From 1187922adf7f781cb257b5e119d53a403e3d4831 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 14 Jan 2011 14:02:02 -0600 Subject: [PATCH 01/11] core: lack of an IPv4 setting indicates DHCP (novell #664640) It shouldn't assert. --- src/nm-device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/nm-device.c b/src/nm-device.c index b9701a399..fa586eff5 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -3355,7 +3355,7 @@ dispose (GObject *object) if ( nm_device_interface_can_assume_connections (NM_DEVICE_INTERFACE (self)) && (nm_device_get_state (self) == NM_DEVICE_STATE_ACTIVATED)) { NMConnection *connection; - NMSettingIP4Config *s_ip4; + NMSettingIP4Config *s_ip4 = NULL; const char *method = NULL; /* Only system connections can be left up */ @@ -3368,9 +3368,8 @@ dispose (GObject *object) * to check that. */ s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG); - g_assert (s_ip4); - - method = nm_setting_ip4_config_get_method (s_ip4); + if (s_ip4) + method = nm_setting_ip4_config_get_method (s_ip4); if ( !method || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) From d53da82ab004f6afd72e575c91038179600e2b62 Mon Sep 17 00:00:00 2001 From: Alexander Shopov Date: Tue, 18 Jan 2011 12:35:46 +0100 Subject: [PATCH 02/11] po: update Bulgarian translation (bgo #639780) --- po/bg.po | 1718 ++++++++++++++++++------------------------------------ 1 file changed, 583 insertions(+), 1135 deletions(-) diff --git a/po/bg.po b/po/bg.po index 5a1e7c1c0..b91690601 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,102 +1,109 @@ # Bulgarian translation of NetworkManager po-file # Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the NetworkManager package. -# Alexander Shopov , 2005, 2007, 2008. +# Alexander Shopov , 2005, 2007, 2008, 2011. # Damyan Ivanov , 2010. # msgid "" msgstr "" -"Project-Id-Version: NetworkManager trunk\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=NetworkManager&component=general\n" -"POT-Creation-Date: 2010-09-20 15:25+0000\n" -"PO-Revision-Date: 2010-09-29 23:55+0300\n" -"Last-Translator: Damyan Ivanov \n" +"Project-Id-Version: NetworkManager master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-01-16 15:37+0200\n" +"PO-Revision-Date: 2011-01-16 15:36+0200\n" +"Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../cli/src/connections.c:60 ../cli/src/connections.c:75 -#: ../cli/src/devices.c:88 ../cli/src/devices.c:101 ../cli/src/devices.c:111 -#: ../cli/src/devices.c:121 ../cli/src/devices.c:134 ../cli/src/devices.c:145 -#: ../cli/src/devices.c:156 ../cli/src/devices.c:165 ../cli/src/devices.c:174 +#: ../cli/src/connections.c:62 ../cli/src/connections.c:78 +#: ../cli/src/devices.c:92 ../cli/src/devices.c:105 ../cli/src/devices.c:115 +#: ../cli/src/devices.c:125 ../cli/src/devices.c:138 ../cli/src/devices.c:151 +#: ../cli/src/devices.c:162 ../cli/src/devices.c:173 ../cli/src/devices.c:182 +#: ../cli/src/devices.c:191 ../cli/src/devices.c:212 msgid "NAME" msgstr "ИМЕ" #. 0 -#: ../cli/src/connections.c:61 ../cli/src/connections.c:76 +#: ../cli/src/connections.c:63 ../cli/src/connections.c:79 msgid "UUID" msgstr "УНИВЕРСАЛЕН ИДЕНТИФИКАТОР" #. 1 -#: ../cli/src/connections.c:62 +#: ../cli/src/connections.c:64 msgid "DEVICES" msgstr "УСТРОЙСТВА" #. 2 -#: ../cli/src/connections.c:63 ../cli/src/connections.c:78 +#: ../cli/src/connections.c:65 ../cli/src/connections.c:81 msgid "SCOPE" msgstr "ОБСЕГ" #. 3 -#: ../cli/src/connections.c:64 +#: ../cli/src/connections.c:66 msgid "DEFAULT" -msgstr "ПОДРАЗ." +msgstr "ПОДРАЗБ." #. 4 -#: ../cli/src/connections.c:65 +#: ../cli/src/connections.c:67 msgid "DBUS-SERVICE" msgstr "УСЛУГА-DBUS" #. 5 -#: ../cli/src/connections.c:66 +#: ../cli/src/connections.c:68 msgid "SPEC-OBJECT" msgstr "СПЕЦИФИКАЦ." #. 6 -#: ../cli/src/connections.c:67 +#: ../cli/src/connections.c:69 msgid "VPN" msgstr "ВЧМ" +#. 7 +#. 2 +#. 11 +#. 5 +#: ../cli/src/connections.c:70 ../cli/src/connections.c:86 +#: ../cli/src/devices.c:65 ../cli/src/devices.c:203 ../cli/src/devices.c:218 +msgid "DBUS-PATH" +msgstr "ПЪТ-DBUS" + #. 1 #. 0 #. 1 -#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90 +#. 2 +#: ../cli/src/connections.c:80 ../cli/src/devices.c:63 ../cli/src/devices.c:94 +#: ../cli/src/devices.c:215 msgid "TYPE" msgstr "ВИД" # Заглавие за датата и часа, когато последно е използвана връзката. # Използва се вътрешният формат (секунди от фиксирана дата през 1700г). #. 3 -#: ../cli/src/connections.c:79 +#: ../cli/src/connections.c:82 msgid "TIMESTAMP" msgstr "ПОСЛ. АКТ." # Заглавие за датата и часа, когато последно е използвана връзката. # Използва се локализиран формат за дата и час. #. 4 -#: ../cli/src/connections.c:80 +#: ../cli/src/connections.c:83 msgid "TIMESTAMP-REAL" msgstr "ПОСЛЕДНО АКТИВНА" #. 5 -#: ../cli/src/connections.c:81 +#: ../cli/src/connections.c:84 msgid "AUTOCONNECT" msgstr "АВТОМАТИЧНА" #. 6 -#: ../cli/src/connections.c:82 +#: ../cli/src/connections.c:85 msgid "READONLY" msgstr "САМО ЧЕТ." -#. 7 -#: ../cli/src/connections.c:83 -msgid "DBUS-PATH" -msgstr "ПЪТ-DBUS" - -#: ../cli/src/connections.c:159 +#: ../cli/src/connections.c:164 #, c-format msgid "" "Usage: nmcli con { COMMAND | help }\n" @@ -104,8 +111,8 @@ msgid "" "\n" " list [id | uuid | system | user]\n" " status\n" -" up id | uuid [iface ] [ap ] [--nowait] [--timeout " -"]\n" +" up id | uuid [iface ] [ap ] [nsp ] [--" +"nowait] [--timeout ]\n" " down id | uuid \n" msgstr "" "Употреба: nmcli con { КОМАНДА | help }\n" @@ -113,805 +120,851 @@ msgstr "" "\n" " list [id <ид> | uuid <ид> | system | user]\n" " status\n" -" up id <ид> | uuid <ид> [iface <интерфейс>] [ap <хардуерен адрес>] [--" -"nowait] [--timeout <изчакване>]\n" +" up id <ид> | uuid <ид> [iface <интерфейс>] [ap <хардуерен адрес>]\n" +" [nsp <име>] [--nowait] [--timeout <изчакване>]\n" " down id <ид> | uuid <ид>\n" -#: ../cli/src/connections.c:199 ../cli/src/connections.c:540 +#: ../cli/src/connections.c:204 ../cli/src/connections.c:554 #, c-format msgid "Error: 'con list': %s" -msgstr "Грешка при „con list“ – %s" +msgstr "Грешка при „con list“ — %s" -#: ../cli/src/connections.c:201 ../cli/src/connections.c:542 +#: ../cli/src/connections.c:206 ../cli/src/connections.c:556 #, c-format msgid "Error: 'con list': %s; allowed fields: %s" -msgstr "Грешка при „con list“ – %s; допустимите полета са %s" +msgstr "Грешка при „con list“ — %s; допустимите полета са %s" -#: ../cli/src/connections.c:209 -#| msgid "Connection Established" +#: ../cli/src/connections.c:214 msgid "Connection details" msgstr "Информация за връзката" -#: ../cli/src/connections.c:384 ../cli/src/connections.c:605 +#: ../cli/src/connections.c:398 ../cli/src/connections.c:619 msgid "system" msgstr "система" -#: ../cli/src/connections.c:384 ../cli/src/connections.c:605 +#: ../cli/src/connections.c:398 ../cli/src/connections.c:619 msgid "user" msgstr "потреб." -#: ../cli/src/connections.c:386 +#: ../cli/src/connections.c:400 msgid "never" msgstr "никога" #. "CAPABILITIES" #. Print header #. "WIFI-PROPERTIES" -#: ../cli/src/connections.c:387 ../cli/src/connections.c:388 -#: ../cli/src/connections.c:606 ../cli/src/connections.c:609 -#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583 -#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586 -#: ../cli/src/devices.c:587 ../cli/src/settings.c:508 -#: ../cli/src/settings.c:551 ../cli/src/settings.c:652 -#: ../cli/src/settings.c:926 ../cli/src/settings.c:927 -#: ../cli/src/settings.c:929 ../cli/src/settings.c:931 -#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057 -#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137 -#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139 -#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141 -#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143 -#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145 -#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147 -#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149 -#: ../cli/src/settings.c:1224 +#: ../cli/src/connections.c:401 ../cli/src/connections.c:402 +#: ../cli/src/connections.c:620 ../cli/src/connections.c:623 +#: ../cli/src/devices.c:469 ../cli/src/devices.c:521 ../cli/src/devices.c:643 +#: ../cli/src/devices.c:669 ../cli/src/devices.c:670 ../cli/src/devices.c:671 +#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/settings.c:520 +#: ../cli/src/settings.c:563 ../cli/src/settings.c:664 +#: ../cli/src/settings.c:938 ../cli/src/settings.c:939 +#: ../cli/src/settings.c:941 ../cli/src/settings.c:943 +#: ../cli/src/settings.c:1068 ../cli/src/settings.c:1069 +#: ../cli/src/settings.c:1070 ../cli/src/settings.c:1149 +#: ../cli/src/settings.c:1150 ../cli/src/settings.c:1151 +#: ../cli/src/settings.c:1152 ../cli/src/settings.c:1153 +#: ../cli/src/settings.c:1154 ../cli/src/settings.c:1155 +#: ../cli/src/settings.c:1156 ../cli/src/settings.c:1157 +#: ../cli/src/settings.c:1158 ../cli/src/settings.c:1159 +#: ../cli/src/settings.c:1160 ../cli/src/settings.c:1161 +#: ../cli/src/settings.c:1236 msgid "yes" msgstr "да" -#: ../cli/src/connections.c:387 ../cli/src/connections.c:388 -#: ../cli/src/connections.c:606 ../cli/src/connections.c:609 -#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583 -#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586 -#: ../cli/src/devices.c:587 ../cli/src/settings.c:508 -#: ../cli/src/settings.c:510 ../cli/src/settings.c:551 -#: ../cli/src/settings.c:652 ../cli/src/settings.c:926 -#: ../cli/src/settings.c:927 ../cli/src/settings.c:929 -#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056 -#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058 -#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138 -#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140 -#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142 -#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144 -#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146 -#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148 -#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224 -#| msgid "none" +#: ../cli/src/connections.c:401 ../cli/src/connections.c:402 +#: ../cli/src/connections.c:620 ../cli/src/connections.c:623 +#: ../cli/src/devices.c:469 ../cli/src/devices.c:521 ../cli/src/devices.c:643 +#: ../cli/src/devices.c:669 ../cli/src/devices.c:670 ../cli/src/devices.c:671 +#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/settings.c:520 +#: ../cli/src/settings.c:522 ../cli/src/settings.c:563 +#: ../cli/src/settings.c:664 ../cli/src/settings.c:938 +#: ../cli/src/settings.c:939 ../cli/src/settings.c:941 +#: ../cli/src/settings.c:943 ../cli/src/settings.c:1068 +#: ../cli/src/settings.c:1069 ../cli/src/settings.c:1070 +#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1150 +#: ../cli/src/settings.c:1151 ../cli/src/settings.c:1152 +#: ../cli/src/settings.c:1153 ../cli/src/settings.c:1154 +#: ../cli/src/settings.c:1155 ../cli/src/settings.c:1156 +#: ../cli/src/settings.c:1157 ../cli/src/settings.c:1158 +#: ../cli/src/settings.c:1159 ../cli/src/settings.c:1160 +#: ../cli/src/settings.c:1161 ../cli/src/settings.c:1236 msgid "no" msgstr "не" -#: ../cli/src/connections.c:461 ../cli/src/connections.c:504 -#| msgid "No active connections!" +#: ../cli/src/connections.c:475 ../cli/src/connections.c:518 msgid "System connections" msgstr "Системни връзки" -#: ../cli/src/connections.c:466 ../cli/src/connections.c:517 -#| msgid "VPN Connections" +#: ../cli/src/connections.c:480 ../cli/src/connections.c:531 msgid "User connections" msgstr "Потребителски връзки" -#: ../cli/src/connections.c:478 ../cli/src/connections.c:1338 -#: ../cli/src/connections.c:1354 ../cli/src/connections.c:1363 -#: ../cli/src/connections.c:1374 ../cli/src/connections.c:1459 -#: ../cli/src/devices.c:962 ../cli/src/devices.c:972 ../cli/src/devices.c:1074 -#: ../cli/src/devices.c:1081 +#: ../cli/src/connections.c:492 ../cli/src/connections.c:1429 +#: ../cli/src/connections.c:1445 ../cli/src/connections.c:1454 +#: ../cli/src/connections.c:1463 ../cli/src/connections.c:1474 +#: ../cli/src/connections.c:1559 ../cli/src/devices.c:1117 +#: ../cli/src/devices.c:1127 ../cli/src/devices.c:1229 +#: ../cli/src/devices.c:1236 ../cli/src/devices.c:1435 +#: ../cli/src/devices.c:1442 #, c-format msgid "Error: %s argument is missing." msgstr "Липсва аргумент за „%s“." -#: ../cli/src/connections.c:491 +#: ../cli/src/connections.c:505 #, c-format msgid "Error: %s - no such connection." msgstr "Няма връзка „%s“." -#: ../cli/src/connections.c:523 ../cli/src/connections.c:1387 -#: ../cli/src/connections.c:1477 ../cli/src/devices.c:785 -#: ../cli/src/devices.c:852 ../cli/src/devices.c:986 ../cli/src/devices.c:1087 +#: ../cli/src/connections.c:537 ../cli/src/connections.c:1487 +#: ../cli/src/connections.c:1577 ../cli/src/devices.c:940 +#: ../cli/src/devices.c:1007 ../cli/src/devices.c:1141 +#: ../cli/src/devices.c:1242 ../cli/src/devices.c:1448 #, c-format msgid "Unknown parameter: %s\n" msgstr "Непознат параметър „%s“\n" -#: ../cli/src/connections.c:532 +#: ../cli/src/connections.c:546 #, c-format msgid "Error: no valid parameter specified." -msgstr "Няма указани параметри." +msgstr "Грешка: не са указани правилни параметри." -#: ../cli/src/connections.c:547 ../cli/src/connections.c:1580 -#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:359 +#: ../cli/src/connections.c:561 ../cli/src/connections.c:1680 +#: ../cli/src/devices.c:1646 ../cli/src/network-manager.c:401 #, c-format msgid "Error: %s." -msgstr "Грешка – %s." +msgstr "Грешка: %s." -#: ../cli/src/connections.c:653 +#: ../cli/src/connections.c:668 #, c-format msgid "Error: 'con status': %s" -msgstr "Грешка при „con status“ – %s" +msgstr "Грешка при „con status“: %s" -#: ../cli/src/connections.c:655 +#: ../cli/src/connections.c:670 #, c-format msgid "Error: 'con status': %s; allowed fields: %s" -msgstr "Грешка при „con status“ – %s. Допустимите полета са %s" +msgstr "Грешка при „con status“: %s. Допустимите полета са: %s" -#: ../cli/src/connections.c:662 -#| msgid "No active connections!" +#: ../cli/src/connections.c:677 msgid "Active connections" msgstr "Активни връзки" -#: ../cli/src/connections.c:1030 +#: ../cli/src/connections.c:1101 #, c-format -#| msgid "No active connections!" msgid "no active connection on device '%s'" msgstr "няма активна връзка, използваща устройството „%s“" -#: ../cli/src/connections.c:1038 +#: ../cli/src/connections.c:1109 #, c-format -#| msgid "No active connections!" msgid "no active connection or device" msgstr "няма активна връзка или устройство" -#: ../cli/src/connections.c:1088 +#: ../cli/src/connections.c:1178 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "устройството „%s“ не е съвместимо с връзката „%s“" -#: ../cli/src/connections.c:1090 +#: ../cli/src/connections.c:1180 #, c-format -#| msgid "Error retrieving VPN connection '%s'" msgid "no device found for connection '%s'" msgstr "не е открито устройство за връзката „%s“" -#: ../cli/src/connections.c:1101 +#: ../cli/src/connections.c:1191 msgid "activating" msgstr "включване" -#: ../cli/src/connections.c:1103 +#: ../cli/src/connections.c:1193 msgid "activated" msgstr "включена" -#: ../cli/src/connections.c:1106 ../cli/src/connections.c:1129 -#: ../cli/src/connections.c:1162 ../cli/src/devices.c:246 -#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:94 -#: ../cli/src/network-manager.c:149 ../cli/src/settings.c:473 -#| msgid "(unknown)" +#: ../cli/src/connections.c:1196 ../cli/src/connections.c:1219 +#: ../cli/src/connections.c:1252 ../cli/src/devices.c:281 +#: ../cli/src/devices.c:644 ../cli/src/network-manager.c:98 +#: ../cli/src/network-manager.c:156 ../cli/src/settings.c:485 msgid "unknown" msgstr "неизвестно" -#: ../cli/src/connections.c:1115 -#| msgid "VPN connecting to '%s'" +#: ../cli/src/connections.c:1205 msgid "VPN connecting (prepare)" msgstr "Свързване към ВЧМ (подготовка)" -#: ../cli/src/connections.c:1117 +#: ../cli/src/connections.c:1207 msgid "VPN connecting (need authentication)" msgstr "Свързване към ВЧМ (нужна е идентификация)" -#: ../cli/src/connections.c:1119 -#| msgid "VPN Connections" +#: ../cli/src/connections.c:1209 msgid "VPN connecting" msgstr "Свързване към ВЧМ" -#: ../cli/src/connections.c:1121 +#: ../cli/src/connections.c:1211 msgid "VPN connecting (getting IP configuration)" msgstr "Свързване към ВЧМ (получаване на настройките за IP)" -#: ../cli/src/connections.c:1123 -#| msgid "Disconnected" +#: ../cli/src/connections.c:1213 msgid "VPN connected" msgstr "Свързан към ВЧМ" -#: ../cli/src/connections.c:1125 -#| msgid "VPN Connect Failure" +#: ../cli/src/connections.c:1215 msgid "VPN connection failed" msgstr "Неуспешно свързване към ВЧМ" -#: ../cli/src/connections.c:1127 -#| msgid "Disconnected" +#: ../cli/src/connections.c:1217 msgid "VPN disconnected" msgstr "Връзката към ВЧМ е прекъсната" -#: ../cli/src/connections.c:1138 -#| msgid "(unknown)" +#: ../cli/src/connections.c:1228 msgid "unknown reason" msgstr "неизвестна причина" -#: ../cli/src/connections.c:1140 +#: ../cli/src/connections.c:1230 msgid "none" msgstr "липсва" -#: ../cli/src/connections.c:1142 -#| msgid "The network connection has been disconnected." +#: ../cli/src/connections.c:1232 msgid "the user was disconnected" msgstr "потребителят е изключен" -#: ../cli/src/connections.c:1144 -#| msgid "The network connection has been disconnected." +#: ../cli/src/connections.c:1234 msgid "the base network connection was interrupted" msgstr "основната връзка към мрежата е прекъсната" -#: ../cli/src/connections.c:1146 +#: ../cli/src/connections.c:1236 msgid "the VPN service stopped unexpectedly" msgstr "услугата за ВЧМ спря неочаквано" -#: ../cli/src/connections.c:1148 +#: ../cli/src/connections.c:1238 msgid "the VPN service returned invalid configuration" msgstr "услугата за ВЧМ предостави неправилни настройки" -#: ../cli/src/connections.c:1150 +#: ../cli/src/connections.c:1240 msgid "the connection attempt timed out" msgstr "времето за свързване изтече" -#: ../cli/src/connections.c:1152 +#: ../cli/src/connections.c:1242 msgid "the VPN service did not start in time" msgstr "услугата за ВЧМ не успя да тръгне в определеното време" -#: ../cli/src/connections.c:1154 +#: ../cli/src/connections.c:1244 msgid "the VPN service failed to start" msgstr "услугата за ВЧМ не успя да тръгне" -#: ../cli/src/connections.c:1156 +#: ../cli/src/connections.c:1246 msgid "no valid VPN secrets" msgstr "няма правилни пароли за ВЧМ" -#: ../cli/src/connections.c:1158 +#: ../cli/src/connections.c:1248 msgid "invalid VPN secrets" msgstr "неправилни пароли за ВЧМ" -#: ../cli/src/connections.c:1160 +#: ../cli/src/connections.c:1250 msgid "the connection was removed" msgstr "връзката е премахната" -#: ../cli/src/connections.c:1174 +#: ../cli/src/connections.c:1264 #, c-format msgid "state: %s\n" msgstr "състояние: %s\n" -#: ../cli/src/connections.c:1177 ../cli/src/connections.c:1203 +#: ../cli/src/connections.c:1267 ../cli/src/connections.c:1293 #, c-format -#| msgid "Connection Established" msgid "Connection activated\n" msgstr "Връзката е активирана\n" -#: ../cli/src/connections.c:1180 +#: ../cli/src/connections.c:1270 #, c-format -#| msgid "Connection to the wired network failed." msgid "Error: Connection activation failed." msgstr "Грешка при активиране на връзката." -#: ../cli/src/connections.c:1199 +#: ../cli/src/connections.c:1289 #, c-format msgid "state: %s (%d)\n" msgstr "състояние: %s (%d)\n" -#: ../cli/src/connections.c:1209 +#: ../cli/src/connections.c:1299 #, c-format msgid "Error: Connection activation failed: %s." msgstr "Грешка при активиране на връзката: %s." -#: ../cli/src/connections.c:1226 ../cli/src/devices.c:909 +#: ../cli/src/connections.c:1316 ../cli/src/devices.c:1064 #, c-format msgid "Error: Timeout %d sec expired." -msgstr "Просрочено е времето от %d сек." +msgstr "Грешка: просрочване на времето от %d сек." -#: ../cli/src/connections.c:1269 +#: ../cli/src/connections.c:1359 #, c-format msgid "Error: Connection activation failed: %s" msgstr "Грешка при активиране на връзката: %s" -#: ../cli/src/connections.c:1283 +#: ../cli/src/connections.c:1373 #, c-format -#| msgid "Error retrieving VPN connection '%s'" msgid "Error: Obtaining active connection for '%s' failed." msgstr "Грешка при получаване на активната връзка за „%s“." -#: ../cli/src/connections.c:1292 +#: ../cli/src/connections.c:1382 #, c-format -#| msgid "No active connections!" msgid "Active connection state: %s\n" msgstr "Състояние на активната връзка: %s\n" -#: ../cli/src/connections.c:1293 +#: ../cli/src/connections.c:1383 #, c-format -#| msgid "No active connections!" msgid "Active connection path: %s\n" msgstr "Път на активната връзка: %s\n" -#: ../cli/src/connections.c:1347 ../cli/src/connections.c:1468 +#: ../cli/src/connections.c:1438 ../cli/src/connections.c:1568 #, c-format -#| msgid "Error retrieving VPN connection '%s'" msgid "Error: Unknown connection: %s." msgstr "Непозната връзка „%s“." -#: ../cli/src/connections.c:1382 ../cli/src/devices.c:980 +#: ../cli/src/connections.c:1482 ../cli/src/devices.c:1135 #, c-format msgid "Error: timeout value '%s' is not valid." msgstr "Ограничението на времето „%s“ не е правилно." -#: ../cli/src/connections.c:1395 ../cli/src/connections.c:1485 +#: ../cli/src/connections.c:1495 ../cli/src/connections.c:1585 #, c-format msgid "Error: id or uuid has to be specified." msgstr "" "Указването на идентификатор или универсален идентификатор (uuid) е " "задължително." -#: ../cli/src/connections.c:1415 +#: ../cli/src/connections.c:1515 #, c-format msgid "Error: No suitable device found: %s." -msgstr "Не е намерено подходящо устройство – %s." +msgstr "Не е намерено подходящо устройство — %s." -#: ../cli/src/connections.c:1417 +#: ../cli/src/connections.c:1517 #, c-format msgid "Error: No suitable device found." -msgstr "Не е намерено подходящо устройство." +msgstr "Не е намерено подходящо устройство." -#: ../cli/src/connections.c:1512 +#: ../cli/src/connections.c:1612 #, c-format -#| msgid "Connection Information" msgid "Warning: Connection not active\n" msgstr "Предупреждение: Връзката не е активна\n" -#: ../cli/src/connections.c:1569 +#: ../cli/src/connections.c:1669 #, c-format msgid "Error: 'con' command '%s' is not valid." -msgstr "„con“ не поддържа команда „%s“." +msgstr "Грешка: „con“ не поддържа команда „%s“." -#: ../cli/src/connections.c:1605 +#: ../cli/src/connections.c:1705 #, c-format msgid "Error: could not connect to D-Bus." msgstr "Грешка при свързване с D-Bus." -#: ../cli/src/connections.c:1612 +#: ../cli/src/connections.c:1712 #, c-format msgid "Error: Could not get system settings." msgstr "Грешка при получаване на системните настройки." -#: ../cli/src/connections.c:1620 +#: ../cli/src/connections.c:1720 #, c-format msgid "Error: Could not get user settings." msgstr "Грешка при получаване на потребителските настройки." -#: ../cli/src/connections.c:1630 +#: ../cli/src/connections.c:1730 #, c-format msgid "Error: Can't obtain connections: settings services are not running." msgstr "" -"Грешка при получаване на списъка с връзки – услугите за настройки не са " +"Грешка при получаване на списъка с връзки — услугите за настройки не са " "налични." #. 0 #. 9 -#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184 +#. 3 +#: ../cli/src/devices.c:62 ../cli/src/devices.c:93 ../cli/src/devices.c:201 +#: ../cli/src/devices.c:216 msgid "DEVICE" msgstr "УСТРОЙСТВО" #. 1 #. 4 #. 0 -#: ../cli/src/devices.c:63 ../cli/src/devices.c:93 +#: ../cli/src/devices.c:64 ../cli/src/devices.c:97 #: ../cli/src/network-manager.c:36 msgid "STATE" msgstr "СЪСТОЯНИЕ" -#: ../cli/src/devices.c:72 +#: ../cli/src/devices.c:74 msgid "GENERAL" msgstr "ОБЩИ" #. 0 -#: ../cli/src/devices.c:73 +#: ../cli/src/devices.c:75 msgid "CAPABILITIES" msgstr "ВЪЗМОЖНОСТИ" #. 1 -#: ../cli/src/devices.c:74 +#: ../cli/src/devices.c:76 msgid "WIFI-PROPERTIES" -msgstr "БЕЗЖИЧНИ-ХАРАКТЕРИСТИКИ" +msgstr "БЕЗЖ-ХАРАКТЕРИСТИКИ" #. 2 -#: ../cli/src/devices.c:75 -#| msgid "PEAP" +#: ../cli/src/devices.c:77 msgid "AP" -msgstr "ТД" +msgstr "ТЧК-ДСТП" #. 3 -#: ../cli/src/devices.c:76 +#: ../cli/src/devices.c:78 msgid "WIRED-PROPERTIES" msgstr "ЖИЧНИ-ХАРАКТЕРИСТИКИ" #. 4 -#: ../cli/src/devices.c:77 +#: ../cli/src/devices.c:79 +msgid "WIMAX-PROPERTIES" +msgstr "WIMAX-ХАРАКТЕРИСТИКИ" + +#. 5 +#. 0 +#: ../cli/src/devices.c:80 ../cli/src/devices.c:213 +msgid "NSP" +msgstr "ДОСТАВЧИК" + +#. 6 +#: ../cli/src/devices.c:81 msgid "IP4-SETTINGS" msgstr "ПАРАМЕТРИ-IP4" -#. 5 -#: ../cli/src/devices.c:78 +#. 7 +#: ../cli/src/devices.c:82 msgid "IP4-DNS" msgstr "IP4-DNS" -#. 6 -#: ../cli/src/devices.c:79 +#. 8 +#: ../cli/src/devices.c:83 msgid "IP6-SETTINGS" msgstr "ПАРАМЕТРИ-IP6" -#. 7 -#: ../cli/src/devices.c:80 +#. 9 +#: ../cli/src/devices.c:84 msgid "IP6-DNS" msgstr "IP6-DNS" #. 2 -#: ../cli/src/devices.c:91 +#: ../cli/src/devices.c:95 msgid "DRIVER" msgstr "ДРАЙВЕР" #. 3 -#: ../cli/src/devices.c:92 +#: ../cli/src/devices.c:96 msgid "HWADDR" msgstr "ХАРДУЕРЕН-АДРЕС" #. 0 -#: ../cli/src/devices.c:102 +#: ../cli/src/devices.c:106 msgid "CARRIER-DETECT" msgstr "СИГНАЛ-ОТКР." #. 1 -#: ../cli/src/devices.c:103 +#: ../cli/src/devices.c:107 msgid "SPEED" msgstr "СКОРОСТ" #. 0 -#: ../cli/src/devices.c:112 +#: ../cli/src/devices.c:116 msgid "CARRIER" msgstr "СИГНАЛ" #. 0 -#: ../cli/src/devices.c:122 +#: ../cli/src/devices.c:126 msgid "WEP" msgstr "WEP" #. 1 -#: ../cli/src/devices.c:123 +#: ../cli/src/devices.c:127 msgid "WPA" msgstr "WPA" #. 2 -#: ../cli/src/devices.c:124 -#| msgid "WPA2 TKIP" +#: ../cli/src/devices.c:128 msgid "WPA2" msgstr "WPA2" #. 3 -#: ../cli/src/devices.c:125 +#: ../cli/src/devices.c:129 msgid "TKIP" msgstr "TKIP" #. 4 -#: ../cli/src/devices.c:126 -#| msgid "AES-CCMP" +#: ../cli/src/devices.c:130 msgid "CCMP" msgstr "CCMP" #. 0 -#: ../cli/src/devices.c:135 ../cli/src/devices.c:146 +#: ../cli/src/devices.c:139 +msgid "CTR-FREQ" +msgstr "CTR-FREQ" + +#. 1 +#: ../cli/src/devices.c:140 +msgid "RSSI" +msgstr "RSSI" + +#. 2 +#: ../cli/src/devices.c:141 +msgid "CINR" +msgstr "CINR" + +#. 3 +#: ../cli/src/devices.c:142 +msgid "TX-POW" +msgstr "TX-POW" + +#. 4 +#: ../cli/src/devices.c:143 +msgid "BSID" +msgstr "BSID" + +#. 0 +#: ../cli/src/devices.c:152 ../cli/src/devices.c:163 msgid "ADDRESS" msgstr "АДРЕС" #. 1 -#: ../cli/src/devices.c:136 ../cli/src/devices.c:147 +#: ../cli/src/devices.c:153 ../cli/src/devices.c:164 msgid "PREFIX" msgstr "ПРЕФИКС" #. 2 -#: ../cli/src/devices.c:137 ../cli/src/devices.c:148 +#: ../cli/src/devices.c:154 ../cli/src/devices.c:165 msgid "GATEWAY" msgstr "ШЛЮЗ" #. 0 -#: ../cli/src/devices.c:157 ../cli/src/devices.c:166 +#: ../cli/src/devices.c:174 ../cli/src/devices.c:183 msgid "DNS" msgstr "DNS" #. 0 -#: ../cli/src/devices.c:175 +#: ../cli/src/devices.c:192 msgid "SSID" msgstr "SSID" #. 1 -#: ../cli/src/devices.c:176 +#: ../cli/src/devices.c:193 msgid "BSSID" msgstr "BSSID" #. 2 -#: ../cli/src/devices.c:177 +#: ../cli/src/devices.c:194 msgid "MODE" msgstr "РЕЖИМ" #. 3 -#: ../cli/src/devices.c:178 +#: ../cli/src/devices.c:195 msgid "FREQ" msgstr "ЧЕСТОТА" #. 4 -#: ../cli/src/devices.c:179 +#: ../cli/src/devices.c:196 msgid "RATE" msgstr "СКОРОСТ-ПРЕДАВАНЕ" #. 5 -#: ../cli/src/devices.c:180 +#. 1 +#: ../cli/src/devices.c:197 ../cli/src/devices.c:214 msgid "SIGNAL" msgstr "СИГНАЛ" #. 6 -#: ../cli/src/devices.c:181 +#: ../cli/src/devices.c:198 msgid "SECURITY" msgstr "СИГУРНОСТ" #. 7 -#: ../cli/src/devices.c:182 +#: ../cli/src/devices.c:199 msgid "WPA-FLAGS" msgstr "ФЛАГОВЕ-WPA" #. 8 -#: ../cli/src/devices.c:183 +#: ../cli/src/devices.c:200 msgid "RSN-FLAGS" msgstr "ФЛАГОВЕ-RSN" #. 10 -#: ../cli/src/devices.c:185 +#. 4 +#: ../cli/src/devices.c:202 ../cli/src/devices.c:217 msgid "ACTIVE" msgstr "АКТИВНА" -#: ../cli/src/devices.c:208 +#: ../cli/src/devices.c:242 #, c-format msgid "" "Usage: nmcli dev { COMMAND | help }\n" "\n" -" COMMAND := { status | list | disconnect | wifi }\n" +" COMMAND := { status | list | disconnect | wifi | wimax }\n" "\n" " status\n" " list [iface ]\n" " disconnect iface [--nowait] [--timeout ]\n" " wifi [list [iface ] [hwaddr ]]\n" +" wimax [list [iface ] [nsp ]]\n" "\n" msgstr "" "Употреба: nmcli dev { КОМАНДА | help }\n" "\n" -" КОМАНДА := { status | list | disconnect | wifi }\n" +" КОМАНДА := { status | list | disconnect | wifi | wimax}\n" "\n" " status\n" " list [ iface <интерфейс>]\n" " disconnect iface <интерфейс> [--nowait] [--timeout <време>]\n" " wifi [list [iface <интерфейс>] [hwaddr <хардуерен адрес>]]\n" -"\n" +" wimax [list [iface <интерфейс>] [nsp <име>]]\n" -#: ../cli/src/devices.c:228 +#: ../cli/src/devices.c:263 msgid "unmanaged" msgstr "не се управлява" -#: ../cli/src/devices.c:230 +#: ../cli/src/devices.c:265 msgid "unavailable" msgstr "не е налично" # става дума за устройство # или за общото състояние на N-M -#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:91 -#| msgid "Disconnected" +#: ../cli/src/devices.c:267 ../cli/src/network-manager.c:95 msgid "disconnected" msgstr "без връзка" -#: ../cli/src/devices.c:234 +#: ../cli/src/devices.c:269 msgid "connecting (prepare)" msgstr "свързване (подготовка)" -#: ../cli/src/devices.c:236 -#| msgid "Connection Information" +#: ../cli/src/devices.c:271 msgid "connecting (configuring)" msgstr "свързване (настройка)" -#: ../cli/src/devices.c:238 +#: ../cli/src/devices.c:273 msgid "connecting (need authentication)" msgstr "свързване (нужна е идентификация)" -#: ../cli/src/devices.c:240 -#| msgid "Connection Information" +#: ../cli/src/devices.c:275 msgid "connecting (getting IP configuration)" msgstr "свързване (получаване на настройките за IP)" # става дума и за конкретно устройство, # и за NM като цяло -#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:89 -#| msgid "Disconnected" +#: ../cli/src/devices.c:277 ../cli/src/network-manager.c:93 msgid "connected" msgstr "има връзка" -#: ../cli/src/devices.c:244 -#| msgid "Connection Established" +#: ../cli/src/devices.c:279 msgid "connection failed" msgstr "неуспешно свързване" -# вид устройство (жично, безжично, телефон, bluetooth) или вид мрежа (инфраструктура, ad-hoc) -#: ../cli/src/devices.c:267 ../cli/src/devices.c:424 +# вид устройство (жично, безжично, телефон, Bluetooth) или вид мрежа (инфраструктура, ad-hoc) +#: ../cli/src/devices.c:304 ../cli/src/devices.c:461 ../cli/src/devices.c:504 msgid "Unknown" msgstr "Непознат" # низът се използва когато дадена безжична мрежа няма флагове от рода на pair_ccmp, pair_wpe140 и т.н. -#: ../cli/src/devices.c:299 -#| msgid "none" +#: ../cli/src/devices.c:336 msgid "(none)" msgstr "(без)" -#: ../cli/src/devices.c:324 +#: ../cli/src/devices.c:361 #, c-format msgid "%s: error converting IP4 address 0x%X" msgstr "%s: грешка при преобразуване на адрес IP4 0x%X" -#: ../cli/src/devices.c:393 +#: ../cli/src/devices.c:430 #, c-format msgid "%u MHz" -msgstr "%u МХц" +msgstr "%u MHz" -#: ../cli/src/devices.c:394 +#: ../cli/src/devices.c:431 #, c-format -#| msgid "%d Mb/s" msgid "%u MB/s" -msgstr "%u МБ/с" +msgstr "%u MB/s" -#: ../cli/src/devices.c:403 +#: ../cli/src/devices.c:440 msgid "Encrypted: " -msgstr "Шифроване: " +msgstr "Шифриране: " -#: ../cli/src/devices.c:408 +#: ../cli/src/devices.c:445 msgid "WEP " msgstr "WEP" -#: ../cli/src/devices.c:410 -#| msgid "WPA TKIP" +#: ../cli/src/devices.c:447 msgid "WPA " msgstr "WPA" -#: ../cli/src/devices.c:412 -#| msgid "WPA2 TKIP" +#: ../cli/src/devices.c:449 msgid "WPA2 " msgstr "WPA2" -#: ../cli/src/devices.c:415 -#| msgid "WPA Enterprise" +#: ../cli/src/devices.c:452 msgid "Enterprise " msgstr "Индустр." # Режима на мрежата -#: ../cli/src/devices.c:424 +#: ../cli/src/devices.c:461 msgid "Ad-Hoc" -msgstr "Специален" +msgstr "Инцидентен (ад хок)" # Режима на мрежата -#: ../cli/src/devices.c:424 +#: ../cli/src/devices.c:461 msgid "Infrastructure" msgstr "Инфраструктурен" -#: ../cli/src/devices.c:486 +#: ../cli/src/devices.c:495 +msgid "Home" +msgstr "На доставчика" + +#: ../cli/src/devices.c:498 +msgid "Partner" +msgstr "На партньор" + +#: ../cli/src/devices.c:501 +msgid "Roaming" +msgstr "Роуминг" + +#: ../cli/src/devices.c:570 #, c-format msgid "Error: 'dev list': %s" -msgstr "Грешка при „dev list“ – %s" +msgstr "Грешка при „dev list“ — %s" -#: ../cli/src/devices.c:488 +#: ../cli/src/devices.c:572 #, c-format msgid "Error: 'dev list': %s; allowed fields: %s" -msgstr "Грешка при „dev list“ – %s; допустимите полета са %s" +msgstr "Грешка при „dev list“ — %s; допустимите полета са %s" -#: ../cli/src/devices.c:497 +#: ../cli/src/devices.c:581 msgid "Device details" msgstr "Информация за устройството" # или е драйвер, # или е грешка при прекъсване на връзката -#: ../cli/src/devices.c:527 ../cli/src/devices.c:925 +#: ../cli/src/devices.c:613 ../cli/src/devices.c:1080 msgid "(unknown)" msgstr "(няма информация)" # хардуерен адрес -#: ../cli/src/devices.c:528 -#| msgid "(unknown)" +#: ../cli/src/devices.c:614 msgid "unknown)" msgstr "(няма информация)" -#: ../cli/src/devices.c:554 +#: ../cli/src/devices.c:640 #, c-format -#| msgid "%d Mb/s" msgid "%u Mb/s" -msgstr "%u Мб/с" +msgstr "%u Mb/s" # дадено устройство има сигнал по жицата #. Print header #. "WIRED-PROPERTIES" -#: ../cli/src/devices.c:627 -#| msgid "None" +#: ../cli/src/devices.c:713 msgid "on" msgstr "свързано" -#: ../cli/src/devices.c:627 +#: ../cli/src/devices.c:713 msgid "off" msgstr "без връзка" -#: ../cli/src/devices.c:808 +#: ../cli/src/devices.c:963 #, c-format msgid "Error: 'dev status': %s" -msgstr "Грешка при „dev status“ – %s" +msgstr "Грешка при „dev status“ — %s" -#: ../cli/src/devices.c:810 +#: ../cli/src/devices.c:965 #, c-format msgid "Error: 'dev status': %s; allowed fields: %s" -msgstr "Грешка при „dev status“ – %s; допустимите полета са %s" +msgstr "Грешка при „dev status“ — %s; допустимите полета са %s" -#: ../cli/src/devices.c:817 +#: ../cli/src/devices.c:972 msgid "Status of devices" msgstr "Състояние на устройствата" -#: ../cli/src/devices.c:845 +#: ../cli/src/devices.c:1000 #, c-format msgid "Error: '%s' argument is missing." -msgstr "Липсва аргумент за „%s“." +msgstr "Грешка: липсва аргумент за „%s“." -#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013 -#: ../cli/src/devices.c:1136 +#: ../cli/src/devices.c:1029 ../cli/src/devices.c:1168 +#: ../cli/src/devices.c:1291 ../cli/src/devices.c:1497 #, c-format msgid "Error: Device '%s' not found." -msgstr "Устройството „%s“ не е намерено." +msgstr "Грешка: устройството „%s“ не е открито." -#: ../cli/src/devices.c:897 +#: ../cli/src/devices.c:1052 #, c-format msgid "Success: Device '%s' successfully disconnected." -msgstr "Връзката на устройството „%s“ е прекъсната." +msgstr "Успех: връзката на устройството „%s“ е прекъсната." -#: ../cli/src/devices.c:922 +#: ../cli/src/devices.c:1077 #, c-format msgid "Error: Device '%s' (%s) disconnecting failed: %s" -msgstr "Грешка при прекъсване на връзката на устройството „%s“ (%s) – %s" +msgstr "Грешка при прекъсване на връзката на устройството „%s“ (%s) — %s" -#: ../cli/src/devices.c:930 +#: ../cli/src/devices.c:1085 #, c-format msgid "Device state: %d (%s)\n" msgstr "Състояние на устройството: %d (%s)\n" -#: ../cli/src/devices.c:994 +#: ../cli/src/devices.c:1149 #, c-format msgid "Error: iface has to be specified." -msgstr "Указването на „iface“ е задължително." +msgstr "Грешка: указването на „iface“ е задължително." -#: ../cli/src/devices.c:1112 +#: ../cli/src/devices.c:1267 #, c-format msgid "Error: 'dev wifi': %s" -msgstr "Грешка при „dev wifi“ – %s" +msgstr "Грешка при „dev wifi“ — %s" -#: ../cli/src/devices.c:1114 +#: ../cli/src/devices.c:1269 #, c-format msgid "Error: 'dev wifi': %s; allowed fields: %s" -msgstr "Грешка при „dev wifi“ – %s; допустимите полета са %s" +msgstr "Грешка при „dev wifi“ — %s; допустимите полета са %s" -#: ../cli/src/devices.c:1121 +#: ../cli/src/devices.c:1276 msgid "WiFi scan list" msgstr "Открити безжични мрежи" -#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210 +#: ../cli/src/devices.c:1311 ../cli/src/devices.c:1365 +#: ../cli/src/devices.c:1559 #, c-format msgid "Error: Access point with hwaddr '%s' not found." msgstr "Не е открита точка за достъп с хардуерен адрес „%s“." -#: ../cli/src/devices.c:1173 +#: ../cli/src/devices.c:1328 #, c-format msgid "Error: Device '%s' is not a WiFi device." msgstr "„%s“ не е устройство за безжична мрежа." -#: ../cli/src/devices.c:1237 +#: ../cli/src/devices.c:1392 #, c-format msgid "Error: 'dev wifi' command '%s' is not valid." msgstr "„%s“ не е правилна команда за „dev wifi“." -#: ../cli/src/devices.c:1284 +#: ../cli/src/devices.c:1473 +#, c-format +msgid "Error: 'dev wimax': %s" +msgstr "Грешка при „dev wimax“ — %s" + +#: ../cli/src/devices.c:1475 +#, c-format +msgid "Error: 'dev wimax': %s; allowed fields: %s" +msgstr "Грешка при „dev wifi“ — %s; допустимите полета са %s" + +#: ../cli/src/devices.c:1482 +msgid "WiMAX NSP list" +msgstr "Списък с доставчици на WiMAX" + +#: ../cli/src/devices.c:1517 +#, c-format +msgid "Error: NSP with name '%s' not found." +msgstr "Грешка: доставчикът „%s“ не е открит." + +#: ../cli/src/devices.c:1528 +#, c-format +msgid "Error: Device '%s' is not a WiMAX device." +msgstr "„%s“ не е устройство за мрежа по WiMAX." + +#: ../cli/src/devices.c:1586 +#, c-format +msgid "Error: 'dev wimax' command '%s' is not valid." +msgstr "„%s“ не е правилна команда за „dev wimax“." + +#: ../cli/src/devices.c:1637 #, c-format msgid "Error: 'dev' command '%s' is not valid." msgstr "„%s“ не е правилна команда за „dev“." @@ -945,144 +998,169 @@ msgstr "МОБ. ХАРДУЕР" msgid "WWAN" msgstr "МОБ. МРЕЖА" -#: ../cli/src/network-manager.c:64 +#. 6 +#: ../cli/src/network-manager.c:42 +msgid "WIMAX-HARDWARE" +msgstr "ХАРДУЕР-WIMAX" + +#. 7 +#: ../cli/src/network-manager.c:43 +msgid "WIMAX" +msgstr "WIMAX" + +#: ../cli/src/network-manager.c:67 #, c-format msgid "" "Usage: nmcli nm { COMMAND | help }\n" "\n" -" COMMAND := { status | enable | sleep | wifi | wwan }\n" +" COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n" "\n" " status\n" " enable [true|false]\n" " sleep [true|false]\n" " wifi [on|off]\n" " wwan [on|off]\n" +" wimax [on|off]\n" "\n" msgstr "" "Употреба: nmcli nm { КОМАНДА | help }\n" "\n" -" КОМАНДА := { status | enable | sleep | wifi | wwan }\n" +" КОМАНДА := { status | enable | sleep | wifi | wwan | wimax }\n" "\n" " status\n" " enable [true|false]\n" " sleep [true|false]\n" " wifi [on|off]\n" " wwan [on|off]\n" +" wimax [on|off]\n" "\n" -#: ../cli/src/network-manager.c:85 +#: ../cli/src/network-manager.c:89 msgid "asleep" msgstr "спящ" -#: ../cli/src/network-manager.c:87 -#| msgid "C_onnect" +#: ../cli/src/network-manager.c:91 msgid "connecting" msgstr "свързване" -#: ../cli/src/network-manager.c:128 +#: ../cli/src/network-manager.c:133 #, c-format msgid "Error: 'nm status': %s" -msgstr "Грешка при „nm status“ – %s" +msgstr "Грешка при „nm status“ — %s" -#: ../cli/src/network-manager.c:130 +#: ../cli/src/network-manager.c:135 #, c-format msgid "Error: 'nm status': %s; allowed fields: %s" -msgstr "Грешка при „nm status“ – %s; допустимите полета са %s" +msgstr "Грешка при „nm status“ — %s; допустимите полета са %s" -#: ../cli/src/network-manager.c:137 -#| msgid "NetworkManager Applet" +#: ../cli/src/network-manager.c:142 msgid "NetworkManager status" msgstr "Състояние на NetworkManager" #. Print header -#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145 -#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147 -#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247 -#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328 +#: ../cli/src/network-manager.c:149 ../cli/src/network-manager.c:150 +#: ../cli/src/network-manager.c:151 ../cli/src/network-manager.c:152 +#: ../cli/src/network-manager.c:153 ../cli/src/network-manager.c:154 +#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:257 +#: ../cli/src/network-manager.c:306 ../cli/src/network-manager.c:338 +#: ../cli/src/network-manager.c:370 msgid "enabled" msgstr "включено" -#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145 -#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147 -#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247 -#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328 +#: ../cli/src/network-manager.c:149 ../cli/src/network-manager.c:150 +#: ../cli/src/network-manager.c:151 ../cli/src/network-manager.c:152 +#: ../cli/src/network-manager.c:153 ../cli/src/network-manager.c:154 +#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:257 +#: ../cli/src/network-manager.c:306 ../cli/src/network-manager.c:338 +#: ../cli/src/network-manager.c:370 msgid "disabled" msgstr "изключено" -#: ../cli/src/network-manager.c:152 +#: ../cli/src/network-manager.c:159 msgid "running" msgstr "включен" -#: ../cli/src/network-manager.c:152 +#: ../cli/src/network-manager.c:159 msgid "not running" msgstr "изключен" -#: ../cli/src/network-manager.c:175 +#: ../cli/src/network-manager.c:184 #, c-format msgid "Error: Couldn't connect to system bus: %s" -msgstr "Грешка при свързване към системната шина – %s" +msgstr "Грешка при свързване към системната шина — %s" -#: ../cli/src/network-manager.c:186 +#: ../cli/src/network-manager.c:195 #, c-format msgid "Error: Couldn't create D-Bus object proxy." msgstr "Грешка при създаване на обект-посредник за D-Bus." -#: ../cli/src/network-manager.c:192 +#: ../cli/src/network-manager.c:201 #, c-format msgid "Error in sleep: %s" -msgstr "Грешка при приспиване – %s" +msgstr "Грешка при приспиване — %s" -#: ../cli/src/network-manager.c:237 ../cli/src/network-manager.c:286 -#: ../cli/src/network-manager.c:318 +#: ../cli/src/network-manager.c:247 ../cli/src/network-manager.c:296 +#: ../cli/src/network-manager.c:328 ../cli/src/network-manager.c:360 #, c-format msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s" msgstr "Стойността „%s“ за „--fields“ не е правилна; допустимите полета са %s" -#: ../cli/src/network-manager.c:245 -#| msgid "Networking disabled" +#: ../cli/src/network-manager.c:255 msgid "Networking enabled" msgstr "Мрежата е включена" -#: ../cli/src/network-manager.c:256 +#: ../cli/src/network-manager.c:266 #, c-format msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'." msgstr "" -"Недопустим аргумент на „enable“ – „%s“. Използвайте „true“ или „false“." +"Грешка: неправилен аргумент на „enable“ — „%s“. Използвайте „true“ или " +"„false“." -#: ../cli/src/network-manager.c:265 +#: ../cli/src/network-manager.c:275 #, c-format msgid "Error: Sleeping status is not exported by NetworkManager." msgstr "NetworkManager не предоставя информация за приспиването." -#: ../cli/src/network-manager.c:273 +#: ../cli/src/network-manager.c:283 #, c-format msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'." msgstr "" -"„%s“ не е правилен параметър за „sleep“. Използвайте „true“ или „false“." +"Грешка: „%s“ не е правилен параметър за „sleep“. Използвайте „true“ или " +"„false“." -#: ../cli/src/network-manager.c:294 +#: ../cli/src/network-manager.c:304 msgid "WiFi enabled" msgstr "Безжичната мрежа е включена" -#: ../cli/src/network-manager.c:305 +#: ../cli/src/network-manager.c:315 #, c-format msgid "Error: invalid 'wifi' parameter: '%s'." -msgstr "„%s“ не е правилен параметър за „wifi“." +msgstr "Грешка: „%s“ не е правилен параметър за „wifi“." -#: ../cli/src/network-manager.c:326 +#: ../cli/src/network-manager.c:336 msgid "WWAN enabled" msgstr "Мобилната мрежа е включена" -#: ../cli/src/network-manager.c:337 +#: ../cli/src/network-manager.c:347 #, c-format msgid "Error: invalid 'wwan' parameter: '%s'." -msgstr "„%s“ не е правилен параметър за „wwan“." +msgstr "Грешка: „%s“ не е правилен параметър за „wwan“." -#: ../cli/src/network-manager.c:348 +#: ../cli/src/network-manager.c:368 +msgid "WiMAX enabled" +msgstr "Мрежата по WiMAX е включена" + +#: ../cli/src/network-manager.c:379 +#, c-format +msgid "Error: invalid 'wimax' parameter: '%s'." +msgstr "Грешка: „%s“ не е правилен параметър за „wimax“." + +#: ../cli/src/network-manager.c:390 #, c-format msgid "Error: 'nm' command '%s' is not valid." -msgstr "„%s“ не е правилна команда за „nm“." +msgstr "Грешка: „%s“ не е правилна команда за „nm“." +# CONTINUE #: ../cli/src/nmcli.c:69 #, c-format msgid "" @@ -1111,12 +1189,13 @@ msgstr "" " -p[retty] красив изход\n" " -m[ode] tabular|multiline режим на изхода\n" " -f[ields] <поле1,поле2,…>|all|common извеждани полета\n" -" -е[scape] yes|no кодиране на разделителите между " -"колоните в стойностите\n" +" -е[scape] yes|no екраниране на разделителите " +"между\n" +" колоните в стойностите\n" " -v[ersion] показване на версията на " "програмата\n" -" -h[elp] показване на тази помощна " -"информация\n" +" -h[elp] показване на тази помощна \n" +" информация\n" "\n" "OBJECT\n" " nm състояние на NetworkManager\n" @@ -1127,42 +1206,42 @@ msgstr "" #: ../cli/src/nmcli.c:113 #, c-format msgid "Error: Object '%s' is unknown, try 'nmcli help'." -msgstr "Обектът „%s“ е непознат. Опитайте с „nmcli help“." +msgstr "Грешка: обектът „%s“ е непознат. Опитайте с „nmcli help“." #: ../cli/src/nmcli.c:143 #, c-format msgid "Error: Option '--terse' is specified the second time." -msgstr "Опцията „--terse“ е указана втори път." +msgstr "Грешка: опцията „--terse“ е указана втори път." #: ../cli/src/nmcli.c:148 #, c-format msgid "Error: Option '--terse' is mutually exclusive with '--pretty'." -msgstr "Опцията „--terse“ е несъвместима с „--pretty“." +msgstr "Гешка: опцията „--terse“ е несъвместима с „--pretty“." #: ../cli/src/nmcli.c:156 #, c-format msgid "Error: Option '--pretty' is specified the second time." -msgstr "Опцията „--pretty“ е указана втори път." +msgstr "Грешка: опцията „--pretty“ е указана втори път." #: ../cli/src/nmcli.c:161 #, c-format msgid "Error: Option '--pretty' is mutually exclusive with '--terse'." -msgstr "Опцията „--pretty“ е несъвместима с „--terse“." +msgstr "Грешка: опцията „--pretty“ е несъвместима с „--terse“." #: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187 #, c-format msgid "Error: missing argument for '%s' option." -msgstr "Липсва аргумент на опцията „%s“." +msgstr "Грешка: липсва аргумент на опцията „%s“." #: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196 #, c-format msgid "Error: '%s' is not valid argument for '%s' option." -msgstr "„%s“ не е правилен аргумент за опцията „%s“." +msgstr "Грешка: „%s“ не е правилен аргумент за опцията „%s“." #: ../cli/src/nmcli.c:203 #, c-format msgid "Error: fields for '%s' options are missing." -msgstr "Липсват полета за опциите „%s“." +msgstr "Грешка: липсват полета за опциите „%s“." #: ../cli/src/nmcli.c:209 #, c-format @@ -1172,7 +1251,7 @@ msgstr "nmcli, версия %s\n" #: ../cli/src/nmcli.c:215 #, c-format msgid "Error: Option '%s' is unknown, try 'nmcli -help'." -msgstr "Опцията „%s“ е непозната. Опитайте с „nmcli -help“." +msgstr "Грешка: опцията „%s“ е непозната. Опитайте с „nmcli -help“." #: ../cli/src/nmcli.c:234 #, c-format @@ -1188,82 +1267,79 @@ msgstr "Грешка при свързване с NetworkManager." msgid "Success" msgstr "Успех" -#: ../cli/src/settings.c:411 +#: ../cli/src/settings.c:423 #, c-format msgid "%d (hex-ascii-key)" msgstr "%d (ключ в шестнайсетичен запис)" -#: ../cli/src/settings.c:413 +#: ../cli/src/settings.c:425 #, c-format -#| msgid "WEP 128-bit Passphrase" msgid "%d (104/128-bit passphrase)" msgstr "%d (104/128 битова парола)" -#: ../cli/src/settings.c:416 +#: ../cli/src/settings.c:428 #, c-format -#| msgid "(unknown)" msgid "%d (unknown)" msgstr "%d (неизвестен)" -#: ../cli/src/settings.c:442 -#| msgid "(unknown)" +#: ../cli/src/settings.c:454 msgid "0 (unknown)" msgstr "0 (неизвестно)" -#: ../cli/src/settings.c:448 +#: ../cli/src/settings.c:460 msgid "any, " msgstr "всяка, " -#: ../cli/src/settings.c:450 -msgid "900 MHz, " -msgstr "900 МХц, " - -#: ../cli/src/settings.c:452 -msgid "1800 MHz, " -msgstr "1800 МХц, " - -#: ../cli/src/settings.c:454 -msgid "1900 MHz, " -msgstr "1900 МХц, " - -#: ../cli/src/settings.c:456 -msgid "850 MHz, " -msgstr "850 МХц, " - -#: ../cli/src/settings.c:458 -msgid "WCDMA 3GPP UMTS 2100 MHz, " -msgstr "WCDMA 3GPP UMTS 2100 МХц, " - -#: ../cli/src/settings.c:460 -msgid "WCDMA 3GPP UMTS 1800 MHz, " -msgstr "WCDMA 3GPP UMTS 1800 МХц, " - #: ../cli/src/settings.c:462 -msgid "WCDMA 3GPP UMTS 1700/2100 MHz, " -msgstr "WCDMA 3GPP UMTS 1700/2100 МХц, " +msgid "900 MHz, " +msgstr "900 MHz, " #: ../cli/src/settings.c:464 -msgid "WCDMA 3GPP UMTS 800 MHz, " -msgstr "WCDMA 3GPP UMTS 800 МХц, " +msgid "1800 MHz, " +msgstr "1800 MHz, " #: ../cli/src/settings.c:466 -msgid "WCDMA 3GPP UMTS 850 MHz, " -msgstr "WCDMA 3GPP UMTS 850 МХц, " +msgid "1900 MHz, " +msgstr "1900 MHz, " #: ../cli/src/settings.c:468 -msgid "WCDMA 3GPP UMTS 900 MHz, " -msgstr "WCDMA 3GPP UMTS 900 МХц, " +msgid "850 MHz, " +msgstr "850 MHz, " #: ../cli/src/settings.c:470 -msgid "WCDMA 3GPP UMTS 1700 MHz, " -msgstr "WCDMA 3GPP UMTS 1700 МХц, " +msgid "WCDMA 3GPP UMTS 2100 MHz, " +msgstr "WCDMA 3GPP UMTS 2100 MHz, " -#: ../cli/src/settings.c:554 ../cli/src/settings.c:721 +#: ../cli/src/settings.c:472 +msgid "WCDMA 3GPP UMTS 1800 MHz, " +msgstr "WCDMA 3GPP UMTS 1800 MHz, " + +#: ../cli/src/settings.c:474 +msgid "WCDMA 3GPP UMTS 1700/2100 MHz, " +msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, " + +#: ../cli/src/settings.c:476 +msgid "WCDMA 3GPP UMTS 800 MHz, " +msgstr "WCDMA 3GPP UMTS 800 MHz, " + +#: ../cli/src/settings.c:478 +msgid "WCDMA 3GPP UMTS 850 MHz, " +msgstr "WCDMA 3GPP UMTS 850 MHz, " + +#: ../cli/src/settings.c:480 +msgid "WCDMA 3GPP UMTS 900 MHz, " +msgstr "WCDMA 3GPP UMTS 900 MHz, " + +#: ../cli/src/settings.c:482 +msgid "WCDMA 3GPP UMTS 1700 MHz, " +msgstr "WCDMA 3GPP UMTS 1700 MHz, " + +#: ../cli/src/settings.c:566 ../cli/src/settings.c:733 msgid "auto" msgstr "автоматично" -#: ../cli/src/settings.c:716 ../cli/src/settings.c:719 -#: ../cli/src/settings.c:720 ../cli/src/utils.c:172 +#: ../cli/src/settings.c:728 ../cli/src/settings.c:731 +#: ../cli/src/settings.c:732 ../cli/src/utils.c:172 msgid "not set" msgstr "не е зададено" @@ -1287,134 +1363,130 @@ msgstr "Опцията „--terse“ изисква указването на msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "Опцията „--terse“ изисква конкретни стойности за „--fields“, а не „%s“" -#: ../libnm-util/crypto.c:120 +#: ../libnm-util/crypto.c:121 #, c-format msgid "PEM key file had no end tag '%s'." msgstr "Крайният етикет „%s“ липсва в сертификат във формат PEM." -#: ../libnm-util/crypto.c:130 +#: ../libnm-util/crypto.c:131 #, c-format msgid "Doesn't look like a PEM private key file." msgstr "Това не изглежда да е сертификат във формат PEM с частен ключ." -#: ../libnm-util/crypto.c:138 +#: ../libnm-util/crypto.c:139 #, c-format msgid "Not enough memory to store PEM file data." msgstr "" "Няма достатъчно памет за запазването на данните от сертификата във формат " "PEM." -#: ../libnm-util/crypto.c:154 +#: ../libnm-util/crypto.c:155 #, c-format msgid "Malformed PEM file: Proc-Type was not first tag." msgstr "" -"Неправилен сертификат във формат PEM – първият етикет не е „Proc-Type“." +"Неправилен сертификат във формат PEM — първият етикет не е „Proc-Type“." -#: ../libnm-util/crypto.c:162 +#: ../libnm-util/crypto.c:163 #, c-format msgid "Malformed PEM file: unknown Proc-Type tag '%s'." msgstr "" "Неправилен сертификат във формат PEM: непознат етикет „Proc-Type“ — „%s“." -#: ../libnm-util/crypto.c:172 +#: ../libnm-util/crypto.c:173 #, c-format msgid "Malformed PEM file: DEK-Info was not the second tag." -msgstr "Неправилен сертификат във формат PEM – вторият етикет не е „DEK-Info“." +msgstr "Неправилен сертификат във формат PEM — вторият етикет не е „DEK-Info“." -#: ../libnm-util/crypto.c:183 +#: ../libnm-util/crypto.c:184 #, c-format msgid "Malformed PEM file: no IV found in DEK-Info tag." msgstr "" -"Неправилен сертификат във формат PEM – в етикета „DEK-Info“ липсва начален " +"Неправилен сертификат във формат PEM — в етикета „DEK-Info“ липсва начален " "вектор." -#: ../libnm-util/crypto.c:190 +#: ../libnm-util/crypto.c:191 #, c-format msgid "Malformed PEM file: invalid format of IV in DEK-Info tag." msgstr "" -"Неправилен сертификат във формат PEM – неправилен начален вектор в етикета " +"Неправилен сертификат във формат PEM — неправилен начален вектор в етикета " "„DEK-Info“." -#: ../libnm-util/crypto.c:203 +#: ../libnm-util/crypto.c:204 #, c-format msgid "Malformed PEM file: unknown private key cipher '%s'." msgstr "" -"Неправилен сертификат във формат PEM – непознат шифър „%s“ за частния ключ." +"Неправилен сертификат във формат PEM — непознат шифър „%s“ за частния ключ." -#: ../libnm-util/crypto.c:222 +#: ../libnm-util/crypto.c:223 #, c-format msgid "Could not decode private key." msgstr "Грешка при декодиране на частния ключ." -#: ../libnm-util/crypto.c:267 +#: ../libnm-util/crypto.c:268 #, c-format msgid "PEM certificate '%s' had no end tag '%s'." msgstr "Крайният етикет „%2$s“ липсва в сертификата във формат PEM — „%1$s“." -#: ../libnm-util/crypto.c:277 +#: ../libnm-util/crypto.c:278 #, c-format msgid "Failed to decode certificate." msgstr "Грешка при декодиране на сертификата." -#: ../libnm-util/crypto.c:286 +#: ../libnm-util/crypto.c:287 #, c-format msgid "Not enough memory to store certificate data." msgstr "Няма достатъчно памет за съхраняване на данните от сертификата." -#: ../libnm-util/crypto.c:294 +#: ../libnm-util/crypto.c:295 #, c-format -#| msgid "Not enough memory to store PEM file data." msgid "Not enough memory to store file data." msgstr "Няма достатъчно памет за съхраняване на данните от файла." -#: ../libnm-util/crypto.c:324 +#: ../libnm-util/crypto.c:325 #, c-format msgid "IV must be an even number of bytes in length." msgstr "Началният вектор трябва да е с размер четен брой байта." -#: ../libnm-util/crypto.c:333 +#: ../libnm-util/crypto.c:334 #, c-format msgid "Not enough memory to store the IV." msgstr "Няма достатъчно памет за съхраняване на началния вектор." -#: ../libnm-util/crypto.c:344 +#: ../libnm-util/crypto.c:345 #, c-format msgid "IV contains non-hexadecimal digits." msgstr "Началният вектор съдържа низ, който не е шестнайсетично число." -#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148 +#: ../libnm-util/crypto.c:383 ../libnm-util/crypto_gnutls.c:148 #: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171 #: ../libnm-util/crypto_nss.c:336 #, c-format msgid "Private key cipher '%s' was unknown." msgstr "Шифърът за частен ключ „%s“ е непознат." -#: ../libnm-util/crypto.c:391 +#: ../libnm-util/crypto.c:392 #, c-format -#| msgid "Not enough memory to store decrypted private key." msgid "Not enough memory to decrypt private key." -msgstr "Няма достатъчно памет за разшифроване на частния ключ." +msgstr "Няма достатъчно памет за дешифриране на частния ключ." -#: ../libnm-util/crypto.c:511 +#: ../libnm-util/crypto.c:512 #, c-format -#| msgid "Failed to decrypt the private key: %d." msgid "Unable to determine private key type." msgstr "Видът на частния ключ не може да се определи." -#: ../libnm-util/crypto.c:530 +#: ../libnm-util/crypto.c:531 #, c-format msgid "Not enough memory to store decrypted private key." -msgstr "Няма достатъчно памет за съхраняване на разшифрования частен ключ." +msgstr "Няма достатъчно памет за съхраняване на дешифрирания частен ключ." #: ../libnm-util/crypto_gnutls.c:49 -#| msgid "Failed to initialize the decryption context." msgid "Failed to initialize the crypto engine." -msgstr "Грешка при инициализиране на модула за шифроване." +msgstr "Грешка при инициализиране на модула за шифриране." #: ../libnm-util/crypto_gnutls.c:93 #, c-format msgid "Failed to initialize the MD5 engine: %s / %s." -msgstr "Грешка при инициализиране на модула за MD5 – %s / %s." +msgstr "Грешка при инициализиране на модула за MD5 — %s / %s." #: ../libnm-util/crypto_gnutls.c:156 #, c-format @@ -1424,108 +1496,99 @@ msgstr "Неправилен начален вектор (трябва да е #: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188 #, c-format msgid "Not enough memory for decrypted key buffer." -msgstr "Няма достатъчно памет за буфера за разшифрования ключ." +msgstr "Няма достатъчно памет за буфера за дешифриране." #: ../libnm-util/crypto_gnutls.c:173 #, c-format msgid "Failed to initialize the decryption cipher context: %s / %s." -msgstr "Грешка при инициализиране на контекста за разшифроване – %s / %s." +msgstr "Грешка при инициализиране на контекста за дешифриране — %s / %s." #: ../libnm-util/crypto_gnutls.c:182 #, c-format msgid "Failed to set symmetric key for decryption: %s / %s." -msgstr "Грешка при задаване на симетричния ключ за разшифроване – %s / %s." +msgstr "Грешка при задаване на симетричния ключ за дешифриране — %s / %s." #: ../libnm-util/crypto_gnutls.c:191 #, c-format msgid "Failed to set IV for decryption: %s / %s." -msgstr "Грешка при задаване на началния вектор за разшифроване – %s / %s." +msgstr "Грешка при задаване на началния вектор за дешифриране — %s / %s." #: ../libnm-util/crypto_gnutls.c:200 #, c-format msgid "Failed to decrypt the private key: %s / %s." -msgstr "Грешка при разшифроване на частния ключ – %s / %s." +msgstr "Грешка при дешифриране на частния ключ — %s / %s." #: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267 #, c-format -#| msgid "Failed to decrypt the private key: %d." msgid "Failed to decrypt the private key: unexpected padding length." msgstr "" -"Грешка при разшифроване на частния ключ – неочаквана дължина на " +"Грешка при дешифриране на частния ключ — неочаквана дължина на " "подравняването." #: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278 #, c-format -#| msgid "Failed to decrypt the private key: %d." msgid "Failed to decrypt the private key." -msgstr "Грешка при разшифроване на частния ключ." +msgstr "Грешка при дешифриране на частния ключ." #: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356 #, c-format msgid "Could not allocate memory for encrypting." -msgstr "Няма достатъчно памет за буфер при шифроване." +msgstr "Няма достатъчно памет за буфер при шифриране." #: ../libnm-util/crypto_gnutls.c:294 #, c-format -#| msgid "Failed to initialize the decryption cipher context: %s / %s." msgid "Failed to initialize the encryption cipher context: %s / %s." -msgstr "Грешка при инициализиране на контекста за шифроване – %s / %s." +msgstr "Грешка при инициализиране на контекста за шифриране — %s / %s." #: ../libnm-util/crypto_gnutls.c:303 #, c-format -#| msgid "Failed to set symmetric key for decryption: %s / %s." msgid "Failed to set symmetric key for encryption: %s / %s." -msgstr "Грешка при задаване на симетричния ключ за шифроване – %s / %s." +msgstr "Грешка при задаване на симетричния ключ за шифриране — %s / %s." #: ../libnm-util/crypto_gnutls.c:313 #, c-format -#| msgid "Failed to set IV for decryption: %s / %s." msgid "Failed to set IV for encryption: %s / %s." -msgstr "Грешка при задаване на началния вектор за шифроване – %s / %s." +msgstr "Грешка при задаване на началния вектор за шифриране — %s / %s." #: ../libnm-util/crypto_gnutls.c:322 #, c-format -#| msgid "Failed to decrypt the private key: %s / %s." msgid "Failed to encrypt the data: %s / %s." -msgstr "Грешка при шифроване на данните – %s / %s." +msgstr "Грешка при шифриране на данните — %s / %s." #: ../libnm-util/crypto_gnutls.c:362 #, c-format msgid "Error initializing certificate data: %s" -msgstr "Грешка при инициализиране на данните от сертификата – %s" +msgstr "Грешка при инициализиране на данните от сертификата — %s" #: ../libnm-util/crypto_gnutls.c:384 #, c-format msgid "Couldn't decode certificate: %s" -msgstr "Грешка при декодиране на сертификата – %s" +msgstr "Грешка при декодиране на сертификата — %s" #: ../libnm-util/crypto_gnutls.c:408 #, c-format msgid "Couldn't initialize PKCS#12 decoder: %s" -msgstr "Грешка при инициализиране на модула за декодиране на PKCS#12 – %s" +msgstr "Грешка при инициализиране на модула за декодиране на PKCS#12 — %s" #: ../libnm-util/crypto_gnutls.c:421 #, c-format -#| msgid "Couldn't decode certificate: %s" msgid "Couldn't decode PKCS#12 file: %s" -msgstr "Грешка при декодиране на файла PKCS#12 – %s" +msgstr "Грешка при декодиране на файла PKCS#12 — %s" #: ../libnm-util/crypto_gnutls.c:433 #, c-format -#| msgid "Couldn't decode certificate: %s" msgid "Couldn't verify PKCS#12 file: %s" -msgstr "Грешка при проверка на файла PKCS#12 – %s" +msgstr "Грешка при проверка на файла PKCS#12 — %s" #: ../libnm-util/crypto_nss.c:56 #, c-format -#| msgid "Failed to initialize the MD5 engine: %s / %s." msgid "Failed to initialize the crypto engine: %d." -msgstr "Грешка при инициализиране на модула за шифроване – %d." +msgstr "Грешка при инициализиране на модула за шифриране — %d." #: ../libnm-util/crypto_nss.c:111 #, c-format msgid "Failed to initialize the MD5 context: %d." -msgstr "Грешка при инициализиране на контекста за MD5 – %d." +msgstr "Грешка при инициализиране на контекста за MD5 — %d." #: ../libnm-util/crypto_nss.c:179 #, c-format @@ -1535,135 +1598,123 @@ msgstr "Неправилна дължина на началния вектор ( #: ../libnm-util/crypto_nss.c:196 #, c-format msgid "Failed to initialize the decryption cipher slot." -msgstr "Грешка при инициализиране на буфер за шифъра за разшифроване." +msgstr "Грешка при инициализиране на буфер за шифъра за дешифриране." #: ../libnm-util/crypto_nss.c:206 #, c-format msgid "Failed to set symmetric key for decryption." -msgstr "Грешка при задаване на симетричния ключ за разшифроване." +msgstr "Грешка при задаване на симетричния ключ за дешифриране." #: ../libnm-util/crypto_nss.c:216 #, c-format msgid "Failed to set IV for decryption." -msgstr "Грешка при задаване на началния вектор за разшифроване." +msgstr "Грешка при задаване на началния вектор за дешифриране." #: ../libnm-util/crypto_nss.c:224 #, c-format msgid "Failed to initialize the decryption context." -msgstr "Грешка при инициализиране на контекста за разшифроване." +msgstr "Грешка при инициализиране на контекста за дешифриране." #: ../libnm-util/crypto_nss.c:237 #, c-format msgid "Failed to decrypt the private key: %d." -msgstr "Грешка при разшифроване на частния ключ – %d." +msgstr "Грешка при дешифриране на частния ключ — %d." #: ../libnm-util/crypto_nss.c:245 #, c-format -#| msgid "Failed to decrypt the private key: %d." msgid "Failed to decrypt the private key: decrypted data too large." msgstr "" -"Грешка при разшифроване на частния ключ – твърде много разшифровани данни." +"Грешка при дешифриране на частния ключ — твърде много дешифрирани данни." #: ../libnm-util/crypto_nss.c:256 #, c-format msgid "Failed to finalize decryption of the private key: %d." -msgstr "Грешка при завършване на разшифроването на частния ключ – %d." +msgstr "Грешка при завършване на дешифрирането на частния ключ — %d." #: ../libnm-util/crypto_nss.c:364 #, c-format -#| msgid "Failed to initialize the decryption cipher slot." msgid "Failed to initialize the encryption cipher slot." -msgstr "Грешка при инициализиране на буфер за шифъра за шифроване." +msgstr "Грешка при инициализиране на буфер за шифъра за шифриране." #: ../libnm-util/crypto_nss.c:372 #, c-format -#| msgid "Failed to set symmetric key for decryption." msgid "Failed to set symmetric key for encryption." -msgstr "Грешка при задаване на симетричния ключ за шифроване." +msgstr "Грешка при задаване на симетричния ключ за шифриране." #: ../libnm-util/crypto_nss.c:380 #, c-format -#| msgid "Failed to set IV for decryption." msgid "Failed to set IV for encryption." -msgstr "Грешка при задаване на началния вектор за шифроване." +msgstr "Грешка при задаване на началния вектор за шифриране." #: ../libnm-util/crypto_nss.c:388 #, c-format -#| msgid "Failed to initialize the decryption context." msgid "Failed to initialize the encryption context." -msgstr "Грешка при инициализиране на контекста за шифроване." +msgstr "Грешка при инициализиране на контекста за шифриране." #: ../libnm-util/crypto_nss.c:396 #, c-format -#| msgid "Failed to decrypt the private key: %d." msgid "Failed to encrypt: %d." -msgstr "Грешка при шифроване – %d." +msgstr "Грешка при шифриране — %d." #: ../libnm-util/crypto_nss.c:404 #, c-format msgid "Unexpected amount of data after encrypting." -msgstr "Неочакван обем данни след шифроване." +msgstr "Неочакван обем данни след шифриране." #: ../libnm-util/crypto_nss.c:447 #, c-format msgid "Couldn't decode certificate: %d" -msgstr "Грешка при декодиране на сертификата – %d" +msgstr "Грешка при декодиране на сертификата — %d" #: ../libnm-util/crypto_nss.c:482 #, c-format msgid "Couldn't convert password to UCS2: %d" -msgstr "Грешка при преобразуване на паролата в UCS2 – %d" +msgstr "Грешка при преобразуване на паролата в UCS2 — %d" #: ../libnm-util/crypto_nss.c:510 #, c-format msgid "Couldn't initialize PKCS#12 decoder: %d" -msgstr "Грешка при инициализиране на модула за декодиране на PKCS#12 – %d" +msgstr "Грешка при инициализиране на модула за декодиране на PKCS#12 — %d" #: ../libnm-util/crypto_nss.c:519 #, c-format -#| msgid "Couldn't decode certificate: %d" msgid "Couldn't decode PKCS#12 file: %d" -msgstr "Грешка при декодиране на файла с PKCS#12 – %d" +msgstr "Грешка при декодиране на файла с PKCS#12 — %d" #: ../libnm-util/crypto_nss.c:528 #, c-format -#| msgid "Couldn't decode certificate: %d" msgid "Couldn't verify PKCS#12 file: %d" -msgstr "Грешка при проверка на файла с PKCS#12 – %d" +msgstr "Грешка при проверка на файла с PKCS#12 — %d" #: ../libnm-util/crypto_nss.c:557 -#| msgid "Could not decode private key." msgid "Could not generate random data." msgstr "Грешка при генериране на случайни числа." -#: ../libnm-util/nm-utils.c:1975 +#: ../libnm-util/nm-utils.c:1993 #, c-format -#| msgid "Not enough memory to create private key decryption key." msgid "Not enough memory to make encryption key." -msgstr "Няма достатъчно памет за създаването на ключ за шифроване." +msgstr "Няма достатъчно памет за създаването на ключ за шифриране." -#: ../libnm-util/nm-utils.c:2085 -#| msgid "Not enough memory to store PEM file data." +#: ../libnm-util/nm-utils.c:2103 msgid "Could not allocate memory for PEM file creation." msgstr "Няма достатъчно памет за създаването на файл във формат PEM." -#: ../libnm-util/nm-utils.c:2097 +#: ../libnm-util/nm-utils.c:2115 #, c-format msgid "Could not allocate memory for writing IV to PEM file." msgstr "" "Няма достатъчно памет за записването на началния вектор във файл във формат " "PEM." -#: ../libnm-util/nm-utils.c:2109 +#: ../libnm-util/nm-utils.c:2127 #, c-format msgid "Could not allocate memory for writing encrypted key to PEM file." msgstr "" -"Няма достатъчно памет за записване на ключа за шифроване във файл във формат " +"Няма достатъчно памет за записване на ключа за шифриране във файл във формат " "PEM." -#: ../libnm-util/nm-utils.c:2128 +#: ../libnm-util/nm-utils.c:2146 #, c-format -#| msgid "Not enough memory to store PEM file data." msgid "Could not allocate memory for PEM file data." msgstr "Няма достатъчно памет за данните за файла във формат PEM." @@ -1680,7 +1731,6 @@ msgid "Modify persistent system hostname" msgstr "Промяна на името на хоста" #: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4 -#| msgid "No active connections!" msgid "Modify system connections" msgstr "Промяна на системни връзки" @@ -1705,7 +1755,6 @@ msgstr "" "безжична мрежа" #: ../policy/org.freedesktop.NetworkManager.policy.in.h:1 -#| msgid "No network connection" msgid "Allow control of network connections" msgstr "Разрешаване на управлението на мрежовите връзки" @@ -1718,15 +1767,19 @@ msgid "Enable or disable WiFi devices" msgstr "Включване и изключване на устройства за безжични мрежи" #: ../policy/org.freedesktop.NetworkManager.policy.in.h:4 +msgid "Enable or disable WiMAX mobile broadband devices" +msgstr "" +"Включване и изключване на устройства за достъп до мобилни мрежи по WiMAX" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5 msgid "Enable or disable mobile broadband devices" msgstr "Включване и изключване на устройства за достъп до мобилни мрежи" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5 -#| msgid "Enable _Networking" +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6 msgid "Enable or disable system networking" msgstr "Включване и изключване на мрежата на системно ниво" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6 +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7 msgid "" "Put NetworkManager to sleep or wake it up (should only be used by system " "power management)" @@ -1734,34 +1787,41 @@ msgstr "" "Приспиване и събуждане на NetworkManager (за целите на модула за управление " "на захранването на системата)" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7 +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8 msgid "System policy prevents control of network connections" msgstr "Политиката на системата не позволява управляване на мрежовите връзки" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8 +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9 msgid "System policy prevents enabling or disabling WiFi devices" msgstr "" "Политиката на системата не позволява включване и изключване на устройства за " "безжични мрежи" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9 +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10 +msgid "" +"System policy prevents enabling or disabling WiMAX mobile broadband devices" +msgstr "" +"Политиката на системата не позволява включване и изключване на устройства за " +"мобилни мрежи по WiMAX" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11 msgid "System policy prevents enabling or disabling mobile broadband devices" msgstr "" "Политиката на системата не позволява включване и изключване на устройства за " "мобилни мрежи" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10 +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12 msgid "System policy prevents enabling or disabling system networking" msgstr "" "Политиката на системата не позволява включване и изключване на мрежата на " "системно ниво" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11 +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13 msgid "System policy prevents putting NetworkManager to sleep or waking it up" msgstr "" "Политиката на системата не позволява приспиване и събуждане на NetworkManager" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12 +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14 msgid "System policy prevents use of user-specific connections" msgstr "" "Политиката на системата не позволява използване на потребителски връзки" @@ -1770,7 +1830,7 @@ msgstr "" #: ../src/nm-netlink-monitor.c:653 #, c-format msgid "error processing netlink message: %s" -msgstr "грешка при обработката на съобщение от мрежовия слой – %s" +msgstr "грешка при обработката на съобщение от мрежовия слой — %s" #: ../src/nm-netlink-monitor.c:214 msgid "error occurred while waiting for data on socket" @@ -1785,7 +1845,6 @@ msgstr "" #: ../src/nm-netlink-monitor.c:265 #, c-format -#| msgid "unable to allocate netlink handle for monitoring link status: %s" msgid "unable to enable netlink handle credential passing: %s" msgstr "" "грешка при включване на предаването на удостоверения в модула на мрежовия " @@ -1807,32 +1866,29 @@ msgstr "" #: ../src/nm-netlink-monitor.c:502 #, c-format -#| msgid "unable to join netlink group for monitoring link status: %s" msgid "unable to join netlink group: %s" msgstr "грешка при присъединяване към групата на мрежовия слой — %s" #: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642 #, c-format -#| msgid "error processing netlink message: %s" msgid "error updating link cache: %s" -msgstr "грешка при обновяване на информацията за връзките – %s" +msgstr "грешка при обновяване на информацията за връзките — %s" -#: ../src/main.c:499 +#: ../src/main.c:518 #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" msgstr "Неправилна опция. Ползвайте --help, за да видите списъка с опции.\n" -#: ../src/main.c:570 +#: ../src/main.c:589 #, c-format -#| msgid "Invalid option. Please use --help to see a list of valid options.\n" msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s. Ползвайте --help, за да видите списъка с опции.\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient.c:328 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62 msgid "# Created by NetworkManager\n" msgstr "# Създаден от NetworkManager\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient.c:344 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69 #, c-format msgid "" "# Merged from %s\n" @@ -1858,638 +1914,30 @@ msgstr "Не е намерен „dhcpcd“." msgid "unsupported DHCP client '%s'" msgstr "Клиентът за DHCP „%s“ не се поддържа" -#: ../src/logging/nm-logging.c:146 +#: ../src/logging/nm-logging.c:148 #, c-format msgid "Unknown log level '%s'" msgstr "Непознат праг за съобщенията в журнала „%s“" -#: ../src/logging/nm-logging.c:171 +#: ../src/logging/nm-logging.c:173 #, c-format msgid "Unknown log domain '%s'" msgstr "Непознат домейн за съобщенията в журнала „%s“" -#: ../src/dns-manager/nm-dns-manager.c:384 -#| msgid "NOTE: the glibc resolver does not support more than 3 nameservers." +#: ../src/dns-manager/nm-dns-manager.c:367 msgid "NOTE: the libc resolver may not support more than 3 nameservers." msgstr "ЗАБЕЛЕЖКА: libc може да не поддържа повече от 3 сървъра за имена." -#: ../src/dns-manager/nm-dns-manager.c:386 +#: ../src/dns-manager/nm-dns-manager.c:369 msgid "The nameservers listed below may not be recognized." -msgstr "Долните сървъри за имена може да не бъдат разпознати." +msgstr "Следните сървъри за имена може да не бъдат разпознати." #: ../src/system-settings/nm-default-wired-connection.c:157 #, c-format msgid "Auto %s" msgstr "Автоматично %s" -#: ../system-settings/plugins/ifcfg-rh/reader.c:3412 +#: ../system-settings/plugins/ifcfg-rh/reader.c:3409 #: ../system-settings/plugins/ifnet/connection_parser.c:49 -#| msgid "Open System" msgid "System" msgstr "Системна" - -#~ msgid "Passphrase for wireless network %s" -#~ msgstr "Парола за безжичната мрежа %s" - -#~ msgid "Connection to the wireless network '%s' failed." -#~ msgstr "Неуспешно свързване към безжичната мрежа „%s“." - -#~ msgid "Error displaying connection information:" -#~ msgstr "Грешка при показване на информацията за връзката:" - -#~ msgid "Could not find some required resources (the glade file)!" -#~ msgstr "Някои ресурси не бяха открити (файлът на glade)!" - -#~ msgid "Wired Ethernet (%s)" -#~ msgstr "Кабелен Етернет (%s)" - -#~ msgid "Wireless Ethernet (%s)" -#~ msgstr "Безжичен Етернет (%s)" - -#~ msgid "" -#~ "Copyright © 2004-2006 Red Hat, Inc.\n" -#~ "Copyright © 2005-2006 Novell, Inc." -#~ msgstr "" -#~ "Авторски права © 2004—2006 Red Hat, Inc.\n" -#~ "Авторски права © 2004—2006 Novell, Inc." - -#~ msgid "" -#~ "Notification area applet for managing your network devices and " -#~ "connections." -#~ msgstr "" -#~ "Аплет за областта за уведомяване за управление на мрежовите устройства и " -#~ "връзки." - -#~ msgid "translator-credits" -#~ msgstr "" -#~ "Александър Шопов \n" -#~ "\n" -#~ "Проектът за превод на GNOME има нужда от подкрепа.\n" -#~ "Научете повече за нас на http://gnome.cult.bg\n" -#~ "Докладвайте за грешки на http://gnome.cult.bg/bugs<" - -#~ msgid "" -#~ "Copyright © 2004-2005 Red Hat, Inc.\n" -#~ "Copyright © 2005-2006 Novell, Inc." -#~ msgstr "" -#~ "Авторски права © 2004—2005 Red Hat, Inc.\n" -#~ "Авторски права © 2005—2006 Novell, Inc." - -#~ msgid "VPN Login Failure" -#~ msgstr "Грешка при идентификация пред ВЧМ" - -#~ msgid "Could not start the VPN connection '%s' due to a login failure." -#~ msgstr "" -#~ "Неуспех при осъществяването на връзката към ВЧМ „%s“ поради грешка в " -#~ "идентификацията." - -#~ msgid "VPN Start Failure" -#~ msgstr "Грешка при стартиране на ВЧМ" - -#~ msgid "" -#~ "Could not start the VPN connection '%s' due to a failure launching the " -#~ "VPN program." -#~ msgstr "" -#~ "Връзката към ВЧМ „%s“ се провали поради грешка при стартиране на " -#~ "програмата за ВЧМ." - -#~ msgid "Could not start the VPN connection '%s' due to a connection error." -#~ msgstr "Връзката към ВЧМ „%s“ се провали поради грешка при свързването." - -#~ msgid "VPN Configuration Error" -#~ msgstr "Грешка в настройките на ВЧМ" - -#~ msgid "The VPN connection '%s' was not correctly configured." -#~ msgstr "Връзката към ВЧМ „%s“ е с неправилни настройки." - -#~ msgid "" -#~ "Could not start the VPN connection '%s' because the VPN server did not " -#~ "return an adequate network configuration." -#~ msgstr "" -#~ "Връзката към ВЧМ „%s“ се провали, защото настройките на мрежата върнати " -#~ "от сървъра за ВЧМ бяха неправилни." - -#~ msgid "VPN Login Message" -#~ msgstr "Съобщение при идентификация пред ВЧМ" - -#~ msgid "" -#~ "The NetworkManager Applet could not find some required resources (the " -#~ "glade file was not found)." -#~ msgstr "" -#~ "Аплетът NetworkManager не можа да открие някои задължителни ресурси " -#~ "(файлът на glade)." - -#~ msgid "The network device \"%s (%s)\" does not support wireless scanning." -#~ msgstr "Мрежовото устройство „%s (%s)“ не поддържа безжично претърсване." - -#~ msgid "The network device \"%s (%s)\" does not support link detection." -#~ msgstr "Мрежовото устройство „%s (%s)“ не поддържа засичане на връзка." - -#~ msgid "Preparing device %s for the wired network..." -#~ msgstr "Подготвяне на устройството „%s“ за кабелната мрежа…" - -#~ msgid "Preparing device %s for the wireless network '%s'..." -#~ msgstr "Подготвяне на устройството „%s“ за безжичната мрежа „%s“…" - -#~ msgid "Configuring device %s for the wired network..." -#~ msgstr "Настройване на устройството „%s“ за кабелната мрежа…" - -#~ msgid "Attempting to join the wireless network '%s'..." -#~ msgstr "Опит за свързване към безжичната мрежа „%s“…" - -#~ msgid "Waiting for Network Key for the wireless network '%s'..." -#~ msgstr "Изчакване за мрежовия ключ за безжичната мрежа „%s“…" - -#~ msgid "Requesting a network address from the wired network..." -#~ msgstr "Запитване на кабелната мрежа за адрес…" - -#~ msgid "Requesting a network address from the wireless network '%s'..." -#~ msgstr "Запитване на безжичната мрежа „%s“ за адрес…" - -#~ msgid "Finishing connection to the wired network..." -#~ msgstr "Завършване на връзката към кабелната мрежа…" - -#~ msgid "Finishing connection to the wireless network '%s'..." -#~ msgstr "Завършване на връзката към безжичната мрежа „%s“…" - -#~ msgid "NetworkManager is not running" -#~ msgstr "NetworkManager не е включен" - -#~ msgid "Wired network connection" -#~ msgstr "Връзка към кабелна мрежа" - -#~ msgid "Connected to an Ad-Hoc wireless network" -#~ msgstr "Връзка към инцидентна, безжична мрежа" - -#~ msgid "Wireless network connection to '%s' (%d%%)" -#~ msgstr "Безжична връзка към „%s“ (%d%%)" - -#~ msgid "VPN connection to '%s'" -#~ msgstr "Връзка по ВЧМ към „%s“" - -#~ msgid "_Connect to Other Wireless Network..." -#~ msgstr "_Свързване към други безжични мрежи…" - -#~ msgid "Create _New Wireless Network..." -#~ msgstr "Създаване на _нова безжична мрежа…" - -#~ msgid "_VPN Connections" -#~ msgstr "_Връзки по ВЧМ" - -#~ msgid "_Configure VPN..." -#~ msgstr "_Настройване на ВЧМ…" - -#~ msgid "_Disconnect VPN..." -#~ msgstr "_Прекъсване на ВЧМ…" - -#~ msgid "_Dial Up Connections" -#~ msgstr "_Връзки по телефонна линия" - -#~ msgid "Connect to %s..." -#~ msgstr "Свързване към %s…" - -#~ msgid "Disconnect from %s..." -#~ msgstr "Прекъсване на връзката към %s…" - -#~ msgid "No network devices have been found" -#~ msgstr "Не са открити мрежови устройства" - -#~ msgid "NetworkManager is not running..." -#~ msgstr "NetworkManager не е включен…" - -#~ msgid "Enable _Wireless" -#~ msgstr "Включване на _безжичната мрежа" - -#~ msgid "Connection _Information" -#~ msgstr "_Информация за връзката" - -#~ msgid "_Help" -#~ msgstr "_Помощ" - -#~ msgid "_About" -#~ msgstr "_Относно" - -#~ msgid "" -#~ "The NetworkManager applet could not find some required resources. It " -#~ "cannot continue.\n" -#~ msgstr "" -#~ "Аплетът NetworkManager не може да открие необходим ресурс. Програмата не " -#~ "може да продължи работа.\n" - -#~ msgid "Shared Key" -#~ msgstr "Споделен ключ" - -#~ msgid "Automatic (Default)" -#~ msgstr "Автоматично (по подразбиране)" - -#~ msgid "Dynamic WEP" -#~ msgstr "Динамичен WEP" - -#~ msgid "WEP 64/128-bit ASCII" -#~ msgstr "40/128-битов ключ за WEP в ASCII" - -#~ msgid "WEP 64/128-bit Hex" -#~ msgstr "40/128-битов шестнадесетичен ключ за WEP" - -#~ msgid "TLS" -#~ msgstr "TLS" - -#~ msgid "TTLS" -#~ msgstr "TTLS" - -#~ msgid "WPA2 Enterprise" -#~ msgstr "WPA2 Enterprise" - -#~ msgid "WPA2 Personal" -#~ msgstr "WPA2 Personal" - -#~ msgid "WPA Personal" -#~ msgstr "WPA Personal" - -#~ msgid "Orientation" -#~ msgstr "Ориентация" - -#~ msgid "The orientation of the tray." -#~ msgstr "Ориентацията на тавата" - -#~ msgid "Wired Network (%s)" -#~ msgstr "Кабелна мрежа (%s)" - -#~ msgid "_Wired Network" -#~ msgstr "_Кабелна мрежа" - -#~ msgid "Wireless Network (%s)" -#~ msgid_plural "Wireless Networks (%s)" -#~ msgstr[0] "Безжична мрежа (%s)" -#~ msgstr[1] "Безжични мрежи (%s)" - -#~ msgid "Wireless Network" -#~ msgid_plural "Wireless Networks" -#~ msgstr[0] "Безжична мрежа" -#~ msgstr[1] "Безжични мрежи" - -#~ msgid " (invalid Unicode)" -#~ msgstr " (невалиден Уникод)" - -#~ msgid "" -#~ "By default, the wireless network's name is set to your computer's name, %" -#~ "s, with no encryption enabled" -#~ msgstr "" -#~ "По подразбиране името на безжичната мрежа е името на компютъра ви, „%s“, " -#~ "без шифриране" - -#~ msgid "Create new wireless network" -#~ msgstr "Създаване на нова безжична мрежа" - -#~ msgid "" -#~ "Enter the name and security settings of the wireless network you wish to " -#~ "create." -#~ msgstr "" -#~ "Въведете името и настройките на сигурността на безжичната мрежа, която " -#~ "искате да създадете." - -#~ msgid "Create New Wireless Network" -#~ msgstr "Създаване на нова безжична мрежа" - -#~ msgid "Existing wireless network" -#~ msgstr "Съществуваща безжична мрежа" - -#~ msgid "Enter the name of the wireless network to which you wish to connect." -#~ msgstr "" -#~ "Въведете името на безжичната мрежа, към която искате да се свържете." - -#~ msgid "Connect to Other Wireless Network" -#~ msgstr "Свързване към друга безжична мрежа" - -#~ msgid "Error connecting to wireless network" -#~ msgstr "Грешка при свързване към друга безжична мрежа" - -#~ msgid "" -#~ "The requested wireless network requires security capabilities unsupported " -#~ "by your hardware." -#~ msgstr "Хардуерът ви не поддържа изискванията на поисканата безжична мрежа." - -#~ msgid "Cannot start VPN connection '%s'" -#~ msgstr "Връзката към ВЧМ „%s“ не може да бъде стартирана" - -#~ msgid "" -#~ "Could not find the authentication dialog for VPN connection type '%s'. " -#~ "Contact your system administrator." -#~ msgstr "" -#~ "Диалоговата кутия за идентификация пред ВЧМ „%s“ не може да бъде открита. " -#~ "Свържете се със системния администратор." - -#~ msgid "" -#~ "There was a problem launching the authentication dialog for VPN " -#~ "connection type '%s'. Contact your system administrator." -#~ msgstr "" -#~ "Имаше проблем с показването на диалоговата кутия за идентификация пред " -#~ "ВЧМ „%s“. Свържете се със системния администратор." - -#~ msgid " " -#~ msgstr " " - -#~ msgid "" -#~ "Active Connection Information" -#~ msgstr "" -#~ "Информация за действащата връзка" - -#~ msgid "" -#~ "Passphrase Required by Wireless " -#~ "Network\n" -#~ "\n" -#~ "A passphrase or encryption key is required to access the wireless network " -#~ "'%s'." -#~ msgstr "" -#~ "Безжичната мрежа изисква парола\n" -#~ "\n" -#~ "Необходима е парола или ключ за шифриране, за да се свържете с безжичната " -#~ "мрежа „%s“." - -#~ msgid "" -#~ "Reduced Network Functionality\n" -#~ "\n" -#~ "%s It will not be completely functional." -#~ msgstr "" -#~ "Ограничена функционалност на " -#~ "мрежата\n" -#~ "\n" -#~ "%s няма да функционира изцяло." - -#~ msgid "" -#~ "Wireless Network Login " -#~ "Confirmation\n" -#~ "\n" -#~ "You have chosen to log in to the wireless network '%s'. If you are sure " -#~ "that this wireless network is secure, click the checkbox below and " -#~ "NetworkManager will not require confirmation on subsequent log ins." -#~ msgstr "" -#~ "Потвърждение за свързване към " -#~ "безжична мрежа\n" -#~ "\n" -#~ "Избрали сте да се свържете към безжичната мрежа „%s“. Ако сте уверени, че " -#~ "тя е сигурна и можете да ѝ се доверите, задайте настройката отдолу и " -#~ "NetworkManager няма да ви иска потвърждения при следващи влизания." - -#~ msgid "Anonymous Identity:" -#~ msgstr "Анонимна идентичност:" - -#~ msgid "Authentication:" -#~ msgstr "Идентификация:" - -#~ msgid "Broadcast Address:" -#~ msgstr "Адрес за разпръскване:" - -#~ msgid "CA Certificate File:" -#~ msgstr "Файл със сертификатите на сертифициращите организации:" - -#~ msgid "Client Certificate File:" -#~ msgstr "Файл с клиентските сертификати:" - -#~ msgid "Default Route:" -#~ msgstr "Маршрут по подразбиране:" - -#~ msgid "Destination Address:" -#~ msgstr "Целеви адрес:" - -#~ msgid "Driver:" -#~ msgstr "Драйвер:" - -#~ msgid "EAP Method:" -#~ msgstr "Метод за EAP:" - -#~ msgid "Hardware Address:" -#~ msgstr "Хардуерен адрес:" - -#~ msgid "IP Address:" -#~ msgstr "IP адрес:" - -#~ msgid "Identity:" -#~ msgstr "Идентичност:" - -#~ msgid "Interface:" -#~ msgstr "Интерфейс:" - -#~ msgid "Key Type:" -#~ msgstr "Вид ключ:" - -#~ msgid "Key management:" -#~ msgstr "Управление на ключове:" - -#~ msgid "Key:" -#~ msgstr "Ключ:" - -#~ msgid "" -#~ "None\n" -#~ "WEP 128-bit Passphrase\n" -#~ "WEP 64/128-bit Hex\n" -#~ "WEP 64/128-bit ASCII\n" -#~ msgstr "" -#~ "Няма\n" -#~ "128 битова парола WEP\n" -#~ "40/128-битов шестнадесетичен ключ за WEP\n" -#~ "40/128-битов ключ за WEP в ASCII\n" - -#~ msgid "" -#~ "Open System\n" -#~ "Shared Key" -#~ msgstr "" -#~ "Открита система\n" -#~ "Споделен ключ" - -#~ msgid "Other Wireless Network..." -#~ msgstr "Друга безжична мрежа…" - -#~ msgid "Passphrase:" -#~ msgstr "Парола:" - -#~ msgid "Password:" -#~ msgstr "Парола:" - -#~ msgid "Primary DNS:" -#~ msgstr "Основен сървър за DNS:" - -#~ msgid "Private Key File:" -#~ msgstr "Файл с частните ключове:" - -#~ msgid "Private Key Password:" -#~ msgstr "Парола за частния ключ:" - -#~ msgid "Secondary DNS:" -#~ msgstr "Допълнителен сървър за DNS:" - -#~ msgid "Select the CA Certificate File" -#~ msgstr "Избор на файла със сертификатите на сертифициращите организации" - -#~ msgid "Select the Client Certificate File" -#~ msgstr "Избор на файла с клиентските сертификати" - -#~ msgid "Select the Private Key File" -#~ msgstr "Избор на файла с частните ключове" - -#~ msgid "Show key" -#~ msgstr "Показване на ключа" - -#~ msgid "Show passphrase" -#~ msgstr "Показване на паролата" - -#~ msgid "Show password" -#~ msgstr "Показване на паролата" - -#~ msgid "Show passwords" -#~ msgstr "Показване на паролите" - -#~ msgid "Speed:" -#~ msgstr "Скорост:" - -#~ msgid "Subnet Mask:" -#~ msgstr "Маска на подмрежата:" - -#~ msgid "Type:" -#~ msgstr "Вид:" - -#~ msgid "User Name:" -#~ msgstr "Потребителско име:" - -#~ msgid "Wireless Network Key Required" -#~ msgstr "Необходим е ключ за безжична мрежа" - -#~ msgid "Wireless _adapter:" -#~ msgstr "Безжичен _адаптер:" - -#~ msgid "_Always Trust this Wireless Network" -#~ msgstr "_Постоянно доверие на тази безжична мрежа" - -#~ msgid "_Don't remind me again" -#~ msgstr "_Да няма нови напомняния" - -#~ msgid "_Fallback on this Network" -#~ msgstr "Тази мрежа да е и _резервна" - -#~ msgid "_Login to Network" -#~ msgstr "_Свързване към мрежа" - -#~ msgid "_Network Name:" -#~ msgstr "_Име на мрежа:" - -#~ msgid "_Wireless Security:" -#~ msgstr "_Безжична сигурност:" - -#~ msgid "Cannot add VPN connection" -#~ msgstr "Не може да се добави връзка към ВЧМ" - -#~ msgid "" -#~ "No suitable VPN software was found on your system. Contact your system " -#~ "administrator." -#~ msgstr "" -#~ "Не е открит подходящ софтуер за ВЧМ. Свържете се със системния " -#~ "администратор." - -#~ msgid "Cannot import VPN connection" -#~ msgstr "Връзката към ВЧМ не може да се внесе" - -#~ msgid "" -#~ "Cannot find suitable software for VPN connection type '%s' to import the " -#~ "file '%s'. Contact your system administrator." -#~ msgstr "" -#~ "Файлът „%2$s“ не може да се внесе, защото не може да се открие подходящ " -#~ "софтуер за връзка към ВЧМ от вида „%1$s“. Свържете се със системния " -#~ "администратор." - -#~ msgid "" -#~ "Could not find the UI files for VPN connection type '%s'. Contact your " -#~ "system administrator." -#~ msgstr "" -#~ "Файловете с описание на графичния интерфейс за връзки към ВЧМ от вида „%" -#~ "s“ не могат да бъдат открити. Свържете се със системния администратор." - -#~ msgid "Delete VPN connection \"%s\"?" -#~ msgstr "Да се изтрие ли връзката към ВЧМ „%s“?" - -#~ msgid "" -#~ "All information about the VPN connection \"%s\" will be lost and you may " -#~ "need your system administrator to provide information to create a new " -#~ "connection." -#~ msgstr "" -#~ "Цялата информация за връзката към ВЧМ „%s“ ще бъде изтрита и може да се " -#~ "наложи да я искате наново от системния администратор, ако искате да я " -#~ "създадете наново." - -#~ msgid "Unable to load" -#~ msgstr "Неуспех при зареждане" - -#~ msgid "Cannot find some needed resources (the glade file)!" -#~ msgstr "Някои ресурси не бяха открити (файлът на glade)!" - -#~ msgid "Create VPN Connection" -#~ msgstr "Създаване на връзка към ВЧМ" - -#~ msgid "Edit VPN Connection" -#~ msgstr "Редактиране на връзка към ВЧМ" - -#~ msgid "Add a new VPN connection" -#~ msgstr "Добавяне на нова връзка към ВЧМ" - -#~ msgid "Delete the selected VPN connection" -#~ msgstr "Изтриване на избраната връзка към ВЧМ" - -#~ msgid "E_xport" -#~ msgstr "_Изнасяне" - -#~ msgid "Edit the selected VPN connection" -#~ msgstr "Редактиране на избраната връзка към ВЧМ" - -#~ msgid "Export the VPN settings to a file" -#~ msgstr "Изнасяне на настройките за ВЧМ във файл" - -#~ msgid "Export the selected VPN connection to a file" -#~ msgstr "Изнасяне на избраната връзка към ВЧМ във файл" - -#~ msgid "Manage Virtual Private Network Connections" -#~ msgstr "Управление на връзките към ВЧМ" - -#~ msgid "40-bit WEP" -#~ msgstr "40-битов WEP" - -#~ msgid "104-bit WEP" -#~ msgstr "104-битов WEP" - -#~ msgid "WPA CCMP" -#~ msgstr "WPA CCMP" - -#~ msgid "WPA Automatic" -#~ msgstr "Автоматичен WPA" - -#~ msgid "WPA2 CCMP" -#~ msgstr "WPA2 CCMP" - -#~ msgid "WPA2 Automatic" -#~ msgstr "Автоматичен WPA2" - -#~ msgid "operation took too long" -#~ msgstr "операцията продължи прекалено дълго" - -#~ msgid "received data from wrong type of sender" -#~ msgstr "получени са данни от неправилен вид изпращач" - -#~ msgid "received data from unexpected sender" -#~ msgstr "получени са данни от неочакван изпращач" - -#~ msgid "too much data was sent over socket and some of it was lost" -#~ msgstr "" -#~ "през гнездото са получени прекалено много данни и някои от тях са загубени" - -#~ msgid "You are now connected to the Ad-Hoc wireless network '%s'." -#~ msgstr "Свързали сте се към инцидентната, безжична мрежа „%s“." - -#~ msgid "You are now connected to the wireless network '%s'." -#~ msgstr "Свързани сте към безжичната мрежа „%s“." - -#~ msgid "You are now connected to the wired network." -#~ msgstr "Свързани сте към кабелната мрежа." - -#~ msgid "LEAP" -#~ msgstr "LEAP" From 9f7f02b3b8141f980cf9ac36e97660e072f1ec7c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 18 Jan 2011 18:29:56 -0600 Subject: [PATCH 03/11] wifi: clear wireless secrets tries counter when deactivating If NM asks for secrets, and then a client calls ActivateDevice on that same connection, the secrets tries counter doesn't get reset and NM then thinks we need completely new secrets when we really don't since the old secrets request isn't valid anymore. Found by Evan Broder --- src/nm-device-wifi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index 38631d755..efa46bfc7 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -1232,6 +1232,15 @@ real_deactivate_quickly (NMDevice *dev) NMDeviceWifi *self = NM_DEVICE_WIFI (dev); NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self); NMAccessPoint *orig_ap = nm_device_wifi_get_activation_ap (self); + NMActRequest *req; + NMConnection *connection; + + req = nm_device_get_act_request (dev); + if (req) { + connection = nm_act_request_get_connection (req); + /* Clear wireless secrets tries when deactivating */ + g_object_set_data (G_OBJECT (connection), WIRELESS_SECRETS_TRIES, NULL); + } cleanup_association_attempt (self, TRUE); From c804909f8328591cc5239b81edc97fa18f15252d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 18 Jan 2011 18:35:35 -0600 Subject: [PATCH 04/11] wired: clear wired secrets tries counter when appropriate If NM asks for secrets, and then a client calls ActivateDevice on that same connection, the secrets tries counter doesn't get reset and NM then thinks we need completely new secrets when we really don't since the old secrets request isn't valid anymore. Also ensure the secrets tries gets reset on success and failure to match behavior of wifi. --- src/nm-device-ethernet.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c index 00e8a2167..0613c9edf 100644 --- a/src/nm-device-ethernet.c +++ b/src/nm-device-ethernet.c @@ -473,9 +473,43 @@ constructor (GType type, return object; } +static void +clear_secrets_tries (NMDevice *device) +{ + NMActRequest *req; + NMConnection *connection; + + req = nm_device_get_act_request (device); + if (req) { + connection = nm_act_request_get_connection (req); + /* Clear wired secrets tries on success, failure, or when deactivating */ + g_object_set_data (G_OBJECT (connection), WIRED_SECRETS_TRIES, NULL); + } +} + +static void +device_state_changed (NMDevice *device, + NMDeviceState new_state, + NMDeviceState old_state, + NMDeviceStateReason reason, + gpointer user_data) +{ + + switch (new_state) { + case NM_DEVICE_STATE_ACTIVATED: + case NM_DEVICE_STATE_FAILED: + case NM_DEVICE_STATE_DISCONNECTED: + clear_secrets_tries (device); + break; + default: + break; + } +} + static void nm_device_ethernet_init (NMDeviceEthernet * self) { + g_signal_connect (self, "state-changed", G_CALLBACK (device_state_changed), NULL); } static gboolean @@ -1585,6 +1619,9 @@ real_deactivate_quickly (NMDevice *device) NMDeviceEthernet *self = NM_DEVICE_ETHERNET (device); NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self); + /* Clear wired secrets tries when deactivating */ + clear_secrets_tries (device); + if (priv->pending_ip4_config) { g_object_unref (priv->pending_ip4_config); priv->pending_ip4_config = NULL; From 36afce10a4c167eb2ee6f7655ab76a77f7522085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Thu, 20 Jan 2011 16:45:12 +0100 Subject: [PATCH 05/11] cli: add support for WWAN connections for 'nmcli con up' (bgo #640020) --- cli/src/connections.c | 60 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/cli/src/connections.c b/cli/src/connections.c index 075cab487..a39aeef00 100644 --- a/cli/src/connections.c +++ b/cli/src/connections.c @@ -14,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2010 Red Hat, Inc. + * (C) Copyright 2011 Red Hat, Inc. */ #include @@ -943,6 +943,60 @@ check_wimax_compatible (NMDeviceWimax *device, NMConnection *connection, GError return TRUE; } +static gboolean +check_gsm_compatible (NMGsmDevice *device, NMConnection *connection, GError **error) +{ + NMSettingConnection *s_con; + NMSettingGsm *s_gsm; + + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); + g_assert (s_con); + + if (strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_GSM_SETTING_NAME)) { + g_set_error (error, 0, 0, + "The connection was not a GSM connection."); + return FALSE; + } + + s_gsm = NM_SETTING_GSM (nm_connection_get_setting (connection, NM_TYPE_SETTING_GSM)); + if (!s_gsm) { + g_set_error (error, 0, 0, + "The connection was not a valid GSM connection."); + return FALSE; + } + + return TRUE; +} + +static gboolean +check_cdma_compatible (NMCdmaDevice *device, NMConnection *connection, GError **error) +{ + NMSettingConnection *s_con; + NMSettingCdma *s_cdma; + + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); + g_assert (s_con); + + if (strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_CDMA_SETTING_NAME)) { + g_set_error (error, 0, 0, + "The connection was not a CDMA connection."); + return FALSE; + } + + s_cdma = NM_SETTING_CDMA (nm_connection_get_setting (connection, NM_TYPE_SETTING_CDMA)); + if (!s_cdma) { + g_set_error (error, 0, 0, + "The connection was not a valid CDMA connection."); + return FALSE; + } + + return TRUE; +} + static gboolean nm_device_is_connection_compatible (NMDevice *device, NMConnection *connection, GError **error) { @@ -959,6 +1013,10 @@ nm_device_is_connection_compatible (NMDevice *device, NMConnection *connection, // return check_olpc_mesh_compatible (NM_DEVICE_OLPC_MESH (device), connection, error); else if (NM_IS_DEVICE_WIMAX (device)) return check_wimax_compatible (NM_DEVICE_WIMAX (device), connection, error); + else if (NM_IS_GSM_DEVICE (device)) + return check_gsm_compatible (NM_GSM_DEVICE (device), connection, error); + else if (NM_IS_CDMA_DEVICE (device)) + return check_cdma_compatible (NM_CDMA_DEVICE (device), connection, error); g_set_error (error, 0, 0, "unhandled device type '%s'", G_OBJECT_TYPE_NAME (device)); return FALSE; From 60ef505a7019656b9cd75eac967e4f182ff284e6 Mon Sep 17 00:00:00 2001 From: Joan Duran Date: Mon, 24 Jan 2011 16:43:25 +0100 Subject: [PATCH 06/11] po: update Catalan translation (bgo #640350) --- po/ca.po | 2627 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 1686 insertions(+), 941 deletions(-) diff --git a/po/ca.po b/po/ca.po index ebe35d559..d4e6c8e24 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,329 +4,1895 @@ # NetworkManager package. # Josep Puigdemont Casamajó , 2005, 2006. # David Planella , 2009. +# Joan Duran , 2010. # msgid "" msgstr "" "Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=NetworkManager&component=general\n" -"POT-Creation-Date: 2009-01-10 17:02+0000\n" -"PO-Revision-Date: 2009-01-21 17:51+0100\n" -"Last-Translator: David Planella \n" +"POT-Creation-Date: 2011-01-23 15:24+0000\n" +"PO-Revision-Date: 2011-01-23 21:26+0100\n" +"Last-Translator: Joan Duran \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../libnm-util/crypto.c:120 +#: ../cli/src/connections.c:62 ../cli/src/connections.c:78 +#: ../cli/src/devices.c:92 ../cli/src/devices.c:105 ../cli/src/devices.c:115 +#: ../cli/src/devices.c:125 ../cli/src/devices.c:138 ../cli/src/devices.c:151 +#: ../cli/src/devices.c:162 ../cli/src/devices.c:173 ../cli/src/devices.c:182 +#: ../cli/src/devices.c:191 ../cli/src/devices.c:212 +msgid "NAME" +msgstr "NOM" + +#. 0 +#: ../cli/src/connections.c:63 ../cli/src/connections.c:79 +msgid "UUID" +msgstr "UUID" + +#. 1 +#: ../cli/src/connections.c:64 +msgid "DEVICES" +msgstr "DISPOSITIUS" + +#. 2 +#: ../cli/src/connections.c:65 ../cli/src/connections.c:81 +msgid "SCOPE" +msgstr "ABAST" + +#. 3 +#: ../cli/src/connections.c:66 +msgid "DEFAULT" +msgstr "PREDETERMINAT" + +#. 4 +#: ../cli/src/connections.c:67 +msgid "DBUS-SERVICE" +msgstr "SERVEI-DBUS" + +#. 5 +#: ../cli/src/connections.c:68 +msgid "SPEC-OBJECT" +msgstr "OBJECTE-ESPEC" + +#. 6 +#: ../cli/src/connections.c:69 +msgid "VPN" +msgstr "VPN" + +#. 7 +#. 2 +#. 11 +#. 5 +#: ../cli/src/connections.c:70 ../cli/src/connections.c:86 +#: ../cli/src/devices.c:65 ../cli/src/devices.c:203 ../cli/src/devices.c:218 +msgid "DBUS-PATH" +msgstr "CAMÍ-DBUS" + +#. 1 +#. 0 +#. 1 +#. 2 +#: ../cli/src/connections.c:80 ../cli/src/devices.c:63 ../cli/src/devices.c:94 +#: ../cli/src/devices.c:215 +msgid "TYPE" +msgstr "TIPUS" + +#. 3 +#: ../cli/src/connections.c:82 +msgid "TIMESTAMP" +msgstr "MARCA-HORÀRIA" + +#. 4 +#: ../cli/src/connections.c:83 +msgid "TIMESTAMP-REAL" +msgstr "MARCA-HORÀRIA-REAL" + +#. 5 +#: ../cli/src/connections.c:84 +msgid "AUTOCONNECT" +msgstr "CONNEXIÓ-AUTOMÀTICA" + +#. 6 +#: ../cli/src/connections.c:85 +msgid "READONLY" +msgstr "NOMÉS-LECTURA" + +#: ../cli/src/connections.c:164 +#, c-format +msgid "" +"Usage: nmcli con { COMMAND | help }\n" +" COMMAND := { list | status | up | down }\n" +"\n" +" list [id | uuid | system | user]\n" +" status\n" +" up id | uuid [iface ] [ap ] [nsp ] [--" +"nowait] [--timeout ]\n" +" down id | uuid \n" +msgstr "" +"Utilització: nmcli con { ORDRE | help }\n" +" ORDRE := { list | status | up | down }\n" +"\n" +" list [id | uuid | system | user]\n" +" status\n" +" up id | uuid [iface ] [ap ] [nsp ] [--" +"nowait] [--timeout ]\n" +" down id | uuid \n" + +#: ../cli/src/connections.c:204 ../cli/src/connections.c:554 +#, c-format +msgid "Error: 'con list': %s" +msgstr "Error: «con list»: %s" + +#: ../cli/src/connections.c:206 ../cli/src/connections.c:556 +#, c-format +msgid "Error: 'con list': %s; allowed fields: %s" +msgstr "Error: «con list»: %s; camps permesos: %s" + +#: ../cli/src/connections.c:214 +msgid "Connection details" +msgstr "Detalls de la connexió" + +#: ../cli/src/connections.c:398 ../cli/src/connections.c:619 +msgid "system" +msgstr "sistema" + +#: ../cli/src/connections.c:398 ../cli/src/connections.c:619 +msgid "user" +msgstr "usuari" + +#: ../cli/src/connections.c:400 +msgid "never" +msgstr "mai" + +#. "CAPABILITIES" +#. Print header +#. "WIFI-PROPERTIES" +#: ../cli/src/connections.c:401 ../cli/src/connections.c:402 +#: ../cli/src/connections.c:620 ../cli/src/connections.c:623 +#: ../cli/src/devices.c:469 ../cli/src/devices.c:521 ../cli/src/devices.c:643 +#: ../cli/src/devices.c:669 ../cli/src/devices.c:670 ../cli/src/devices.c:671 +#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/settings.c:520 +#: ../cli/src/settings.c:563 ../cli/src/settings.c:664 +#: ../cli/src/settings.c:938 ../cli/src/settings.c:939 +#: ../cli/src/settings.c:941 ../cli/src/settings.c:943 +#: ../cli/src/settings.c:1068 ../cli/src/settings.c:1069 +#: ../cli/src/settings.c:1070 ../cli/src/settings.c:1149 +#: ../cli/src/settings.c:1150 ../cli/src/settings.c:1151 +#: ../cli/src/settings.c:1152 ../cli/src/settings.c:1153 +#: ../cli/src/settings.c:1154 ../cli/src/settings.c:1155 +#: ../cli/src/settings.c:1156 ../cli/src/settings.c:1157 +#: ../cli/src/settings.c:1158 ../cli/src/settings.c:1159 +#: ../cli/src/settings.c:1160 ../cli/src/settings.c:1161 +#: ../cli/src/settings.c:1236 +msgid "yes" +msgstr "sí" + +#: ../cli/src/connections.c:401 ../cli/src/connections.c:402 +#: ../cli/src/connections.c:620 ../cli/src/connections.c:623 +#: ../cli/src/devices.c:469 ../cli/src/devices.c:521 ../cli/src/devices.c:643 +#: ../cli/src/devices.c:669 ../cli/src/devices.c:670 ../cli/src/devices.c:671 +#: ../cli/src/devices.c:672 ../cli/src/devices.c:673 ../cli/src/settings.c:520 +#: ../cli/src/settings.c:522 ../cli/src/settings.c:563 +#: ../cli/src/settings.c:664 ../cli/src/settings.c:938 +#: ../cli/src/settings.c:939 ../cli/src/settings.c:941 +#: ../cli/src/settings.c:943 ../cli/src/settings.c:1068 +#: ../cli/src/settings.c:1069 ../cli/src/settings.c:1070 +#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1150 +#: ../cli/src/settings.c:1151 ../cli/src/settings.c:1152 +#: ../cli/src/settings.c:1153 ../cli/src/settings.c:1154 +#: ../cli/src/settings.c:1155 ../cli/src/settings.c:1156 +#: ../cli/src/settings.c:1157 ../cli/src/settings.c:1158 +#: ../cli/src/settings.c:1159 ../cli/src/settings.c:1160 +#: ../cli/src/settings.c:1161 ../cli/src/settings.c:1236 +msgid "no" +msgstr "no" + +#: ../cli/src/connections.c:475 ../cli/src/connections.c:518 +msgid "System connections" +msgstr "Connexions del sistema" + +#: ../cli/src/connections.c:480 ../cli/src/connections.c:531 +msgid "User connections" +msgstr "Connexions d'usuari" + +#: ../cli/src/connections.c:492 ../cli/src/connections.c:1487 +#: ../cli/src/connections.c:1503 ../cli/src/connections.c:1512 +#: ../cli/src/connections.c:1521 ../cli/src/connections.c:1532 +#: ../cli/src/connections.c:1617 ../cli/src/devices.c:1117 +#: ../cli/src/devices.c:1127 ../cli/src/devices.c:1229 +#: ../cli/src/devices.c:1236 ../cli/src/devices.c:1435 +#: ../cli/src/devices.c:1442 +#, c-format +msgid "Error: %s argument is missing." +msgstr "Error: Falta l'argument %s." + +#: ../cli/src/connections.c:505 +#, c-format +msgid "Error: %s - no such connection." +msgstr "Error: %s - no existeix la connexió." + +#: ../cli/src/connections.c:537 ../cli/src/connections.c:1545 +#: ../cli/src/connections.c:1635 ../cli/src/devices.c:940 +#: ../cli/src/devices.c:1007 ../cli/src/devices.c:1141 +#: ../cli/src/devices.c:1242 ../cli/src/devices.c:1448 +#, c-format +msgid "Unknown parameter: %s\n" +msgstr "Paràmetre desconegut: %s\n" + +#: ../cli/src/connections.c:546 +#, c-format +msgid "Error: no valid parameter specified." +msgstr "Error: No s'ha especificat cap paràmetre vàlid." + +#: ../cli/src/connections.c:561 ../cli/src/connections.c:1738 +#: ../cli/src/devices.c:1646 ../cli/src/network-manager.c:401 +#, c-format +msgid "Error: %s." +msgstr "Error: %s." + +#: ../cli/src/connections.c:668 +#, c-format +msgid "Error: 'con status': %s" +msgstr "Error: «con status»: %s" + +#: ../cli/src/connections.c:670 +#, c-format +msgid "Error: 'con status': %s; allowed fields: %s" +msgstr "Error: «con status»: %s; camps permesos: %s" + +#: ../cli/src/connections.c:677 +msgid "Active connections" +msgstr "Connexions actives" + +#: ../cli/src/connections.c:1159 +#, c-format +msgid "no active connection on device '%s'" +msgstr "no hi ha cap connexió activa al dispositiu «%s»" + +#: ../cli/src/connections.c:1167 +#, c-format +msgid "no active connection or device" +msgstr "connexió o dispositiu no actiu" + +#: ../cli/src/connections.c:1236 +#, c-format +msgid "device '%s' not compatible with connection '%s'" +msgstr "el dispositiu «%s» no és compatible amb la connexió «%s»" + +#: ../cli/src/connections.c:1238 +#, c-format +msgid "no device found for connection '%s'" +msgstr "no s'ha trobat cap dispositiu per a la connexió «%s»" + +#: ../cli/src/connections.c:1249 +msgid "activating" +msgstr "s'està activant" + +#: ../cli/src/connections.c:1251 +msgid "activated" +msgstr "activada" + +#: ../cli/src/connections.c:1254 ../cli/src/connections.c:1277 +#: ../cli/src/connections.c:1310 ../cli/src/devices.c:281 +#: ../cli/src/devices.c:644 ../cli/src/network-manager.c:98 +#: ../cli/src/network-manager.c:156 ../cli/src/settings.c:485 +msgid "unknown" +msgstr "desconegut" + +#: ../cli/src/connections.c:1263 +msgid "VPN connecting (prepare)" +msgstr "S'està connectant a la VPN (preparació)" + +#: ../cli/src/connections.c:1265 +msgid "VPN connecting (need authentication)" +msgstr "S'està connectant a la VPN (cal autenticació)" + +#: ../cli/src/connections.c:1267 +msgid "VPN connecting" +msgstr "S'està connectant a la VPN" + +#: ../cli/src/connections.c:1269 +msgid "VPN connecting (getting IP configuration)" +msgstr "S'està connectant a la VPN (obtenció de la configuració d'IP)" + +#: ../cli/src/connections.c:1271 +msgid "VPN connected" +msgstr "S'ha connectat a la VPN" + +#: ../cli/src/connections.c:1273 +msgid "VPN connection failed" +msgstr "No s'ha pogut connectar a la VPN" + +#: ../cli/src/connections.c:1275 +msgid "VPN disconnected" +msgstr "S'ha desconnectat la VPN" + +#: ../cli/src/connections.c:1286 +msgid "unknown reason" +msgstr "raó desconeguda" + +#: ../cli/src/connections.c:1288 +msgid "none" +msgstr "cap" + +#: ../cli/src/connections.c:1290 +msgid "the user was disconnected" +msgstr "l'usuari s'ha desconnectat" + +#: ../cli/src/connections.c:1292 +msgid "the base network connection was interrupted" +msgstr "la connexió de xarxa de base es va interrompre" + +#: ../cli/src/connections.c:1294 +msgid "the VPN service stopped unexpectedly" +msgstr "el servei VPN es va parar inesperadament" + +#: ../cli/src/connections.c:1296 +msgid "the VPN service returned invalid configuration" +msgstr "el servei VPN ha retornat una configuració no vàlida" + +#: ../cli/src/connections.c:1298 +msgid "the connection attempt timed out" +msgstr "l'intent de connexió ha excedit el temps" + +#: ../cli/src/connections.c:1300 +msgid "the VPN service did not start in time" +msgstr "el servei VPN no s'ha iniciat a temps" + +#: ../cli/src/connections.c:1302 +msgid "the VPN service failed to start" +msgstr "no s'ha pogut iniciar el servei VPN" + +#: ../cli/src/connections.c:1304 +msgid "no valid VPN secrets" +msgstr "els secrets de la VPN no són vàlids" + +#: ../cli/src/connections.c:1306 +msgid "invalid VPN secrets" +msgstr "els secrets de la VPN no són vàlids" + +#: ../cli/src/connections.c:1308 +msgid "the connection was removed" +msgstr "s'ha suprimit la connexió" + +#: ../cli/src/connections.c:1322 +#, c-format +msgid "state: %s\n" +msgstr "estat: %s\n" + +#: ../cli/src/connections.c:1325 ../cli/src/connections.c:1351 +#, c-format +msgid "Connection activated\n" +msgstr "S'ha activat la connexió\n" + +#: ../cli/src/connections.c:1328 +#, c-format +msgid "Error: Connection activation failed." +msgstr "Error: No s'ha pogut activar la connexió." + +#: ../cli/src/connections.c:1347 +#, c-format +msgid "state: %s (%d)\n" +msgstr "estat: %s (%d)\n" + +#: ../cli/src/connections.c:1357 +#, c-format +msgid "Error: Connection activation failed: %s." +msgstr "Error: No s'ha pogut activar la connexió: %s." + +#: ../cli/src/connections.c:1374 ../cli/src/devices.c:1064 +#, c-format +msgid "Error: Timeout %d sec expired." +msgstr "Error: S'ha excedit el temps d'espera de %d segons." + +#: ../cli/src/connections.c:1417 +#, c-format +msgid "Error: Connection activation failed: %s" +msgstr "Error: No s'ha pogut activar la connexió: %s" + +#: ../cli/src/connections.c:1431 +#, c-format +msgid "Error: Obtaining active connection for '%s' failed." +msgstr "Error: No s'ha pogut obtenir la connexió activa per «%s»." + +#: ../cli/src/connections.c:1440 +#, c-format +msgid "Active connection state: %s\n" +msgstr "Estat de la connexió activa: %s\n" + +#: ../cli/src/connections.c:1441 +#, c-format +msgid "Active connection path: %s\n" +msgstr "Camí de la connexió activa: %s\n" + +#: ../cli/src/connections.c:1496 ../cli/src/connections.c:1626 +#, c-format +msgid "Error: Unknown connection: %s." +msgstr "Error: Connexió desconeguda: %s." + +#: ../cli/src/connections.c:1540 ../cli/src/devices.c:1135 +#, c-format +msgid "Error: timeout value '%s' is not valid." +msgstr "Error: El valor «%s» del temps d'espera no és vàlid." + +#: ../cli/src/connections.c:1553 ../cli/src/connections.c:1643 +#, c-format +msgid "Error: id or uuid has to be specified." +msgstr "Error: S'ha d'especificar un ID o UUID." + +#: ../cli/src/connections.c:1573 +#, c-format +msgid "Error: No suitable device found: %s." +msgstr "Error: No s'ha trobat cap dispositiu adequat: %s." + +#: ../cli/src/connections.c:1575 +#, c-format +msgid "Error: No suitable device found." +msgstr "Error: No s'ha trobat cap dispositiu adequat." + +#: ../cli/src/connections.c:1670 +#, c-format +msgid "Warning: Connection not active\n" +msgstr "Avís: La connexió no està activa\n" + +#: ../cli/src/connections.c:1727 +#, c-format +msgid "Error: 'con' command '%s' is not valid." +msgstr "Error: L'ordre «con» «%s» no és vàlida." + +#: ../cli/src/connections.c:1763 +#, c-format +msgid "Error: could not connect to D-Bus." +msgstr "Error: No s'ha pogut connectar al D-Bus." + +#: ../cli/src/connections.c:1770 +#, c-format +msgid "Error: Could not get system settings." +msgstr "Error: No s'han pogut obtenir els paràmetres del sistema." + +#: ../cli/src/connections.c:1778 +#, c-format +msgid "Error: Could not get user settings." +msgstr "Error: No s'han pogut obtenir els paràmetres de l'usuari." + +#: ../cli/src/connections.c:1788 +#, c-format +msgid "Error: Can't obtain connections: settings services are not running." +msgstr "" +"Error: No es poden obtenir les connexions: no s'estan executant els serveis " +"dels paràmetres." + +#. 0 +#. 9 +#. 3 +#: ../cli/src/devices.c:62 ../cli/src/devices.c:93 ../cli/src/devices.c:201 +#: ../cli/src/devices.c:216 +msgid "DEVICE" +msgstr "DISPOSITIU" + +#. 1 +#. 4 +#. 0 +#: ../cli/src/devices.c:64 ../cli/src/devices.c:97 +#: ../cli/src/network-manager.c:36 +msgid "STATE" +msgstr "ESTAT" + +#: ../cli/src/devices.c:74 +msgid "GENERAL" +msgstr "GENERAL" + +#. 0 +#: ../cli/src/devices.c:75 +msgid "CAPABILITIES" +msgstr "CAPACITATS" + +#. 1 +#: ../cli/src/devices.c:76 +msgid "WIFI-PROPERTIES" +msgstr "PROPIETATS-WI-FI" + +#. 2 +#: ../cli/src/devices.c:77 +msgid "AP" +msgstr "PUNT-D'ACCÉS" + +#. 3 +#: ../cli/src/devices.c:78 +msgid "WIRED-PROPERTIES" +msgstr "PROPIETATS-AMB-FIL" + +#. 4 +#: ../cli/src/devices.c:79 +msgid "WIMAX-PROPERTIES" +msgstr "PROPIETATS-WIMAX" + +#. 5 +#. 0 +#: ../cli/src/devices.c:80 ../cli/src/devices.c:213 +msgid "NSP" +msgstr "NSP" + +#. 6 +#: ../cli/src/devices.c:81 +msgid "IP4-SETTINGS" +msgstr "PARÀMETRES-IP4" + +#. 7 +#: ../cli/src/devices.c:82 +msgid "IP4-DNS" +msgstr "DNS-IP4" + +#. 8 +#: ../cli/src/devices.c:83 +msgid "IP6-SETTINGS" +msgstr "PARÀMETRES-IP6" + +#. 9 +#: ../cli/src/devices.c:84 +msgid "IP6-DNS" +msgstr "DNS-IP6" + +#. 2 +#: ../cli/src/devices.c:95 +msgid "DRIVER" +msgstr "CONTROLADOR" + +#. 3 +#: ../cli/src/devices.c:96 +msgid "HWADDR" +msgstr "ADREÇA-FÍSICA" + +#. 0 +#: ../cli/src/devices.c:106 +msgid "CARRIER-DETECT" +msgstr "DETECCIÓ-DE-LA-PORTADORA" + +#. 1 +#: ../cli/src/devices.c:107 +msgid "SPEED" +msgstr "VELOCITAT" + +#. 0 +#: ../cli/src/devices.c:116 +msgid "CARRIER" +msgstr "PORTADORA" + +#. 0 +#: ../cli/src/devices.c:126 +msgid "WEP" +msgstr "WEP" + +#. 1 +#: ../cli/src/devices.c:127 +msgid "WPA" +msgstr "WPA" + +#. 2 +#: ../cli/src/devices.c:128 +msgid "WPA2" +msgstr "WPA2" + +#. 3 +#: ../cli/src/devices.c:129 +msgid "TKIP" +msgstr "TKIP" + +#. 4 +#: ../cli/src/devices.c:130 +msgid "CCMP" +msgstr "CCMP" + +#. 0 +#: ../cli/src/devices.c:139 +msgid "CTR-FREQ" +msgstr "FREQ-CTR" + +#. 1 +#: ../cli/src/devices.c:140 +msgid "RSSI" +msgstr "RSSI" + +#. 2 +#: ../cli/src/devices.c:141 +msgid "CINR" +msgstr "CINR" + +#. 3 +#: ../cli/src/devices.c:142 +msgid "TX-POW" +msgstr "FORÇA-TRANSMISSIÓ" + +#. 4 +#: ../cli/src/devices.c:143 +msgid "BSID" +msgstr "BSID" + +#. 0 +#: ../cli/src/devices.c:152 ../cli/src/devices.c:163 +msgid "ADDRESS" +msgstr "ADREÇA" + +#. 1 +#: ../cli/src/devices.c:153 ../cli/src/devices.c:164 +msgid "PREFIX" +msgstr "PREFIX" + +#. 2 +#: ../cli/src/devices.c:154 ../cli/src/devices.c:165 +msgid "GATEWAY" +msgstr "PASSAREL·LA" + +#. 0 +#: ../cli/src/devices.c:174 ../cli/src/devices.c:183 +msgid "DNS" +msgstr "DNS" + +#. 0 +#: ../cli/src/devices.c:192 +msgid "SSID" +msgstr "SSID" + +#. 1 +#: ../cli/src/devices.c:193 +msgid "BSSID" +msgstr "BSSID" + +#. 2 +#: ../cli/src/devices.c:194 +msgid "MODE" +msgstr "MODE" + +#. 3 +#: ../cli/src/devices.c:195 +msgid "FREQ" +msgstr "FREQ" + +#. 4 +#: ../cli/src/devices.c:196 +msgid "RATE" +msgstr "VELOCITAT" + +#. 5 +#. 1 +#: ../cli/src/devices.c:197 ../cli/src/devices.c:214 +msgid "SIGNAL" +msgstr "SENYAL" + +#. 6 +#: ../cli/src/devices.c:198 +msgid "SECURITY" +msgstr "SEGURETAT" + +#. 7 +#: ../cli/src/devices.c:199 +msgid "WPA-FLAGS" +msgstr "INDICADORS-WPA" + +#. 8 +#: ../cli/src/devices.c:200 +msgid "RSN-FLAGS" +msgstr "INDICADORS-RSN" + +#. 10 +#. 4 +#: ../cli/src/devices.c:202 ../cli/src/devices.c:217 +msgid "ACTIVE" +msgstr "ACTIU" + +#: ../cli/src/devices.c:242 +#, c-format +msgid "" +"Usage: nmcli dev { COMMAND | help }\n" +"\n" +" COMMAND := { status | list | disconnect | wifi | wimax }\n" +"\n" +" status\n" +" list [iface ]\n" +" disconnect iface [--nowait] [--timeout ]\n" +" wifi [list [iface ] [hwaddr ]]\n" +" wimax [list [iface ] [nsp ]]\n" +"\n" +msgstr "" +"Utilització: nmcli dev { ORDRE | help }\n" +"\n" +" ORDRE := { status | list | disconnect | wifi | wimax }\n" +"\n" +" status\n" +" list [iface ]\n" +" disconnect iface [--nowait] [--timeout ]\n" +" wifi [list [iface ] [hwaddr ]]\n" +" wimax [list [iface ] [nsp ]]\n" +"\n" + +#: ../cli/src/devices.c:263 +msgid "unmanaged" +msgstr "sense gestió" + +#: ../cli/src/devices.c:265 +msgid "unavailable" +msgstr "no disponible" + +#: ../cli/src/devices.c:267 ../cli/src/network-manager.c:95 +msgid "disconnected" +msgstr "desconnectat" + +#: ../cli/src/devices.c:269 +msgid "connecting (prepare)" +msgstr "s'està connectant (preparació)" + +#: ../cli/src/devices.c:271 +msgid "connecting (configuring)" +msgstr "s'està connectant (configuració)" + +#: ../cli/src/devices.c:273 +msgid "connecting (need authentication)" +msgstr "s'està connectant (cal autenticació)" + +#: ../cli/src/devices.c:275 +msgid "connecting (getting IP configuration)" +msgstr "s'està connectant (obtenció de la configuració IP)" + +#: ../cli/src/devices.c:277 ../cli/src/network-manager.c:93 +msgid "connected" +msgstr "connectat" + +#: ../cli/src/devices.c:279 +msgid "connection failed" +msgstr "no s'ha pogut connectar" + +#: ../cli/src/devices.c:304 ../cli/src/devices.c:461 ../cli/src/devices.c:504 +msgid "Unknown" +msgstr "Desconegut" + +#: ../cli/src/devices.c:336 +msgid "(none)" +msgstr "(cap)" + +#: ../cli/src/devices.c:361 +#, c-format +msgid "%s: error converting IP4 address 0x%X" +msgstr "%s: s'ha produït un error en convertir l'adreça IP4 0x%X" + +#: ../cli/src/devices.c:430 +#, c-format +msgid "%u MHz" +msgstr "%u MHz" + +#: ../cli/src/devices.c:431 +#, c-format +msgid "%u MB/s" +msgstr "%u MB/s" + +#: ../cli/src/devices.c:440 +msgid "Encrypted: " +msgstr "Encriptat: " + +#: ../cli/src/devices.c:445 +msgid "WEP " +msgstr "WEP " + +#: ../cli/src/devices.c:447 +msgid "WPA " +msgstr "WPA " + +#: ../cli/src/devices.c:449 +msgid "WPA2 " +msgstr "WPA2 " + +#: ../cli/src/devices.c:452 +msgid "Enterprise " +msgstr "Empresa " + +#: ../cli/src/devices.c:461 +msgid "Ad-Hoc" +msgstr "Ad-Hoc" + +#: ../cli/src/devices.c:461 +msgid "Infrastructure" +msgstr "Infraestructura" + +#: ../cli/src/devices.c:495 +msgid "Home" +msgstr "Casa" + +#: ../cli/src/devices.c:498 +msgid "Partner" +msgstr "Soci" + +#: ../cli/src/devices.c:501 +msgid "Roaming" +msgstr "Itinerància" + +#: ../cli/src/devices.c:570 +#, c-format +msgid "Error: 'dev list': %s" +msgstr "Error: «dev list»: %s" + +#: ../cli/src/devices.c:572 +#, c-format +msgid "Error: 'dev list': %s; allowed fields: %s" +msgstr "Error: «dev list»: %s; camps permesos: %s" + +#: ../cli/src/devices.c:581 +msgid "Device details" +msgstr "Detalls del dispositiu" + +#: ../cli/src/devices.c:613 ../cli/src/devices.c:1080 +msgid "(unknown)" +msgstr "(desconegut)" + +#: ../cli/src/devices.c:614 +msgid "unknown)" +msgstr "desconegut)" + +#: ../cli/src/devices.c:640 +#, c-format +msgid "%u Mb/s" +msgstr "%u Mb/s" + +#. Print header +#. "WIRED-PROPERTIES" +#: ../cli/src/devices.c:713 +msgid "on" +msgstr "actiu" + +#: ../cli/src/devices.c:713 +msgid "off" +msgstr "inactiu" + +#: ../cli/src/devices.c:963 +#, c-format +msgid "Error: 'dev status': %s" +msgstr "Error: «dev status»: %s" + +#: ../cli/src/devices.c:965 +#, c-format +msgid "Error: 'dev status': %s; allowed fields: %s" +msgstr "Error: «dev status»: %s; camps permesos: %s" + +#: ../cli/src/devices.c:972 +msgid "Status of devices" +msgstr "Estat dels dispositius" + +#: ../cli/src/devices.c:1000 +#, c-format +msgid "Error: '%s' argument is missing." +msgstr "Error: Falta l'argument «%s»." + +#: ../cli/src/devices.c:1029 ../cli/src/devices.c:1168 +#: ../cli/src/devices.c:1291 ../cli/src/devices.c:1497 +#, c-format +msgid "Error: Device '%s' not found." +msgstr "Error: No s'ha trobat el dispositiu «%s»." + +#: ../cli/src/devices.c:1052 +#, c-format +msgid "Success: Device '%s' successfully disconnected." +msgstr "Èxit: El dispositiu «%s» s'ha desconnectat correctament." + +#: ../cli/src/devices.c:1077 +#, c-format +msgid "Error: Device '%s' (%s) disconnecting failed: %s" +msgstr "Error: No s'ha pogut desconnectar del dispositiu «%s» (%s): %s" + +#: ../cli/src/devices.c:1085 +#, c-format +msgid "Device state: %d (%s)\n" +msgstr "Estat del dispositiu: %d (%s)\n" + +#: ../cli/src/devices.c:1149 +#, c-format +msgid "Error: iface has to be specified." +msgstr "Error: S'ha d'especificar l'iface." + +#: ../cli/src/devices.c:1267 +#, c-format +msgid "Error: 'dev wifi': %s" +msgstr "Error: «dev wifi»: %s" + +#: ../cli/src/devices.c:1269 +#, c-format +msgid "Error: 'dev wifi': %s; allowed fields: %s" +msgstr "Error: «dev wifi»: %s; camps permesos: %s" + +#: ../cli/src/devices.c:1276 +msgid "WiFi scan list" +msgstr "Llista d'escaneig Wi-Fi" + +#: ../cli/src/devices.c:1311 ../cli/src/devices.c:1365 +#: ../cli/src/devices.c:1559 +#, c-format +msgid "Error: Access point with hwaddr '%s' not found." +msgstr "Error: No s'ha trobat el punt d'accés amb l'adreça física «%s»." + +#: ../cli/src/devices.c:1328 +#, c-format +msgid "Error: Device '%s' is not a WiFi device." +msgstr "Error: El dispositiu «%s» no és un dispositiu Wi-Fi." + +#: ../cli/src/devices.c:1392 +#, c-format +msgid "Error: 'dev wifi' command '%s' is not valid." +msgstr "Error: L'ordre «%s» de «dev wifi» no és vàlida." + +#: ../cli/src/devices.c:1473 +#, c-format +msgid "Error: 'dev wimax': %s" +msgstr "Error: «dev wimax»: %s" + +#: ../cli/src/devices.c:1475 +#, c-format +msgid "Error: 'dev wimax': %s; allowed fields: %s" +msgstr "Error: «dev wimax»: %s; camps permesos: %s" + +#: ../cli/src/devices.c:1482 +msgid "WiMAX NSP list" +msgstr "Llista de WiMAX NSP" + +#: ../cli/src/devices.c:1517 +#, c-format +msgid "Error: NSP with name '%s' not found." +msgstr "Error: No s'ha trobat l'NSP amb el nom «%s»." + +#: ../cli/src/devices.c:1528 +#, c-format +msgid "Error: Device '%s' is not a WiMAX device." +msgstr "Error: El dispositiu «%s» no és un dispositiu WiMAX." + +#: ../cli/src/devices.c:1586 +#, c-format +msgid "Error: 'dev wimax' command '%s' is not valid." +msgstr "Error: L'ordre «%s» de «dev wimax» no és vàlida." + +#: ../cli/src/devices.c:1637 +#, c-format +msgid "Error: 'dev' command '%s' is not valid." +msgstr "Error: L'ordre «%s» de «dev» no és vàlida." + +#: ../cli/src/network-manager.c:35 +msgid "RUNNING" +msgstr "S'ESTÀ-EXECUTANT" + +#. 1 +#: ../cli/src/network-manager.c:37 +msgid "NET-ENABLED" +msgstr "XARXA-HABILITADA" + +#. 2 +#: ../cli/src/network-manager.c:38 +msgid "WIFI-HARDWARE" +msgstr "MAQUINARI-WI-FI" + +#. 3 +#: ../cli/src/network-manager.c:39 +msgid "WIFI" +msgstr "WI-FI" + +#. 4 +#: ../cli/src/network-manager.c:40 +msgid "WWAN-HARDWARE" +msgstr "MAQUINARI-WWAN" + +#. 5 +#: ../cli/src/network-manager.c:41 +msgid "WWAN" +msgstr "WWAN" + +#. 6 +#: ../cli/src/network-manager.c:42 +msgid "WIMAX-HARDWARE" +msgstr "MAQUINARI-WIMAX" + +#. 7 +#: ../cli/src/network-manager.c:43 +msgid "WIMAX" +msgstr "WIMAX" + +#: ../cli/src/network-manager.c:67 +#, c-format +msgid "" +"Usage: nmcli nm { COMMAND | help }\n" +"\n" +" COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n" +"\n" +" status\n" +" enable [true|false]\n" +" sleep [true|false]\n" +" wifi [on|off]\n" +" wwan [on|off]\n" +" wimax [on|off]\n" +"\n" +msgstr "" +"Utilització: nmcli nm { ORDRE | help }\n" +"\n" +" ORDRE := { status | enable | sleep | wifi | wwan | wimax }\n" +"\n" +" status\n" +" enable [true|false]\n" +" sleep [true|false]\n" +" wifi [on|off]\n" +" wwan [on|off]\n" +" wimax [on|off]\n" +"\n" + +#: ../cli/src/network-manager.c:89 +msgid "asleep" +msgstr "dormint" + +#: ../cli/src/network-manager.c:91 +msgid "connecting" +msgstr "s'està connectant" + +#: ../cli/src/network-manager.c:133 +#, c-format +msgid "Error: 'nm status': %s" +msgstr "Error: «nm status»: %s" + +#: ../cli/src/network-manager.c:135 +#, c-format +msgid "Error: 'nm status': %s; allowed fields: %s" +msgstr "Error: «nm status»: %s; camps permesos: %s" + +#: ../cli/src/network-manager.c:142 +msgid "NetworkManager status" +msgstr "Estat del NetworkManager" + +#. Print header +#: ../cli/src/network-manager.c:149 ../cli/src/network-manager.c:150 +#: ../cli/src/network-manager.c:151 ../cli/src/network-manager.c:152 +#: ../cli/src/network-manager.c:153 ../cli/src/network-manager.c:154 +#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:257 +#: ../cli/src/network-manager.c:306 ../cli/src/network-manager.c:338 +#: ../cli/src/network-manager.c:370 +msgid "enabled" +msgstr "habilitat" + +#: ../cli/src/network-manager.c:149 ../cli/src/network-manager.c:150 +#: ../cli/src/network-manager.c:151 ../cli/src/network-manager.c:152 +#: ../cli/src/network-manager.c:153 ../cli/src/network-manager.c:154 +#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:257 +#: ../cli/src/network-manager.c:306 ../cli/src/network-manager.c:338 +#: ../cli/src/network-manager.c:370 +msgid "disabled" +msgstr "inhabilitat" + +#: ../cli/src/network-manager.c:159 +msgid "running" +msgstr "s'està executant" + +#: ../cli/src/network-manager.c:159 +msgid "not running" +msgstr "no s'està executant" + +#: ../cli/src/network-manager.c:184 +#, c-format +msgid "Error: Couldn't connect to system bus: %s" +msgstr "Error: No s'ha pogut connectar al bus del sistema: %s" + +#: ../cli/src/network-manager.c:195 +#, c-format +msgid "Error: Couldn't create D-Bus object proxy." +msgstr "" +"Error: No s'ha pogut crear el servidor intermediari d'objectes del D-Bus." + +#: ../cli/src/network-manager.c:201 +#, c-format +msgid "Error in sleep: %s" +msgstr "S'ha produït un en dormir: %s" + +#: ../cli/src/network-manager.c:247 ../cli/src/network-manager.c:296 +#: ../cli/src/network-manager.c:328 ../cli/src/network-manager.c:360 +#, c-format +msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s" +msgstr "Error: Aquí no és vàlid el valor «%s» de «--fields»; camps permesos: %s" + +#: ../cli/src/network-manager.c:255 +msgid "Networking enabled" +msgstr "Xarxa habilitada" + +#: ../cli/src/network-manager.c:266 +#, c-format +msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'." +msgstr "" +"Error: El paràmetre «enable» no és vàlid: «%s»; utilitzeu «true» (cert) o " +"«false» (fals)." + +#: ../cli/src/network-manager.c:275 +#, c-format +msgid "Error: Sleeping status is not exported by NetworkManager." +msgstr "Error: El NetworkManager no ha exportat l'estat de dormir." + +#: ../cli/src/network-manager.c:283 +#, c-format +msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'." +msgstr "" +"Error: El paràmetre «sleep» no és vàlid: «%s»; utilitzeu «true» (cert) o " +"«false» (fals)." + +#: ../cli/src/network-manager.c:304 +msgid "WiFi enabled" +msgstr "Wi-Fi habilitat" + +#: ../cli/src/network-manager.c:315 +#, c-format +msgid "Error: invalid 'wifi' parameter: '%s'." +msgstr "Error: El paràmetre «wifi» no és vàlid: «%s»." + +#: ../cli/src/network-manager.c:336 +msgid "WWAN enabled" +msgstr "WWAN habilitat" + +#: ../cli/src/network-manager.c:347 +#, c-format +msgid "Error: invalid 'wwan' parameter: '%s'." +msgstr "Error: El paràmetre «wwan» no és vàlid: «%s»." + +#: ../cli/src/network-manager.c:368 +msgid "WiMAX enabled" +msgstr "WiMAX habilitat" + +#: ../cli/src/network-manager.c:379 +#, c-format +msgid "Error: invalid 'wimax' parameter: '%s'." +msgstr "Error: El paràmetre «wimax» no és vàlid: «%s»." + +#: ../cli/src/network-manager.c:390 +#, c-format +msgid "Error: 'nm' command '%s' is not valid." +msgstr "Error: L'ordre «%s» de «nm» no és vàlida." + +#: ../cli/src/nmcli.c:69 +#, c-format +msgid "" +"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" +"\n" +"OPTIONS\n" +" -t[erse] terse output\n" +" -p[retty] pretty output\n" +" -m[ode] tabular|multiline output mode\n" +" -f[ields] |all|common specify fields to output\n" +" -e[scape] yes|no escape columns separators in " +"values\n" +" -v[ersion] show program version\n" +" -h[elp] print this help\n" +"\n" +"OBJECT\n" +" nm NetworkManager status\n" +" con NetworkManager connections\n" +" dev devices managed by NetworkManager\n" +"\n" +msgstr "" +"Utilització: %s [OPCIONS] OBJECTE { ORDRE | help }\n" +"\n" +"OPCIONS\n" +" -t[erse] sortida terse\n" +" -p[retty] sortida pretty\n" +" -m[ode] tabular|multiline mode de sortida\n" +" -f[ields] |all|common especifica els camps de la " +"sortida\n" +" -e[scape] yes|no escapa els separadors de " +"columnes en valors\n" +" -v[ersion] mostra la versió del programa\n" +" -h[elp] imprimeix aquesta ajuda\n" +"\n" +"OBJECTE\n" +" nm estat del NetworkManager\n" +" con connexions del NetworkManager\n" +" dev dispositius gestionats pel NetworkManager\n" +"\n" + +#: ../cli/src/nmcli.c:113 +#, c-format +msgid "Error: Object '%s' is unknown, try 'nmcli help'." +msgstr "Error: L'objecte «%s» és desconegut, proveu «nmcli help»." + +#: ../cli/src/nmcli.c:143 +#, c-format +msgid "Error: Option '--terse' is specified the second time." +msgstr "Error: L'opció «--terse» s'ha especificat dos cops." + +#: ../cli/src/nmcli.c:148 +#, c-format +msgid "Error: Option '--terse' is mutually exclusive with '--pretty'." +msgstr "Error: L'opció «--terse» és mútuament exclusiu amb «--pretty»." + +#: ../cli/src/nmcli.c:156 +#, c-format +msgid "Error: Option '--pretty' is specified the second time." +msgstr "Error: L'opció «--pretty» s'ha especificat dos cops." + +#: ../cli/src/nmcli.c:161 +#, c-format +msgid "Error: Option '--pretty' is mutually exclusive with '--terse'." +msgstr "Error: L'opció «--pretty» és mútuament exclusiu amb «--terse»." + +#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187 +#, c-format +msgid "Error: missing argument for '%s' option." +msgstr "Error: Falta l'argument per a l'opció «%s»." + +#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196 +#, c-format +msgid "Error: '%s' is not valid argument for '%s' option." +msgstr "Error: «%s» no és un argument vàlid per a l'opció «%s»." + +#: ../cli/src/nmcli.c:203 +#, c-format +msgid "Error: fields for '%s' options are missing." +msgstr "Error: Falten els camps per a les opcions «%s»." + +#: ../cli/src/nmcli.c:209 +#, c-format +msgid "nmcli tool, version %s\n" +msgstr "Eina nmcli, versió %s\n" + +#: ../cli/src/nmcli.c:215 +#, c-format +msgid "Error: Option '%s' is unknown, try 'nmcli -help'." +msgstr "Error: L'opció «%s» és desconeguda, proveu «nmcli -help»." + +#: ../cli/src/nmcli.c:234 +#, c-format +msgid "Caught signal %d, shutting down..." +msgstr "S'ha capturat el senyal %d, s'està aturant..." + +#: ../cli/src/nmcli.c:259 +#, c-format +msgid "Error: Could not connect to NetworkManager." +msgstr "Error: No s'ha pogut connectar al NetworkManager." + +#: ../cli/src/nmcli.c:275 +msgid "Success" +msgstr "Èxit" + +#: ../cli/src/settings.c:423 +#, c-format +msgid "%d (hex-ascii-key)" +msgstr "%d (clau-hex-ascii)" + +#: ../cli/src/settings.c:425 +#, c-format +msgid "%d (104/128-bit passphrase)" +msgstr "%d (contrasenya de 104/128-bit)" + +#: ../cli/src/settings.c:428 +#, c-format +msgid "%d (unknown)" +msgstr "%d (desconegut)" + +#: ../cli/src/settings.c:454 +msgid "0 (unknown)" +msgstr "0 (desconegut)" + +#: ../cli/src/settings.c:460 +msgid "any, " +msgstr "qualsevol, " + +#: ../cli/src/settings.c:462 +msgid "900 MHz, " +msgstr "900 MHz, " + +#: ../cli/src/settings.c:464 +msgid "1800 MHz, " +msgstr "1800 MHz, " + +#: ../cli/src/settings.c:466 +msgid "1900 MHz, " +msgstr "1900 MHz, " + +#: ../cli/src/settings.c:468 +msgid "850 MHz, " +msgstr "850 MHz, " + +#: ../cli/src/settings.c:470 +msgid "WCDMA 3GPP UMTS 2100 MHz, " +msgstr "WCDMA 3GPP UMTS 2100 MHz, " + +#: ../cli/src/settings.c:472 +msgid "WCDMA 3GPP UMTS 1800 MHz, " +msgstr "WCDMA 3GPP UMTS 1800 MHz, " + +#: ../cli/src/settings.c:474 +msgid "WCDMA 3GPP UMTS 1700/2100 MHz, " +msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, " + +#: ../cli/src/settings.c:476 +msgid "WCDMA 3GPP UMTS 800 MHz, " +msgstr "WCDMA 3GPP UMTS 800 MHz, " + +#: ../cli/src/settings.c:478 +msgid "WCDMA 3GPP UMTS 850 MHz, " +msgstr "WCDMA 3GPP UMTS 850 MHz, " + +#: ../cli/src/settings.c:480 +msgid "WCDMA 3GPP UMTS 900 MHz, " +msgstr "WCDMA 3GPP UMTS 900 MHz, " + +#: ../cli/src/settings.c:482 +msgid "WCDMA 3GPP UMTS 1700 MHz, " +msgstr "WCDMA 3GPP UMTS 1700 MHz, " + +#: ../cli/src/settings.c:566 ../cli/src/settings.c:733 +msgid "auto" +msgstr "automàtic" + +#: ../cli/src/settings.c:728 ../cli/src/settings.c:731 +#: ../cli/src/settings.c:732 ../cli/src/utils.c:172 +msgid "not set" +msgstr "sense definir" + +#: ../cli/src/utils.c:124 +#, c-format +msgid "field '%s' has to be alone" +msgstr "el camp «%s» ha d'estar sol" + +#: ../cli/src/utils.c:127 +#, c-format +msgid "invalid field '%s'" +msgstr "el camp «%s» no és vàlid" + +#: ../cli/src/utils.c:146 +#, c-format +msgid "Option '--terse' requires specifying '--fields'" +msgstr "L'opció «--terse» requereix que s'especifiqui «--fields»" + +#: ../cli/src/utils.c:150 +#, c-format +msgid "Option '--terse' requires specific '--fields' option values , not '%s'" +msgstr "" +"L'opció «--terse» requereix valors específics de l'opció «--fields» i no «%s»" + +#: ../libnm-util/crypto.c:121 #, c-format msgid "PEM key file had no end tag '%s'." msgstr "El fitxer de clau PEM no té l'etiqueta de final «%s»." -#: ../libnm-util/crypto.c:130 +#: ../libnm-util/crypto.c:131 #, c-format msgid "Doesn't look like a PEM private key file." -msgstr "Aquest no sembla que sigui un fitxer de clau privada PEM." +msgstr "No sembla que sigui un fitxer de clau privada PEM." -#: ../libnm-util/crypto.c:138 +#: ../libnm-util/crypto.c:139 #, c-format msgid "Not enough memory to store PEM file data." msgstr "No hi ha prou memòria per a emmagatzemar les dades del fitxer PEM." -#: ../libnm-util/crypto.c:154 +#: ../libnm-util/crypto.c:155 #, c-format msgid "Malformed PEM file: Proc-Type was not first tag." msgstr "" "El format del fitxer PEM és incorrecte: la primera etiqueta no és la de Proc-" "Type." -#: ../libnm-util/crypto.c:162 +#: ../libnm-util/crypto.c:163 #, c-format msgid "Malformed PEM file: unknown Proc-Type tag '%s'." msgstr "" "El format del fitxer PEM és incorrecte: l'etiqueta de Proc-Type «%s» és " "desconeguda." -#: ../libnm-util/crypto.c:172 +#: ../libnm-util/crypto.c:173 #, c-format msgid "Malformed PEM file: DEK-Info was not the second tag." msgstr "" "El format del fitxer PEM és incorrecte: la segona etiqueta no és la de DEK-" "Info." -#: ../libnm-util/crypto.c:183 +#: ../libnm-util/crypto.c:184 #, c-format msgid "Malformed PEM file: no IV found in DEK-Info tag." msgstr "" "El format del fitxer PEM és incorrecte: no s'ha trobat cap vector " "d'inicialització a l'etiqueta de DEK-Info." -#: ../libnm-util/crypto.c:190 +#: ../libnm-util/crypto.c:191 #, c-format msgid "Malformed PEM file: invalid format of IV in DEK-Info tag." msgstr "" "El format del fitxer PEM és incorrecte: el format del vector " "d'inicialització a l'etiqueta DEK-Info no és vàlid." -#: ../libnm-util/crypto.c:203 +#: ../libnm-util/crypto.c:204 #, c-format msgid "Malformed PEM file: unknown private key cipher '%s'." msgstr "" "El format del fitxer PEM és incorrecte: el criptògraf «%s» de clau privada és " "desconegut." -#: ../libnm-util/crypto.c:222 +#: ../libnm-util/crypto.c:223 #, c-format msgid "Could not decode private key." msgstr "No s'ha pogut descodificar la clau privada." -#: ../libnm-util/crypto.c:267 +#: ../libnm-util/crypto.c:268 #, c-format msgid "PEM certificate '%s' had no end tag '%s'." -msgstr "No s'ha trobat l'etiqueta de tancament «%s» al certificat PEM «%s»." +msgstr "No s'ha trobat l'etiqueta de tancament «%2$s» al certificat PEM «%1$s»." -#: ../libnm-util/crypto.c:277 +#: ../libnm-util/crypto.c:278 #, c-format msgid "Failed to decode certificate." msgstr "No s'ha pogut descodificar el certificat." -#: ../libnm-util/crypto.c:286 +#: ../libnm-util/crypto.c:287 #, c-format msgid "Not enough memory to store certificate data." msgstr "No hi ha prou memòria per a emmagatzemar les dades del certificat." -#: ../libnm-util/crypto.c:294 +#: ../libnm-util/crypto.c:295 #, c-format msgid "Not enough memory to store file data." msgstr "No hi ha prou memòria per a emmagatzemar les dades del fitxer." -#: ../libnm-util/crypto.c:324 +#: ../libnm-util/crypto.c:325 #, c-format msgid "IV must be an even number of bytes in length." msgstr "" "La llargada del vector d'inicialització ha de ser un nombre parell de bytes." -#: ../libnm-util/crypto.c:333 +#: ../libnm-util/crypto.c:334 #, c-format msgid "Not enough memory to store the IV." msgstr "No hi ha prou memòria per a emmagatzemar el vector d'inicialització." -#: ../libnm-util/crypto.c:344 +#: ../libnm-util/crypto.c:345 #, c-format msgid "IV contains non-hexadecimal digits." msgstr "El vector d'inicialització conté dígits que no són hexadecimals." -#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:143 -#: ../libnm-util/crypto_nss.c:169 +#: ../libnm-util/crypto.c:383 ../libnm-util/crypto_gnutls.c:148 +#: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171 +#: ../libnm-util/crypto_nss.c:336 #, c-format msgid "Private key cipher '%s' was unknown." msgstr "Es desconeix el criptògraf «%s» de la clau privada." -#: ../libnm-util/crypto.c:391 +#: ../libnm-util/crypto.c:392 #, c-format msgid "Not enough memory to decrypt private key." -msgstr "No hi ha prou memòria per a desencriptar a la clau privada." +msgstr "No hi ha prou memòria per desencriptar la clau privada." -#: ../libnm-util/crypto.c:511 +#: ../libnm-util/crypto.c:512 #, c-format msgid "Unable to determine private key type." msgstr "No s'ha pogut determinar el tipus de la clau privada." -#: ../libnm-util/crypto.c:530 +#: ../libnm-util/crypto.c:531 #, c-format msgid "Not enough memory to store decrypted private key." msgstr "" "No hi ha prou memòria per a emmagatzemar la clau privada desencriptada." -#: ../libnm-util/crypto_gnutls.c:46 +#: ../libnm-util/crypto_gnutls.c:49 msgid "Failed to initialize the crypto engine." msgstr "No s'ha pogut inicialitzar el motor criptogràfic." -#: ../libnm-util/crypto_gnutls.c:90 +#: ../libnm-util/crypto_gnutls.c:93 #, c-format msgid "Failed to initialize the MD5 engine: %s / %s." msgstr "No s'ha pogut inicialitzar el motor MD5: %s / %s." -#: ../libnm-util/crypto_gnutls.c:152 ../libnm-util/crypto_nss.c:178 +#: ../libnm-util/crypto_gnutls.c:156 +#, c-format +msgid "Invalid IV length (must be at least %zd)." +msgstr "" +"La longitud del vector d'inicialització no és vàlida (la mida mínima és %zd)." + +#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188 #, c-format msgid "Not enough memory for decrypted key buffer." -msgstr "No hi ha prou memòria per al búfer de la clau desencriptada." +msgstr "" +"No hi ha prou espai per a la memòria intermèdia de la clau desencriptada." -#: ../libnm-util/crypto_gnutls.c:160 +#: ../libnm-util/crypto_gnutls.c:173 #, c-format msgid "Failed to initialize the decryption cipher context: %s / %s." msgstr "" "No s'ha pogut inicialitzar el context del criptògraf de desencriptació: %s / " "%s." -#: ../libnm-util/crypto_gnutls.c:169 +#: ../libnm-util/crypto_gnutls.c:182 #, c-format msgid "Failed to set symmetric key for decryption: %s / %s." msgstr "" "No s'ha pogut definir la clau simètrica per a la desencriptació: %s / %s." -#: ../libnm-util/crypto_gnutls.c:178 +#: ../libnm-util/crypto_gnutls.c:191 #, c-format msgid "Failed to set IV for decryption: %s / %s." msgstr "" "No s'ha pogut definir el vector d'inicialització per a la desencriptació: %" "s / %s." -#: ../libnm-util/crypto_gnutls.c:187 +#: ../libnm-util/crypto_gnutls.c:200 #, c-format msgid "Failed to decrypt the private key: %s / %s." msgstr "No s'ha pogut desencriptar la clau privada: %s / %s." -#: ../libnm-util/crypto_gnutls.c:200 +#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267 +#, c-format +msgid "Failed to decrypt the private key: unexpected padding length." +msgstr "" +"No s'ha pogut desencriptar la clau privada: no s'esperava la longitud del " +"farciment." + +#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278 #, c-format msgid "Failed to decrypt the private key." msgstr "No s'ha pogut desencriptar la clau privada." -#: ../libnm-util/crypto_gnutls.c:235 +#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356 +#, c-format +msgid "Could not allocate memory for encrypting." +msgstr "No s'ha pogut assignar memòria per a l'encriptació." + +#: ../libnm-util/crypto_gnutls.c:294 +#, c-format +msgid "Failed to initialize the encryption cipher context: %s / %s." +msgstr "" +"No s'ha pogut inicialitzar del context del criptògraf d'encriptació: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:303 +#, c-format +msgid "Failed to set symmetric key for encryption: %s / %s." +msgstr "No s'ha pogut establir la clau simètrica per a l'encriptació: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:313 +#, c-format +msgid "Failed to set IV for encryption: %s / %s." +msgstr "" +"No s'ha pogut establir el vector d'inicialització per a l'encriptació: %s / %" +"s." + +#: ../libnm-util/crypto_gnutls.c:322 +#, c-format +msgid "Failed to encrypt the data: %s / %s." +msgstr "No s'han pogut encriptar les dades: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:362 #, c-format msgid "Error initializing certificate data: %s" msgstr "S'ha produït un error en inicialitzar les dades del certificat: %s" -#: ../libnm-util/crypto_gnutls.c:257 +#: ../libnm-util/crypto_gnutls.c:384 #, c-format msgid "Couldn't decode certificate: %s" msgstr "No s'ha pogut descodificar el certificat: %s" -#: ../libnm-util/crypto_gnutls.c:281 +#: ../libnm-util/crypto_gnutls.c:408 #, c-format msgid "Couldn't initialize PKCS#12 decoder: %s" msgstr "No s'ha pogut inicialitzar el descodificador PKCS#12: %s" -#: ../libnm-util/crypto_gnutls.c:294 +#: ../libnm-util/crypto_gnutls.c:421 #, c-format msgid "Couldn't decode PKCS#12 file: %s" msgstr "No s'ha pogut descodificar el fitxer PKCS#12: %s" -#: ../libnm-util/crypto_gnutls.c:306 +#: ../libnm-util/crypto_gnutls.c:433 #, c-format msgid "Couldn't verify PKCS#12 file: %s" msgstr "No s'ha pogut verificar el fitxer PKCS#12: %s" -#: ../libnm-util/crypto_nss.c:57 +#: ../libnm-util/crypto_nss.c:56 #, c-format msgid "Failed to initialize the crypto engine: %d." -msgstr "No s'ha pogut inicialitzar el motor criptogràfic: %d" +msgstr "No s'ha pogut inicialitzar el motor criptogràfic: %d." #: ../libnm-util/crypto_nss.c:111 #, c-format msgid "Failed to initialize the MD5 context: %d." msgstr "No s'ha pogut inicialitzar el context MD5: %d." -#: ../libnm-util/crypto_nss.c:186 +#: ../libnm-util/crypto_nss.c:179 +#, c-format +msgid "Invalid IV length (must be at least %d)." +msgstr "" +"La llargada del vector d'inicialització no és vàlida (la mida mínima és %d)." + +#: ../libnm-util/crypto_nss.c:196 #, c-format msgid "Failed to initialize the decryption cipher slot." msgstr "No s'ha pogut inicialitzar la ranura del criptògraf de desencriptació." -#: ../libnm-util/crypto_nss.c:196 +#: ../libnm-util/crypto_nss.c:206 #, c-format msgid "Failed to set symmetric key for decryption." msgstr "No s'ha pogut definir la clau simètrica per a la desencriptació." -#: ../libnm-util/crypto_nss.c:206 +#: ../libnm-util/crypto_nss.c:216 #, c-format msgid "Failed to set IV for decryption." msgstr "" "No s'ha pogut definir el vector d'inicialització per a la desencriptació." -#: ../libnm-util/crypto_nss.c:214 +#: ../libnm-util/crypto_nss.c:224 #, c-format msgid "Failed to initialize the decryption context." -msgstr "No s'ha pogut inicialitzar el context de desxifratge." +msgstr "No s'ha pogut inicialitzar el context de desencriptació." -#: ../libnm-util/crypto_nss.c:227 +#: ../libnm-util/crypto_nss.c:237 #, c-format msgid "Failed to decrypt the private key: %d." -msgstr "No s'ha pogut desxifrar la clau privada: %d." +msgstr "No s'ha pogut desencriptar la clau privada: %d." -#: ../libnm-util/crypto_nss.c:239 +#: ../libnm-util/crypto_nss.c:245 +#, c-format +msgid "Failed to decrypt the private key: decrypted data too large." +msgstr "" +"No s'ha pogut desencriptar la clau privada: les dades desencriptades són " +"massa llargues." + +#: ../libnm-util/crypto_nss.c:256 #, c-format msgid "Failed to finalize decryption of the private key: %d." msgstr "No s'ha pogut finalitzar la desencriptació de la clau privada: %d." -#: ../libnm-util/crypto_nss.c:284 +#: ../libnm-util/crypto_nss.c:364 +#, c-format +msgid "Failed to initialize the encryption cipher slot." +msgstr "No s'ha pogut inicialitzar la ranura del criptògraf d'encriptació." + +#: ../libnm-util/crypto_nss.c:372 +#, c-format +msgid "Failed to set symmetric key for encryption." +msgstr "No s'ha pogut establir la clau simètrica per encriptar." + +#: ../libnm-util/crypto_nss.c:380 +#, c-format +msgid "Failed to set IV for encryption." +msgstr "No s'ha pogut establir el vector d'inicialització per a l'encriptació." + +#: ../libnm-util/crypto_nss.c:388 +#, c-format +msgid "Failed to initialize the encryption context." +msgstr "No s'ha pogut inicialitzar el context d'encriptació." + +#: ../libnm-util/crypto_nss.c:396 +#, c-format +msgid "Failed to encrypt: %d." +msgstr "No s'ha pogut encriptar: %d." + +#: ../libnm-util/crypto_nss.c:404 +#, c-format +msgid "Unexpected amount of data after encrypting." +msgstr "No s'esperava aquesta quantitat de dades després de l'encriptació." + +#: ../libnm-util/crypto_nss.c:447 #, c-format msgid "Couldn't decode certificate: %d" msgstr "No s'ha pogut descodificar el certificat: %d" -#: ../libnm-util/crypto_nss.c:319 +#: ../libnm-util/crypto_nss.c:482 #, c-format msgid "Couldn't convert password to UCS2: %d" msgstr "No s'ha pogut convertir la contrasenya a UCS2: %d" -#: ../libnm-util/crypto_nss.c:347 +#: ../libnm-util/crypto_nss.c:510 #, c-format msgid "Couldn't initialize PKCS#12 decoder: %d" msgstr "No s'ha pogut inicialitzar el descodificador PKCS#12: %d" -#: ../libnm-util/crypto_nss.c:356 +#: ../libnm-util/crypto_nss.c:519 #, c-format msgid "Couldn't decode PKCS#12 file: %d" msgstr "No s'ha pogut descodificar el fitxer PKCS#12: %d" -#: ../libnm-util/crypto_nss.c:365 +#: ../libnm-util/crypto_nss.c:528 #, c-format msgid "Couldn't verify PKCS#12 file: %d" msgstr "No s'ha pogut verificar el fitxer PKCS#12: %d" -#: ../src/nm-netlink-monitor.c:194 ../src/nm-netlink-monitor.c:454 +#: ../libnm-util/crypto_nss.c:557 +msgid "Could not generate random data." +msgstr "No s'han pogut generar dades aleatòries." + +#: ../libnm-util/nm-utils.c:1993 +#, c-format +msgid "Not enough memory to make encryption key." +msgstr "No hi ha prou memòria per crear la clau d'encriptació." + +#: ../libnm-util/nm-utils.c:2103 +msgid "Could not allocate memory for PEM file creation." +msgstr "No s'ha pogut assignar memòria per a la creació del fitxer PEM." + +#: ../libnm-util/nm-utils.c:2115 +#, c-format +msgid "Could not allocate memory for writing IV to PEM file." +msgstr "" +"No s'ha pogut assignar memòria per escriure el vector d'inicialització al " +"fitxer PEM." + +#: ../libnm-util/nm-utils.c:2127 +#, c-format +msgid "Could not allocate memory for writing encrypted key to PEM file." +msgstr "" +"No s'ha pogut assignar memòria per escriure la clau encriptada al fitxer PEM." + +#: ../libnm-util/nm-utils.c:2146 +#, c-format +msgid "Could not allocate memory for PEM file data." +msgstr "No s'ha pogut assignar memòria per al fitxer de dades PEM." + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1 +msgid "Connection sharing via a protected WiFi network" +msgstr "Connexió compartida mitjançant una xarxa Wi-Fi protegida" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2 +msgid "Connection sharing via an open WiFi network" +msgstr "Connexió compartida mitjançant una xarxa Wi-Fi oberta" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3 +msgid "Modify persistent system hostname" +msgstr "Modifica el nom de l'ordinador de forma permanent" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4 +msgid "Modify system connections" +msgstr "Modifica les connexions del sistema" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5 +msgid "System policy prevents modification of system settings" +msgstr "" +"La política del sistema impedeix la modificació dels paràmetres del sistema" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6 +msgid "System policy prevents modification of the persistent system hostname" +msgstr "" +"La política del sistema impedeix la modificació del nom de l'ordinador de " +"forma permanent" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7 +msgid "System policy prevents sharing connections via a protected WiFi network" +msgstr "" +"La política del sistema impedeix compartir connexions mitjançant una xarxa " +"Wi-Fi protegida" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8 +msgid "System policy prevents sharing connections via an open WiFi network" +msgstr "" +"La política del sistema impedeix compartir connexions mitjançant una xarxa " +"Wi-Fi oberta" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1 +msgid "Allow control of network connections" +msgstr "Permet el control de les connexions de xarxa" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2 +msgid "Allow use of user-specific connections" +msgstr "Permet l'ús de connexions específiques per a cada usuari" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3 +msgid "Enable or disable WiFi devices" +msgstr "Habilita o inhabilita els dispositius Wi-Fi" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4 +msgid "Enable or disable WiMAX mobile broadband devices" +msgstr "Habilita o inhabilita els dispositius de banda ampla mòbil WiMAX" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5 +msgid "Enable or disable mobile broadband devices" +msgstr "Habilita o inhabilita els dispositius de banda ampla mòbil" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6 +msgid "Enable or disable system networking" +msgstr "Habilita o inhabilita la xarxa del sistema" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7 +msgid "" +"Put NetworkManager to sleep or wake it up (should only be used by system " +"power management)" +msgstr "" +"Posa el NetworkManager a dormir o desperta'l (només l'hauria d'utilitzar el " +"sistema de gestió d'energia)" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8 +msgid "System policy prevents control of network connections" +msgstr "La política del sistema impedeix el control de les connexions de xarxa" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9 +msgid "System policy prevents enabling or disabling WiFi devices" +msgstr "" +"La política del sistema impedeix habilitar o inhabilitar els dispositius Wi-" +"Fi" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10 +msgid "" +"System policy prevents enabling or disabling WiMAX mobile broadband devices" +msgstr "" +"La política del sistema impedeix habilitar o inhabilitar els dispositius de " +"banda ampla mòbil WiMAX" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11 +msgid "System policy prevents enabling or disabling mobile broadband devices" +msgstr "" +"La política del sistema impedeix habilitar o inhabilitar els dispositius de " +"banda ampla mòbil" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12 +msgid "System policy prevents enabling or disabling system networking" +msgstr "" +"La política del sistema impedeix habilitar o inhabilitar la xarxa del sistema" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13 +msgid "System policy prevents putting NetworkManager to sleep or waking it up" +msgstr "" +"La política del sistema impedeix posar el NetworkManager a dormir o " +"despertar-lo" + +#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14 +msgid "System policy prevents use of user-specific connections" +msgstr "" +"La política del sistema impedeix la utilització de connexions específiques " +"per a cada usuari" + +#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231 +#: ../src/nm-netlink-monitor.c:653 #, c-format msgid "error processing netlink message: %s" -msgstr "s'ha produït un error en processar el missatge netlink: %s" +msgstr "s'ha produït un error en processar el missatge del netlink: %s" -#: ../src/nm-netlink-monitor.c:251 -#, c-format -msgid "unable to allocate netlink handle for monitoring link status: %s" -msgstr "" -"no s'ha pogut assignar el gestor del netlink per a fer un seguiment de " -"l'estat de l'enllaç: %s" +#: ../src/nm-netlink-monitor.c:214 +msgid "error occurred while waiting for data on socket" +msgstr "s'ha produït un error en esperar dades del sòcol" -#: ../src/nm-netlink-monitor.c:261 +#: ../src/nm-netlink-monitor.c:254 #, c-format msgid "unable to connect to netlink for monitoring link status: %s" msgstr "" "no s'ha pogut connectar amb el netlink per a fer un seguiment de l'estat de " "l'enllaç: %s" -#: ../src/nm-netlink-monitor.c:269 +#: ../src/nm-netlink-monitor.c:265 #, c-format -msgid "unable to join netlink group for monitoring link status: %s" -msgstr "" -"no s'ha pogut unir el grup del netlink per a fer un seguiment de l'estat de " -"l'enllaç: %s" +msgid "unable to enable netlink handle credential passing: %s" +msgstr "no s'ha pogut habilitar el gestor netlink per passar credencials: %s" -#: ../src/nm-netlink-monitor.c:277 +#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353 +#, c-format +msgid "unable to allocate netlink handle for monitoring link status: %s" +msgstr "" +"no s'ha pogut assignar el gestor del netlink per a fer un seguiment de " +"l'estat de l'enllaç: %s" + +#: ../src/nm-netlink-monitor.c:376 #, c-format msgid "unable to allocate netlink link cache for monitoring link status: %s" msgstr "" "no s'ha pogut assignar la memòria cau de l'enllaç del netlink per a fer un " "seguiment de l'estat de l'enllaç: %s" -#: ../src/nm-netlink-monitor.c:418 +#: ../src/nm-netlink-monitor.c:502 +#, c-format +msgid "unable to join netlink group: %s" +msgstr "no ha pogut unir-se al grup netlink: %s" + +#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642 #, c-format msgid "error updating link cache: %s" msgstr "s'ha produït un error en actualitzar la memòria cau de l'enllaç: %s" -#: ../src/nm-netlink-monitor.c:484 -msgid "error occurred while waiting for data on socket" -msgstr "s'ha produït un error en esperar dades del sòcol" - -#: ../src/NetworkManager.c:293 +#: ../src/main.c:518 #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" msgstr "" "Opció no vàlida. Utilitzeu --help per a veure la llista d'opcions vàlides.\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient.c:92 +#: ../src/main.c:589 +#, c-format +msgid "%s. Please use --help to see a list of valid options.\n" +msgstr "%s. Utilitzeu --help per veure un llistat amb les opcions vàlides.\n" + +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62 msgid "# Created by NetworkManager\n" msgstr "# Creat pel NetworkManager\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient.c:98 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69 #, c-format msgid "" "# Merged from %s\n" @@ -335,875 +1901,54 @@ msgstr "" "# Fusionat des de %s\n" "\n" -#: ../src/dns-manager/nm-dns-manager.c:256 +#: ../src/dhcp-manager/nm-dhcp-manager.c:284 +msgid "no usable DHCP client could be found." +msgstr "no s'ha pogut trobar cap client DHCP." + +#: ../src/dhcp-manager/nm-dhcp-manager.c:293 +msgid "'dhclient' could be found." +msgstr "s'ha trobat el «dhclient»." + +#: ../src/dhcp-manager/nm-dhcp-manager.c:303 +msgid "'dhcpcd' could be found." +msgstr "s'ha trobat el «dhcpcd»." + +#: ../src/dhcp-manager/nm-dhcp-manager.c:311 +#, c-format +msgid "unsupported DHCP client '%s'" +msgstr "el client DHCP «%s» no és compatible" + +#: ../src/logging/nm-logging.c:148 +#, c-format +msgid "Unknown log level '%s'" +msgstr "Es desconeix el nivell de registre «%s»" + +#: ../src/logging/nm-logging.c:173 +#, c-format +msgid "Unknown log domain '%s'" +msgstr "Es desconeix el domini de registre «%s»" + +#: ../src/dns-manager/nm-dns-manager.c:367 msgid "NOTE: the libc resolver may not support more than 3 nameservers." msgstr "" -"NOTA: pot ser que el sistema de resolució de la libc no funcioni amb més de " -"3 servidors de noms." +"NOTA: pot ser que el sistema de resolució de la libc no permeti més de 3 " +"servidors de noms." -#: ../src/dns-manager/nm-dns-manager.c:258 +#: ../src/dns-manager/nm-dns-manager.c:369 msgid "The nameservers listed below may not be recognized." -msgstr "Pot ser que no es reconeguin els servidors de noms llistats més avall." +msgstr "Pot ser que no es reconeguin els servidors de noms llistats aquí sota." -#: ../system-settings/src/main.c:381 +#: ../src/system-settings/nm-default-wired-connection.c:157 #, c-format msgid "Auto %s" msgstr "%s automàtic" -#~ msgid "Passphrase for wireless network %s" -#~ msgstr "Contrasenya per a la xarxa sense fil %s" +#: ../system-settings/plugins/ifcfg-rh/reader.c:3409 +#: ../system-settings/plugins/ifnet/connection_parser.c:49 +msgid "System" +msgstr "Sistema" -#~ msgid "Connection to the wireless network '%s' failed." -#~ msgstr "Ha fallat la connexió a la xarxa sense fil «%s»." - -#~ msgid "Connection to the wired network failed." -#~ msgstr "Ha fallat la connexió a la xarxa amb fil." - -#~ msgid "Error displaying connection information:" -#~ msgstr "S'ha produït un error en mostrar la informació de la connexió:" - -#~ msgid "Could not find some required resources (the glade file)!" +#~ msgid "unable to join netlink group for monitoring link status: %s" #~ msgstr "" -#~ "Alguns dels recursos requerits no s'han pogut trobar (el fitxer glade)!" - -#~ msgid "No active connections!" -#~ msgstr "No hi ha cap connexió activa." - -#~ msgid "%d Mb/s" -#~ msgstr "%d Mb/s" - -#~ msgid "Wired Ethernet (%s)" -#~ msgstr "Xarxa amb fil (%s)" - -#~ msgid "Wireless Ethernet (%s)" -#~ msgstr "Xarxa sense fil (%s)" - -#~ msgid "Unknown" -#~ msgstr "Desconegut" - -#~ msgid "NetworkManager Applet" -#~ msgstr "Miniaplicació NetworkManager" - -#~ msgid "" -#~ "Copyright © 2004-2006 Red Hat, Inc.\n" -#~ "Copyright © 2005-2006 Novell, Inc." -#~ msgstr "" -#~ "Copyright © 2004-2006 Red Hat, Inc.\n" -#~ "Copyright © 2005-2006 Novell, Inc." - -#~ msgid "" -#~ "Notification area applet for managing your network devices and " -#~ "connections." -#~ msgstr "" -#~ "Miniaplicació per a l'àrea de notificació per a gestionar els vostres " -#~ "dispositius de xarxa i connexions." - -#~ msgid "translator-credits" -#~ msgstr "Josep Puigdemont i Casamajó " - -#~ msgid "" -#~ "Copyright © 2004-2005 Red Hat, Inc.\n" -#~ "Copyright © 2005-2006 Novell, Inc." -#~ msgstr "" -#~ "Copyright © 2004-2005 Red Hat, Inc.\n" -#~ "Copyright © 2005-2006 Novell, Inc." - -#~ msgid "VPN Login Failure" -#~ msgstr "S'ha produït un error en l'entrada VPN" - -#~ msgid "Could not start the VPN connection '%s' due to a login failure." -#~ msgstr "" -#~ "Atès que s'ha produït un error en l'entrada, no s'ha pogut iniciar la " -#~ "connexió VPN «%s»." - -#~ msgid "VPN Start Failure" -#~ msgstr "No s'ha pogut iniciar la VPN" - -#~ msgid "" -#~ "Could not start the VPN connection '%s' due to a failure launching the " -#~ "VPN program." -#~ msgstr "" -#~ "No s'ha pogut iniciar la connexió VPN «%s» perquè s'ha produït un error en " -#~ "llançar la VPN." - -#~ msgid "VPN Connect Failure" -#~ msgstr "S'ha produït un error en la connexió VPN" - -#~ msgid "Could not start the VPN connection '%s' due to a connection error." -#~ msgstr "" -#~ "No s'ha pogut iniciar la connexió VPN «%s» ja que s'ha produït un error de " -#~ "connexió." - -#~ msgid "VPN Configuration Error" -#~ msgstr "S'ha produït un error de configuració de la VPN" - -#~ msgid "The VPN connection '%s' was not correctly configured." -#~ msgstr "La connexió VPN «%s» no està correctament configurada." - -#~ msgid "" -#~ "Could not start the VPN connection '%s' because the VPN server did not " -#~ "return an adequate network configuration." -#~ msgstr "" -#~ "No s'ha pogut iniciar la connexió VPN «%s» perquè el servidor VPN no ha " -#~ "retornat cap configuració de xarxa adequada." - -#~ msgid "VPN Login Message" -#~ msgstr "Missatge d'entrada de la VPN" - -#~ msgid "" -#~ "The NetworkManager Applet could not find some required resources (the " -#~ "glade file was not found)." -#~ msgstr "" -#~ "La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos " -#~ "requerits (no s'ha trobat el fitxer glade)." - -# FIXME -#~ msgid "The network device \"%s (%s)\" does not support wireless scanning." -#~ msgstr "El dispositiu de xarxa «%s (%s)» no permet l'escaneig sense fil." - -#~ msgid "The network device \"%s (%s)\" does not support link detection." -#~ msgstr "El dispositiu de xarxa «%s (%s)» no permet la detecció de l'enllaç." - -#~ msgid "(unknown)" -#~ msgstr "(desconegut)" - -#~ msgid "Preparing device %s for the wired network..." -#~ msgstr "S'està preparant el dispositiu %s per a la xarxa amb fil..." - -#~ msgid "Preparing device %s for the wireless network '%s'..." -#~ msgstr "S'està preparant el dispositiu %s per a la xarxa sense fil «%s»..." - -#~ msgid "Configuring device %s for the wired network..." -#~ msgstr "S'està configurant el dispositiu %s per a la xarxa amb fil..." - -#~ msgid "Attempting to join the wireless network '%s'..." -#~ msgstr "S'està intentant entrar a la xarxa sense fil «%s»..." - -#~ msgid "Waiting for Network Key for the wireless network '%s'..." -#~ msgstr "S'està esperant per a la clau de xarxa de la xarxa sense fil «%s»..." - -#~ msgid "Requesting a network address from the wired network..." -#~ msgstr "S'està sol·licitant una adreça de xarxa per a la xarxa amb fil..." - -#~ msgid "Requesting a network address from the wireless network '%s'..." -#~ msgstr "" -#~ "S'està sol·licitant una adreça de xarxa per a la xarxa sense fil «%s»..." - -#~ msgid "Finishing connection to the wired network..." -#~ msgstr "S'està finalitzant la connexió a la xarxa amb fil..." - -#~ msgid "Finishing connection to the wireless network '%s'..." -#~ msgstr "S'està finalizant la connexió a la xarxa sense fil «%s»..." - -#~ msgid "NetworkManager is not running" -#~ msgstr "No s'està executant el NetworkManager" - -#~ msgid "Networking disabled" -#~ msgstr "S'ha inhabilitat la xarxa" - -#~ msgid "No network connection" -#~ msgstr "No hi ha cap connexió de xarxa" - -#~ msgid "Wired network connection" -#~ msgstr "Connexió de xarxa amb fil" - -#~ msgid "Connected to an Ad-Hoc wireless network" -#~ msgstr "Connectat a una xarxa Ad-Hoc sense fil" - -#~ msgid "Wireless network connection to '%s' (%d%%)" -#~ msgstr "Connexió de xarxa sense fil a «%s» (%d%%)" - -#~ msgid "VPN connection to '%s'" -#~ msgstr "Connexió VPN a «%s»" - -#~ msgid "VPN connecting to '%s'" -#~ msgstr "S'està connectant amb VPN a «%s»" - -#~ msgid "_Connect to Other Wireless Network..." -#~ msgstr "_Connecta a d'altres xarxes sense fil..." - -#~ msgid "Create _New Wireless Network..." -#~ msgstr "Crea una xarxa sense fil _nova..." - -#~ msgid "_VPN Connections" -#~ msgstr "Connexions _VPN" - -#~ msgid "_Configure VPN..." -#~ msgstr "_Configura la VPN..." - -#~ msgid "_Disconnect VPN..." -#~ msgstr "_Desconnecta la VPN..." - -#~ msgid "_Dial Up Connections" -#~ msgstr "Connexions de _marcatge" - -#~ msgid "Connect to %s..." -#~ msgstr "Connecta a %s..." - -#~ msgid "Disconnect from %s..." -#~ msgstr "Desconnecta de %s..." - -#~ msgid "No network devices have been found" -#~ msgstr "No s'ha trobat cap dispositiu de xarxa" - -#~ msgid "NetworkManager is not running..." -#~ msgstr "No s'està executant el NetworkManager..." - -#~ msgid "Enable _Networking" -#~ msgstr "Habilita la _xarxa" - -#~ msgid "Enable _Wireless" -#~ msgstr "Habilita la xarxa _sense fil" - -#~ msgid "Connection _Information" -#~ msgstr "_Informació de la connexió" - -#~ msgid "_Help" -#~ msgstr "A_juda" - -#~ msgid "_About" -#~ msgstr "_Quant a" - -#~ msgid "" -#~ "The NetworkManager applet could not find some required resources. It " -#~ "cannot continue.\n" -#~ msgstr "" -#~ "La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos " -#~ "requerits. No pot continuar.\n" - -#~ msgid "Open System" -#~ msgstr "Sistema obert" - -#~ msgid "Shared Key" -#~ msgstr "Clau compartida" - -#~ msgid "Automatic (Default)" -#~ msgstr "Automàtic (Predeterminat)" - -#~ msgid "AES-CCMP" -#~ msgstr "AES-CCMP" - -#~ msgid "TKIP" -#~ msgstr "TKIP" - -#~ msgid "Dynamic WEP" -#~ msgstr "WEP dinàmic" - -#~ msgid "None" -#~ msgstr "Cap" - -#~ msgid "WEP 64/128-bit ASCII" -#~ msgstr "WEP 64/128-bit ASCII" - -#~ msgid "WEP 64/128-bit Hex" -#~ msgstr "WEP 64/128-bit Hex" - -#~ msgid "WEP 128-bit Passphrase" -#~ msgstr "WEP contrasenya de 128-bits" - -#~ msgid "PEAP" -#~ msgstr "PEAP" - -#~ msgid "TLS" -#~ msgstr "TLS" - -#~ msgid "TTLS" -#~ msgstr "TTLS" - -#~ msgid "WPA2 Enterprise" -#~ msgstr "WPA2 Enterprise" - -#~ msgid "WPA Enterprise" -#~ msgstr "WPA Enterprise" - -#~ msgid "WPA2 Personal" -#~ msgstr "WPA2 personal" - -#~ msgid "WPA Personal" -#~ msgstr "WPA personal" - -#~ msgid "Orientation" -#~ msgstr "Orientació" - -#~ msgid "The orientation of the tray." -#~ msgstr "La orientació de l'àrea de notificació." - -#~ msgid "Wired Network (%s)" -#~ msgstr "Xarxa amb fil (%s)" - -#~ msgid "_Wired Network" -#~ msgstr "Xarxa amb _fil" - -#~ msgid "Wireless Network (%s)" -#~ msgid_plural "Wireless Networks (%s)" -#~ msgstr[0] "Xarxa sense fil (%s)" -#~ msgstr[1] "Xarxes sense fil (%s)" - -#~ msgid "Wireless Network" -#~ msgid_plural "Wireless Networks" -#~ msgstr[0] "Xarxa sense fil" -#~ msgstr[1] "Xarxes sense fil" - -#~ msgid " (invalid Unicode)" -#~ msgstr " (Unicode invàlid)" - -#~ msgid "" -#~ "By default, the wireless network's name is set to your computer's name, %" -#~ "s, with no encryption enabled" -#~ msgstr "" -#~ "Per defecte, el nom de la xarxa sense fil s'estableix al nom de " -#~ "l'ordinador, %s, sense habilitar el xifratge" - -#~ msgid "Create new wireless network" -#~ msgstr "Crea una nova xarxa sense fil" - -#~ msgid "" -#~ "Enter the name and security settings of the wireless network you wish to " -#~ "create." -#~ msgstr "" -#~ "Entreu el nom els paràmetres de seguretat per a la xarxa sense fil que " -#~ "vulgueu crear." - -#~ msgid "Create New Wireless Network" -#~ msgstr "Crea una xarxa sense fil nova" - -#~ msgid "Existing wireless network" -#~ msgstr "Xarxa sense fil existent" - -#~ msgid "Enter the name of the wireless network to which you wish to connect." -#~ msgstr "Entreu el nom de la xarxa sense fil a la que vulgueu connectar-vos." - -#~ msgid "Connect to Other Wireless Network" -#~ msgstr "Connecta a d'altres xarxes sense fil" - -#~ msgid "Error connecting to wireless network" -#~ msgstr "S'ha produït un error en connectar a la xarxa sense fil..." - -#~ msgid "" -#~ "The requested wireless network requires security capabilities unsupported " -#~ "by your hardware." -#~ msgstr "" -#~ "La xarxa sense fil seleccionada requereix certes característiques de " -#~ "seguretat que no estan implementades en el aquest maquinari." - -#~ msgid "Cannot start VPN connection '%s'" -#~ msgstr "No s'ha pogut iniciar la connexió VPN «%s»" - -#~ msgid "" -#~ "Could not find the authentication dialog for VPN connection type '%s'. " -#~ "Contact your system administrator." -#~ msgstr "" -#~ "No s'ha pogut trobar el diàleg d'autenticació per al tipus de connexió " -#~ "VPN «%s». Contacteu el vostre administrador de sistemes." - -#~ msgid "" -#~ "There was a problem launching the authentication dialog for VPN " -#~ "connection type '%s'. Contact your system administrator." -#~ msgstr "" -#~ "S'ha produït un error en llançar el diàleg d'autenticació per al tipus de " -#~ "connexió VPN «%s». Contacteu el vostre administrador de sistemes." - -#~ msgid " " -#~ msgstr " " - -#~ msgid "" -#~ "Active Connection Information" -#~ msgstr "" -#~ "Informació de la connexió activa" - -#~ msgid "" -#~ "Passphrase Required by Wireless " -#~ "Network\n" -#~ "\n" -#~ "A passphrase or encryption key is required to access the wireless network " -#~ "'%s'." -#~ msgstr "" -#~ "Contrasenya necessària per a la " -#~ "xarxa sense fil\n" -#~ "\n" -#~ "Es requereix una contrasenya o clau de xifratge per a la xarxa sense fil «%" -#~ "s»." - -#~ msgid "" -#~ "Reduced Network Functionality\n" -#~ "\n" -#~ "%s It will not be completely functional." -#~ msgstr "" -#~ "Funcionalitat de xarxa reduïda\n" -#~ "\n" -#~ "%s No serà del tot funcional." - -#~ msgid "" -#~ "Wireless Network Login " -#~ "Confirmation\n" -#~ "\n" -#~ "You have chosen to log in to the wireless network '%s'. If you are sure " -#~ "that this wireless network is secure, click the checkbox below and " -#~ "NetworkManager will not require confirmation on subsequent log ins." -#~ msgstr "" -#~ "Confirmació de l'entrada a la xarxa " -#~ "sense fil\n" -#~ "\n" -#~ "Heu escollit entrar a la xarxa sense fil «%s». Si esteu segur que la xarxa " -#~ "sense fil és segura, feu clic al quadre de comprovació de sota i el " -#~ "NetworkManager no us tornarà a demanarà cap més confirmació per entrar a " -#~ "aquesta xarxa en el futur." - -#~ msgid "Anonymous Identity:" -#~ msgstr "Identitat anònima:" - -#~ msgid "Authentication:" -#~ msgstr "Autenticació:" - -#~ msgid "Broadcast Address:" -#~ msgstr "Adreça de multidifusió:" - -#~ msgid "CA Certificate File:" -#~ msgstr "Fitxer del certificat CA:" - -#~ msgid "C_onnect" -#~ msgstr "C_onnecta" - -#~ msgid "Client Certificate File:" -#~ msgstr "Fitxer del certificat del client:" - -#~ msgid "Connection Information" -#~ msgstr "Informació de la connexió" - -#~ msgid "Default Route:" -#~ msgstr "Ruta predeterminada:" - -#~ msgid "Destination Address:" -#~ msgstr "Adreça de destí:" - -#~ msgid "Driver:" -#~ msgstr "Connector:" - -#~ msgid "EAP Method:" -#~ msgstr "Mètode EAP:" - -#~ msgid "Hardware Address:" -#~ msgstr "Adreça del maquinari:" - -#~ msgid "IP Address:" -#~ msgstr "Adreça IP:" - -#~ msgid "Identity:" -#~ msgstr "Identitat:" - -#~ msgid "Interface:" -#~ msgstr "Interfície:" - -#~ msgid "Key Type:" -#~ msgstr "Tipus de clau:" - -#~ msgid "Key management:" -#~ msgstr "Gestió de claus:" - -#~ msgid "Key:" -#~ msgstr "Clau:" - -#~ msgid "" -#~ "None\n" -#~ "WEP 128-bit Passphrase\n" -#~ "WEP 64/128-bit Hex\n" -#~ "WEP 64/128-bit ASCII\n" -#~ msgstr "" -#~ "Cap\n" -#~ "WEP contrasenya de 128 bits\n" -#~ "WEP 64/128-bit Hex\n" -#~ "WEP 64/128-bit ASCII\n" - -#~ msgid "" -#~ "Open System\n" -#~ "Shared Key" -#~ msgstr "" -#~ "Sistema obert\n" -#~ "Clau compartida" - -#~ msgid "Other Wireless Network..." -#~ msgstr "Altres xarxes sense fil..." - -#~ msgid "Passphrase:" -#~ msgstr "Contrasenya:" - -#~ msgid "Password:" -#~ msgstr "Contrasenya:" - -#~ msgid "Primary DNS:" -#~ msgstr "DNS primari:" - -#~ msgid "Private Key File:" -#~ msgstr "Fitxer de la clau privada:" - -#~ msgid "Private Key Password:" -#~ msgstr "Contrasenya de la clau privada:" - -#~ msgid "Secondary DNS:" -#~ msgstr "DNS secundari:" - -#~ msgid "Select the CA Certificate File" -#~ msgstr "Seleccioneu el fitxer del certificat de la CA" - -#~ msgid "Select the Client Certificate File" -#~ msgstr "Seleccioneu el fitxer del certificat del client" - -#~ msgid "Select the Private Key File" -#~ msgstr "Seleccioneu el fitxer de la clau privada" - -#~ msgid "Show key" -#~ msgstr "Mostra la clau" - -#~ msgid "Show passphrase" -#~ msgstr "Mostra la contrasenya:" - -#~ msgid "Show password" -#~ msgstr "Mostra la contrasenya:" - -#~ msgid "Show passwords" -#~ msgstr "Mostra les contrasenyes" - -#~ msgid "Speed:" -#~ msgstr "Velocitat:" - -#~ msgid "Subnet Mask:" -#~ msgstr "Màscara de subxarxa:" - -#~ msgid "Type:" -#~ msgstr "Tipus:" - -#~ msgid "User Name:" -#~ msgstr "Nom d'usuari:" - -#~ msgid "Wireless Network Key Required" -#~ msgstr "Es requereix una clau per a la xarxa sense fil" - -#~ msgid "Wireless _adapter:" -#~ msgstr "_Adaptador sense fil:" - -#~ msgid "_Always Trust this Wireless Network" -#~ msgstr "Confia sempre en _aquesta xarxa sense fil" - -#~ msgid "_Don't remind me again" -#~ msgstr "_No m'ho tornis a recordar" - -#~ msgid "_Fallback on this Network" -#~ msgstr "Utilitza aquesta _xarxa com a alternativa" - -#~ msgid "_Login to Network" -#~ msgstr "_Entra a la xarxa" - -#~ msgid "_Network Name:" -#~ msgstr "Nom de _xarxa:" - -#~ msgid "_Wireless Security:" -#~ msgstr "Seguretat de la _xarxa sense fil:" - -#~ msgid "Cannot add VPN connection" -#~ msgstr "No s'ha pogut afegir la connexions VPN" - -#~ msgid "" -#~ "No suitable VPN software was found on your system. Contact your system " -#~ "administrator." -#~ msgstr "" -#~ "No s'ha pogut trobar el programari VPN adequat en aquest ordinador. " -#~ "Contacteu el vostre administrador." - -#~ msgid "Cannot import VPN connection" -#~ msgstr "No s'ha pogut importar la connexió VPN" - -#~ msgid "" -#~ "Cannot find suitable software for VPN connection type '%s' to import the " -#~ "file '%s'. Contact your system administrator." -#~ msgstr "" -#~ "No s'ha pogut trobar el programari adequat per al tipus de connexió VPN «%" -#~ "s» per a importar el fitxer «%s». Contacteu el vostre administrador de " -#~ "sistemes." - -#~ msgid "Error retrieving VPN connection '%s'" -#~ msgstr "S'ha produït un error en recuperar la connexió VPN «%s»" - -#~ msgid "" -#~ "Could not find the UI files for VPN connection type '%s'. Contact your " -#~ "system administrator." -#~ msgstr "" -#~ "No s'han pogut trobar els fitxers d'UI per al tipus de connexió VPN «%s». " -#~ "Contacteu el vostre administrador de sistemes." - -#~ msgid "Delete VPN connection \"%s\"?" -#~ msgstr "Voleu suprimir la connexió VPN «%s»?" - -#~ msgid "" -#~ "All information about the VPN connection \"%s\" will be lost and you may " -#~ "need your system administrator to provide information to create a new " -#~ "connection." -#~ msgstr "" -#~ "Tota la informació sobre la connexió VPN «%s» es perdrà, i segurament " -#~ "necessitareu que el vostre administrador us proporcioni informació per a " -#~ "crear una connexió nova." - -#~ msgid "Unable to load" -#~ msgstr "No es pot carregar" - -#~ msgid "Cannot find some needed resources (the glade file)!" -#~ msgstr "" -#~ "No s'han pogut trobar alguns dels recursos requerits el fitxer glade)." - -#~ msgid "Create VPN Connection" -#~ msgstr "Crea una connexió VPN" - -#~ msgid "Edit VPN Connection" -#~ msgstr "Edita la connexió VPN" - -#~ msgid "Add a new VPN connection" -#~ msgstr "Afegeix una connexions VPN nova" - -#~ msgid "Delete the selected VPN connection" -#~ msgstr "Suprimeix la connexió VPN seleccionada" - -#~ msgid "E_xport" -#~ msgstr "E_xporta" - -#~ msgid "Edit the selected VPN connection" -#~ msgstr "Edita la connexió VPN seleccionada" - -#~ msgid "Export the VPN settings to a file" -#~ msgstr "Exporta els paràmetres VPN al fitxer" - -#~ msgid "Export the selected VPN connection to a file" -#~ msgstr "Exporta la connexió VPN a un fitxer" - -#~ msgid "Manage Virtual Private Network Connections" -#~ msgstr "Gestioneu connexions a xarxes privades virtuals" - -#~ msgid "VPN Connections" -#~ msgstr "Connexions VPN" - -#~ msgid "40-bit WEP" -#~ msgstr "40-bit WEP" - -#~ msgid "104-bit WEP" -#~ msgstr "104-bit WEP" - -#~ msgid "WPA TKIP" -#~ msgstr "WPA TKIP" - -#~ msgid "WPA CCMP" -#~ msgstr "WPA CCMP" - -#~ msgid "WPA Automatic" -#~ msgstr "WPA automàtic" - -#~ msgid "WPA2 TKIP" -#~ msgstr "WPA2 TKIP" - -#~ msgid "WPA2 CCMP" -#~ msgstr "WPA2 CCMP" - -#~ msgid "WPA2 Automatic" -#~ msgstr "WPA2 automàtic" - -#~ msgid "none" -#~ msgstr "cap" - -#~ msgid "operation took too long" -#~ msgstr "l'operació ha trigat massa" - -#~ msgid "received data from wrong type of sender" -#~ msgstr "s'han rebut dades d'un tipus de remitent equivocat" - -#~ msgid "received data from unexpected sender" -#~ msgstr "s'han rebut dades d'un remitent que no s'esperava" - -#~ msgid "too much data was sent over socket and some of it was lost" -#~ msgstr "" -#~ "s'han enviat massa dades a través del sòcol, i se n'han perdut algunes" - -#~ msgid "You are now connected to the Ad-Hoc wireless network '%s'." -#~ msgstr "Ara esteu connectat a la xarxa Ad-Hoc sense fil «%s»." - -#~ msgid "You are now connected to the wireless network '%s'." -#~ msgstr "Ara esteu connectat a la xarxa sense fil «%s»." - -#~ msgid "You are now connected to the wired network." -#~ msgstr "Ara esteu connectat a la xarxa amb fil." - -#~ msgid "Connection Established" -#~ msgstr "S'ha establert la connexió" - -#~ msgid "Disconnected" -#~ msgstr "Desconnectat" - -#~ msgid "The network connection has been disconnected." -#~ msgstr "S'ha desconnectat la connexió de xarxa." - -#~ msgid "LEAP" -#~ msgstr "LEAP" - -#~ msgid "Choose which type of VPN connection you wish to create." -#~ msgstr "Escolliu el tipus de connexió VPN que vulgueu crear." - -#~ msgid "Connect to:" -#~ msgstr "Connecta a:" - -#~ msgid "Create VPN Connection - 1 of 2" -#~ msgstr "Creació d'una connexió VPN - 1 de 2" - -#~ msgid "Create VPN Connection - 2 of 2" -#~ msgstr "Creació d'una connexió VPN - 2 de 2" - -#~ msgid "Finish Creating VPN Connection" -#~ msgstr "Finalitza la creació de la connexió VPN" - -#~ msgid "" -#~ "This assistant will guide you through the creation of a connection to a " -#~ "Virtual Private Network (VPN).\n" -#~ "\n" -#~ "It will require some information, such as IP addresses and secrets. " -#~ "Please see your system administrator to obtain this information." -#~ msgstr "" -#~ "Aquest auxiliar us guiarà a través de la creació d'una nova connexió VPN " -#~ "a una xarxa privada (VPN).\n" -#~ "\n" -#~ "Cal certa informació, com ara l'adreça IP i secrets, que us hauria de " -#~ "proporcionar el vostre administrador." - -#~ msgid "VPN Error" -#~ msgstr "Error VPN" - -#~ msgid "The VPN service said: \"%s\"" -#~ msgstr "El servei VPN digué: «%s»" - -#~ msgid "VPN connection '%s' said:" -#~ msgstr "La connexió VPN «%s» digué:" - -#~ msgid "leap_subwindow" -#~ msgstr "leap_subwindow" - -#~ msgid "wep_key_subwindow" -#~ msgstr "wep_key_subwindow" - -#~ msgid "wep_passphrase_subwindow" -#~ msgstr "wep_passphrase_subwindow" - -#~ msgid "wpa_psk_subwindow" -#~ msgstr "wpa_psk_subwindow" - -#~ msgid "" -#~ "The requested wireless network '%s' does not appear to be in range. A " -#~ "different wireless network will be used if any are available." -#~ msgstr "" -#~ "La xarxa sense fil sol·licitada «%s», sembla que no està dins del rang. " -#~ "Se'n farà servir una altra si n'hi ha cap de disponible." - -#~ msgid "Failed to get information about the interface!" -#~ msgstr "No s'ha pogut obtenir informació quant a la interfície." - -#~ msgid "_Stop All Wireless Devices" -#~ msgstr "Atura tots els dispositius _sense fil" - -#~ msgid "_Start All Wireless Devices" -#~ msgstr "Inicia tots els dispositius _sense fil" - -#~ msgid "_Wireless Network Discovery" -#~ msgstr "Descobriment de _xarxes sense fil" - -#~ msgid "Always Search" -#~ msgstr "Cerca sempre" - -#~ msgid "Search Only When Disconnected" -#~ msgstr "Cerca només en estar desconnectat" - -#~ msgid "Never Search" -#~ msgstr "No cerquis mai" - -#~ msgid "Stop All Wireless Devices" -#~ msgstr "Atura tots els dispositius sense fil" - -#~ msgid "_Passphrase:" -#~ msgstr "_Contrasenya:" - -#~ msgid "_ASCII Key:" -#~ msgstr "Klau _ASCII:" - -#~ msgid "_Hex Key:" -#~ msgstr "Clau _hexadecimal:" - -#~ msgid ", with no encryption enabled." -#~ msgstr ", amb el xifratge habilitat." - -#~ msgid "ASCII Key:" -#~ msgstr "Clau ASCII:" - -#~ msgid "" -#~ "128-bit Passphrase (WEP)\n" -#~ "ASCII Key (WEP)\n" -#~ "Hex Key (WEP)" -#~ msgstr "" -#~ "Contrasenya de 128-bit (WEP)\n" -#~ "Clau ASCII (WEP)\n" -#~ "Clau Hexadecimal (WEP)" - -#~ msgid "" -#~ "128-bit passphrase (WEP)\n" -#~ "ASCII key (WEP)\n" -#~ "Hex key (WEP)" -#~ msgstr "" -#~ "Contrasenya de 128-bit (WEP)\n" -#~ "Clau ASCII (WEP)\n" -#~ "Clau hexadecimal (WEP)" - -#~ msgid "Connect with _encryption enabled" -#~ msgstr "Connecta amb el _xifratge habilitat" - -#~ msgid "Wireless _network:" -#~ msgstr "_Xarxa sense fil:" - -#~ msgid "" -#~ "Dependent on the private network you want to connect to, you need to " -#~ "select what type of connection you want to create." -#~ msgstr "" -#~ "Depenent del tipus de xarxa privada a la que us vulgueu connectar, heu " -#~ "d'escollir el tipus de connexió que vulgueu crear." - -#~ msgid "Other Wireless Networks..." -#~ msgstr "Altres xarxes sense fil..." - -# FIXME -#~ msgid "Pause Wireless Scanning" -#~ msgstr "Atura l'escaneig sense fil" - -# FIXME -#~ msgid "Resume Wireless Scanning" -#~ msgstr "Reprèn l'escaneig sense fil" - -#~ msgid "progress bar label|%d %%" -#~ msgstr "Etiqueta de la barra de progrés|%d %%" - -# FIXME? -#~ msgid "You must log in to access the Virtual Private Network '%s'." -#~ msgstr "Heu d'autenticar-vos per accedir a la xarxa privada virtual «%s»." - -#~ msgid "_OK" -#~ msgstr "_D'acord" - -#~ msgid "%s" -#~ msgstr "%s" - -#~ msgid "Wireless Networks:" -#~ msgstr "Xarxes sense fil:" - -#~ msgid "Modify Wireless Networks" -#~ msgstr "Modifica xarxes sense fil" - -#~ msgid "*" -#~ msgstr "*" - -#~ msgid "You must log in to access the private network %s" -#~ msgstr "Heu d'autenticar-vos per accedir a la xarxa privada %s" - -#~ msgid "_About..." -#~ msgstr "_Quant a..." +#~ "no s'ha pogut unir el grup del netlink per a fer un seguiment de l'estat " +#~ "de l'enllaç: %s" From a74189fd040c7e23b76ab0eb2ca14fa4bd99dab2 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 24 Jan 2011 15:48:35 -0600 Subject: [PATCH 07/11] ifcfg-rh: fix possible uninitialized variable usage --- system-settings/plugins/ifcfg-rh/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-settings/plugins/ifcfg-rh/reader.c b/system-settings/plugins/ifcfg-rh/reader.c index 5b01417cb..a79db721f 100644 --- a/system-settings/plugins/ifcfg-rh/reader.c +++ b/system-settings/plugins/ifcfg-rh/reader.c @@ -888,7 +888,7 @@ error: static NMIP6Address * parse_full_ip6_address (const char *addr_str, GError **error) { - NMIP6Address *addr; + NMIP6Address *addr = NULL; char **list; char *ip_tag, *prefix_tag; struct in6_addr tmp = IN6ADDR_ANY_INIT; From 1e3a6c1311c701cf618d6434759a43e10961770f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 24 Jan 2011 15:55:10 -0600 Subject: [PATCH 08/11] ifcfg-rh: fix possible uninitialized variable usage --- system-settings/plugins/ifcfg-rh/writer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/system-settings/plugins/ifcfg-rh/writer.c b/system-settings/plugins/ifcfg-rh/writer.c index cf1e2663a..e016d76f4 100644 --- a/system-settings/plugins/ifcfg-rh/writer.c +++ b/system-settings/plugins/ifcfg-rh/writer.c @@ -884,6 +884,7 @@ write_wired_setting (NMConnection *connection, shvarFile *ifcfg, GError **error) svSetValue (ifcfg, "SUBCHANNELS", NULL, FALSE); s390_subchannels = nm_setting_wired_get_s390_subchannels (s_wired); if (s390_subchannels) { + tmp = NULL; if (s390_subchannels->len == 2) { tmp = g_strdup_printf ("%s,%s", (const char *) g_ptr_array_index (s390_subchannels, 0), From 398993e2f4023a2c968d794d583a50dcadd5d4ff Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 24 Jan 2011 15:57:33 -0600 Subject: [PATCH 09/11] build: turn off set-but-not-used variable warnings in new GCC --- m4/compiler_warnings.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4 index 6cea2f74e..be69af278 100644 --- a/m4/compiler_warnings.m4 +++ b/m4/compiler_warnings.m4 @@ -10,7 +10,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \ -Wdeclaration-after-statement -Wstrict-prototypes \ -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \ - -fno-strict-aliasing; do + -fno-strict-aliasing -Wno-unused-but-set-variable; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" AC_MSG_CHECKING([whether gcc understands $option]) From d884aadc3d9fe60adf3babe19a003b74c2674a23 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 25 Jan 2011 12:40:18 -0600 Subject: [PATCH 10/11] doc: fix distcheck by cleaning generated files Today, for some reason, the generated files are no longer cleaned up or ignored during distcheck, so clean them up ourselves. Not sure what changed. --- docs/libnm-glib/Makefile.am | 6 +++++- docs/libnm-util/Makefile.am | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index 96ff66eee..dc658a0b5 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -81,5 +81,9 @@ GTKDOC_LIBS = $(top_builddir)/libnm-glib/libnm-glib.la # include common portion ... include $(top_srcdir)/gtk-doc.make -CLEANFILES += libnm-glib-sections.txt +CLEANFILES += \ + libnm-glib-sections.txt \ + html/* \ + tmpl/* \ + xml/* diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index 59a9ef6b2..fa736e2a9 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -60,5 +60,9 @@ GTKDOC_LIBS = $(top_builddir)/libnm-util/libnm-util.la # include common portion ... include $(top_srcdir)/gtk-doc.make -CLEANFILES += libnm-util-sections.txt +CLEANFILES += \ + libnm-util-sections.txt \ + html/* \ + tmpl/* \ + xml/* From bc6fc7b910435aae00ef54db972a3e8359700d09 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 25 Jan 2011 12:41:03 -0600 Subject: [PATCH 11/11] vpn: fix VPN active connection D-Bus API handling (bgo #569294) Due to limitations in dbus-glib, where one GObject cannot have more than one introspection XML object attached to it, we used to include more than one in the VPNConnection object introspection XML. This was suboptimal for two reasons: 1) it duplicated the Connection.Active introspection XML which made it harder for clients to use the introspection data in a dynamic fashion, besides looking ugly in the docs 2) not many other programs use this feature of dbus-glib, which means it didn't get a lot of testing, and broke, which sucks for NM. To fix this issue, create a base class for NMVpnConnection that handles the Connection.Active API, and make NMVpnConnection itself handle just the VPN pieces that it layers on top. This makes dbus-glib happy because we aren't using two blocks in the same introspection XML, and it makes the NM code more robust because we can re-use the existing Connection.Active introspection XML in the NMVpnConnectionBase class. --- introspection/nm-vpn-connection.xml | 32 ---- src/nm-activation-request.c | 73 ++------- src/nm-active-connection.c | 78 ++++++++- src/nm-active-connection.h | 12 +- src/vpn-manager/Makefile.am | 18 +- src/vpn-manager/nm-vpn-connection-base.c | 199 +++++++++++++++++++++++ src/vpn-manager/nm-vpn-connection-base.h | 54 ++++++ src/vpn-manager/nm-vpn-connection.c | 174 +++----------------- src/vpn-manager/nm-vpn-connection.h | 5 +- 9 files changed, 385 insertions(+), 260 deletions(-) create mode 100644 src/vpn-manager/nm-vpn-connection-base.c create mode 100644 src/vpn-manager/nm-vpn-connection-base.h diff --git a/introspection/nm-vpn-connection.xml b/introspection/nm-vpn-connection.xml index 3a47cdf1b..8feee0335 100644 --- a/introspection/nm-vpn-connection.xml +++ b/introspection/nm-vpn-connection.xml @@ -1,38 +1,6 @@ - - - The D-Bus service name providing this connection. - - - The path of the connection. - - - A specific object associated with the active connection. - - - Array of object paths representing devices which are part of this active connection. - - - The state of this active connection. - - - Whether this active connection is the default connection, i.e. whether it currently owns the default route. - - - Whether this active connection is also a VPN connection. - - - - - - A dictionary mapping property names to variant boxed values - - - - - Represents an active connection to a Virtual Private Network. diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 2529e77f6..7d1314014 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -35,6 +35,7 @@ #include "nm-properties-changed-signal.h" #include "nm-active-connection.h" #include "nm-dbus-glib-types.h" +#include "nm-active-connection-glue.h" static void secrets_provider_interface_init (NMSecretsProviderInterface *sp_interface_class); @@ -304,64 +305,15 @@ nm_act_request_class_init (NMActRequestClass *req_class) object_class->finalize = finalize; /* properties */ - g_object_class_install_property - (object_class, PROP_SERVICE_NAME, - g_param_spec_string (NM_ACTIVE_CONNECTION_SERVICE_NAME, - "Service name", - "Service name", - NULL, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_CONNECTION, - g_param_spec_boxed (NM_ACTIVE_CONNECTION_CONNECTION, - "Connection", - "Connection", - DBUS_TYPE_G_OBJECT_PATH, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_SPECIFIC_OBJECT, - g_param_spec_boxed (NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, - "Specific object", - "Specific object", - DBUS_TYPE_G_OBJECT_PATH, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_DEVICES, - g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES, - "Devices", - "Devices", - DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_STATE, - g_param_spec_uint (NM_ACTIVE_CONNECTION_STATE, - "State", - "State", - NM_ACTIVE_CONNECTION_STATE_UNKNOWN, - NM_ACTIVE_CONNECTION_STATE_ACTIVATED, - NM_ACTIVE_CONNECTION_STATE_UNKNOWN, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_DEFAULT, - g_param_spec_boolean (NM_ACTIVE_CONNECTION_DEFAULT, - "Default", - "Is the default IPv4 active connection", - FALSE, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_DEFAULT6, - g_param_spec_boolean (NM_ACTIVE_CONNECTION_DEFAULT6, - "Default6", - "Is the default IPv6 active connection", - FALSE, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_VPN, - g_param_spec_boolean (NM_ACTIVE_CONNECTION_VPN, - "VPN", - "Is a VPN connection", - FALSE, - G_PARAM_READABLE)); + nm_active_connection_install_properties (object_class, + PROP_SERVICE_NAME, + PROP_CONNECTION, + PROP_SPECIFIC_OBJECT, + PROP_DEVICES, + PROP_STATE, + PROP_DEFAULT, + PROP_DEFAULT6, + PROP_VPN); /* Signals */ signals[CONNECTION_SECRETS_UPDATED] = @@ -386,9 +338,10 @@ nm_act_request_class_init (NMActRequestClass *req_class) signals[PROPERTIES_CHANGED] = nm_properties_changed_signal_new (object_class, - G_STRUCT_OFFSET (NMActRequestClass, properties_changed)); + G_STRUCT_OFFSET (NMActRequestClass, properties_changed)); - nm_active_connection_install_type_info (object_class); + dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (req_class), + &dbus_glib_nm_active_connection_object_info); } static gboolean diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 4207e1450..90495bd2c 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -21,8 +21,8 @@ #include #include "nm-active-connection.h" #include "NetworkManager.h" -#include "nm-active-connection-glue.h" #include "nm-logging.h" +#include "nm-dbus-glib-types.h" char * nm_active_connection_get_next_object_path (void) @@ -32,13 +32,6 @@ nm_active_connection_get_next_object_path (void) return g_strdup_printf (NM_DBUS_PATH "/ActiveConnection/%d", counter++); } -void -nm_active_connection_install_type_info (GObjectClass *klass) -{ - dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), - &dbus_glib_nm_active_connection_object_info); -} - void nm_active_connection_scope_to_value (NMConnection *connection, GValue *value) { @@ -60,4 +53,73 @@ nm_active_connection_scope_to_value (NMConnection *connection, GValue *value) } } +void +nm_active_connection_install_properties (GObjectClass *object_class, + guint prop_service_name, + guint prop_connection, + guint prop_specific_object, + guint prop_devices, + guint prop_state, + guint prop_default, + guint prop_default6, + guint prop_vpn) +{ + g_object_class_install_property (object_class, prop_service_name, + g_param_spec_string (NM_ACTIVE_CONNECTION_SERVICE_NAME, + "Service name", + "Service name", + NULL, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, prop_connection, + g_param_spec_boxed (NM_ACTIVE_CONNECTION_CONNECTION, + "Connection", + "Connection", + DBUS_TYPE_G_OBJECT_PATH, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, prop_specific_object, + g_param_spec_boxed (NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, + "Specific object", + "Specific object", + DBUS_TYPE_G_OBJECT_PATH, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, prop_devices, + g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES, + "Devices", + "Devices", + DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, prop_state, + g_param_spec_uint (NM_ACTIVE_CONNECTION_STATE, + "State", + "State", + NM_ACTIVE_CONNECTION_STATE_UNKNOWN, + NM_ACTIVE_CONNECTION_STATE_ACTIVATED, + NM_ACTIVE_CONNECTION_STATE_UNKNOWN, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, prop_default, + g_param_spec_boolean (NM_ACTIVE_CONNECTION_DEFAULT, + "Default", + "Is the default IPv4 active connection", + FALSE, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, prop_default6, + g_param_spec_boolean (NM_ACTIVE_CONNECTION_DEFAULT6, + "Default6", + "Is the default IPv6 active connection", + FALSE, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, prop_vpn, + g_param_spec_boolean (NM_ACTIVE_CONNECTION_VPN, + "VPN", + "Is a VPN connection", + FALSE, + G_PARAM_READABLE)); +} diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h index 6a463cb25..5dde30875 100644 --- a/src/nm-active-connection.h +++ b/src/nm-active-connection.h @@ -35,8 +35,16 @@ char *nm_active_connection_get_next_object_path (void); -void nm_active_connection_install_type_info (GObjectClass *klass); - void nm_active_connection_scope_to_value (NMConnection *connection, GValue *value); +void nm_active_connection_install_properties (GObjectClass *object_class, + guint prop_service_name, + guint prop_connection, + guint prop_specific_object, + guint prop_devices, + guint prop_state, + guint prop_default, + guint prop_default6, + guint prop_vpn); + #endif /* NM_ACTIVE_CONNECTION_H */ diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am index b0692d70c..3b206617f 100644 --- a/src/vpn-manager/Makefile.am +++ b/src/vpn-manager/Makefile.am @@ -11,12 +11,14 @@ INCLUDES = \ noinst_LTLIBRARIES = libvpn-manager.la -libvpn_manager_la_SOURCES = \ - nm-vpn-manager.c \ - nm-vpn-manager.h \ - nm-vpn-service.c \ - nm-vpn-service.h \ - nm-vpn-connection.c \ +libvpn_manager_la_SOURCES = \ + nm-vpn-manager.c \ + nm-vpn-manager.h \ + nm-vpn-service.c \ + nm-vpn-service.h \ + nm-vpn-connection-base.c \ + nm-vpn-connection-base.h \ + nm-vpn-connection.c \ nm-vpn-connection.h libvpn_manager_la_CPPFLAGS = \ @@ -31,6 +33,9 @@ libvpn_manager_la_LIBADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) +nm-vpn-connection-base-glue.h: $(top_srcdir)/introspection/nm-active-connection.xml + $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_connection_base --mode=glib-server --output=$@ $< + nm-vpn-connection-glue.h: $(top_srcdir)/introspection/nm-vpn-connection.xml $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_connection --mode=glib-server --output=$@ $< @@ -39,6 +44,7 @@ nm-vpn-plugin-bindings.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml BUILT_SOURCES = \ + nm-vpn-connection-base-glue.h \ nm-vpn-connection-glue.h \ nm-vpn-plugin-bindings.h diff --git a/src/vpn-manager/nm-vpn-connection-base.c b/src/vpn-manager/nm-vpn-connection-base.c new file mode 100644 index 000000000..8a6fb2beb --- /dev/null +++ b/src/vpn-manager/nm-vpn-connection-base.c @@ -0,0 +1,199 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2005 - 2011 Red Hat, Inc. + * Copyright (C) 2007 - 2008 Novell, Inc. + */ + +#include "NetworkManager.h" +#include "nm-vpn-connection-base.h" +#include "nm-active-connection.h" +#include "nm-vpn-connection-base-glue.h" +#include "nm-dbus-manager.h" + +G_DEFINE_ABSTRACT_TYPE (NMVpnConnectionBase, nm_vpn_connection_base, G_TYPE_OBJECT) + +#define NM_VPN_CONNECTION_BASE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ + NM_TYPE_VPN_CONNECTION_BASE, \ + NMVpnConnectionBasePrivate)) + +typedef struct { + gboolean disposed; + + NMConnection *connection; + char *ac_path; + gboolean is_default; + gboolean is_default6; + NMActiveConnectionState state; +} NMVpnConnectionBasePrivate; + +enum { + PROP_0, + PROP_SERVICE_NAME, + PROP_CONNECTION, + PROP_SPECIFIC_OBJECT, + PROP_DEVICES, + PROP_STATE, + PROP_DEFAULT, + PROP_DEFAULT6, + PROP_VPN, + + LAST_PROP +}; + +/****************************************************************/ + +void +nm_vpn_connection_base_set_state (NMVpnConnectionBase *self, + NMVPNConnectionState vpn_state) +{ + NMVpnConnectionBasePrivate *priv = NM_VPN_CONNECTION_BASE_GET_PRIVATE (self); + NMActiveConnectionState new_ac_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; + + /* Set the NMActiveConnection state based on VPN state */ + switch (vpn_state) { + case NM_VPN_CONNECTION_STATE_PREPARE: + case NM_VPN_CONNECTION_STATE_NEED_AUTH: + case NM_VPN_CONNECTION_STATE_CONNECT: + case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: + new_ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATING; + break; + case NM_VPN_CONNECTION_STATE_ACTIVATED: + new_ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATED; + break; + default: + break; + } + + if (new_ac_state != priv->state) { + priv->state = new_ac_state; + g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_STATE); + } +} + +const char * +nm_vpn_connection_base_get_ac_path (NMVpnConnectionBase *self) +{ + return NM_VPN_CONNECTION_BASE_GET_PRIVATE (self)->ac_path; +} + +void +nm_vpn_connection_base_export (NMVpnConnectionBase *self, + NMConnection *connection) +{ + NMVpnConnectionBasePrivate *priv = NM_VPN_CONNECTION_BASE_GET_PRIVATE (self); + NMDBusManager *dbus_mgr; + + g_return_if_fail (priv->connection == NULL); + + priv->connection = g_object_ref (connection); + + dbus_mgr = nm_dbus_manager_get (); + dbus_g_connection_register_g_object (nm_dbus_manager_get_connection (dbus_mgr), + priv->ac_path, G_OBJECT (self)); + g_object_unref (dbus_mgr); +} + +/****************************************************************/ + +static void +nm_vpn_connection_base_init (NMVpnConnectionBase *self) +{ + NMVpnConnectionBasePrivate *priv = NM_VPN_CONNECTION_BASE_GET_PRIVATE (self); + + priv->state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; + priv->ac_path = nm_active_connection_get_next_object_path (); +} + +static void +dispose (GObject *object) +{ + NMVpnConnectionBasePrivate *priv = NM_VPN_CONNECTION_BASE_GET_PRIVATE (object); + + if (!priv->disposed) { + priv->disposed = TRUE; + + g_free (priv->ac_path); + g_object_unref (priv->connection); + } + + G_OBJECT_CLASS (nm_vpn_connection_base_parent_class)->dispose (object); +} + +static void +get_property (GObject *object, guint prop_id, + GValue *value, GParamSpec *pspec) +{ + NMVpnConnectionBasePrivate *priv = NM_VPN_CONNECTION_BASE_GET_PRIVATE (object); + + switch (prop_id) { + case PROP_SERVICE_NAME: + nm_active_connection_scope_to_value (priv->connection, value); + break; + case PROP_CONNECTION: + g_value_set_boxed (value, nm_connection_get_path (priv->connection)); + break; + case PROP_SPECIFIC_OBJECT: + g_value_set_boxed (value, priv->ac_path); + break; + case PROP_DEVICES: + g_value_take_boxed (value, g_ptr_array_new ()); + break; + case PROP_STATE: + g_value_set_uint (value, priv->state); + break; + case PROP_DEFAULT: + g_value_set_boolean (value, priv->is_default); + break; + case PROP_DEFAULT6: + g_value_set_boolean (value, priv->is_default6); + break; + case PROP_VPN: + g_value_set_boolean (value, TRUE); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +nm_vpn_connection_base_class_init (NMVpnConnectionBaseClass *vpn_class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (vpn_class); + + g_type_class_add_private (vpn_class, sizeof (NMVpnConnectionBasePrivate)); + + /* virtual methods */ + object_class->get_property = get_property; + object_class->dispose = dispose; + + /* properties */ + nm_active_connection_install_properties (object_class, + PROP_SERVICE_NAME, + PROP_CONNECTION, + PROP_SPECIFIC_OBJECT, + PROP_DEVICES, + PROP_STATE, + PROP_DEFAULT, + PROP_DEFAULT6, + PROP_VPN); + + dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (vpn_class), + &dbus_glib_nm_vpn_connection_base_object_info); +} + diff --git a/src/vpn-manager/nm-vpn-connection-base.h b/src/vpn-manager/nm-vpn-connection-base.h new file mode 100644 index 000000000..0c17d9e85 --- /dev/null +++ b/src/vpn-manager/nm-vpn-connection-base.h @@ -0,0 +1,54 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (C) Copyright 2005 - 2011 Red Hat, Inc. + */ + +#ifndef NM_VPN_CONNECTION_BASE_H +#define NM_VPN_CONNECTION_BASE_H + +#include +#include "NetworkManagerVPN.h" +#include "nm-connection.h" + +#define NM_TYPE_VPN_CONNECTION_BASE (nm_vpn_connection_base_get_type ()) +#define NM_VPN_CONNECTION_BASE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_CONNECTION_BASE, NMVpnConnectionBase)) +#define NM_VPN_CONNECTION_BASE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_CONNECTION_BASE, NMVpnConnectionBaseClass)) +#define NM_IS_VPN_CONNECTION_BASE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_CONNECTION_BASE)) +#define NM_IS_VPN_CONNECTION_BASE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_VPN_CONNECTION_BASE)) +#define NM_VPN_CONNECTION_BASE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_CONNECTION_BASE, NMVpnConnectionBaseClass)) + +typedef struct { + GObject parent; +} NMVpnConnectionBase; + +typedef struct { + GObjectClass parent; +} NMVpnConnectionBaseClass; + +GType nm_vpn_connection_base_get_type (void); + +const char *nm_vpn_connection_base_get_ac_path (NMVpnConnectionBase *self); + +void nm_vpn_connection_base_export (NMVpnConnectionBase *self, + NMConnection *connection); + +void nm_vpn_connection_base_set_state (NMVpnConnectionBase *self, + NMVPNConnectionState vpn_state); + +#endif /* NM_VPN_CONNECTION_BASE_H */ + diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index cf844992c..4a0771240 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -52,7 +52,7 @@ static void secrets_provider_interface_init (NMSecretsProviderInterface *sp_interface_class); -G_DEFINE_TYPE_EXTENDED (NMVPNConnection, nm_vpn_connection, G_TYPE_OBJECT, 0, +G_DEFINE_TYPE_EXTENDED (NMVPNConnection, nm_vpn_connection, NM_TYPE_VPN_CONNECTION_BASE, 0, G_IMPLEMENT_INTERFACE (NM_TYPE_SECRETS_PROVIDER_INTERFACE, secrets_provider_interface_init)) @@ -62,16 +62,11 @@ typedef struct { NMConnection *connection; NMActRequest *act_request; - char *ac_path; NMDevice *parent_dev; gulong device_monitor; gulong device_ip4; - gboolean is_default; - gboolean is_default6; - NMActiveConnectionState state; - NMVPNConnectionState vpn_state; NMVPNConnectionStateReason failure_reason; DBusGProxy *proxy; @@ -97,14 +92,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; enum { PROP_0, - PROP_SERVICE_NAME, - PROP_CONNECTION, - PROP_SPECIFIC_OBJECT, - PROP_DEVICES, - PROP_STATE, - PROP_DEFAULT, - PROP_DEFAULT6, - PROP_VPN, PROP_VPN_STATE, PROP_BANNER, @@ -117,7 +104,6 @@ nm_vpn_connection_set_vpn_state (NMVPNConnection *connection, NMVPNConnectionStateReason reason) { NMVPNConnectionPrivate *priv; - NMActiveConnectionState new_ac_state; NMVPNConnectionState old_vpn_state; char *ip_iface; @@ -131,32 +117,14 @@ nm_vpn_connection_set_vpn_state (NMVPNConnection *connection, old_vpn_state = priv->vpn_state; priv->vpn_state = vpn_state; + /* Update active connection base class state */ + nm_vpn_connection_base_set_state (NM_VPN_CONNECTION_BASE (connection), vpn_state); + /* Save ip_iface since when the VPN goes down it may get freed * before we're done with it. */ ip_iface = g_strdup (priv->ip_iface); - /* Set the NMActiveConnection state based on VPN state */ - switch (vpn_state) { - case NM_VPN_CONNECTION_STATE_PREPARE: - case NM_VPN_CONNECTION_STATE_NEED_AUTH: - case NM_VPN_CONNECTION_STATE_CONNECT: - case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: - new_ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATING; - break; - case NM_VPN_CONNECTION_STATE_ACTIVATED: - new_ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATED; - break; - default: - new_ac_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; - break; - } - - if (new_ac_state != priv->state) { - priv->state = new_ac_state; - g_object_notify (G_OBJECT (connection), NM_ACTIVE_CONNECTION_STATE); - } - /* The connection gets destroyed by the VPN manager when it enters the * disconnected/failed state, but we need to keep it around for a bit * to send out signals and handle the dispatcher. So ref it. @@ -259,6 +227,9 @@ nm_vpn_connection_new (NMConnection *connection, priv->device_ip4 = g_signal_connect (parent_device, "notify::" NM_DEVICE_INTERFACE_IP4_CONFIG, G_CALLBACK (device_ip4_config_changed), self); + + nm_vpn_connection_base_export (NM_VPN_CONNECTION_BASE (self), connection); + return self; } @@ -688,7 +659,7 @@ nm_vpn_connection_get_active_connection_path (NMVPNConnection *connection) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), NULL); - return NM_VPN_CONNECTION_GET_PRIVATE (connection)->ac_path; + return nm_vpn_connection_base_get_ac_path (NM_VPN_CONNECTION_BASE (connection)); } const char * @@ -979,20 +950,9 @@ connection_state_changed (NMVPNConnection *connection, } static void -nm_vpn_connection_init (NMVPNConnection *connection) +nm_vpn_connection_init (NMVPNConnection *self) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); - NMDBusManager *dbus_mgr; - - priv->state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; - priv->vpn_state = NM_VPN_CONNECTION_STATE_PREPARE; - priv->ac_path = nm_active_connection_get_next_object_path (); - - dbus_mgr = nm_dbus_manager_get (); - dbus_g_connection_register_g_object (nm_dbus_manager_get_connection (dbus_mgr), - priv->ac_path, - G_OBJECT (connection)); - g_object_unref (dbus_mgr); + NM_VPN_CONNECTION_GET_PRIVATE (self)->vpn_state = NM_VPN_CONNECTION_STATE_PREPARE; } static void @@ -1039,7 +999,6 @@ finalize (GObject *object) g_free (priv->banner); g_free (priv->ip_iface); - g_free (priv->ac_path); G_OBJECT_CLASS (nm_vpn_connection_parent_class)->finalize (object); } @@ -1051,30 +1010,6 @@ get_property (GObject *object, guint prop_id, NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); switch (prop_id) { - case PROP_SERVICE_NAME: - nm_active_connection_scope_to_value (priv->connection, value); - break; - case PROP_CONNECTION: - g_value_set_boxed (value, nm_connection_get_path (priv->connection)); - break; - case PROP_SPECIFIC_OBJECT: - g_value_set_boxed (value, nm_act_request_get_active_connection_path (priv->act_request)); - break; - case PROP_DEVICES: - g_value_take_boxed (value, g_ptr_array_new ()); - break; - case PROP_STATE: - g_value_set_uint (value, priv->state); - break; - case PROP_DEFAULT: - g_value_set_boolean (value, priv->is_default); - break; - case PROP_DEFAULT6: - g_value_set_boolean (value, priv->is_default6); - break; - case PROP_VPN: - g_value_set_boolean (value, TRUE); - break; case PROP_VPN_STATE: g_value_set_uint (value, priv->vpn_state); break; @@ -1101,82 +1036,21 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) object_class->finalize = finalize; /* properties */ - g_object_class_install_property - (object_class, PROP_SERVICE_NAME, - g_param_spec_string (NM_ACTIVE_CONNECTION_SERVICE_NAME, - "Service name", - "Service name", - NULL, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_CONNECTION, - g_param_spec_boxed (NM_ACTIVE_CONNECTION_CONNECTION, - "Connection", - "Connection", - DBUS_TYPE_G_OBJECT_PATH, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_SPECIFIC_OBJECT, - g_param_spec_boxed (NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, - "Specific object", - "Specific object", - DBUS_TYPE_G_OBJECT_PATH, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_DEVICES, - g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES, - "Devices", - "Devices", - DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_STATE, - g_param_spec_uint (NM_ACTIVE_CONNECTION_STATE, - "State", - "State", - NM_ACTIVE_CONNECTION_STATE_UNKNOWN, - NM_ACTIVE_CONNECTION_STATE_ACTIVATED, - NM_ACTIVE_CONNECTION_STATE_UNKNOWN, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_DEFAULT, - g_param_spec_boolean (NM_ACTIVE_CONNECTION_DEFAULT, - "Default", - "Is the default IPv4 active connection", - FALSE, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_DEFAULT6, - g_param_spec_boolean (NM_ACTIVE_CONNECTION_DEFAULT6, - "Default6", - "Is the default IPv6 active connection", - FALSE, - G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_VPN, - g_param_spec_boolean (NM_ACTIVE_CONNECTION_VPN, - "VPN", - "Is a VPN connection", - TRUE, - G_PARAM_READABLE)); + g_object_class_install_property (object_class, PROP_VPN_STATE, + g_param_spec_uint (NM_VPN_CONNECTION_VPN_STATE, + "VpnState", + "Current VPN state", + NM_VPN_CONNECTION_STATE_UNKNOWN, + NM_VPN_CONNECTION_STATE_DISCONNECTED, + NM_VPN_CONNECTION_STATE_UNKNOWN, + G_PARAM_READABLE)); - g_object_class_install_property - (object_class, PROP_VPN_STATE, - g_param_spec_uint (NM_VPN_CONNECTION_VPN_STATE, - "VpnState", - "Current VPN state", - NM_VPN_CONNECTION_STATE_UNKNOWN, - NM_VPN_CONNECTION_STATE_DISCONNECTED, - NM_VPN_CONNECTION_STATE_UNKNOWN, - G_PARAM_READABLE)); - - g_object_class_install_property - (object_class, PROP_BANNER, - g_param_spec_string (NM_VPN_CONNECTION_BANNER, - "Banner", - "Login Banner", - NULL, - G_PARAM_READABLE)); + g_object_class_install_property (object_class, PROP_BANNER, + g_param_spec_string (NM_VPN_CONNECTION_BANNER, + "Banner", + "Login Banner", + NULL, + G_PARAM_READABLE)); /* signals */ signals[VPN_STATE_CHANGED] = diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h index d69674db9..ab880b17f 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn-manager/nm-vpn-connection.h @@ -28,6 +28,7 @@ #include "nm-device.h" #include "nm-activation-request.h" #include "nm-secrets-provider-interface.h" +#include "nm-vpn-connection-base.h" #define NM_TYPE_VPN_CONNECTION (nm_vpn_connection_get_type ()) #define NM_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnection)) @@ -40,11 +41,11 @@ #define NM_VPN_CONNECTION_BANNER "banner" typedef struct { - GObject parent; + NMVpnConnectionBase parent; } NMVPNConnection; typedef struct { - GObjectClass parent; + NMVpnConnectionBaseClass parent; /* Signals */ void (*vpn_state_changed) (NMVPNConnection *connection,