diff -Nru wicd-1.7.0+ds1/AUTHORS wicd-1.7.1/AUTHORS --- wicd-1.7.0+ds1/AUTHORS 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/AUTHORS 2011-11-09 16:12:30.000000000 +0000 @@ -1,3 +1,4 @@ Adam Blackburn (compwiz18@gmail.com) Dan O'Reilly (oreilldf@gmail.com) Andrew Psaltis (ampsaltis@gmail.com) +David Paleino (d.paleino@gmail.com) diff -Nru wicd-1.7.0+ds1/.bzrignore wicd-1.7.1/.bzrignore --- wicd-1.7.0+ds1/.bzrignore 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/.bzrignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -experimental.wpr -install.log -uninstall.log -.bzrignore -vcsinfo.py -build -build/* -init/*/* -wpath.py* -man/wicd-curses.8 -man/wicd-manager-settings.conf.5 -man/wicd-wired-settings.conf.5 -man/wicd-wireless-settings.conf.5 -man/wicd.8 -other/50-wicd-suspend.sh -other/55wicd -other/80-wicd-connect.sh -other/WHEREAREMYFILES -other/wicd.conf -other/postinst -scripts/wicd -scripts/wicd-client -scripts/wicd-curses -translations/* -wicd/wpath.py -*tags diff -Nru wicd-1.7.0+ds1/CHANGES wicd-1.7.1/CHANGES --- wicd-1.7.0+ds1/CHANGES 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/CHANGES 2012-02-02 19:11:02.000000000 +0000 @@ -1,4247 +1,1178 @@ ------------------------------------------------------------ -revno: 551 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Thu 2010-01-14 18:15:05 -1000 -message: - add support for using dhcpcd-bin on Debian ------------------------------------------------------------- -revno: 550 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Thu 2010-01-14 18:02:10 -1000 -message: - add a 1 second sleep after setting essid but before scanning ------------------------------------------------------------- -revno: 549 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Thu 2010-01-14 17:46:38 -1000 -message: - change to use dict.get instead of dict[] ------------------------------------------------------------- -revno: 548 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sun 2010-01-10 18:10:55 -1000 -message: - add information about global scripts to wicd(8) ------------------------------------------------------------- -revno: 547 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-09 15:34:06 -1000 -message: - updated CHANGES, setup.py, and NEWS for release ------------------------------------------------------------- -revno: 546 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-09 15:30:55 -1000 -message: - mark ioctl not supported in wicd-gtk ------------------------------------------------------------- -revno: 545 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sat 2010-01-09 11:34:19 -0500 -message: - Fix a comment. ------------------------------------------------------------- -revno: 544 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sat 2010-01-09 11:17:49 -0500 -message: - Removed the wicd-curses clock, all it was doing really was eating CPU cycles. ------------------------------------------------------------- -revno: 543 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sat 2010-01-09 10:38:12 -0500 -message: - Remove extraneous print statement from netentry-curses.py. ------------------------------------------------------------- -revno: 542 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Fri 2010-01-08 18:15:57 -0500 -message: - Remove the flickering from wicd-curses, thanks to Ian Ward for reminding me that it was still happening. ------------------------------------------------------------- -revno: 541 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Fri 2010-01-08 18:04:28 -0500 -message: - Fix another code separation-induced problem. Thanks to Robby Workman. ------------------------------------------------------------- -revno: 540 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Thu 2010-01-07 10:39:06 -1000 -message: - have wicd-client pass arguments to wicd-gtk and wicd-curses again ------------------------------------------------------------- -revno: 539 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Wed 2010-01-06 15:03:42 -1000 -message: - remove useless about menu in wicd's tray icon ------------------------------------------------------------- -revno: 538 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Mon 2010-01-04 08:53:24 -1000 -message: - create wpath.networks at run time if it doesn't exist ------------------------------------------------------------- -revno: 537 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Mon 2010-01-04 08:33:24 -1000 -message: - add .empty_on_purpose to empty directories ------------------------------------------------------------- -revno: 536 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Mon 2010-01-04 08:18:55 -1000 -message: - removed empty scripts directory ------------------------------------------------------------- -revno: 535 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sun 2010-01-03 23:10:55 -1000 -message: - run global scripts in ordered way ------------------------------------------------------------- -revno: 534 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sun 2010-01-03 23:07:34 -1000 -message: - make wicd-cli easier to use ------------------------------------------------------------- -revno: 533 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sun 2010-01-03 22:47:32 -1000 -message: - fix the case sensitivity in wicd-cli ------------------------------------------------------------- -revno: 532 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sun 2010-01-03 22:37:57 -1000 -message: - fix udhcpc not working due to an extra period ------------------------------------------------------------- -revno: 531 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sun 2010-01-03 22:04:03 -1000 -message: - update wicd-cli calls to work with the current daemon ------------------------------------------------------------- -revno: 530 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sun 2010-01-03 13:13:35 -1000 -message: - updated CHANGES, NEWS, and setup.py for release ------------------------------------------------------------- -revno: 529 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sun 2010-01-03 09:05:58 -1000 -message: - updated Gentoo init script ------------------------------------------------------------- -revno: 528 [merge] -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sun 2010-01-03 08:51:01 -1000 -message: - merged code-seperation ------------------------------------------------------------- -revno: 527 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 22:33:13 -1000 -message: - updated CHANGES, NEWS, and setup.py for release ------------------------------------------------------------- -revno: 526 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 21:27:41 -1000 -message: - restore old resolv.conf file on -k instead of sigterm ------------------------------------------------------------- -revno: 525 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:59:10 -1000 -message: - update CHANGES ------------------------------------------------------------- -revno: 524 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:59:05 -1000 -message: - put the Dutch man pages in the correct directory ------------------------------------------------------------- -revno: 523 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:50:31 -1000 -message: - updated CHANGES ------------------------------------------------------------- -revno: 522 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:50:16 -1000 -message: - added wireless-settings.conf Dutch man page ------------------------------------------------------------- -revno: 521 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:43:26 -1000 -message: - update CHANGES ------------------------------------------------------------- -revno: 520 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:42:36 -1000 -message: - renamed a Dutch manpage ------------------------------------------------------------- -revno: 519 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:29:53 -1000 -message: - update CHANGES ------------------------------------------------------------- -revno: 518 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:29:18 -1000 -message: - remove setup.py reference to Dutch version of wicd-cli.8 that doesn't exist ------------------------------------------------------------- -revno: 517 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:23:48 -1000 -message: - updated CHANGES, NEWS, and setup.py version number ------------------------------------------------------------- -revno: 516 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:22:00 -1000 -message: - added no_install_i18n_man to wpath.py.in ------------------------------------------------------------- -revno: 515 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 20:14:43 -1000 -message: - add Dutch man pages ------------------------------------------------------------- -revno: 514 [merge] -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 19:55:04 -1000 -message: - merged iconfallout ------------------------------------------------------------- -revno: 513 [merge] -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 19:49:05 -1000 -message: - changed the path of monitor.py to the correct one so it will run again [again] ------------------------------------------------------------- -revno: 512 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 19:46:33 -1000 -message: - changed the path of monitor.py to the correct one so it will run again ------------------------------------------------------------- -revno: 511 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 18:43:42 -1000 -message: - change Slackware's wicdgroup to netdev ------------------------------------------------------------- -revno: 510 [merge] -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 18:35:06 -1000 -message: - add pixmaps to wpath ------------------------------------------------------------- -revno: 509 [merge] -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 09:22:51 -1000 -message: - add an xpm icon so that the .desktop file will have an icon ------------------------------------------------------------- -revno: 508 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 08:22:06 -1000 -message: - fix potential urwid compatibility problem ------------------------------------------------------------- -revno: 507 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 08:11:31 -1000 -message: - create directories if they do not exist when running configure ------------------------------------------------------------- -revno: 506 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 07:57:14 -1000 -message: - use wicd-gtk to launch the GTK UI instead of wicd-client ------------------------------------------------------------- -revno: 505 [merge] -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Sat 2010-01-02 07:52:03 -1000 -message: - merged David Paleino's split file installation branch ------------------------------------------------------------- -revno: 504 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Fri 2010-01-01 21:44:48 -1000 -message: - updated setup.py and CHANGES for release ------------------------------------------------------------- -revno: 503 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Wed 2009-12-30 11:29:59 -1000 -message: - fixed connection info dialog text alignment ------------------------------------------------------------- -revno: 502 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Wed 2009-12-30 11:29:42 -1000 -message: - updated translations.py ------------------------------------------------------------- -revno: 501 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Wed 2009-12-30 11:06:27 -1000 -message: - fix network list not being enabled after disconnect button clicked ------------------------------------------------------------- -revno: 500 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Wed 2009-12-30 10:13:49 -1000 -message: - fix a typo in the Slackware init script ------------------------------------------------------------- -revno: 499 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Wed 2009-12-30 10:06:39 -1000 -message: - update the Arch init script to use the -k switch ------------------------------------------------------------- -revno: 498 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Wed 2009-12-30 08:29:22 -1000 -message: - change the default height of the network properties dialog so that scrollbars will never be needed ------------------------------------------------------------- -revno: 497 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Wed 2009-12-30 08:28:50 -1000 -message: - update news with a note to packagers about the -k option ------------------------------------------------------------- -revno: 496 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-12-29 21:22:23 -0500 -message: - Modified two initscripts to support wicd -k, made wicd -k have a non-zero exit code if it can't find a daemon to kill. ------------------------------------------------------------- -revno: 495 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-12-29 21:01:59 -0500 -message: - Cleaned up the wicd-curses code, pruned the documentation of old stuff, and removed the -c/-r options from wicd-curses, since only -r works. ------------------------------------------------------------- -revno: 494 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-12-29 20:50:31 -0500 -message: - Added a command-line argument to the wicd daemon that will disconnect active connections before terminating the daemon. ------------------------------------------------------------- -revno: 493 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Tue 2009-12-29 14:36:03 -1000 -message: - added code to make the network properties dialog box resizable ------------------------------------------------------------- -revno: 492 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Tue 2009-12-29 12:09:42 -1000 -message: - backup and restore user's resolv.conf on start/exit ------------------------------------------------------------- -revno: 491 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Tue 2009-12-29 11:11:14 -1000 -message: - save the wireless network profile when connecting in order to save hidden essids ------------------------------------------------------------- -revno: 490 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Mon 2009-12-28 10:21:18 -1000 -message: - expose methods for getting a list of interfaces over DBus ------------------------------------------------------------- -revno: 489 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sun 2009-12-27 22:22:09 -0500 -message: - Use the system python instead of a local one (which may be referenced inside the scripts that call wicd). Thanks to Russel O'Connor. ------------------------------------------------------------- -revno: 488 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Wed 2009-12-23 16:51:19 -1000 -message: - updated version number, CHANGES, and NEWS ------------------------------------------------------------- -revno: 487 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Wed 2009-12-23 16:48:39 -1000 -message: - add support for copying dhclient.conf.template from a default file if it isn't found ------------------------------------------------------------- -revno: 486 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Tue 2009-12-22 18:48:43 -1000 -message: - added dhclient.conf.template and made setup.py install it ------------------------------------------------------------- -revno: 485 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Mon 2009-12-14 16:21:02 -0500 -message: - Fix crash on accessing preferences. ------------------------------------------------------------- -revno: 484 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-12-01 23:35:45 -0500 -message: - Remove the 'wired' wpa_supplicant driver from the list of drivers returned from - GetWpaSupplicantDrivers(). ------------------------------------------------------------- -revno: 483 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-12-01 23:24:48 -0500 -message: - Improved compatibility with the init system in Fedora/RHEL/CentOS. ------------------------------------------------------------- -revno: 482 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Tue 2009-12-01 20:59:27 -0600 -message: - updated version number, CHANGES, and NEWS for release ------------------------------------------------------------- -revno: 481 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Mon 2009-11-30 12:14:45 -0500 -message: - Some wicd-curses cleanup. ------------------------------------------------------------- -revno: 480 [merge] -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Thu 2009-11-26 21:43:15 -0600 -message: - merged optional-dhcp-hostnames to make optional hostnames work in the daemon ------------------------------------------------------------- -revno: 479 -committer: Adam Blackburn -branch nick: 1.7 -timestamp: Thu 2009-11-26 21:42:39 -0600 -message: - add checkbox to GTK UI to make using the DHCP Hostname optional ------------------------------------------------------------- -revno: 478 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Thu 2009-11-26 00:05:03 -0500 -message: - Merge in Adam's dhclient-hostname stuff, and fix up the dhcphostname KeyError. ------------------------------------------------------------- -revno: 477 [merge] -committer: Adam Blackburn -branch nick: wicd -timestamp: Wed 2009-11-25 21:27:29 -0600 -message: - merged Erik de Castro Lopo's branch to allow multiple configuration files ------------------------------------------------------------- -revno: 476 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Tue 2009-11-24 00:27:41 -0500 -message: - Make pinging wireless access points when using static gateways optional. ------------------------------------------------------------- -revno: 475 -committer: Adam Blackburn -branch nick: wicd -timestamp: Mon 2009-11-23 12:22:43 -0600 -message: - make sure that disconnect scripts are run when the connection is dropped ------------------------------------------------------------- -revno: 474 -committer: Adam Blackburn -branch nick: wicd -timestamp: Mon 2009-11-23 11:43:50 -0600 -message: - make setting the essid work even if the essid is a reserved word ------------------------------------------------------------- -revno: 473 -committer: Adam Blackburn -branch nick: wicd -timestamp: Mon 2009-11-23 11:01:32 -0600 -message: - fixed incorrect translation when using a wired network ------------------------------------------------------------- -revno: 472 -committer: Adam Blackburn -branch nick: wicd -timestamp: Sat 2009-11-21 22:08:33 -0600 -message: - updated setup.py, NEWS, and CHANGES ------------------------------------------------------------- -revno: 471 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sat 2009-11-21 18:27:41 -0500 -message: - Fix dhcp hostname bug in wicd-curses, and fix a small formatting issue. ------------------------------------------------------------- -revno: 470 [merge] -committer: Adam Blackburn -branch nick: wicd -timestamp: Sat 2009-11-21 12:06:46 -0600 -message: - merged optionalgui ------------------------------------------------------------- -revno: 469 [merge] -committer: Adam Blackburn -branch nick: wicd -timestamp: Sat 2009-11-21 11:56:03 -0600 -message: - merged cli_integration ------------------------------------------------------------- -revno: 468 [merge] -committer: Adam Blackburn -branch nick: wicd -timestamp: Sat 2009-11-21 11:55:50 -0600 -message: - merged connection-info ------------------------------------------------------------- -revno: 467 [merge] -committer: Adam Blackburn -branch nick: wicd -timestamp: Sat 2009-11-21 11:47:02 -0600 -message: - merged dhcp-hostnames ------------------------------------------------------------- -revno: 466 [merge] -committer: Adam Blackburn -branch nick: wicd -timestamp: Sat 2009-11-21 11:03:28 -0600 -message: - merged global-parameters ------------------------------------------------------------- -revno: 465 [merge] -committer: Adam Blackburn -branch nick: wicd -timestamp: Sat 2009-11-21 11:02:56 -0600 -message: - merged wired-while-scanning ------------------------------------------------------------- -revno: 464 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Sun 2009-11-01 15:22:45 -0500 -message: - Retry AP association verification 10 times to accomodate cards that are slow to associate. Thanks to muttoni for the patch. ------------------------------------------------------------- -revno: 463 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Fri 2009-10-30 23:52:30 -0400 -message: - Determine valid wpa_supplicant drivers by parsing the list from wpa_supplicant, rather than comparing it's output to a static list of possible drivers. ------------------------------------------------------------- -revno: 462 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Sat 2009-10-24 01:03:29 -0400 -message: - Handle essids that are made up of numbers. Thanks to anish for the patch. ------------------------------------------------------------- -revno: 461 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-09-29 12:38:11 -0400 -message: - Remove uses of ternary operator from wicd-curses, restoring support for python 2.4. ------------------------------------------------------------- -revno: 460 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sun 2009-09-27 17:35:26 -0400 -message: - Reduce cursor flicker in wicd-curses. ------------------------------------------------------------- -revno: 459 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Sat 2009-09-19 17:24:40 -0400 -message: - Still trying to get rid of this empty wired-settings.conf section bug. ------------------------------------------------------------- -revno: 458 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Sat 2009-09-19 14:58:00 -0400 -message: - chmod to 0755, not 755. Fixes LP #431304 ------------------------------------------------------------- -revno: 457 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Thu 2009-09-10 19:43:26 -0400 -message: - Fix for crash when trying to connect to an essid with all numeric characters. ------------------------------------------------------------- -revno: 456 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Wed 2009-09-02 10:20:13 -0400 -message: - Adjusted the keystrokes in wicd-curses to support 8-bit terminals (like xterms by default). - - Thanks to DarkStarSword for the patch. ------------------------------------------------------------- -revno: 455 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Fri 2009-08-28 19:47:55 -0400 -message: - Wait for the network interface to finish coming up before moving on during the connection process. - Use a dict instead of if/elifs in StartDHCP() method. ------------------------------------------------------------- -revno: 454 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-08-15 18:12:40 -0500 -message: - updated hidden network ESSID retrieval code ------------------------------------------------------------- -revno: 453 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Fri 2009-08-14 11:00:54 -0500 -message: - merged 1.6-urwid-all ------------------------------------------------------------- -revno: 452 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-08-13 12:11:55 -0500 -message: - merged 1.6-strip-ips and updated translations.py ------------------------------------------------------------- -revno: 451 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-08-13 05:10:58 -0500 -message: - merged 1.6-reconnect-dbm to allow automatic reconnection when the dBm signal drops below -99 ------------------------------------------------------------- -revno: 450 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-08-05 21:27:24 -0500 -message: - commit fix from https://bugs.launchpad.net/wicd/+bug/388116/comments/3 ------------------------------------------------------------- -revno: 449 [merge] -committer: Dan O'Reilly -branch nick: trunk -timestamp: Mon 2009-08-03 19:30:21 -0400 -message: - Merge. ------------------------------------------------------------- -revno: 448 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Mon 2009-08-03 19:29:18 -0400 -message: - Actually display the error messag we get when scanning fails in the ioctl backend. - Make sure we actually abort the connection attempt when authentication validation fails. ------------------------------------------------------------- -revno: 447 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Sat 2009-08-01 21:25:58 -0400 -message: - Fix crash when trying to use an unavaiable locale. ------------------------------------------------------------- -revno: 446 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Sat 2009-08-01 19:05:24 -0400 -message: - Enforce valid wired profile names at the GUI level. ------------------------------------------------------------- -revno: 445 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Sat 2009-08-01 18:57:00 -0400 -message: - Fix some minor formatting issues - Don't save wired profiles that have only whitespace in their names. ------------------------------------------------------------- -revno: 444 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Mon 2009-07-27 21:09:18 -0500 -message: - moved 55wicd to 91wicd ------------------------------------------------------------- -revno: 443 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-07-22 21:47:47 -0500 -message: - added the -o option to the help text ------------------------------------------------------------- -revno: 442 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-07-22 21:29:34 -0500 -message: - added support for not displaying the tray icon or the GUI, only the notifications ------------------------------------------------------------- -revno: 441 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Mon 2009-07-13 18:10:28 -0400 -message: - Fix typo in prefs.py ------------------------------------------------------------- -revno: 440 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-07-07 22:01:19 -1000 -message: - commit Dan's fix for long numeric keys ------------------------------------------------------------- -revno: 439 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-07-07 21:51:32 -1000 -message: - merge trunk-rw again ------------------------------------------------------------- -revno: 438 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-07-07 18:41:52 -1000 -message: - Added Robby's comment on at_console ------------------------------------------------------------- -revno: 437 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-07-07 18:29:53 -1000 -message: - merged up to r438 from lp:~rworkman/wicd/trunk-rw ------------------------------------------------------------- -revno: 436 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-07-05 09:26:24 -1000 -message: - fix problem running get_translations if translations/ doesn't exist ------------------------------------------------------------- -revno: 435 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-07-05 08:56:26 -1000 -message: - updated setup.py version number, CHANGES, and NEWS ------------------------------------------------------------- -revno: 434 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-07-05 08:51:39 -1000 -message: - updated translations.py ------------------------------------------------------------- -revno: 433 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sun 2009-07-05 14:42:39 -0400 -message: - Actually tell the user that he may need to be in wpath.wicd_group if wicd-clientgets an access-denied error. ------------------------------------------------------------- -revno: 432 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-07-05 08:16:59 -1000 -message: - check to see if the interface exists in the decorator ------------------------------------------------------------- -revno: 431 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Thu 2009-07-02 18:26:37 -0400 -message: - Make sure we run to_unicode on all properties we read from disk or get from the user (bug 390680). - Don't try to run global scripts of the global script directory doesn't exist (bug 386244). ------------------------------------------------------------- -revno: 430 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Thu 2009-07-02 16:50:48 -0400 -message: - Fix crash when trying to create an ad-hoc network. ------------------------------------------------------------- -revno: 429 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-06-30 22:58:44 -0400 -message: - Merged r353 of 1.6-nacl. ------------------------------------------------------------- -revno: 428 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Wed 2009-06-24 19:14:43 -0400 -message: - Merge bugfixes from r351 of 1.6-nacl, thanks to comfrey in #wicd for noticing them. ------------------------------------------------------------- -revno: 427 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sun 2009-06-21 14:45:44 -0400 -message: - Fix typo that crashes wicd-curses on attempting to bring up the help dialog. ------------------------------------------------------------- -revno: 426 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-06-20 23:02:23 -0500 -message: - updated setup.py version and CHANGES ------------------------------------------------------------- -revno: 425 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sat 2009-06-20 23:46:38 -0400 -message: - Fix the log file chmodding (os.chmod() can't accept a string, apparently). ------------------------------------------------------------- -revno: 424 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-06-20 21:59:45 -0500 -message: - updated translations.py ------------------------------------------------------------- -revno: 423 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-06-20 21:44:32 -0500 -message: - merged lp:~nacl/wicd/1.6-access-denied to display an error message if access to the daemon via DBus is denied ------------------------------------------------------------- -revno: 422 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-06-20 19:25:10 -0500 -message: - merged lp:~adamblackburn/wicd/1.6-return-101-if-no-strength to allow cards that don't report signal strength to work with Wicd's default settings ------------------------------------------------------------- -revno: 421 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-06-20 19:24:07 -0500 -message: - merged lp:~dpaleino/wicd/pre-post-down to allow having pre/post disconnection scripts ------------------------------------------------------------- -revno: 420 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-06-20 19:22:36 -0500 -message: - merged lp:~adamblackburn/wicd/loggroup to allow passing the preferred log group and permissions to setup.py configure -- thanks to David Paleino ------------------------------------------------------------- -revno: 419 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-06-20 19:20:42 -0500 -message: - merged lp:~adamblackburn/wicd/1.6-cancel-edit-settings to allow canceling the edit settings dialog that appears when attempting to connect to an encrypted network without entering the encryption details ------------------------------------------------------------- -revno: 418 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-06-20 10:33:23 -0500 -message: - merged David Paleino's Debian init script that includes a status command ------------------------------------------------------------- -revno: 417 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-06-18 14:56:25 +0800 -message: - fixed crash that occured when clicking to connect to a secured network but without entering the security information ------------------------------------------------------------- -revno: 416 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-06-16 23:36:58 +0800 -message: - fix a small typo in misc.py -- thanks to David Paleino ------------------------------------------------------------- -revno: 415 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-06-16 07:44:27 +0800 -message: - disable automatically disconnecting when Automatically reconnect is False ------------------------------------------------------------- -revno: 414 [merge] -committer: Dan O'Reilly -branch nick: trunk -timestamp: Sun 2009-06-14 14:27:21 -0400 -message: - Merge. ------------------------------------------------------------- -revno: 413 -committer: Dan O'Reilly -branch nick: trunk -timestamp: Sun 2009-06-14 14:25:06 -0400 -message: - Convert strings being prints out by dhclients to utf-8 before trying to log them. - When iwscan displays two entries for a hidden network, only display the one with the essid included. ------------------------------------------------------------- -revno: 412 -committer: Adam Blackburn -branch nick: wicd -timestamp: Tue 2009-06-09 13:25:02 +0800 -message: - display the ESSID/Wired Network in the title of the settings dialog ------------------------------------------------------------- -revno: 411 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Fri 2009-06-05 16:13:38 +0800 -message: - Updated translations.py ------------------------------------------------------------- -revno: 410 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Fri 2009-06-05 15:20:58 +0800 -message: - updated CHANGES ------------------------------------------------------------- -revno: 409 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Fri 2009-06-05 15:08:47 +0800 -message: - merged experimental-nacl ------------------------------------------------------------- -revno: 408 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-06-04 22:24:14 +0800 -message: - add .sourceforge.net to the URLs in the translator ------------------------------------------------------------- -revno: 407 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-06-04 21:39:36 +0800 -message: - updated CHANGES, setup.py version, and NEWS ------------------------------------------------------------- -revno: 406 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sat 2009-05-30 23:18:22 -0400 -message: - Merge r342 of experimental-nacl. ------------------------------------------------------------- -revno: 405 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-05-28 11:10:10 +0800 -message: - updated CHANGES and setup.py version ------------------------------------------------------------- -revno: 404 [merge] -committer: Dan O'Reilly -branch nick: 1.6 -timestamp: Wed 2009-05-27 22:25:32 -0400 -message: - Merge 1.6-dan ------------------------------------------------------------- -revno: 403 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-05-23 12:51:02 +0800 -message: - Updated version numbers and CHANGES ------------------------------------------------------------- -revno: 402 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sat 2009-05-23 00:40:52 -0400 -message: - Merged r340 of experimental-nacl. ------------------------------------------------------------- -revno: 401 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Fri 2009-05-22 11:29:12 +0800 -message: - Buttons are now activated correctly when using the keyboard ------------------------------------------------------------- -revno: 400 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-05-21 23:18:48 +0800 -message: - merged 1.6-rworkman ------------------------------------------------------------- -revno: 399 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-05-19 21:25:09 -0400 -message: - Merged r336 of experimental-nacl. ------------------------------------------------------------- -revno: 398 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-05-20 07:12:58 +0800 -message: - Merged 1.6-rworkman ------------------------------------------------------------- -revno: 397 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-05-20 07:10:49 +0800 -message: - merge ------------------------------------------------------------- -revno: 396 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-05-20 07:09:42 +0800 -message: - changed DHCP client order in preferences dialog ------------------------------------------------------------- -revno: 395 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-05-14 21:55:59 +0800 -message: - update CHANGES and NEWS ------------------------------------------------------------- -revno: 394 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Thu 2009-05-14 09:44:28 -0400 -message: - Merged typo fix from r331 of experimental-nacl. ------------------------------------------------------------- -revno: 393 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-05-14 19:37:20 +0800 -message: - Fix / tags ------------------------------------------------------------- -revno: 392 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-05-12 00:06:38 -0400 -message: - Merged r330 of experimental-nacl. ------------------------------------------------------------- -revno: 391 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-05-10 13:53:54 -0400 -message: - Don't use dbusmanager.DBusException--it doesn't exist. ------------------------------------------------------------- -revno: 390 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-05-10 22:51:49 +0800 -message: - Made the GUI look better with dark themes ------------------------------------------------------------- -revno: 389 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-05-10 22:03:52 +0800 -message: - Removed italicized text from the GTK GUI ------------------------------------------------------------- -revno: 388 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sun 2009-05-10 09:51:01 -0400 -message: - Merged with r328 of experimental-nacl. ------------------------------------------------------------- -revno: 387 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-05-09 20:53:49 -0400 -message: - Make bitrates regex work when it's the last entry in a cell. ------------------------------------------------------------- -revno: 386 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Wed 2009-05-06 18:13:29 -0400 -message: - Fixed missing endquote in wicd-client.py. ------------------------------------------------------------- -revno: 385 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-05-05 12:56:09 +0800 -message: - Updated translations.py ------------------------------------------------------------- -revno: 384 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-05-05 12:55:35 +0800 -message: - Added code to debug why pynotify fails ------------------------------------------------------------- -revno: 383 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-05-05 12:00:22 +0800 -message: - updated CHANGES/NEWS ------------------------------------------------------------- -revno: 382 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-05-05 11:58:36 +0800 -message: - merged notifications branch ------------------------------------------------------------- -revno: 381 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-05-03 22:00:24 +0800 -message: - print wicd's version number on daemon start ------------------------------------------------------------- -revno: 380 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-05-03 21:58:11 +0800 -message: - print wicd's version number on daemon start ------------------------------------------------------------- -revno: 379 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sat 2009-05-02 14:08:07 -0400 -message: - Merged bugfixes from r321 of experimental-nacl. ------------------------------------------------------------- -revno: 378 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-05-02 15:32:58 +0800 -message: - Updated INSTALL to use update_translations_py before get_translations ------------------------------------------------------------- -revno: 377 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-05-02 15:30:09 +0800 -message: - Added automatically generated translations.py ------------------------------------------------------------- -revno: 376 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-05-02 15:24:50 +0800 -message: - added support for automatically retrieving translations.py ------------------------------------------------------------- -revno: 375 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-05-01 20:26:46 -0400 -message: - Fix bug where shared essid settings couldn't be disabled once they were turned on. ------------------------------------------------------------- -revno: 374 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-05-01 20:20:40 -0400 -message: - Fix crash when saving settings for unencrypted networks. - Remove unneeded function in prefs.py ------------------------------------------------------------- -revno: 373 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Fri 2009-05-01 21:58:53 +0800 -message: - Merge 1.6-rworkman (thanks!) ------------------------------------------------------------- -revno: 372 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Fri 2009-05-01 13:41:13 +0800 -message: - Also catch AttributeErrors when guessing data types ------------------------------------------------------------- -revno: 371 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-04-27 19:17:01 -0400 -message: - Correctly handle case where a key is all digits and starts with a '0'. - Remove some unused imports. - Simplfy code that checks for valid wpa_supplicant drivers. ------------------------------------------------------------- -revno: 370 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-04-26 08:03:59 +0900 -message: - Updated version numbers ------------------------------------------------------------- -revno: 369 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-04-26 08:00:33 +0900 -message: - Redirected bzr output to /dev/null ------------------------------------------------------------- -revno: 368 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-04-26 07:53:24 +0900 -message: - Fixed setup.py translations installation and made wicd-daemon.py +x ------------------------------------------------------------- -revno: 367 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-04-23 19:41:10 +0800 -message: - Merged ------------------------------------------------------------- -revno: 366 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-04-23 19:38:48 +0800 -message: - Updated CHANGES and added NEWS ------------------------------------------------------------- -revno: 365 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-04-22 22:17:39 +0800 -message: - fixed another typo ------------------------------------------------------------- -revno: 364 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-04-22 22:11:33 +0800 -message: - fixed a typo ------------------------------------------------------------- -revno: 363 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-04-22 22:02:31 +0800 -message: - Updated version number ------------------------------------------------------------- -revno: 362 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-04-22 21:45:51 +0800 -message: - Updated vcsinfo.py generation logic ------------------------------------------------------------- -revno: 361 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-04-21 21:25:59 -0400 -message: - Refactor monitor.py polling code to remove reliance on globals. - Make sure we update the polling rate in wicd-monitor when the backend changes. ------------------------------------------------------------- -revno: 360 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-04-21 20:30:40 -0400 -message: - Use atexit instead of catching SIGTERM in wicd-daemon. - Use Popen to launch wicd-monitor instead of gobject.spawn_async. ------------------------------------------------------------- -revno: 359 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-04-21 17:47:46 -0400 -message: - Merged r316 of experimental-nacl, providing some small feature additions and bufixes. ------------------------------------------------------------- -revno: 358 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Tue 2009-04-21 22:33:29 +0800 -message: - Updated CHANGES ------------------------------------------------------------- -revno: 357 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Mon 2009-04-20 01:02:20 -0400 -message: - Set the "Required-Stop" field in the openSUSE initscript to $null to get the OBS to stop complaining. ------------------------------------------------------------- -revno: 356 -committer: Dan O'Reilly -branch nick: hiddenfixes -timestamp: Sun 2009-04-19 21:13:58 -0400 -message: - Use the -v option if dhclient is 4.x - Simplify sorting method for WAPs. ------------------------------------------------------------- -revno: 355 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Fri 2009-04-17 14:38:12 +0900 -message: - Made wicd-daemon.py executable ------------------------------------------------------------- -revno: 354 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2009-04-16 21:49:42 -0400 -message: - Remove pointless assignment in be-ioctl - Set wireless mode before putting interface up. - Put wireless interfaces up before trying to authenticate. ------------------------------------------------------------- -revno: 353 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-04-14 01:06:36 -0400 -message: - Updated wicd-curses.8.in, made the date in wicd-client.1 accurate, fixed a typo in setup.py, and added a bdist_rpm option in setup.cfg. ------------------------------------------------------------- -revno: 352 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sun 2009-04-12 02:50:57 -0400 -message: - Added my name to setup.py. ------------------------------------------------------------- -revno: 351 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sun 2009-04-12 14:48:52 +0800 -message: - vcsinfo.py is regenerated when setup.py is run ------------------------------------------------------------- -revno: 350 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-04-11 22:45:13 -0400 -message: - Fix duplicate GetOperationalMode() methods. - Switch misc.get_gettext() to translations.get_gettext() in configscript.py ------------------------------------------------------------- -revno: 349 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-04-11 22:41:34 -0400 -message: - Add missing print statement to ExecuteScripts() ------------------------------------------------------------- -revno: 348 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-04-11 19:57:02 -0400 -message: - Make sure we fall back to wpa_cli if wpactrl isn't available when stopping wpa_supplicant. ------------------------------------------------------------- -revno: 347 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-04-11 18:53:30 -0400 -message: - Only check for wireless tools in the ioctl backend if wpactrl isn't available. - Fix up error handling when there is no graphical sudo program installed. ------------------------------------------------------------- -revno: 346 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-04-11 18:37:51 -0400 -message: - Make sure we check for wirelesstools in the ioctl backend. ------------------------------------------------------------- -revno: 345 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-04-11 18:04:22 -0400 -message: - Don't build C extensions modules in main setup.py - Give WirelessInformationDialog a parent. ------------------------------------------------------------- -revno: 344 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Fri 2009-04-10 22:46:57 -0400 -message: - Merged some more wicd-curses changes, experimental-nacl r310. ------------------------------------------------------------- -revno: 343 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Fri 2009-04-10 22:13:48 -0400 -message: - Merged wicd-curses changes from r309 of experimental-nacl. ------------------------------------------------------------- -revno: 342 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-04-04 13:43:29 -0400 -message: - Fix crash with hidden essids if it was stored in wireless-settings.conf as None. - Only trigger a wpa_supplicant rescan once when connecting. ------------------------------------------------------------- -revno: 341 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-04-03 19:07:00 -0400 +revno: 716 [merge] +committer: David Paleino +branch nick: wicd +timestamp: Thu 2012-02-02 17:40:20 +0100 message: - Always use the "C" local when running external commands. + Merged wired-encryption implementation by Joe MacMahon. Thanks! ------------------------------------------------------------ -revno: 340 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-03-27 23:14:19 -0400 +revno: 715 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Thu 2012-02-02 06:13:08 +0000 message: - Merge. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 339 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-03-27 23:13:16 -0400 +revno: 714 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2012-02-01 17:09:53 +0100 message: - Fix another issue with integer keys. + Try to better handle the double-escaped unicode ESSIDs ------------------------------------------------------------ -revno: 338 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-03-25 20:19:11 -0400 +revno: 713 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Wed 2012-02-01 05:10:05 +0000 message: - Add a workaround for an issue where large integers got mishandled by python-dbus on 64-bit systems. - Fix potential issue if encryption key is a number - Close all open fd's in the daemonize code. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 337 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Tue 2009-03-24 12:30:25 -0400 +revno: 712 +fixes bug: https://launchpad.net/bugs/907528 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2012-01-31 18:23:54 +0100 message: - Merged in curses-uimod changes from experimental-nacl. + Finally really fix the issue with \x00-ESSIDs :( ------------------------------------------------------------ -revno: 336 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-03-23 17:53:59 -0400 +revno: 711 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sat 2012-01-28 05:09:06 +0000 message: - Remove some unneeded imports. - Remove unused variable. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 335 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-03-23 01:30:16 -0400 +revno: 710 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Fri 2012-01-27 05:34:49 +0000 message: - Merge to import lines. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 334 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-03-23 01:28:50 -0400 +revno: 709 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sun 2012-01-22 05:35:04 +0000 message: - Make the ioctl backends use of python-iwscan and python-wpactrl optional. - Don't use __all__ in wnettools.py, and make the backends explicitly import the methods/classes they need from wnettools.py. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 333 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-22 18:39:44 -0400 +revno: 708 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Fri 2012-01-20 04:45:31 +0000 message: - Update docstrings. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 332 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-22 17:36:55 -0400 +revno: 707 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Thu 2012-01-19 05:03:26 +0000 message: - Update copyrights and some docstrings. - Make trayicon network menu scan-triggering behave better. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 331 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-22 00:13:42 -0400 +revno: 706 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Wed 2012-01-18 04:49:09 +0000 message: - Fix decorators. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 330 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-03-21 22:38:33 -0400 +revno: 705 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Mon 2012-01-16 05:24:40 +0000 message: - Merge enctemplates branch. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 329 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-03-21 22:22:04 -0400 +revno: 704 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2012-01-15 20:44:58 +0100 message: - Added a neediface decorator to replace using "if not self.iface return..." in every method that needs it. + Improve German translation, thanks to Jakobus Schürz ------------------------------------------------------------ -revno: 328 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-03-21 19:41:13 -0400 +revno: 703 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2012-01-15 20:23:51 +0100 message: - Add missing check for no interface to GetIP. + Fix translations (again!) ------------------------------------------------------------ -revno: 327 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-03-21 16:28:40 -0400 +revno: 702 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2012-01-15 15:24:28 +0100 message: - - Replace some tabs that snuck in with spaces. - - Try to validate successful association with static IPs by pinging the gateway specified. + Fix missing import ------------------------------------------------------------ -revno: 326 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-15 20:54:16 -0400 +revno: 701 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2012-01-15 15:21:16 +0100 message: - Apply Debian initscript patch from David Paleino. + A hopefully better attempt at ESSIDs with '\x00' in them ------------------------------------------------------------ -revno: 325 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-15 15:54:14 -0400 +revno: 700 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2012-01-15 15:19:40 +0100 message: - Merge in resolvconf support. + Revert commit 691/8aa66e4: Don't support wireless networks with '\x00' in the ESSID ------------------------------------------------------------ -revno: 324 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-03-12 17:55:16 +0800 +revno: 699 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sat 2012-01-14 05:18:58 +0000 message: - Fixed get_translations and renamed cleargenerated to clear_generated + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 323 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-03-09 01:46:31 -0400 +revno: 698 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Tue 2012-01-10 05:39:10 +0000 message: - Add lunar init directory. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 322 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-08 23:39:41 -0400 +revno: 697 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sun 2012-01-08 05:07:40 +0000 message: - Still trying to fix this... + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 321 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-08 22:49:24 -0400 +revno: 696 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Thu 2012-01-05 05:57:39 +0000 message: - Merge in Dario Freddi's additions, with some modifications. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 320 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-08 20:38:54 -0400 +revno: 695 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sun 2012-01-01 05:35:01 +0000 message: - Create an error dialog when we get a DBus access denied error. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 319 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-08 15:58:44 -0400 +revno: 694 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sat 2011-12-31 06:07:45 +0000 message: - Fix suse init script. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 318 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sat 2009-03-07 11:38:37 -0500 +revno: 693 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Fri 2011-12-30 05:51:45 +0000 message: - Merged wicd-curses changes from experimental-nacl, r294 + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 317 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Fri 2009-03-06 19:28:09 -0500 -message: - Made the wicd-curses script add WHEREAREMYFILES - Moved WHEREAREMYFILES to /var/lib/wicd, and adapted setup.py, wpath.py, and - the wicd-client script to support it - Fixed a typo in setup.py ------------------------------------------------------------- -revno: 316 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-03-04 18:34:35 -0500 +revno: 692 [merge] +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-12-29 12:17:57 +0100 message: Merge ------------------------------------------------------------ -revno: 315 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-03-04 18:32:15 -0500 +revno: 691 +fixes bug: https://launchpad.net/bugs/907528 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-12-29 12:16:17 +0100 message: - Fix setup.py bug where - was getting turned into _ in paths. + Don't support wireless networks with '\x00' in the ESSID ------------------------------------------------------------ -revno: 314 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-01 23:15:34 -0500 +revno: 690 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Thu 2011-12-29 04:52:35 +0000 message: - Apply lang patch from David Paleino + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 313 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-03-01 23:00:22 -0500 +revno: 689 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Wed 2011-12-28 05:41:14 +0000 message: - Merge in global script support. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 312 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-02-28 15:34:34 -0500 +revno: 688 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Mon 2011-12-26 04:56:18 +0000 message: - Don't use the thread module in networking.py. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 311 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-02-27 00:38:09 -0500 +revno: 687 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sat 2011-12-24 05:59:25 +0000 message: - Merge. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 310 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-02-27 00:35:53 -0500 +revno: 686 +committer: David Paleino +branch nick: wicd +timestamp: Mon 2011-12-19 23:04:08 +0100 message: - Get rid of unneeded "use_tray" variable being passed around in wicd-client. - Remove some extra whitespace in networking.py + Fix bug with unicode-translated locale and wicd-curses ------------------------------------------------------------ -revno: 309 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-02-27 00:08:31 -0500 +revno: 685 +committer: David Paleino +branch nick: wicd +timestamp: Mon 2011-12-19 23:01:38 +0100 message: - Fix issue where signal strength wouldn't be reported correctly if the first link quality regex didn't match. - Add some helper methods that will eventually be used for encryption template parsing. - Use more specific exception checking in a few places. + Make signal formatting clearer ------------------------------------------------------------ -revno: 308 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-02-21 13:11:55 -0500 +revno: 684 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sun 2011-12-18 04:41:10 +0000 message: - Fix typo + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 307 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Sat 2009-02-21 01:37:38 -0500 +revno: 683 +committer: David Paleino +branch nick: wicd +timestamp: Sat 2011-12-17 08:00:56 +0100 message: - Merged experimental-nacl r288, and updated wicd-curses revno. + Fix Spanish translation ------------------------------------------------------------ -revno: 306 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-02-21 01:00:40 -0500 +revno: 682 +committer: David Paleino +branch nick: wicd +timestamp: Sat 2011-12-17 07:55:18 +0100 message: - merge + Mask out sensitive information in the logfile ------------------------------------------------------------ -revno: 305 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-02-21 00:57:40 -0500 +revno: 681 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sat 2011-12-17 05:30:39 +0000 message: - Create the wpactrl interface connection in a less bizarre way. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 304 -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Thu 2009-02-19 18:14:40 -0500 +revno: 680 +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-12-16 23:00:28 +0100 message: - Fixed regex problem in wicd/misc.py. + Don't include removed directory in the generated tarball ------------------------------------------------------------ -revno: 303 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-02-19 22:59:40 -0600 +revno: 679 +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-12-16 22:59:54 +0100 message: - Added check for loop before exiting loop + Remove unused third-party code ------------------------------------------------------------ -revno: 302 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Thu 2009-02-19 22:22:12 -0600 +revno: 678 +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-12-16 21:47:07 +0100 message: - Fixed the dhcp_object error. + Make the templating system more robust to custom fields ------------------------------------------------------------ -revno: 301 [merge] -committer: Andrew Psaltis -branch nick: 1.6 -timestamp: Wed 2009-02-18 07:42:48 -0500 +revno: 677 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-12-15 20:14:05 +0100 message: - Merged with experimental-nacl, r282. + Redundant regex ------------------------------------------------------------ -revno: 300 [merge] -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-02-18 16:15:50 +0800 +revno: 676 +fixes bugs: https://launchpad.net/bugs/718662 https://launchpad.net/bugs/269664 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-12-15 19:21:53 +0100 message: - Merge + Fix unicode bugs with ESSIDs and keys ------------------------------------------------------------ -revno: 299 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Wed 2009-02-18 16:13:31 +0800 +revno: 675 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-12-15 17:49:51 +0100 message: - Updated copyright, setup.py version number, and AUTHORS + Make wicd-cli executable ------------------------------------------------------------ -revno: 298 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-02-13 18:54:27 -0500 +revno: 674 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-12-15 11:43:01 +0100 message: - Fix bug where GUI could get stuck in the connecting state if the GUI was first opened while a connection was in progress. + Convert from \r\n to \n ------------------------------------------------------------ -revno: 297 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2009-02-12 20:07:12 -0500 +revno: 673 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Thu 2011-12-15 05:33:50 +0000 message: - Merge experimental-rworkman + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 296 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2009-02-12 18:48:10 -0500 +revno: 672 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-12-14 20:09:18 +0100 message: - Merged curses changes. + Fix uk and ru translations, thanks to Andriy Senkovych! ------------------------------------------------------------ -revno: 295 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2009-02-12 18:38:40 -0500 +revno: 671 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-12-11 20:41:57 +0100 message: - Fix issue where GetForcedDisconnect was returning True when we had just connected. - Fix issues with auto-switch to wired. - Change to how the gui handles changing state from connecting to not-connecting to be nicer. - Make the gui trigger monitor state updates while in the connecting state. - Make sure the monitor logs a warning when it catches a D-Bus exception. - Make sure cancelling a wired connection attempt kills DHCP. - Fix issue where DHCP wouldn't get run if automatic dhcp tool was enabled. + Oops. Don't wipe out configuration files :) :/ ------------------------------------------------------------ -revno: 294 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-02-11 22:44:38 -0500 +revno: 670 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sun 2011-12-11 05:45:35 +0000 message: - Make default init script executable. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 293 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-02-11 21:01:12 -0500 +revno: 669 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sat 2011-12-10 05:03:06 +0000 message: - Fix possible crash when handling D-Bus exceptions in monitor.py + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 292 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-02-11 20:55:02 -0500 +revno: 668 +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-12-09 23:01:53 +0100 message: - Make sure it's possible to stop a dhcp client that's in the process of getting a lease. - Have gui.py trigger connection status updates every .5 seconds if in a connecting state. - Fix typo in wicd-client.py + Fix more wrongities in l10n ------------------------------------------------------------ -revno: 291 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-02-10 01:08:12 -0500 +revno: 667 +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-12-09 22:21:48 +0100 message: - Don't convert to milliseconds in misc.timeout_add if milli is True. + Fix various l10n bugs (better no translation, that a wrong one) ------------------------------------------------------------ -revno: 290 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-02-10 00:58:11 -0500 +revno: 666 +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-12-09 18:30:38 +0100 message: - Change "Advanced Settings" to "Properties" - Remove some unneeded debugging output. - Replace gobject.timeout_add_seconds / gobject.timeout_add if/else logic with calls to a misc.timeout_add method that does it internally. - Only display the dbus lost error message if dbus has been gone for 5 seconds without coming back. + Don't conflict with NetworkManager ------------------------------------------------------------ -revno: 289 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-02-08 19:59:53 -0500 +revno: 665 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-12-08 23:17:36 +0100 message: - Tweak algorithm for searching for sudo progs so we search every directory in $PATH for a particular app before moving on to the next one. + Fix brown-paper-bag bug, causing lots of troubles ------------------------------------------------------------ -revno: 288 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-02-08 18:42:05 -0500 +revno: 664 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-12-08 22:45:58 +0100 message: - Fix crashing bug in daemon. - Dont have wicd-monitor inherit stdin from the daemon. + (Try to) Fix mismatch between clients code and DBus API, thanks to Anthony Vital ------------------------------------------------------------ -revno: 287 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-02-08 16:14:17 -0500 +revno: 663 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-12-08 18:56:03 +0100 message: - Applied LC_MESSAGES patch from David Paleino + Fix bug for new installations ------------------------------------------------------------ -revno: 286 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-02-08 16:09:55 -0500 +revno: 662 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-12-08 13:23:29 +0100 message: - Enforce only one scan being allowed to happen at a time in the daemon. + Don't duplicate code ------------------------------------------------------------ -revno: 285 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-02-07 01:50:49 -0500 +revno: 661 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Thu 2011-12-08 05:46:47 +0000 message: - Always updated the network list if we get a scan finished signal. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 284 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-02-07 01:22:42 -0500 +revno: 660 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-12-07 23:08:55 +0100 message: - Fix some issues with the GUI statusbar being incorrect. - Make wicd-client more tolerant of dbus exceptions. - Disconnect from both managed interfaces before making a connection. + Update translations for new catalog ------------------------------------------------------------ -revno: 283 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-02-06 19:26:09 -0500 +revno: 659 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-12-07 23:08:42 +0100 message: - Fix bug where interface name was being passed to the dhcp client executable twice. - Tweak connect/disconnect to not kill any processes. Instead it releases leases and terminates the wpa_supplicant instance through its ctrl interface. This should make wicd handle multiple connections better. + Updated French translation received by e-mail ------------------------------------------------------------ -revno: 282 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-02-04 23:05:05 -0500 +revno: 658 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-12-07 23:08:19 +0100 message: - If the monitor loses contact with the daemon for an extended period, die instead of ignoring the errors. + Update translatable strings ------------------------------------------------------------ -revno: 281 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-02-04 19:13:06 -0500 +revno: 657 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Tue 2011-12-06 05:40:21 +0000 message: - More tweaking of how the GUI updates the status bar. Should be more efficient now. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 280 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-02-04 18:32:58 -0500 +revno: 656 +tags: 1.7.1~b3 +committer: David Paleino +branch nick: wicd +timestamp: Mon 2011-12-05 18:39:09 +0100 message: - Merge experimental-nacl. + Release 1.7.1~b3 ------------------------------------------------------------ -revno: 279 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-02-04 00:26:13 -0500 +revno: 655 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Mon 2011-12-05 05:25:14 +0000 message: - Rather than polling for network status in the GUI, just have the monitor run an on-demand pull and get the results from the daemon. Should reduce iwconfig/ifconfig calls while the GUI is open and make for nicer looking code. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 278 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-02-03 23:48:58 -0500 +revno: 654 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sun 2011-12-04 04:47:42 +0000 message: - Fix bug where link detection tool value wasn't get propogated down the stack. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 277 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-02-03 21:21:40 -0500 +revno: 653 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sat 2011-12-03 05:27:48 +0000 message: - Merge experimental-rworkman + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 276 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-02-03 19:59:53 -0500 +revno: 652 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Fri 2011-12-02 05:08:06 +0000 message: - Add a .bzrignore file. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 275 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-02-03 19:38:07 -0500 +revno: 651 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-11-24 17:41:42 +0100 message: - Remove unneeded parameter from PreferencesDialog constructor. + Fix stupid bug with multiple pattern regex ------------------------------------------------------------ -revno: 274 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-02-03 19:35:57 -0500 +revno: 650 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Wed 2011-11-23 05:33:15 +0000 message: - Make sure we try each external app in order if selection is set to be automatic. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 273 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-02-03 00:05:11 -0500 +revno: 649 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Tue 2011-11-22 05:11:59 +0000 message: - Make sure debug settings are propogated down the stack as soon a the daemon loads. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 272 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-02-02 23:47:54 -0500 +revno: 648 [merge] +committer: David Paleino +branch nick: wicd +timestamp: Mon 2011-11-21 10:58:14 +0100 message: - Make GetWirelessInterfaces() return a list instead of the first interface. Also make the networking.py layer pull the first entry from the list. - Some documentation cleanup. + LP translations ------------------------------------------------------------ -revno: 271 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-02-02 23:39:52 -0500 +revno: 647 +committer: David Paleino +branch nick: wicd +timestamp: Mon 2011-11-21 10:56:30 +0100 message: - Minor formatting tweak + Make configfile sorted ------------------------------------------------------------ -revno: 270 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-02-02 23:05:29 -0500 +revno: 646 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sat 2011-11-19 05:26:31 +0000 message: - Simplify the inheritance of static wnettools functions in the backends. - Make sure we select a default route flushing tool. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 269 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-02-01 23:32:55 -0500 +revno: 645 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Fri 2011-11-18 05:19:00 +0000 message: - Merge NaCl's curses frontend and rworkman's experimental branch. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 268 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-02-01 23:32:28 -0500 +revno: 644 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Thu 2011-11-17 05:33:46 +0000 message: - Remove some comments. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 267 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-02-01 23:10:11 -0500 +revno: 643 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Tue 2011-11-15 05:10:58 +0000 message: - Make it possible for the user to select which graphical sudo application to use. - Make any external apps not installed on the system unselectable in the GUI. - Rework the app selection code in the backend to fall back to auto-selection if a requested app isn't installed. - Tweak the autoconnect attempt throttle in wicd-monitor to not be as aggressive. - Made sure the preferences dialog would reconnect to dbus when a DaemonStarting signal was sent. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 266 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-01-31 20:22:15 -0500 +revno: 642 +committer: David Paleino +branch nick: wicd +timestamp: Mon 2011-11-14 09:29:45 +0100 message: - Fix broken Scan() call in wicd-client + Revert 576: it was properly fixed in 640 ------------------------------------------------------------ -revno: 265 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-01-31 00:31:50 -0500 +revno: 641 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-11-13 08:17:44 +0100 message: - A bunch of small fixes for errors/warnings reported by Pylint. + Fix source tarball generation ------------------------------------------------------------ -revno: 264 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-01-30 21:20:43 -0500 +revno: 640 +fixes bug: https://launchpad.net/bugs/755745 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-11-13 07:57:12 +0100 message: - Fix crash if essid is None + Show correct ESSID during connection, thanks to Jonatan! (LP: #755745) ------------------------------------------------------------ -revno: 263 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-01-28 19:54:17 -0500 +revno: 639 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-11-09 18:15:56 +0100 message: - Merge translations updates. + Add myself to copyright header ------------------------------------------------------------ -revno: 262 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Wed 2009-01-28 19:52:51 -0500 +revno: 638 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-11-09 18:12:13 +0100 message: - Always scan when the daemon starts. - Remove old init scripts. + Don't allow no-value options in config files ------------------------------------------------------------ -revno: 261 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-01-26 18:46:57 -0500 +revno: 637 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-11-09 17:12:32 +0100 message: - Fix issues with the way disconnect scripts work. - Make flushing the route table more likely to work. + Adding myself to authors ------------------------------------------------------------ -revno: 260 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Mon 2009-01-26 11:51:09 +0800 +revno: 636 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-11-09 13:26:49 +0100 message: - Added three new translations + Ignore debian/, and in git too ------------------------------------------------------------ -revno: 259 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Mon 2009-01-26 11:15:35 +0800 +revno: 635 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-11-09 13:17:35 +0100 message: - Fixed some typos in the hidden network code and fix a bug if you try to start the tray icon without the daemon + Make configscript.py use the RawConfigParser wrapper ------------------------------------------------------------ -revno: 258 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Mon 2009-01-26 10:54:38 +0800 +revno: 634 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-11-09 13:17:04 +0100 message: - Fixed a spacing issue in the preferences dialog + Fix configscript.py startup ------------------------------------------------------------ -revno: 257 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-01-25 16:43:45 -0500 +revno: 633 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sat 2011-11-05 06:02:53 +0000 message: - Fixing the fix... + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 256 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-01-25 16:40:26 -0500 +revno: 632 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Fri 2011-11-04 05:14:54 +0000 message: - Don't try to set properties in the advanced dialog before it exists. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 255 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-01-25 16:34:32 -0500 +revno: 631 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-11-03 10:37:50 +0100 message: - Fix issue where toggling default wired profile could cause settings to get set for multiple profiles. - Remove some no longer needed checks in the daemon. + Support alternative ifconfig output style ------------------------------------------------------------ -revno: 254 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-01-25 15:15:49 -0500 +revno: 630 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-11-03 10:02:53 +0100 message: - Add UI portion of wired switch feature. + Update manpages ------------------------------------------------------------ -revno: 253 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2009-01-25 00:44:51 -0500 +revno: 629 +committer: David Paleino +branch nick: trunk +timestamp: Thu 2011-11-03 09:43:43 +0100 message: - Add new wired GUI icon. + Autostart in tray-only mode ------------------------------------------------------------ -revno: 252 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-01-24 23:54:57 -0500 +revno: 628 [merge] +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-11-03 09:35:23 +0100 message: - Merge in improved wired profile UI - Tweak how wired profile list is built to be simple/more efficent and not cause a dbus error. + Merged LP translations ------------------------------------------------------------ -revno: 251 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-01-24 23:31:24 -0500 +revno: 627 +committer: David Paleino +branch nick: trunk +timestamp: Thu 2011-11-03 09:32:25 +0100 message: - Initial work on automatic switchover to wired networks (no UI work yet) - actually use "write=True" instead of just "True" everywhere we do config writes explicitly. - Fix the scripts dialog not working for wired connections. - Force the monitor to update state after triggering a disconnect or connect. - Remove an unneeded Scan call from autoconnect.py + Implement -t/--tray to only run the wicd-gtk tray icon ------------------------------------------------------------ -revno: 250 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-01-23 08:35:28 -0500 +revno: 626 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-11-02 22:17:09 +0100 message: - Fix broken Scan() call in autoconnect.py + Fix version check to correctly handle linux3 ------------------------------------------------------------ -revno: 249 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2009-01-22 21:51:03 -0500 +revno: 625 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Wed 2011-11-02 05:03:56 +0000 message: - Tweak a comment + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 248 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2009-01-22 21:26:05 -0500 +revno: 624 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sun 2011-10-30 05:20:58 +0000 message: - Tweak autoconnect logic be more likely to work if initial scans don't give us good results. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 247 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-01-20 23:55:43 -0500 +revno: 623 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Wed 2011-10-26 05:17:20 +0000 message: - Add missing guiutil module + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 246 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2009-01-20 00:32:56 -0500 +revno: 622 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Tue 2011-10-25 04:57:11 +0000 message: - Add support for writing config data with whitespace kept intact. - Propgate debug setting to the ConfigManager instances. - Don't write essid key sections to the config file if we're not actually using them. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 245 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-01-19 23:45:05 -0500 +revno: 621 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Sun 2011-10-23 05:27:35 +0000 message: - Fix a few typos in the option gateway code. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 244 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-01-19 23:37:35 -0500 +revno: 620 [merge] +committer: David Paleino +branch nick: wicd +timestamp: Sat 2011-10-22 09:22:56 +0200 message: - Fix bug that was keeping DHCP release from working. + Merge ------------------------------------------------------------ -revno: 243 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2009-01-19 01:06:57 -0500 +revno: 619 +committer: David Paleino +branch nick: wicd +timestamp: Sat 2011-10-22 09:22:11 +0200 message: - Fix ttls template - Add a guiutils module for gui-related functions/classes that are used in multiple modules. - Replace os.access with os.path.exists - Make the static gateway entry optional. - Don't auto-connect/reconnect when the gui is open. - Fix bug that would keep the gui from working if the wired network entry was displayed. + Fix gl translation ------------------------------------------------------------ -revno: 242 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2009-01-17 12:58:02 -0500 +revno: 618 +committer: David Paleino +branch nick: wicd +timestamp: Sat 2011-10-22 00:14:38 +0200 message: - Fix bug where encryption keys with non-ascii characters caused crashes. - Only write settings being saved if debug mode is on. - Clear keys entered through the GUI when the encryption checkbox is disabled. + Make sdist work ------------------------------------------------------------ -revno: 241 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2009-01-15 01:25:24 -0500 +revno: 617 [merge] +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-10-21 23:28:30 +0200 message: - Merging in noexpander branch. + Merged ------------------------------------------------------------ -revno: 240 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2009-01-15 01:22:40 -0500 +revno: 616 +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-10-21 23:20:23 +0200 message: - Use dbusmanager in autoconnect.py + Merge translations from revision 609 (they were marked fuzzy, may need fixing? -- better than nothing though :)) ------------------------------------------------------------ -revno: 239 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Mon 2009-01-12 20:09:11 +0800 +revno: 615 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Thu 2011-10-20 04:47:49 +0000 message: - Applied patch from https://bugs.launchpad.net/wicd/+bug/315238 to add expandable values to the script parameters + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 238 -committer: Adam Blackburn -branch nick: 1.6 -timestamp: Sat 2009-01-10 08:53:55 +0800 +revno: 614 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-10-19 12:46:03 +0200 message: - Don't expand the DNS domain + Fix imports of '_' for l10n ------------------------------------------------------------ -revno: 237 -committer: Adam Blackburn -branch nick: experimental -timestamp: Sat 2009-01-03 10:35:28 +0800 +revno: 613 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-10-19 12:34:42 +0200 message: - Changed 25% signal icon to red and 50% signal icon to orange + Updated pofiles and pot ------------------------------------------------------------ -revno: 236 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-01-02 19:57:21 -0500 +revno: 612 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-10-19 12:31:31 +0200 message: - Merge in rworkman-experimental + Fix incomplete translation issue for the GTK client ------------------------------------------------------------ -revno: 235 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Fri 2009-01-02 19:52:28 -0500 +revno: 611 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-10-19 12:30:18 +0200 message: - Move logic that saves settings for network entries out of gui.py and into netentry.py. + Fix it translation ------------------------------------------------------------ -revno: 234 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2008-12-30 23:20:00 -0500 +revno: 610 +committer: Launchpad Translations on behalf of wicd-devel +branch nick: wicd +timestamp: Wed 2011-10-19 06:04:29 +0000 message: - Add a domain entry for dns settings. - Display an error if global dns is enabled for a network, but global dns entries aren't entered in the general preferences window. + Launchpad automatic translations update. ------------------------------------------------------------ -revno: 233 [merge] -committer: Adam Blackburn -branch nick: experimental -timestamp: Tue 2008-12-30 18:01:27 -0600 +revno: 609 +committer: David Paleino +branch nick: wicd +timestamp: Wed 2011-10-19 00:10:32 +0200 message: - Merged with wpathenhancements ------------------------------------------------------------- -revno: 232 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2008-12-28 16:19:18 -0500 -message: - Fix bug where the daemon could crash if an encryption key was entered for a network without encryption on. - Some minor code formatting changes - Replace "new" with "experimental" in description for ioctl backend. ------------------------------------------------------------- -revno: 231 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2008-12-27 18:31:50 -0500 -message: - Fix prefs label ------------------------------------------------------------- -revno: 230 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2008-12-27 18:23:15 -0500 -message: - Make backend combobox tooltip display the active backend's description. - Reverse the order of the OK/Cancel button in the Ad-Hoc connection dialog. - Use a new set of icons. - Extend the update invervals for all backends by 1 second. - Try to use en_US.utf8 instead of C as the LANG in misc.Run if it is available. - Add ability to force a network state update. (Currently not used). + Used msgen to complete en_GB file ------------------------------------------------------------ -revno: 229 -committer: Adam Blackburn -branch nick: experimental -timestamp: Wed 2008-12-24 00:24:26 -0600 +revno: 608 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-18 23:51:52 +0200 message: - Removed stringToBoolean + Sort output for easier diffing ------------------------------------------------------------ -revno: 228 -committer: Adam Blackburn -branch nick: experimental -timestamp: Tue 2008-12-23 23:34:22 -0600 +revno: 607 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-18 23:35:58 +0200 message: - Added unit test for misc.py + Fixed already ------------------------------------------------------------ -revno: 227 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2008-12-23 21:10:17 -0500 +revno: 606 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-18 23:34:04 +0200 message: - Tweak misc.to_unicode() so that it is more likely to encode to utf-8 correctly. + Update po files, po template, and po handling ------------------------------------------------------------ -revno: 226 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2008-12-23 18:23:38 -0500 +revno: 605 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-18 23:33:23 +0200 message: - Fix "_" getting stripped from interface names. + Moved translations out of translations.py, re-designed l10n system a bit ------------------------------------------------------------ -revno: 225 -committer: Adam Blackburn -branch nick: experimental -timestamp: Tue 2008-12-23 16:55:15 -0600 +revno: 604 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-18 13:42:16 +0200 message: - Added the wpa-psk template and change the wpa one to wpa passphrase + Fix logrotate config installation ------------------------------------------------------------ -revno: 224 -committer: Adam Blackburn -branch nick: experimental -timestamp: Tue 2008-12-23 11:39:55 -0600 +revno: 603 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-18 09:52:38 +0200 message: - Updated Preferences dialog and added test cases for wnettools + Implement new commands to handle the xgettext/pybabel infrastructure ------------------------------------------------------------ -revno: 223 -committer: Adam Blackburn -branch nick: experimental -timestamp: Mon 2008-12-22 23:30:52 -0600 +revno: 602 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-18 09:36:25 +0200 message: - Updated Preferences dialog more and commented out translations in prefs.py + Add po's from Rosetta, and implement message extraction (pybabel + xgettext) ------------------------------------------------------------ -revno: 222 -committer: Adam Blackburn -branch nick: experimental -timestamp: Mon 2008-12-22 23:08:12 -0600 +revno: 601 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-18 09:35:35 +0200 message: - Updated Preferences dialog to conform to the GNOME HIG better + These strings shouldn't be translated ------------------------------------------------------------ -revno: 221 -committer: Adam Blackburn -branch nick: experimental -timestamp: Mon 2008-12-22 21:25:51 -0600 +revno: 600 +committer: David Paleino +branch nick: wicd +timestamp: Mon 2011-10-17 23:56:28 +0200 message: - Fixed hidden network icon + Make style consistent across the file ------------------------------------------------------------ -revno: 220 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2008-12-22 21:28:31 -0500 -message: - Fix problem where combobox entries would get screwed up when the preferences window was opened more than once. ------------------------------------------------------------- -revno: 219 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2008-12-22 00:20:42 -0500 -message: - Fix some issues with wired networks caused by refactoring. - Add missing return statement. ------------------------------------------------------------- -revno: 218 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2008-12-22 00:05:19 -0500 -message: - More work on bubbling the reason for connection failures up to the UI. - Refactor Wireless/Wired classes in networking module and daemon so that they don't need to reference each other. Wired objects don't know about Wireless objects and vice versa. This also means connecting to a wired/wireless network will only clear the connection on whichever network type you're connecting to. ------------------------------------------------------------- -revno: 217 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2008-12-21 00:19:18 -0500 -message: - Checkpoint for work on getting reasons for connection failure back up to the UI. ------------------------------------------------------------- -revno: 216 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2008-12-16 01:30:46 -0500 -message: - Fix non-blocking error dialog. ------------------------------------------------------------- -revno: 215 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2008-12-16 01:19:26 -0500 -message: - Make gui.error() calls optionally not block. - Make the lost dbus error message translatable. ------------------------------------------------------------- -revno: 214 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2008-12-16 00:48:47 -0500 -message: - Only show valid wpa_supplicant drivers in the GUI. - Don't needlessly created PreferenceDialog objects. - Use dbus signals to alert the UI that the daemon is back up, instead of polling. ------------------------------------------------------------- -revno: 213 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Mon 2008-12-15 00:31:35 -0500 -message: - Fix some gtk warnings that would pop up when the GUI was opened. - Fix broken Network menu entries. ------------------------------------------------------------- -revno: 212 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2008-12-14 22:19:35 -0500 -message: - More work on making the client handle a daemon restart ------------------------------------------------------------- -revno: 211 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2008-12-14 18:31:24 -0500 -message: - Make client survive the daemon going down. - Port a few fixes from trunk. ------------------------------------------------------------- -revno: 210 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2008-12-13 19:39:15 -0500 -message: - Make sure autoconnect.py never blocks - Tweak configmanager to not write a default value unless one is specified in the get call. ------------------------------------------------------------- -revno: 209 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2008-12-13 17:32:54 -0500 -message: - Use RawConfigParser instead of ConfigParser ------------------------------------------------------------- -revno: 208 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2008-12-13 17:07:31 -0500 -message: - Pass lists instead of strings in GeneratePSK and Authenticate methods. ------------------------------------------------------------- -revno: 207 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2008-12-13 13:28:05 -0500 -message: - Fix saving scripts not working correctly. ------------------------------------------------------------- -revno: 206 [merge] -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2008-12-13 01:49:15 -0500 -message: - merging ------------------------------------------------------------- -revno: 205 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sat 2008-12-13 01:37:57 -0500 -message: - Fix some suspend/resume issues ------------------------------------------------------------- -revno: 204 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2008-12-11 18:42:11 -0500 -message: - Fix dbus permissions problem. - Fix missing dbus import. ------------------------------------------------------------- -revno: 203 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2008-12-11 00:56:12 -0500 -message: - Apply patch from rworkman - Update suspend/resume script ------------------------------------------------------------- -revno: 202 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2008-12-11 00:37:07 -0500 -message: - More build fixes ------------------------------------------------------------- -revno: 201 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2008-12-11 00:33:10 -0500 -message: - Add missing man file ------------------------------------------------------------- -revno: 200 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Thu 2008-12-11 00:29:00 -0500 -message: - Fix running scripts - Fix broken symlink - Update slackware init script - Add new build options to wpath.py ------------------------------------------------------------- -revno: 199 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Tue 2008-12-09 22:53:30 -0500 -message: - Make sure suspend script never fails ------------------------------------------------------------- -revno: 198 -committer: Dan O'Reilly -branch nick: experimental -timestamp: Sun 2008-12-07 21:15:29 -0500 -message: - merging in a bunch of trunk changes ------------------------------------------------------------- -revno: 197 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-12-06 19:11:43 +0000 -message: - experimental branch: - - Tray icon fixes from trunk - - Handle possible failure in wpactrl - - Format some docstrings ------------------------------------------------------------- -revno: 196 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-11-02 14:26:42 +0000 -message: - experimental branch: - - Enhance dbus manager to handle settings up mainloops, etc. - - Early work on getting wicd-client to recover from a daemon crash. - - Simply how the the scripts editor gets launched. - - Remove unneeded cleanup code from netentry.py - - More ralink legacy work. - - Run scans in a thread, this should make the UI more responsive while a scan is going on. Rework the UI code to never expect a scan to be blocking. - - Don't require the daemon to be restarted when we switch backends, just try to prevent any calls to the backend until the switch is made. ------------------------------------------------------------- -revno: 195 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-10-18 17:37:42 +0000 -message: - experimental branch: - - Port a bunch of fixes from the trunk - - Use an actual Gtk.Menu in the toolbar for the "Network" widget ------------------------------------------------------------- -revno: 194 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-10-11 12:36:49 +0000 -message: - experimental branch: - - Actually destroy the network entry objects that are supposed to get destroied - - Improve GUI behavior when initially opened. - - Use the python -O flag when launching the daemon/GUI. - - Favor gksudo over gksu. - - Remove broken interface enable/disable options. ------------------------------------------------------------- -revno: 193 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-10-09 18:45:01 +0000 -message: - experimental: - - Add 3rd party python libraries used by ioctl backend to tree and to setup.py - - Port several bug fixes from the trunk (removing reliance on shell for running external commands, unicode fixes, gui crash fixes, authentication validation improvements, several others) - - Fix some crashes in ioctl backend. - - Change daemon/GUI launch scripts to use the -O flag. ------------------------------------------------------------- -revno: 192 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-27 21:36:04 +0000 -message: - branches/experimental: - - Fix scripts dialog not appearing. ------------------------------------------------------------- -revno: 191 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-09-25 20:17:35 +0000 -message: - branches/experimental: - - A bunch of documentation additions/updates. - - Minor refactoring. - - Fix catching wrong exception in netentry.py ------------------------------------------------------------- -revno: 190 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-09-21 16:38:15 +0000 -message: - branches/experimental: - - Fix some wired method issues in the daemon. - - Make sure stringToBoolean always returns a boolean. ------------------------------------------------------------- -revno: 189 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-09-21 13:26:46 +0000 -message: - trunk & experimental: - - Make sure all entries in the connection status info list are strings. ------------------------------------------------------------- -revno: 188 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-20 19:13:34 +0000 -message: - trunk, experimental: - - Fix crash if default locale isn't supported. ------------------------------------------------------------- -revno: 187 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-20 10:39:23 +0000 -message: - trunk/experimental: - - Fix use of subprocess.call method ------------------------------------------------------------- -revno: 186 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-20 10:22:06 +0000 -message: - branches/experimental - - Add support for entering search domain into static DNS settings. - - Fix some errors in how static setting texboxes were getting set. - - Fixed a bunch of errors/warnings found by pylint. ------------------------------------------------------------- -revno: 185 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-20 08:02:06 +0000 -message: - branches/experimental: - - Fix crash in configmanager. ------------------------------------------------------------- -revno: 184 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-09-19 16:28:26 +0000 -message: - experimental: - - Fix potential deadlock in connection thread - - Make wireless interface blank string if set to None in config. ------------------------------------------------------------- -revno: 183 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-09-18 21:18:40 +0000 -message: - experimental: - - Use the full path to wpa_passphrase. - - Fix some crashing bugs in the daemon and configscript.py - - Port a few changes/fixes from trunk. - - Some minor refactoring. ------------------------------------------------------------- -revno: 182 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-09-18 16:07:49 +0000 -message: - trunk/experimental: - - Fix EAP-TLS template. Thanks to Andrew Psaltis for the fix. ------------------------------------------------------------- -revno: 181 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-13 22:52:01 +0000 -message: - experimental: - - Add UPDATE_INTERVAL as a required attribute for backends, and used by monitor.py - - Update Copyright stuff in a few files - - Remove/update some scripts and configuration files. ------------------------------------------------------------- -revno: 180 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-13 21:39:20 +0000 -message: - experimental: - - Merge missing dbusmanager changes from pluggablebackends - - Merge a change from trunk for --no-autoconnect mode - - Make monitor timeout_add_seconds time an integer ------------------------------------------------------------- -revno: 179 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-13 11:28:36 +0000 -message: - experimental: - - Use gobject.timeout_add_seconds instead of gobject.timeout_add when possible - - Merge some fixes from pluggablebackends - - Replace os.system usage with subprocess.call. ------------------------------------------------------------- -revno: 178 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-06 20:53:21 +0000 -message: - experimental: - - fix some autoconnect issues related to the splitting up of the daemon ------------------------------------------------------------- -revno: 177 -committer: compwiz18 -branch nick: experimental -timestamp: Sat 2008-09-06 20:35:53 +0000 -message: - Experimental: - * Fixed typo in setup.py ------------------------------------------------------------- -revno: 176 -committer: compwiz18 -branch nick: experimental -timestamp: Sat 2008-09-06 20:30:23 +0000 -message: - Experimental: - * Added wicd.configmanager to setup.py ------------------------------------------------------------- -revno: 175 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-06 19:54:20 +0000 -message: - experimental: - - Add backends entry to wpath.py ------------------------------------------------------------- -revno: 174 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-06 19:53:25 +0000 -message: - experimental: - - Fix some syntax/import problems created during the merge ------------------------------------------------------------- -revno: 173 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-06 17:29:25 +0000 -message: - experimental: - - update glade file ------------------------------------------------------------- -revno: 172 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-06 16:57:36 +0000 -message: - experimental: - - update setup.py ------------------------------------------------------------- -revno: 171 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-09-06 16:54:53 +0000 -message: - experimental: - - Merge in changes from pluggablebackends. ------------------------------------------------------------- -revno: 170 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-08-29 14:49:37 +0000 -message: - All braches/trunk: - - Force locale settings to C before running commands with piped output. ------------------------------------------------------------- -revno: 169 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-08-29 12:22:34 +0000 -message: - All branches/trunk: - - Specify the device to use in SetDefaultRoute ------------------------------------------------------------- -revno: 168 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-08-28 18:58:34 +0000 -message: - trunk/all branches: - make wicd launch scripts use "exec" so that the launch script exits after starting up the daemon/tray icon. ------------------------------------------------------------- -revno: 167 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-08-24 08:36:07 +0000 -message: - experimental/pluggablebackends: - - Remove --scan-interval option from daemon since its no longer needed. ------------------------------------------------------------- -revno: 166 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-08-24 08:15:24 +0000 -message: - experimental: - - Some minor cleanup/formatting fixes - - Add a missing DetectWiredInterfaces() method to networking.py ------------------------------------------------------------- -revno: 165 -committer: compwiz18 -branch nick: experimental -timestamp: Sat 2008-08-23 20:14:43 +0000 -message: - Experimental: Apply changes involving setup.py - * Added setup.py from trunk - * Updated various information files (AUTHORS, README, etc) - * Update the Wicd icon - * Move stuff around to match trunk's layout ------------------------------------------------------------- -revno: 164 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-08-23 14:50:50 +0000 +revno: 599 +committer: David Paleino +branch nick: wicd +timestamp: Mon 2011-10-17 23:40:35 +0200 message: - experimental: - - Merge in changes (prefs.py, dbusmanager.py, clean up in daemon.py) from pluggablebackends. - - pluggablebackends: - - Some minor cleanup. + Make setup.py executable ------------------------------------------------------------ -revno: 163 -committer: imdano -branch nick: experimental -timestamp: Wed 2008-08-20 14:09:47 +0000 -message: - trunk/experiementa/pluggablebackends: - - Fix crash due to _sanitize_string getting None passed in. ------------------------------------------------------------- -revno: 162 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-08-19 19:06:26 +0000 -message: - Experimental: - - Add new logging system which rotates the log file once it reaches a set size. - - Merge in fixes and new features from pluggablebackends and trunk - - Right click network menu in tray icon now bolds the active network. ------------------------------------------------------------- -revno: 161 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-07-21 13:46:38 +0000 -message: - Testing: - - Fix typo in daemon ------------------------------------------------------------- -revno: 160 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-07-20 16:34:45 +0000 -message: - Experimental: - - Port a ton of changes from the testing branch over. ------------------------------------------------------------- -revno: 159 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-06-29 20:38:30 +0000 -message: - Testing: - - Fix bug in configscript.py that kept it from loading correctly. - - More manpage fixes/updates from rworkman. ------------------------------------------------------------- -revno: 158 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-06-24 14:14:18 +0000 +revno: 598 +committer: David Paleino +branch nick: wicd +timestamp: Mon 2011-10-17 22:14:40 +0200 message: - Experimental/Testing: - - Fix changes made to encryption settings not being reset if "cancel" is selected in the dialog box. - - Experimental: - - Fix bug where Static DNS checkbox would be disabled no matter what if Static IP was disabled. + Support urwid 1.0.0 ------------------------------------------------------------ -revno: 157 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-06-23 22:21:47 +0000 -message: - Experimental/Testing: - - Fix encryption combobox size sometimes getting distorted when switching between encryption types. ------------------------------------------------------------- -revno: 156 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-06-23 08:08:53 +0000 -message: - Experimental/Testing: - - Fix dhcp not getting released if the disconnect button wasn't pressed explicitly, but a new connection is trying to be made. ------------------------------------------------------------- -revno: 155 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-06-20 08:13:56 +0000 -message: - Experimental/Testing: - - Fix bug keeping wired networks from connecting - - Wicd will now try to release dhcp when disconnecting from a network. ------------------------------------------------------------- -revno: 154 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-06-19 22:09:39 +0000 -message: - Experimental/Testing: - - Improved behavior in the networking backend. The wired/wireless wnettools instances now refer to each other, and get passed on to connection threads as well, which simplifies passing settings for external program usage. Also removed some unecessary creating of duplicate wnettools instances which ended up causing some issues. - - Fixed bug where dhclient was being used as the dhcp client even if it was selected in the options menu. - - Fixed a typo in the connection commands used for ralink cards. - - Fixed the wrong cli option for releasing a dhcpcd lease. - - Monitor.py no longer calls for an auto-rescan if the daemon is currently connecting to a network. - - Cleaned up some comments and simplified the logic in a few methods/functions. ------------------------------------------------------------- -revno: 153 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-06-12 15:08:50 +0000 -message: - Experimental/Testing: - - Fixed typo in ttls template (Thanks to Nido Media for catching it) ------------------------------------------------------------- -revno: 152 -committer: imdano -branch nick: experimental -timestamp: Wed 2008-06-11 20:13:32 +0000 -message: - Experimental/Testing: - - Added support for using kdesu instead of gksu where it makes sense. - - Improved code used to sanitize network keys used with wpa_passphrase. - - Removed some unused functions and imports. - - Cleaned up some comments/docstrings. - - Experimental: - - Split gui.py into gui.py and netentry.py. netentry is imported by gui.py to make use of NetworkEntry and its subclasses. - - Reorganzed how dbus and the language dict are used in wicd.py and gui.py. ------------------------------------------------------------- -revno: 151 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-05-24 11:36:14 +0000 +revno: 597 [merge] +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-04 23:24:04 +0200 message: - Experimental/Testing: - - Fix bug where wired advanced settings wouldn't be saved properly - - Experimental: - - Add support for determining which graphical sudo program (gksu/kdesu) should be used. ------------------------------------------------------------- -revno: 150 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-05-09 21:07:41 +0000 -message: - Testing/Experimental: - - Fixed an indentation problem - - Use misc.RenameProcess for process renaming in wicd.py - - Experimental: - - Make the encryption template file parsing used for the GUI a little more robust. ------------------------------------------------------------- -revno: 149 -committer: imdano -branch nick: experimental -timestamp: Wed 2008-05-07 21:59:44 +0000 -message: - Testing/Experimental: - - Move process renaming code to the misc module, and fix process ranming for 64 bit systems. (Thanks to Helber Maciel) - - Move the error gtk method to the gui module. (Thanks to Helber Maciel) - - Removed a debugging print statement from monitor.py - - Fixed up a few docstrings/comments. - - Testing: - - Fix bug where Connect button would become inactive after disconnecting from a network. + merge add support for nevershow buttons and options (Robin Becker 2011-09-18) ------------------------------------------------------------ -revno: 148 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-05-04 18:10:47 +0000 +revno: 596 +fixes bug: https://launchpad.net/bugs/867547 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-04 23:19:44 +0200 message: - Testing/Experimental: - - Emit a dbus signal when an autoscan is called, so that the GUI can update if needed. - - Experimental: - - Merged a few changes from the testing branch. ------------------------------------------------------------- -revno: 147 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-05-03 09:30:09 +0000 -message: - Testing/Experimental: - - Fixed bug where monitor would crash on resume because dbus wasn't ready yet. - - Monitor now calls a rescan every 2 minutes. - - Experimental: - - Added a network list submenu to the right-click menu of the tray icon. + add logrotate config file, thanks to David Cantrell for inspiration ------------------------------------------------------------ -revno: 146 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-04-29 14:29:44 +0000 -message: - Testing/Experimental: - - Replaced uses of /proc/net/wireless with /sys/class/net/. ------------------------------------------------------------- -revno: 145 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-04-28 18:22:37 +0000 -message: - Testing/Experimental: - - Added check to make sure wpa_cli is installed, and make sure not to try to validate authentication if it isn't. - Experimental: - - Increased length of sleep time before checking for an active link when the wired interface has to be put up explicitly. ------------------------------------------------------------- -revno: 144 -committer: imdano -branch nick: experimental -timestamp: Wed 2008-04-23 18:10:23 +0000 -message: - Fixed problems with passphrases using non-alphanumeric characters. ------------------------------------------------------------- -revno: 143 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-04-19 09:09:15 +0000 -message: - Fixed bug where building with setup.py wouldn't add rcX symlinks to init.d, so wicd wouldn't start at boot. ------------------------------------------------------------- -revno: 142 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-04-19 08:48:09 +0000 -message: - Fixed bug where special characters would break expander label formatting. ------------------------------------------------------------- -revno: 141 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-04-19 08:00:44 +0000 -message: - Fixed problems with wpa_supplicant driver not being passed to wnettools correctly in networking.py. - Fixed bug where connect threads could crash if debug was on and dhcp failed. ------------------------------------------------------------- -revno: 140 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-04-11 10:29:10 +0000 -message: - Fixed bug where advanced settings dialog wouldn't appear for wired networks. - Added MAC address to the top level info line in a wireless network entry. - Fixed some setup.py problems. ------------------------------------------------------------- -revno: 139 -committer: imdano -branch nick: experimental -timestamp: Wed 2008-04-02 10:52:41 +0000 -message: - Fixed some setup.py problems - Added a bunch of docstrings - Fixed a crash bug when the daemon is called with the -s option caused by wicd.py calling SetForceDisconnect(False) when it launches. ------------------------------------------------------------- -revno: 138 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-03-31 21:37:21 +0000 -message: - Fixed gui sometimes not updating buttons after clicking the disconnect button for the active network. - Fixed gui not behaving properly after cancelling a connection. ------------------------------------------------------------- -revno: 137 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-03-31 15:23:59 +0000 -message: - Lengthened the sleep time between putting a wired interface up and checking to see if the link is active. - A few small optimizations/code cleanup. ------------------------------------------------------------- -revno: 136 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-03-31 14:21:43 +0000 -message: - Added support for monitoring connection status without the need for iwconfig, ifconfig, and ethtool/miitool. - Added a "Disconnect" button to each network entry, which will be visible instead of the "Connect" button for the active network. - Fixed a bug where cancelling a connection while validating authentication would leave the GUI in the connecting state forever. ------------------------------------------------------------- -revno: 135 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-03-30 12:14:11 +0000 -message: - Added missing icon images - Updated dbus config file to work under more distros - Added support for determing wireless interface by parsing /proc/net/wireless (removing need for iwconfig call) - A few minor formatting improvements. ------------------------------------------------------------- -revno: 134 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-03-24 20:37:46 +0000 -message: - Added support for resizing the preferences window to any size. Also added support for remembing the size of the preferences window. ------------------------------------------------------------- -revno: 133 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-03-24 00:03:35 +0000 -message: - Added distro-specific init scripts based on those used by NM (these are very experimental and likely broken in many cases). - Updated setup.py to pick which initscript to install based on the distro detected. - Updated MANIFEST.in to make sure launchdaemon.sh is included in the sdist build. - Fixed a bunch of crash bugs in tool detection system when tools are detected. - Made tool detection work correctly when "which" returns output if no match is found (as opposed to no output). Eventually we might want to hardcode possible paths instead of using which at all... - Fixed some message formatting in the daemon. - Added some docstrings. - Added a pidfile system for increased initscript compatibility (sort of, it's somewhat incomplete). ------------------------------------------------------------- -revno: 132 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-03-21 17:07:47 +0000 -message: - Added support in the preferences window for specifying which dhcp client, link detection tool, and route flushing tool to use. It can also be left up to wicd to decide automatically. - Made a few logic optimizations. ------------------------------------------------------------- -revno: 131 -committer: compwiz18 -branch nick: experimental -timestamp: Fri 2008-03-21 03:38:57 +0000 -message: - Couple of fixes, started integrating a feature that will allow Wicd to smartly detect wired networks, by using detected wireless networks and connected USB devices ------------------------------------------------------------- -revno: 130 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-03-20 11:16:49 +0000 -message: - Scripts no longer fork into the background by default. ------------------------------------------------------------- -revno: 129 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-03-18 22:42:55 +0000 -message: - Ported the animated tray icon code to the experimental branch. - Added a command line option to run the tray with the animations disabled. ------------------------------------------------------------- -revno: 128 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-03-18 10:21:32 +0000 -message: - Fixed bug where wpa_supplicant driver wasn't being set properly in the preferences window. ------------------------------------------------------------- -revno: 127 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-03-18 09:12:05 +0000 -message: - Added checks to auto-reconnection code to keep it from constantly trying to reconnect when it isn't working. - Added a ShouldAutoReconnect method to the daemon, to simply the call needed in monitor.py's auto_reconnect method. ------------------------------------------------------------- -revno: 126 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-03-17 07:50:51 +0000 -message: - Improved automatic reconnection behavior. - Improved debug mode behavior. - Improved the way networking.py interfaces passes attributes on to wnettools.py interfaces. - Fixed crash in __printReturn when a parameter to return wasn't of type 'str'. ------------------------------------------------------------- -revno: 125 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-03-15 00:40:27 +0000 -message: - Forgot the translations folder updates from two commits ago. (P.S. Adam make sure that the updates look right as well.) ------------------------------------------------------------- -revno: 124 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-03-15 00:26:24 +0000 -message: - Forgot to add the "other" folder in the last commit. ------------------------------------------------------------- -revno: 123 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-03-15 00:25:59 +0000 -message: - Added README and INSTALL files. - Added a setup.py script. - Added the new init and suspend scripts to a folder called other, which also holds all files which don't currently go in the /opt/wicd folders. These are used by the setup.py script and put into their respective directories. ------------------------------------------------------------- -revno: 122 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-03-14 19:16:18 +0000 -message: - Fixed asynchronous Autoconnect calls so that they actually work properly ------------------------------------------------------------- -revno: 121 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-03-14 10:18:28 +0000 -message: - Removed unneeded call to LogWriter() in wicd.py ------------------------------------------------------------- -revno: 120 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-03-13 14:10:49 +0000 -message: - Made calls to Autoconnect outside the daemon asynchronous. - Removed some unnecessary print statements. - Added checks to the daemon and configscript.py to make sure the user opening it is root. - Fixed formatting problems in class definitions in wicd.py ------------------------------------------------------------- -revno: 119 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-03-13 10:16:03 +0000 -message: - Improved GUI opening performance so there is less delay between clicking the icon and the gui actually appearing. - Made network entry list inactive while refreshing networks. - Made debugging output less spammy and more helpful (still incomplete). ------------------------------------------------------------- -revno: 118 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-03-11 15:15:55 +0000 -message: - Fixed a malformed ''.join() call in daemon.py - Replaced a couple of concatenations with ''.join() calls. ------------------------------------------------------------- -revno: 117 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-03-10 20:55:46 +0000 -message: - Added support for using one set of global settings for all networks with a given essid. - Fixed a few wired autoconnect issues. ------------------------------------------------------------- -revno: 116 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-03-09 22:09:22 +0000 -message: - Refactored networking.py to be more modular. - Added docstrings to wnettools.py - Fixed wired autoconnect bug due to missing parenthesis on a method call. - Moved connection monitoring code out of daemon.py and into monitor.py, which is run as a separate, child process of daemon.py, to reduce delays in dbus reponse time while connection status and autoreconnect code is running. - Added full support for running the gui without the tray icon using the --no-tray option. - Some minor changes to code to be more readable/efficient/pythonic. ------------------------------------------------------------- -revno: 115 -committer: imdano -branch nick: experimental -timestamp: Wed 2008-03-05 23:29:48 +0000 -message: - Increased time allowed for wpa_supplicant to complete authentication. - Reduced external calls (when possible) in update_status_bar. - pulse_progress_bar is now only run when connecting to a network. - Only check encryption settings on connect, instead of all of them, which shouldn't be necessary. ------------------------------------------------------------- -revno: 114 -committer: imdano -branch nick: experimental -timestamp: Wed 2008-03-05 20:43:32 +0000 -message: - Fix formatting of wireless network entry information. ------------------------------------------------------------- -revno: 113 -committer: imdano -branch nick: experimental -timestamp: Wed 2008-03-05 15:30:22 +0000 -message: - Fixed a few more bugs caused by misnamed variables ------------------------------------------------------------- -revno: 112 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-03-04 20:39:53 +0000 -message: - Made a bunch of small logic improvements. - Fixed some remaining bugs from the gui.py refactoring. ------------------------------------------------------------- -revno: 111 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-03-04 14:06:04 +0000 -message: - Added support for putting interfaces up/down through the gui. ------------------------------------------------------------- -revno: 110 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-03-04 11:55:34 +0000 -message: - Renamed a bunch of variables in gui.py to comply to python conventions. - Fixed a few small bugs due to misnamed variables in gui.py and networking.py ------------------------------------------------------------- -revno: 109 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-03-03 22:42:29 +0000 -message: - Refactored the NetworkEntry/PrettyNetworkEntry classes in order to fix a memory leak. PrettyNetwork entry classes are now merged with NetworkEntry classes. There is now a separate AdvancedSettingsDialog to handle the advanced settings for each network entry. - Fixed last-used wired autoconnect support, which had gotten removed. - Removed a debugging string from networking.py ------------------------------------------------------------- -revno: 108 -committer: compwiz18 -branch nick: experimental -timestamp: Mon 2008-03-03 06:08:45 +0000 -message: - Fixed a bug that wouldn't let wireless interfaces scan ------------------------------------------------------------- -revno: 107 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-03-01 19:45:45 +0000 -message: - Autoconnect method will now fallback to wireless if a wired attempt fails for any reason. ------------------------------------------------------------- -revno: 106 -committer: imdano -branch nick: experimental -timestamp: Sat 2008-03-01 00:59:52 +0000 -message: - Improved the authentication validation code. Instead of sleeping for an abitrary amount of time, then checking if authentication succeeded, it now repeatedly checks for a longer set amount of time. This way it is less likely to fail because it didn't wait long enough, but will usually finish faster. ------------------------------------------------------------- -revno: 105 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-02-29 22:14:32 +0000 -message: - Altered autoconnection code to fall back to wireless if wired fails because there is no default profile set. ------------------------------------------------------------- -revno: 104 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-02-29 15:20:51 +0000 -message: - Added wep-hex, wep-passphrase, eap-tls, wep-shared encryption templates - Removed wep template (its now called wep-hex). ------------------------------------------------------------- -revno: 103 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-02-29 14:16:21 +0000 -message: - Fixed crash bug in script configuration dialog when a network doesn't have script options written in the config file yet. - Refactored networking.py to not have to create a new wnettools interface every time a method gets called. Now it reuses the same one and makes changes to the iface name/driver as needed. - Refactored a few methods in wnettools.py to be organized more logically and reduce external program calls. - In experimental branch, added a few methods to networking/wnettools that can be used for enabling/disabling interfaces, as well as unloading/loading the driver associated with an interface. - Added a check for mii-tool/ethtool that gets run when wicd starts, so it can decide which to use to check for a wired connection. - Added a check for ip, to decide how to flush the routing tables. - Rewrote some of the DHCP client checking code. - Added a method (that's currently unused) to release a dhcp lease for each of the supported clients. ------------------------------------------------------------- -revno: 102 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-02-14 13:46:34 +0000 -message: - Fixed bug where preferences window sometimes wouldn't appear due to a problem with the wpacombobox. ------------------------------------------------------------- -revno: 101 -committer: imdano -branch nick: experimental -timestamp: Wed 2008-02-13 13:08:15 +0000 -message: - Added support for two more DHCP clients: pump and dhcpcd. - Added check when DHCP is run to determine what DHCP clients are available. - Fixed bug where sometimes wicd wouldn't reconnect automatically when a wired connection was lost. - Cleaned up a couple of comments. ------------------------------------------------------------- -revno: 100 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-02-12 19:40:18 +0000 -message: - Fixed bug where script changes weren't getting saved. - Added check to make sure encryption information is entered when it's required. ------------------------------------------------------------- -revno: 99 -committer: imdano -branch nick: experimental -timestamp: Mon 2008-02-11 14:55:29 +0000 -message: - Fixed a bug that prevented unsetting the "automatically connect to this network" option. - Some formatting/docstring cleanups. ------------------------------------------------------------- -revno: 98 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-02-05 13:46:42 +0000 -message: - Fixed bug where network entry settings weren't being saved correctly because of overloading the variable "type", which is a built in python function. - Cleaned up some formatting in gui.py and daemon.py - Fixed some bad daemon calls in the setting saving process. ------------------------------------------------------------- -revno: 97 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-01-29 21:03:19 +0000 -message: - Fixed bad except statement in misc.py. - Cleaned up formatting in gui.py. - Made glade template for preferences dialog and rewrote gui.py to use it instead of creating it explictly in the code. - Fixed a bunch indentation/whitespace problems. - Cleaned up a ton of formatting in daemon.py - Fixed a wired autoconnect bug. - Rewrote part of the connection monitoring code, further minimizing the number of external program calls, as well as number of dbus calls. - Added StatusInformation methods to daemon.py, to allow external apps to poll for the current connection status without making several dbus calls. - Fixed bad function call to GetDBMSignalStrength in daemon.py. ------------------------------------------------------------- -revno: 96 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-01-27 15:36:00 +0000 -message: - Got rid of extra call to ethtool that should only be done if using mii-tool fallback. ------------------------------------------------------------- -revno: 95 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-01-27 15:32:21 +0000 -message: - Fixed some malformed regular expressions. ------------------------------------------------------------- -revno: 94 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-01-25 14:12:32 +0000 -message: - Refactored several files (especially gui.py) to be more in line with python conventions and make the code easier to understand. - Added a bunch of docstrings. - Fixed an invalid function call in wnettools.py. ------------------------------------------------------------- -revno: 93 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-01-25 14:11:59 +0000 -message: - Refactored several files (especially gui.py) to be more in line with python conventions and make the code easier to understand. - Added a bunch of docstrings. - Fixed an invalid function call in wnettools.py. ------------------------------------------------------------- -revno: 92 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-01-25 09:23:50 +0000 -message: - Made IsValidIP method check that each ip octet is an integer < 255. - Added checks to the network entry settings menu to make sure that all the settings are valid. - Fixed global dns being set to True whenever static IP address were enabled for wireless networks. ------------------------------------------------------------- -revno: 91 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-01-24 14:28:20 +0000 -message: - Forgot a file in the last commit. ------------------------------------------------------------- -revno: 90 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-01-24 14:25:27 +0000 -message: - Simplified psk escape process. ------------------------------------------------------------- -revno: 89 -committer: imdano -branch nick: experimental -timestamp: Thu 2008-01-24 10:36:22 +0000 -message: - Committed patch from Sabin Iacob to sanitize a user's psk, to prevent possible parsing errors and security risks. ------------------------------------------------------------- -revno: 88 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-01-22 16:05:30 +0000 -message: - Refactored a few daemon methods from bring registered under the 'wireless' service to 'daemon'. - Fixed the wired autoconnect profile chooser, which was badly broken. - Added a check to GetPluggedIn() that makes sure that the wired interface is up before checking. If it's not, it tries to put it up. This is necessary because ethtool doesn't make this check for us, as mii-tool did. ------------------------------------------------------------- -revno: 87 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-01-22 09:55:42 +0000 -message: - Moved the advanced settings and script buttons into the main network entry expander. ------------------------------------------------------------- -revno: 86 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-01-22 09:24:23 +0000 -message: - Fixed dns entries not getting cleared from wireless network preferences when they should be - Added signal strength info to uppermost level of each wireless network entry in the GUI. ------------------------------------------------------------- -revno: 85 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-01-20 23:09:29 +0000 -message: - - Simplified main configuration loading code. This *might* break some old conf files, but should be easy to manually fix. - - Reworked GUI: Moved script button next to connect button, reduced size of both buttons, moved advanced settings from an expander to a dialog and put an advanced settings button next to scripts/connect buttons. - - When a wireless network has encryption enabled, "Secured" will no longer show up in the info for the network unless the encryption type can't be determined. - - Added support for detecting kill switch status (thanks to webograph for the inital patch). - - Reduced the number of calls to iwconfig during connection status updates (it is only called once per update now), which should lower cpu usage. - - Moved Autoreconnect methods from the wireless dbus service to the daemon dbus service. - - Added "Validating Authentication" status message during wireless connection process. - - Added support for disabling monitoring of connection status when computer is suspended, which gets rid of some error messages, eliminates occasional suspension failure, and reduces the odds that wicd will auto connect to a wireless network when a wired network is available. (Right now this feature is disabled, as it requires a script in /etc/acpi/suspend.d/, which can't be included with the current SVN layout.) ------------------------------------------------------------- -revno: 84 -committer: compwiz18 -branch nick: experimental -timestamp: Tue 2008-01-15 02:11:36 +0000 -message: - Updated comments in misc.py - Updated some GUI elements ------------------------------------------------------------- -revno: 83 -committer: imdano -branch nick: experimental -timestamp: Wed 2008-01-09 22:57:13 +0000 -message: - Fixed bad language key for "wired network" in wicd.py ------------------------------------------------------------- -revno: 82 -committer: imdano -branch nick: experimental -timestamp: Tue 2008-01-08 10:24:44 +0000 -message: - Updated wicd.glade to include a missing gtk.Dialog ------------------------------------------------------------- -revno: 81 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-01-06 21:20:15 +0000 -message: - A default wired profile is now created when wired-settings.conf is initially generated. ------------------------------------------------------------- -revno: 80 -committer: imdano -branch nick: experimental -timestamp: Sun 2008-01-06 13:55:23 +0000 -message: - Changed misc.Run to use subprocess.Popen instead of os.popen. Also altered Run to optionally return a pipe to the command run, instead of just the output. - The output of dhclient is now parsed by wicd and used to determine why the connection failed. - All the wpa_supplicant conf files will now generate a ctrl_interface, so that they can be accessed by wpa_cli. wpa_cli now is used by wicd to attempt to determine is wpa_supplicant authentication was successful. This is still experimental, and might have to be tweaked to work properly. - If wicd.py is started and the daemon isn't present, it will autolaunch it by calling launchdaemon.sh, instead of asking the user to start the daemon manually. - Cleaned up some comments, formatting, etc. - Probably a couple of other little bug fixes I'm forgetting. ------------------------------------------------------------- -revno: 79 -committer: imdano -branch nick: experimental -timestamp: Fri 2008-01-04 14:08:14 +0000 -message: - Fixed resizing causing the window to center itself. ------------------------------------------------------------- -revno: 78 -committer: imdano -branch nick: experimental -timestamp: Sat 2007-12-29 11:56:47 +0000 -message: - Scripts now can only be setup with root access and always run as root, instead of trying to run as the current user. - Possibly fixed problems with scripts not running when they should and/or leaving zombies. - Slightly reworked the GUI to make the new script system look nicer. - Removed the ability to set script information through built in daemon functions, it now has to be done by directly editing configuration files (which require root access to read/write). ------------------------------------------------------------- -revno: 77 -committer: imdano -branch nick: experimental -timestamp: Sat 2007-12-22 22:09:00 +0000 -message: - Make sure daemon alerts tray to change status during connection process. - Specify which network is being connected to in both the tray tooltip and gui statusbar - Clean up code in wicd.py. - Refactor Edgy/DapperTrayIcon class names to something less Ubuntu-specific. - Fix typo in EggTrayIcon that would keep gui from opening. ------------------------------------------------------------- -revno: 76 -committer: imdano -branch nick: experimental -timestamp: Wed 2007-12-19 22:35:07 +0000 -message: - Fixed cancelling a connection not working. - Stopped the gui status bar from updating while the gui is closed, which reduces CPU usage and should hopefully fix problems with hibernation not working while wicd was running. ------------------------------------------------------------- -revno: 75 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-12-17 15:44:41 +0000 -message: - Fixed a bug that would sometimes cause the tray icon to not display the right connection state on startup. ------------------------------------------------------------- -revno: 74 -committer: compwiz18 -branch nick: experimental -timestamp: Mon 2007-12-17 15:22:04 +0000 -message: - * Fixed a couple more syntax errors ------------------------------------------------------------- -revno: 73 -committer: compwiz18 -branch nick: experimental -timestamp: Mon 2007-12-17 15:20:02 +0000 -message: - * Fixed indentation errors and syntax errors - * Fixed wicd.py so it starts properly - * Hid the status bar in gui.py when it is displayed via the tray icon ------------------------------------------------------------- -revno: 72 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-12-17 15:17:00 +0000 -message: - Fixed some problems with tabs being used instead of 4 spaces. ------------------------------------------------------------- -revno: 71 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-12-17 11:49:03 +0000 -message: - Fixed a bug (typo?) in daemon.py that would keep it from working correctly. ------------------------------------------------------------- -revno: 70 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-12-17 11:42:16 +0000 -message: - Lowered minimum GUI height to 400. - Added support for the GUI to remember when its resized. ------------------------------------------------------------- -revno: 69 -committer: compwiz18 -branch nick: experimental -timestamp: Sun 2007-12-16 19:08:00 +0000 -message: - Applied pach in https://bugs.launchpad.net/wicd/+bug/175104 to fix signal strength issues, thanks Philip ------------------------------------------------------------- -revno: 68 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-12-10 16:48:37 +0000 -message: - Moved autoreconnect code and connection status updates into the daemon. Daemon now sends D-Bus signals when status changes, which the tray listens for and updates icon/tooltip when received. ------------------------------------------------------------- -revno: 67 -committer: imdano -branch nick: experimental -timestamp: Tue 2007-12-04 12:02:14 +0000 -message: - Fix some indentation problems and turned off stdout/stderr redirection in wicd.py since it would break things. ------------------------------------------------------------- -revno: 66 -committer: imdano -branch nick: experimental -timestamp: Thu 2007-11-22 10:23:33 +0000 -message: - Adding peap-tkip template part 2 ------------------------------------------------------------- -revno: 65 -committer: imdano -branch nick: experimental -timestamp: Tue 2007-11-20 22:20:10 +0000 -message: - Fixed encoding problems that would cause wicd to crash if a network returned an essid with exotic characters. - Reduced log spam, and altered how logging gets done a little bit. - Cleaned up some comments, docstrings, etc. ------------------------------------------------------------- -revno: 64 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-11-19 13:22:14 +0000 -message: - Fixed some problems with the tray icon running under gtk < 2.10. ------------------------------------------------------------- -revno: 63 -committer: imdano -branch nick: experimental -timestamp: Sun 2007-11-18 14:19:50 +0000 -message: - - Fixed a crash bug caused by dBm signal strength not being found correctly. - - Fixed a crash caused by an incorrectly named variable in wicd.py. ------------------------------------------------------------- -revno: 62 -committer: imdano -branch nick: experimental -timestamp: Sun 2007-11-18 01:37:16 +0000 -message: - * Removing files (all tray-related) that are no longer used. ------------------------------------------------------------- -revno: 61 -committer: imdano -branch nick: experimental -timestamp: Sun 2007-11-18 01:35:35 +0000 -message: - * Completely reworked the gui/tray system. gui.py and edgy/dapper/tray.py are now all run from the same wicd.py file. - * Added a connection_lost_counter to prevent the wicd frontend from trying to automatically reconnect too quickly if signal strength is briefly lost. - * Added some code to hopefully fix some of the dbus-related encoding problems caused by essids with weird characters. (Might still need work). - * The tray/gui will now show up in the process manager under the name wicd (along with the wicd icon), instead of just python. - * Added a GetCurrentInterface() method to the daemon that will eventually be used in the VPN plugin. - * Fixed a possible crash caused by signal strength not being returned correctly. - * Split the Wired Profile Chooser from the appGui class, so they are now called separately within wicd.py. When the profile chooser is called from the daemon, it sets a flag as well as sending a dbus signal, so the chooser will still launch if the wicd frontend isn't running yet. - * Added some docstrings, comments, etc. Probably a few other small changes I'm forgetting. ------------------------------------------------------------- -revno: 60 -committer: compwiz18 -branch nick: experimental -timestamp: Tue 2007-10-23 00:45:36 +0000 -message: - Fixed the typo in the LEAP template. ------------------------------------------------------------- -revno: 59 -committer: compwiz18 -branch nick: experimental -timestamp: Fri 2007-10-05 02:29:42 +0000 -message: - applied patch from bug https://bugs.launchpad.net/wicd/+bug/149318 - applied patch from bug https://bugs.launchpad.net/wicd/+bug/149322 - thanks Daniel ------------------------------------------------------------- -revno: 58 -committer: compwiz18 -branch nick: experimental -timestamp: Thu 2007-10-04 03:31:07 +0000 -message: - Added mhenze's patch to add last used wired profile ------------------------------------------------------------- -revno: 57 -committer: imdano -branch nick: experimental -timestamp: Thu 2007-09-20 13:11:43 +0000 -message: - Fixed more signal display issues - Added a "Connecting..." dialog to tray icon in experimental branch - Possibly fixed issue where GUI statusbar would still show up as connected when ethernet cable was unplugged. ------------------------------------------------------------- -revno: 56 -committer: imdano -branch nick: experimental -timestamp: Wed 2007-09-19 09:56:17 +0000 -message: - Fixed bug in signal strength display for ralink cards - Altered the way ralink network info gets handled during the connection process ------------------------------------------------------------- -revno: 55 -committer: compwiz18 -branch nick: experimental -timestamp: Tue 2007-09-04 02:43:25 +0000 -message: - fixed indentation problems ------------------------------------------------------------- -revno: 54 -committer: imdano -branch nick: experimental -timestamp: Fri 2007-08-31 08:19:13 +0000 -message: - Fixed bug where manually opened (not opened with the tray) gui.py would reopen when closed. ------------------------------------------------------------- -revno: 53 -committer: imdano -branch nick: experimental -timestamp: Wed 2007-08-29 18:49:02 +0000 -message: - Completely reorganized edgy.py - Changed the way wired profile chooser gets launched (now uses a dbus signal) - Fixed bug where launching gui.py through the tray sometimes left a zombie (uses a dbus signal) - Added a bunch of docstrings and changed formatting to follow python conventions - Added support for displaying signal strength in dBm instead of a percentage - Added some print statements during the ad-hoc connection process - Started work on a way to autoconnect to a hidden network (not done or working yet) ------------------------------------------------------------- -revno: 52 -committer: imdano -branch nick: experimental -timestamp: Fri 2007-08-17 06:13:08 +0000 -message: - Reverted an accidental change to networking.py that undid a bug fix ------------------------------------------------------------- -revno: 51 -committer: compwiz18 -branch nick: experimental -timestamp: Fri 2007-08-17 04:36:16 +0000 -message: - fixed the tray icon ------------------------------------------------------------- -revno: 50 -committer: imdano -branch nick: experimental -timestamp: Thu 2007-08-16 12:18:03 +0000 -message: - Changed script execution behavior to fork before running. Causes more reliable execution but can leave zombies. ------------------------------------------------------------- -revno: 49 -committer: compwiz18 -branch nick: experimental -timestamp: Thu 2007-08-16 05:55:45 +0000 +revno: 595 +fixes bug: https://launchpad.net/bugs/867546 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-04 23:11:57 +0200 message: - fixed a couple of bugs: - - wnettools.py: DetectWirelessInterfaces() didn't return the wireless interface - daemon.py: GetGlobalDNSAddresses() now returns a blank string instead of None for blank addresses; None could not be sent over dbus + add systemd unit file for wicd-daemon, thanks to David Cantrell ------------------------------------------------------------ -revno: 48 -committer: metrics -branch nick: experimental -timestamp: Thu 2007-08-16 01:53:13 +0000 -message: - Fix up some issues spotted by pychecker. ------------------------------------------------------------- -revno: 47 -committer: metrics -branch nick: experimental -timestamp: Thu 2007-08-16 01:07:26 +0000 -message: - Split the networking module, moving the common tasks into wnettools.py - - By splitting the common tasks performed by the networking module out - into a separate set of classes, it is possible to reduce code - duplication and improve the structure of the networking module. - - The wnettools module now performs _almost_ all the actual commands that - control the network interfaces, splitting it from the actual connection - logic contained in the networking module. Splitting these two tasks also - allows for tool changes to be made in a central location, rather than - spread throughout the networking.py file. ------------------------------------------------------------- -revno: 46 -committer: imdano -branch nick: experimental -timestamp: Wed 2007-08-15 07:25:10 +0000 -message: - Added a bunch of bug fixes from the experimental branch to the testing branch. - Added disconnect script feature and executing script in usermode feature to testing branch ------------------------------------------------------------- -revno: 45 -committer: imdano -branch nick: experimental -timestamp: Tue 2007-08-14 17:02:38 +0000 -message: - Fixed the typo in networking.py correctly this time :) - Corrected the version number displayed in usage() ------------------------------------------------------------- -revno: 44 -committer: imdano -branch nick: experimental -timestamp: Tue 2007-08-14 16:01:30 +0000 -message: - Improved the behavior of threading in networking.py when an error occurs. - Fixed typo in the wpa_supplicant string in networking.py. - Changed formatting in dapper.py, edgy.py, and networking.py to conform closer to python coding conventions (and hopefully improve readability in general) ------------------------------------------------------------- -revno: 43 -committer: metrics -branch nick: experimental -timestamp: Sun 2007-08-12 03:31:04 +0000 +revno: 594 +fixes bug: https://launchpad.net/bugs/867545 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-04 23:07:12 +0200 message: - Refactor daemon.py to handle command line arguments. - - Move the old module code in daemon.py into a main() function, splitting - off the daemonization into daemonize() function. Also add correct - parsing of command line arguments to allow disabling of stderr and - stdout redirection, daemonizing and auto-connect. - - Tidy up start of file including correct GPL license pre-amble and a - short description of the wicd daemon module. + add dbus service file, thanks to David Cantrell ------------------------------------------------------------ -revno: 42 -committer: metrics -branch nick: experimental -timestamp: Sun 2007-08-12 01:36:49 +0000 -message: - Convert FlushWriter into LogWriter and optimise log writing. - - FlushWriter looped through all the characters provided, writing them one - at a time. This is not strictly necessary, so modify the algorithm to - use a smart substitution and keep the timestamps correct. Name change to - better match its behaviour. ------------------------------------------------------------- -revno: 41 -committer: metrics -branch nick: experimental -timestamp: Sun 2007-08-12 00:30:01 +0000 +revno: 593 +fixes bug: https://launchpad.net/bugs/867540 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-04 22:46:28 +0200 message: - Centralise path configuration into a single file. - - Path configuration was distributed throughout wicd, making it difficult - to move around project files. Centralise the configuration into - wpath.py. + initialize self._wire_showing in gtk/gui.py, thanks to David Cantrell ------------------------------------------------------------ -revno: 40 -committer: imdano -branch nick: experimental -timestamp: Fri 2007-08-10 07:59:36 +0000 +revno: 592 +fixes bug: https://launchpad.net/bugs/867538 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-04 22:45:25 +0200 message: - Added disconnection script - Changed auto-reconnection behavior slightly to prevent possible hanging issues - Changed/Added some comments + ensure 'check' and 'message' are initialized in cli/wicd-cli.py, thanks to David Cantrell ------------------------------------------------------------ -revno: 39 -committer: imdano -branch nick: experimental -timestamp: Sat 2007-08-04 19:09:05 +0000 +revno: 591 +fixes bug: https://launchpad.net/bugs/867536 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-10-04 22:43:22 +0200 message: - Added support for displaying correct network info in drivers using some non-standard display info. + Handle wicd-daemon not running when client starts, thanks to David Cantrell ------------------------------------------------------------ -revno: 38 -committer: imdano -branch nick: experimental -timestamp: Wed 2007-08-01 09:31:43 +0000 +revno: 590 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-09-18 12:35:16 +0200 message: - Changed script execution method so that scripts are always run in usermode. - Removed autostarting daemon code so that script execution would work properly. - Added channel display support for cards that only get frequency info in 'iwlist scan'. - Changed autoconnect behavior to fix a bug where dbus would crash if connecting was taking too long. - Changed/added some comments. + Fix RH init script (LP: #587690) ------------------------------------------------------------ -revno: 37 -committer: imdano -branch nick: experimental -timestamp: Sun 2007-07-29 08:17:00 +0000 +revno: 589 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-09-18 12:11:53 +0200 message: - made get debugmode function return an int + Allow empty DNS fields (LP: #492795) ------------------------------------------------------------ -revno: 36 -committer: imdano -branch nick: experimental -timestamp: Sat 2007-07-28 11:20:38 +0000 +revno: 588 +committer: David Paleino +branch nick: trunk +timestamp: Sun 2011-09-18 10:45:30 +0200 message: - added a debugmode check to dapper.py + Fix leap template (LP: #495473) ------------------------------------------------------------ -revno: 35 -committer: imdano -branch nick: experimental -timestamp: Sat 2007-07-28 11:19:18 +0000 +revno: 587 +committer: David Paleino +branch nick: trunk +timestamp: Sun 2011-09-18 10:31:15 +0200 message: - fixed a bug in the open/close gui function in dapper.py - fixed a bug in getdebugmode function in daemon.py + Implemented rfkill support (LP: #293727) ------------------------------------------------------------ -revno: 34 -committer: imdano -branch nick: experimental -timestamp: Fri 2007-07-27 18:20:51 +0000 +revno: 586 +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-09-16 18:29:23 +0200 message: - Rewrote dapper.py to act just like edgy.py (needs to be tested), changed some gui behavior, fixed version numbers in experimental/testing daemon.py + Simplify IP validation check (LP: #743795) ------------------------------------------------------------ -revno: 33 -committer: imdano -branch nick: experimental -timestamp: Wed 2007-07-25 17:59:31 +0000 +revno: 585 +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-09-16 18:18:36 +0200 message: - Updated autoconnect.py to reflect changes to daemon + Change bootscript order to work with non-standard wifi cards (LP: #585266) ------------------------------------------------------------ -revno: 32 -committer: imdano -branch nick: experimental -timestamp: Wed 2007-07-25 09:04:39 +0000 +revno: 584 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-09-15 12:56:14 +0200 message: - Fixed typo in the testing release, added ralink correct signal strength info to experimental release, fixed wired connection bug in experimental release + Added PSU template, thanks to Alexander Anisimov (LP: #424504) ------------------------------------------------------------ -revno: 31 -committer: imdano -branch nick: experimental -timestamp: Tue 2007-07-24 15:30:59 +0000 +revno: 583 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-09-15 12:50:21 +0200 message: - fixed a typo + Merged reyammer's branch lp:~reyammer/wicd/bug-476982: implement password hiding (LP: #476982) ------------------------------------------------------------ -revno: 30 -committer: compwiz18 -branch nick: experimental -timestamp: Tue 2007-07-24 06:31:07 +0000 +revno: 582 +committer: David Paleino +branch nick: wicd +timestamp: Thu 2011-09-15 12:38:22 +0200 message: - daemon will now fork + Add new encryption templates. + + Taken from http://wicd.net/punbb/viewtopic.php?id=233 ------------------------------------------------------------ -revno: 29 -committer: compwiz18 -branch nick: experimental -timestamp: Tue 2007-07-24 06:06:27 +0000 +revno: 581 +committer: David Paleino +branch nick: wicd +timestamp: Fri 2011-09-02 08:08:30 +0200 message: - updates and bug fixes and all that fun stuff + Support more-than-2-digits channels (Closes: #545248) ------------------------------------------------------------ -revno: 28 -committer: imdano -branch nick: experimental -timestamp: Tue 2007-07-24 05:05:15 +0000 +revno: 580 +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-08-09 18:03:01 +0200 message: - Added myself as a co-author :) + Convert from tabs to (4) spaces ------------------------------------------------------------ -revno: 27 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-07-23 07:05:05 +0000 +revno: 579 [merge] +committer: David Paleino +branch nick: wicd +timestamp: Tue 2011-08-09 17:58:33 +0200 message: - Added wired auto-connect profile chooser, fixed some bugs in the ralink legacy connection code, reorganized edgy.py and fixed some bugs in it, probably a few other things too + Merge fox 2011-08-09 fixing exception for cli/wicd-cli.py --wireless -c ------------------------------------------------------------ -revno: 26 -committer: imdano -branch nick: experimental -timestamp: Tue 2007-07-17 08:03:16 +0000 +revno: 578 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-08-07 22:52:52 +0200 message: - fixed bug where wired icon wouldn't change if cable became unplugged, fixed yet another indentation screw up + Make configscript use GtkBuilder as well (LP: #555386) ------------------------------------------------------------ -revno: 25 -committer: imdano -branch nick: experimental -timestamp: Tue 2007-07-17 07:33:18 +0000 +revno: 577 [merge] +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-08-07 22:45:28 +0200 message: - improved autoreconnect code + Merge Nik Nyby 2011-03-27 removed copy module, since it's no longer being used. ------------------------------------------------------------ -revno: 24 -committer: imdano -branch nick: experimental -timestamp: Tue 2007-07-17 07:19:10 +0000 +revno: 576 [merge] +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-08-07 22:39:08 +0200 message: - fixed a screw up in my indentation in edgy.py, changed tabs to 4 spaces everywhere it wasn't already + Merged fox 2011-07-03 Fixed wireless connecting status message ------------------------------------------------------------ -revno: 23 -committer: compwiz18 -branch nick: experimental -timestamp: Mon 2007-07-16 09:23:18 +0000 +revno: 575 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-08-07 22:21:10 +0200 message: - daemon will now daemonize + fix suspend scripts to use correct locations ------------------------------------------------------------ -revno: 22 -committer: compwiz18 -branch nick: experimental -timestamp: Mon 2007-07-16 08:35:07 +0000 +revno: 574 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-08-07 22:20:17 +0200 message: - fixed global DNS + restrict network mode to some characters only ------------------------------------------------------------ -revno: 21 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-07-16 06:41:34 +0000 +revno: 573 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-08-07 22:16:36 +0200 message: - removed conflict resolution info that would probably cause syntax errors + Don't store useless variables inside configfiles ------------------------------------------------------------ -revno: 20 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-07-16 06:34:23 +0000 +revno: 572 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-08-07 22:09:49 +0200 message: - Added support for ralink legacy cards, implemented a debug mode option, swapped order that autoconnect uses, fixed some indentation issues, changed/added some comments + generalize libc linking using ctypes' find_library() ------------------------------------------------------------ -revno: 19 -committer: compwiz18 -branch nick: experimental -timestamp: Mon 2007-07-16 06:16:52 +0000 +revno: 571 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-02-06 18:54:57 +0100 message: - added global dns options (not quite working) + Don't crash on notification errors + + This is not an essential feature, so no need to crash. ------------------------------------------------------------ -revno: 18 -committer: imdano -branch nick: experimental -timestamp: Wed 2007-07-11 12:47:44 +0000 +revno: 570 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-02-06 18:33:59 +0100 message: - Optimized autoconnect for wired code (should be more log friendly) + Use 'dhcpcd' also in Debian, so that defaults in /etc/default/dhcpcd are still observed. ------------------------------------------------------------ -revno: 17 -committer: imdano -branch nick: experimental -timestamp: Tue 2007-07-10 14:32:45 +0000 +revno: 569 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-02-06 18:30:44 +0100 message: - Fixed bug caused by wired/wireless daemons using the same function names + Don't make dhcpcd handle link-local ------------------------------------------------------------ -revno: 16 -committer: compwiz18 -branch nick: experimental -timestamp: Tue 2007-07-10 05:39:00 +0000 +revno: 568 +committer: David Paleino +branch nick: wicd +timestamp: Sun 2011-02-06 18:22:14 +0100 message: - syntax error fixed + Detect which flavour of ping(1) is installed + + This is needed because inetutils-ping does not support + "-w deadline", but just waits timeout. ------------------------------------------------------------ -revno: 15 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-07-09 14:41:14 +0000 +revno: 567 +fixes bug: https://launchpad.net/bugs/129608 +committer: Adam Blackburn +branch nick: wicd +timestamp: Sat 2010-12-25 13:58:35 -1000 message: - Added script execution support, added autoconnect to wired network support, created a default wired network system to allow autoconnection + Patch to make adhoc connections work better - thanks to ArchLinux people - https://bugs.archlinux.org/task/22057 ------------------------------------------------------------ -revno: 14 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-07-09 09:38:45 +0000 +revno: 566 +committer: Adam Blackburn +branch nick: wicd +timestamp: Thu 2010-12-23 09:12:58 -1000 message: - Removed sleep time in autoreconnect in stable (it would sometimes make it impossible to open the GUI), removed sleep time and altered autoreconnect behavior in experimental. (Try #3) + fixing more Python version issues ------------------------------------------------------------ -revno: 13 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-07-09 09:27:13 +0000 +revno: 565 +committer: Adam Blackburn +branch nick: wicd +timestamp: Fri 2010-10-29 10:35:13 -0500 message: - Removed sleep time in autoreconnect in stable (it would sometimes make it impossible to open the GUI), removed sleep time and altered autoreconnect behavior in experimental. + update versions to 1.7.1b2 ------------------------------------------------------------ -revno: 12 -committer: imdano -branch nick: experimental -timestamp: Mon 2007-07-09 09:21:42 +0000 +revno: 564 +committer: Adam Blackburn +branch nick: wicd +timestamp: Fri 2010-10-29 10:32:33 -0500 message: - Removed sleep time in autoreconnect in stable (it would sometimes make it impossible to open the GUI), removed sleep time and altered autoreconnect behavior in experimental. + work with Python < 2.7 again ------------------------------------------------------------ -revno: 11 -committer: compwiz18 -branch nick: experimental -timestamp: Sun 2007-07-08 20:12:44 +0000 +revno: 563 +committer: Adam Blackburn +branch nick: wicd +timestamp: Wed 2010-10-27 11:46:49 -0500 message: - changed version number + change to 1.7.1b1 beta release ------------------------------------------------------------ -revno: 10 -committer: imdano -branch nick: experimental -timestamp: Sun 2007-07-08 10:36:47 +0000 +revno: 562 +committer: Adam Blackburn +branch nick: wicd +timestamp: Wed 2010-10-27 11:41:47 -0500 message: - Added DNS fix to wired class + updated NEWS and CHANGES for 1.7.1 release (again) ------------------------------------------------------------ -revno: 9 -committer: imdano -branch nick: experimental -timestamp: Sun 2007-07-08 10:31:48 +0000 +revno: 561 +committer: Adam Blackburn +branch nick: wicd +timestamp: Wed 2010-10-27 11:17:15 -0500 message: - Fixed a static DNS bug and added some comments / fixed some typos + committed patch to fix Python 2.7 support and use python2 instead of python to run monitor.py -- thanks to Archlinux and Rémy Oudompheng ------------------------------------------------------------ -revno: 8 -committer: imdano -branch nick: experimental -timestamp: Sun 2007-07-08 10:31:28 +0000 +revno: 560 +committer: Andrew Psaltis +branch nick: 1.6 +timestamp: Fri 2010-08-20 17:38:52 -0400 message: - Fixed a static DNS bug and added some comments / fixed some typos + Scan the SSID by default, should make wicd a bit more cooperative at handling hidden SSIDs. + + Set scan_ssid in the templates to "1" by default, instead of "0". ------------------------------------------------------------ -revno: 7 -committer: imdano -branch nick: experimental -timestamp: Sun 2007-07-08 08:34:42 +0000 +revno: 559 +committer: Adam Blackburn +branch nick: wicd +timestamp: Tue 2010-06-15 11:53:53 -0500 message: - shortened sleep time when returning from hibernation + updated setup.py, NEWS, and CHANGES for 1.7.1 release ------------------------------------------------------------ -revno: 6 -committer: imdano -branch nick: experimental -timestamp: Sat 2007-07-07 20:31:45 +0000 +revno: 558 +committer: Adam Blackburn +branch nick: wicd +timestamp: Tue 2010-06-15 11:52:12 -0500 message: - some minor adjustments and bug fixes + added wicd.ui and updated setup.py to use it ------------------------------------------------------------ -revno: 5 -committer: compwiz18 -branch nick: experimental -timestamp: Sat 2007-07-07 20:09:37 +0000 +revno: 557 [merge] +committer: Adam Blackburn +branch nick: wicd +timestamp: Wed 2010-06-09 12:23:28 -0500 message: - Added ICS support, but commented it out so we can release + removed the scary wicd-curses exception message ------------------------------------------------------------ -revno: 4 -committer: compwiz18 -branch nick: experimental -timestamp: Sat 2007-07-07 08:06:14 +0000 +revno: 556 [merge] +committer: Adam Blackburn +branch nick: wicd +timestamp: Sun 2010-05-30 18:03:18 +0800 message: - string table updated + Merged 1.7.1-probably, which contains 14 patches from Debian. Thanks to David Paleino and everyone else who contributed these patches. ------------------------------------------------------------ -revno: 3 -committer: imdano -branch nick: experimental -timestamp: Thu 2007-07-05 06:53:57 +0000 +revno: 555 +fixes bug: https://launchpad.net/bugs/555386 +committer: Adam Blackburn +branch nick: wicd +timestamp: Mon 2010-05-17 21:51:43 -0500 message: - Fixed a typo, added note that only WEP can be used for Ad-hoc encryption + apply patch to use gtkbuilder instead of libglade ------------------------------------------------------------ -revno: 2 -committer: imdano -branch nick: experimental -timestamp: Thu 2007-07-05 05:30:09 +0000 +revno: 554 +committer: Andrew Psaltis +branch nick: 1.6 +timestamp: Mon 2010-03-29 13:19:08 -0400 message: - Fixed bug where tray wouldn't load when it automatically opened the daemon - Fixed some typos + Fixed typo in EAP-fast template, re-resolving bug 261804. ------------------------------------------------------------ -revno: 1 -committer: compwiz18 -branch nick: stable -timestamp: Wed 2007-07-04 14:51:57 +0000 +revno: 553 +committer: Andrew Psaltis +branch nick: 1.6 +timestamp: Wed 2010-01-27 14:06:21 -0500 message: - trying to fix + Fixed bug in script macro expansion. ------------------------------------------------------------ -Use --include-merges or -n0 to see merged revisions. + +Due to size, this file has been truncated. All revisions relevant to +the 1.7.1 release have been included. For more information, please see +the full log of changes at: + https://code.launchpad.net/~wicd-devel/wicd/experimental + +For a short list of major changes, please see NEWS. diff -Nru wicd-1.7.0+ds1/cli/wicd-cli.py wicd-1.7.1/cli/wicd-cli.py --- wicd-1.7.0+ds1/cli/wicd-cli.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/cli/wicd-cli.py 2012-01-15 14:19:03.000000000 +0000 @@ -31,17 +31,21 @@ bus = dbus.SystemBus() try: - daemon = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon'), - 'org.wicd.daemon') - wireless = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wireless'), - 'org.wicd.daemon.wireless') - wired = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wired'), - 'org.wicd.daemon.wired') - config = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/config'), - 'org.wicd.daemon.config') + daemon = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon'), + 'org.wicd.daemon') + wireless = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wireless'), + 'org.wicd.daemon.wireless') + wired = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wired'), + 'org.wicd.daemon.wired') + config = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/config'), + 'org.wicd.daemon.config') except dbus.DBusException: - print 'Error: Could not connect to the daemon. Please make sure it is running.' - sys.exit(3) + print 'Error: Could not connect to the daemon. Please make sure it is running.' + sys.exit(3) + +if not daemon: + print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.' + sys.exit(3) parser = optparse.OptionParser() @@ -67,174 +71,182 @@ op_performed = False if not (options.wireless or options.wired): - print "Please use --wireless or --wired to specify " + \ - "the type of connection to operate on." + print "Please use --wireless or --wired to specify " + \ + "the type of connection to operate on." # functions def is_valid_wireless_network_id(network_id): - if not (network_id >= 0 \ - and network_id < wireless.GetNumberOfNetworks()): - print 'Invalid wireless network identifier.' - sys.exit(1) + if not (network_id >= 0 \ + and network_id < wireless.GetNumberOfNetworks()): + print 'Invalid wireless network identifier.' + sys.exit(1) def is_valid_wired_network_id(network_id): - num = len(wired.GetWiredProfileList()) - if not (network_id < num and \ - network_id >= 0): - print 'Invalid wired network identifier.' - sys.exit(4) + num = len(wired.GetWiredProfileList()) + if not (network_id < num and \ + network_id >= 0): + print 'Invalid wired network identifier.' + sys.exit(4) def is_valid_wired_network_profile(profile_name): - if not profile_name in wired.GetWiredProfileList(): - print 'Profile of that name does not exist.' - sys.exit(5) + if not profile_name in wired.GetWiredProfileList(): + print 'Profile of that name does not exist.' + sys.exit(5) if options.scan and options.wireless: - # synchronized scan - wireless.Scan(True) - op_performed = True + # synchronized scan + wireless.Scan(True) + op_performed = True if options.load_profile and options.wired: - is_valid_wired_network_profile(options.name) - config.ReadWiredNetworkProfile(options.name) - op_performed = True + is_valid_wired_network_profile(options.name) + config.ReadWiredNetworkProfile(options.name) + op_performed = True if options.list_networks: - if options.wireless: - print '#\tBSSID\t\t\tChannel\tESSID' - for network_id in range(0, wireless.GetNumberOfNetworks()): - print '%s\t%s\t%s\t%s' % (network_id, - wireless.GetWirelessProperty(network_id, 'bssid'), - wireless.GetWirelessProperty(network_id, 'channel'), - wireless.GetWirelessProperty(network_id, 'essid')) - elif options.wired: - print '#\tProfile name' - id = 0 - for profile in wired.GetWiredProfileList(): - print '%s\t%s' % (id, profile) - id += 1 - op_performed = True + if options.wireless: + print '#\tBSSID\t\t\tChannel\tESSID' + for network_id in range(0, wireless.GetNumberOfNetworks()): + print '%s\t%s\t%s\t%s' % (network_id, + wireless.GetWirelessProperty(network_id, 'bssid'), + wireless.GetWirelessProperty(network_id, 'channel'), + wireless.GetWirelessProperty(network_id, 'essid')) + elif options.wired: + print '#\tProfile name' + id = 0 + for profile in wired.GetWiredProfileList(): + print '%s\t%s' % (id, profile) + id += 1 + op_performed = True if options.network_details: - if options.wireless: - if options.network >= 0: - is_valid_wireless_network_id(options.network) - network_id = options.network - else: - network_id = wireless.GetCurrentNetworkID(0) - is_valid_wireless_network_id(network_id) - # we're connected to a network, print IP - print "IP: %s" % wireless.GetWirelessIP(0) - - print "Essid: %s" % wireless.GetWirelessProperty(network_id, "essid") - print "Bssid: %s" % wireless.GetWirelessProperty(network_id, "bssid") - if wireless.GetWirelessProperty(network_id, "encryption"): - print "Encryption: On" - print "Encryption Method: %s" % \ - wireless.GetWirelessProperty(network_id, "encryption_method") - else: - print "Encryption: Off" - print "Quality: %s" % wireless.GetWirelessProperty(network_id, "quality") - print "Mode: %s" % wireless.GetWirelessProperty(network_id, "mode") - print "Channel: %s" % wireless.GetWirelessProperty(network_id, "channel") - print "Bit Rates: %s" % wireless.GetWirelessProperty(network_id, "bitrates") - op_performed = True + if options.wireless: + if options.network >= 0: + is_valid_wireless_network_id(options.network) + network_id = options.network + else: + network_id = wireless.GetCurrentNetworkID(0) + is_valid_wireless_network_id(network_id) + # we're connected to a network, print IP + print "IP: %s" % wireless.GetWirelessIP(0) + + print "Essid: %s" % wireless.GetWirelessProperty(network_id, "essid") + print "Bssid: %s" % wireless.GetWirelessProperty(network_id, "bssid") + if wireless.GetWirelessProperty(network_id, "encryption"): + print "Encryption: On" + print "Encryption Method: %s" % \ + wireless.GetWirelessProperty(network_id, "encryption_method") + else: + print "Encryption: Off" + print "Quality: %s" % wireless.GetWirelessProperty(network_id, "quality") + print "Mode: %s" % wireless.GetWirelessProperty(network_id, "mode") + print "Channel: %s" % wireless.GetWirelessProperty(network_id, "channel") + print "Bit Rates: %s" % wireless.GetWirelessProperty(network_id, "bitrates") + op_performed = True # network properties if options.network_property: - options.network_property = option.network_property.lower() - if options.wireless: - if options.network >= 0: - is_valid_wireless_network_id(options.network) - network_id = options.network - else: - network_id = wireless.GetCurrentNetworkID(0) - is_valid_wireless_network_id(network_id) - if not options.set_to: - print wireless.GetWirelessProperty(network_id, options.network_property) - else: - wireless.SetWirelessProperty(network_id, \ - options.network_property, options.set_to) - elif options.wired: - if not options.set_to: - print wired.GetWiredProperty(options.network_property) - else: - wired.SetWiredProperty(options.network_property, options.set_to) - op_performed = True + options.network_property = options.network_property.lower() + if options.wireless: + if options.network >= 0: + is_valid_wireless_network_id(options.network) + network_id = options.network + else: + network_id = wireless.GetCurrentNetworkID(0) + is_valid_wireless_network_id(network_id) + if not options.set_to: + print wireless.GetWirelessProperty(network_id, options.network_property) + else: + wireless.SetWirelessProperty(network_id, \ + options.network_property, options.set_to) + elif options.wired: + if not options.set_to: + print wired.GetWiredProperty(options.network_property) + else: + wired.SetWiredProperty(options.network_property, options.set_to) + op_performed = True if options.disconnect: - daemon.Disconnect() - if options.wireless: - if wireless.GetCurrentNetworkID(0) > -1: - print "Disconnecting from %s on %s" % (wireless.GetCurrentNetwork(0), - wireless.DetectWirelessInterface()) - elif options.wired: - if wired.CheckPluggedIn(): - print "Disconnecting from wired connection on %s" % wired.DetectWiredInterface() - op_performed = True + daemon.Disconnect() + if options.wireless: + if wireless.GetCurrentNetworkID(0) > -1: + print "Disconnecting from %s on %s" % (wireless.GetCurrentNetwork(0), + wireless.DetectWirelessInterface()) + elif options.wired: + if wired.CheckPluggedIn(): + print "Disconnecting from wired connection on %s" % wired.DetectWiredInterface() + op_performed = True if options.connect: - if options.wireless and options.network > -1: - is_valid_wireless_network_id(options.network) - name = wireless.GetWirelessProperty(options.network, 'essid') - encryption = wireless.GetWirelessProperty(options.network, 'enctype') - print "Connecting to %s with %s on %s" % (name, encryption, - wireless.DetectWirelessInterface()) - wireless.ConnectWireless(options.network) - - check = lambda: wireless.CheckIfWirelessConnecting() - message = lambda: wireless.CheckWirelessConnectingMessage() - elif options.wired: - print "Connecting to wired connection on %s" % wired.DetectWiredInterface() - wired.ConnectWired() - - check = lambda: wired.CheckIfWiredConnecting() - message = lambda: wired.CheckWiredConnectingMessage() - - # update user on what the daemon is doing - last = None - while check(): - next = message() - if next != last: - # avoid a race condition where status is updated to "done" after the - # loop check - if next == "done": - break - print "%s..." % next.replace("_", " ") - last = next - print "done!" - op_performed = True + check = None + if options.wireless and options.network > -1: + is_valid_wireless_network_id(options.network) + name = wireless.GetWirelessProperty(options.network, 'essid') + encryption = wireless.GetWirelessProperty(options.network, 'enctype') + print "Connecting to %s with %s on %s" % (name, encryption, + wireless.DetectWirelessInterface()) + wireless.ConnectWireless(options.network) + + check = lambda: wireless.CheckIfWirelessConnecting() + status = lambda: wireless.CheckWirelessConnectingStatus() + message = lambda: wireless.CheckWirelessConnectingMessage() + elif options.wired: + print "Connecting to wired connection on %s" % wired.DetectWiredInterface() + wired.ConnectWired() + + check = lambda: wired.CheckIfWiredConnecting() + status = lambda: wired.CheckWiredConnectingStatus() + message = lambda: wired.CheckWiredConnectingMessage() + else: + check = lambda: False + status = lambda: False + message = lambda: False + + # update user on what the daemon is doing + last = None + if check: + while check(): + next = status() + if next != last: + # avoid a race condition where status is updated to "done" after the + # loop check + if next == "done": + break + print message() + last = next + print "done!" + op_performed = True # pretty print optional and required properties def str_properties(prop): - if len(prop) == 0: - return "None" - else: - return ', '.join("%s (%s)" % (x[0], x[1].replace("_", " ")) for x in type['required']) + if len(prop) == 0: + return "None" + else: + return ', '.join("%s (%s)" % (x[0], x[1].replace("_", " ")) for x in type['required']) if options.wireless and options.list_encryption_types: - et = misc.LoadEncryptionMethods() - # print 'Installed encryption templates:' - print '%s\t%-20s\t%s' % ('#', 'Name', 'Description') - id = 0 - for type in et: - print '%s\t%-20s\t%s' % (id, type['type'], type['name']) - print ' Req: %s' % str_properties(type['required']) - print '---' - # don't print optionals (yet) - #print ' Opt: %s' % str_properties(type['optional']) - id += 1 - op_performed = True + et = misc.LoadEncryptionMethods() + # print 'Installed encryption templates:' + print '%s\t%-20s\t%s' % ('#', 'Name', 'Description') + id = 0 + for type in et: + print '%s\t%-20s\t%s' % (id, type['type'], type['name']) + print ' Req: %s' % str_properties(type['required']) + print '---' + # don't print optionals (yet) + #print ' Opt: %s' % str_properties(type['optional']) + id += 1 + op_performed = True if options.save and options.network > -1: - if options.wireless: - is_valid_wireless_network_id(options.network) - config.SaveWirelessNetworkProfile(options.network) - elif options.wired: - config.SaveWiredNetworkProfile(options.name) - op_performed = True + if options.wireless: + is_valid_wireless_network_id(options.network) + config.SaveWirelessNetworkProfile(options.network) + elif options.wired: + config.SaveWiredNetworkProfile(options.name) + op_performed = True if not op_performed: - print "No operations performed." + print "No operations performed." diff -Nru wicd-1.7.0+ds1/curses/configscript_curses.py wicd-1.7.1/curses/configscript_curses.py --- wicd-1.7.0+ds1/curses/configscript_curses.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/curses/configscript_curses.py 2011-10-18 17:31:11.000000000 +0000 @@ -24,6 +24,7 @@ # MA 02110-1301, USA. from wicd import misc +from wicd.translations import _ import configscript from configscript import write_scripts,get_script_info,get_val,none_to_blank,blank_to_none @@ -32,15 +33,6 @@ import sys import os -_ = misc.get_gettext() - -language = {} -language['configure_scripts'] = _("Configure Scripts") -language['before_script'] = _("Pre-connection Script") -language['after_script'] = _("Post-connection Script") -language['pre_disconnect_script'] = _("Pre-disconnection Script") -language['post_disconnect_script'] = _("Post-disconnection Script") - def main(argv): global ui,frame if len(argv) < 2: @@ -61,10 +53,10 @@ script_info = get_script_info(network, network_type) blank = urwid.Text('') - pre_entry_t = ('body',language['before_script']+': ') - post_entry_t = ('body',language['after_script']+': ') - pre_disconnect_entry_t = ('body',language['pre_disconnect_script']+': ') - post_disconnect_entry_t = ('body',language['post_disconnect_script']+': ') + pre_entry_t = ('body',_('Pre-connection Script')+': ') + post_entry_t = ('body',_('Post-connection Script')+': ') + pre_disconnect_entry_t = ('body',_('Pre-disconnection Script')+': ') + post_disconnect_entry_t = ('body',_('Post-disconnection Script')+': ') global pre_entry,post_entry,pre_disconnect_entry,post_disconnect_entry pre_entry = urwid.AttrWrap(urwid.Edit(pre_entry_t, @@ -78,8 +70,8 @@ none_to_blank(script_info.get('post_disconnect_entry'))),'editbx','editfc' ) # The buttons - ok_button = urwid.AttrWrap(urwid.Button('OK',ok_callback),'body','focus') - cancel_button = urwid.AttrWrap(urwid.Button('Cancel',cancel_callback),'body','focus') + ok_button = urwid.AttrWrap(urwid.Button(_('OK'),ok_callback),'body','focus') + cancel_button = urwid.AttrWrap(urwid.Button(_('Cancel'),cancel_callback),'body','focus') button_cols = urwid.Columns([ok_button,cancel_button],dividechars=1) diff -Nru wicd-1.7.0+ds1/curses/curses_misc.py wicd-1.7.1/curses/curses_misc.py --- wicd-1.7.0+ds1/curses/curses_misc.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/curses/curses_misc.py 2011-10-18 21:26:55.000000000 +0000 @@ -24,6 +24,8 @@ import urwid +from wicd.translations import _ + # Uses code that is towards the bottom def error(ui,parent,message): """Shows an error dialog (or something that resembles one)""" @@ -478,7 +480,11 @@ while not keys: keys = ui.get_input() for k in keys: - if urwid.is_mouse_event(k): + if urwid.VERSION < (1, 0, 0): + check_mouse_event = urwid.is_mouse_event + else: + check_mouse_event = urwid.util.is_mouse_event + if check_mouse_event(k): event, button, col, row = k overlay.mouse_event( size, event, button, col, row, @@ -518,7 +524,7 @@ self.frame.set_focus('footer') class InputDialog(Dialog2): - def __init__(self, text, height, width,ok_name='OK',edit_text=''): + def __init__(self, text, height, width,ok_name=_('OK'),edit_text=''): self.edit = urwid.Edit(wrap='clip',edit_text=edit_text) body = urwid.ListBox([self.edit]) body = urwid.AttrWrap(body, 'editbx','editfc') @@ -526,7 +532,7 @@ Dialog2.__init__(self, text, height, width, body) self.frame.set_focus('body') - self.add_buttons([(ok_name,0),('Cancel',-1)]) + self.add_buttons([(ok_name,0),(_('Cancel'),-1)]) def unhandled_key(self, size, k): if k in ('up','page up'): diff -Nru wicd-1.7.0+ds1/curses/netentry_curses.py wicd-1.7.1/curses/netentry_curses.py --- wicd-1.7.0+ds1/curses/netentry_curses.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/curses/netentry_curses.py 2012-02-02 16:38:26.000000000 +0000 @@ -26,7 +26,7 @@ import wicd.misc as misc from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool -from wicd.translations import language +from wicd.translations import language, _ import os daemon = None @@ -46,24 +46,24 @@ def __init__(self): self.ui=None - static_ip_t = language['use_static_ip'] - ip_t = ('editcp',language['ip']+': ') - netmask_t = ('editcp',language['netmask']+':') - gateway_t = ('editcp',language['gateway']+':') - - use_static_dns_t = language['use_static_dns'] - use_global_dns_t = language['use_global_dns'] - dns_dom_t = ('editcp',language['dns_domain']+': ') - search_dom_t = ('editcp',language['search_domain']+':') - dns1_t = ('editcp',language['dns']+ ' 1'+':'+' '*8) - dns2_t = ('editcp',language['dns']+ ' 2'+':'+' '*8) - dns3_t = ('editcp',language['dns']+ ' 3'+':'+' '*8) + static_ip_t = _('Use Static IPs') + ip_t = ('editcp',_('IP')+': ') + netmask_t = ('editcp',_('Netmask')+':') + gateway_t = ('editcp',_('Gateway')+':') + + use_static_dns_t = _('Use Static DNS') + use_global_dns_t = _('Use global DNS servers') + dns_dom_t = ('editcp',_('DNS domain')+': ') + search_dom_t = ('editcp',_('Search domain')+':') + dns1_t = ('editcp',_('DNS server')+ ' 1'+':'+' '*8) + dns2_t = ('editcp',_('DNS server')+ ' 2'+':'+' '*8) + dns3_t = ('editcp',_('DNS server')+ ' 3'+':'+' '*8) - use_dhcp_h_t = ("Use DHCP Hostname") - dhcp_h_t = ('editcp',"DHCP Hostname: ") + use_dhcp_h_t = _('Use DHCP Hostname') + dhcp_h_t = ('editcp',_('DHCP Hostname')+': ') - cancel_t = 'Cancel' - ok_t = 'OK' + cancel_t = _('Cancel') + ok_t = _('OK') self.static_ip_cb = urwid.CheckBox(static_ip_t, on_state_change=self.static_ip_toggle) @@ -183,17 +183,84 @@ def ready_widgets(self,ui,body): pass + def combo_on_change(self,combobox,new_index,user_data=None): + self.change_encrypt_method() + + # More or less ripped from netentry.py + def change_encrypt_method(self): + #self.lbox_encrypt = urwid.ListBox() + self.encryption_info = {} + wid,ID = self.encryption_combo.get_focus() + methods = self.encrypt_types + + if self._w.body.body.__contains__(self.pile_encrypt): + self._w.body.body.pop(self._w.body.body.__len__()-1) + + # If nothing is selected, select the first entry. + if ID == -1: + self.encryption_combo.set_focus(0) + ID = 0 + + theList = [] + for type_ in ['required', 'optional']: + fields = methods[ID][type_] + for field in fields: + try: + edit = MaskingEdit(('editcp',language[field[1].lower().replace(' ','_')]+': ')) + except KeyError: + edit = MaskingEdit(('editcp',field[1].replace(' ','_')+': ')) + edit.set_mask_mode('no_focus') + theList.append(edit) + # Add the data to any array, so that the information + # can be easily accessed by giving the name of the wanted + # data. + self.encryption_info[field[0]] = [edit, type_] + + if self.wired: + edit.set_edit_text(noneToBlankString( + wired.GetWiredProperty(field[0]))) + else: + edit.set_edit_text(noneToBlankString( + wireless.GetWirelessProperty(self.networkid, field[0]))) + + #FIXME: This causes the entire pile to light up upon use. + # Make this into a listbox? + self.pile_encrypt = DynWrap(urwid.Pile(theList),attrs=('editbx','editnfc')) + + self.pile_encrypt.set_sensitive(self.encryption_chkbox.get_state()) + + self._w.body.body.insert(self._w.body.body.__len__(),self.pile_encrypt) + #self._w.body.body.append(self.pile_encrypt) + + def encryption_toggle(self,chkbox,new_state,user_data=None): + self.encryption_combo.set_sensitive(new_state) + self.pile_encrypt.set_sensitive(new_state) + class WiredSettingsDialog(AdvancedSettingsDialog): - def __init__(self,name): + def __init__(self,name,parent): global wired, daemon AdvancedSettingsDialog.__init__(self) - self.set_default = urwid.CheckBox(language['default_wired']) + self.wired = True + + self.set_default = urwid.CheckBox(_('Use as default profile (overwrites any previous default)')) #self.cur_default = # Add widgets to listbox self._w.body.body.append(self.set_default) + self.parent = parent + encryption_t = _('Use Encryption') + + self.encryption_chkbox = urwid.CheckBox(encryption_t,on_state_change=self.encryption_toggle) + self.encryption_combo = ComboBox(callback=self.combo_on_change) + self.pile_encrypt = None + # _w is a Frame, _w.body is a ListBox, _w.body.body is the ListWalker :-) + self._listbox.body.append(self.encryption_chkbox) + self._listbox.body.append(self.encryption_combo) + self.encrypt_types = misc.LoadEncryptionMethods(wired = True) + self.set_values() + self.prof_name = name - title = language['configuring_wired'].replace('$A',self.prof_name) + title = _('Configuring preferences for wired profile "$A"').replace('$A',self.prof_name) self._w.header = urwid.Text( ('header',title),align='right' ) self.set_values() @@ -218,6 +285,26 @@ self.set_default.set_state(to_bool(wired.GetWiredProperty("default"))) + # Throw the encryption stuff into a list + list = [] + activeID = -1 # Set the menu to this item when we are done + for x, enc_type in enumerate(self.encrypt_types): + list.append(enc_type['name']) + if enc_type['type'] == wired.GetWiredProperty("enctype"): + activeID = x + self.encryption_combo.set_list(list) + + self.encryption_combo.set_focus(activeID) + if wired.GetWiredProperty("encryption_enabled"): + self.encryption_chkbox.set_state(True,do_callback=False) + self.encryption_combo.set_sensitive(True) + #self.lbox_encrypt_info.set_sensitive(True) + else: + self.encryption_combo.set_focus(0) + self.encryption_combo.set_sensitive(False) + + self.change_encrypt_method() + dhcphname = wired.GetWiredProperty("dhcphostname") if dhcphname is None: dhcphname = os.uname()[1] @@ -227,6 +314,30 @@ self.dhcp_h.set_edit_text(unicode(dhcphname)) def save_settings(self): + # Check encryption info + if self.encryption_chkbox.get_state(): + encrypt_info = self.encryption_info + encrypt_methods = self.encrypt_types + self.set_net_prop("enctype", + encrypt_methods[self.encryption_combo.get_focus()[1] ]['type']) + self.set_net_prop("encryption_enabled", True) + # Make sure all required fields are filled in. + for entry_info in encrypt_info.itervalues(): + if entry_info[0].get_edit_text() == "" \ + and entry_info[1] == 'required': + error(self.ui, self.parent,"%s (%s)" \ + % (_('Required encryption information is missing.'), + entry_info[0].get_caption()[0:-2] ) + ) + return False + + for entry_key, entry_info in encrypt_info.iteritems(): + self.set_net_prop(entry_key, noneToString(entry_info[0]. + get_edit_text())) + else: + self.set_net_prop("enctype", "None") + self.set_net_prop("encryption_enabled", False) + AdvancedSettingsDialog.save_settings(self) if self.set_default.get_state(): wired.UnsetWiredDefault() @@ -250,11 +361,13 @@ def __init__(self,networkID,parent): global wireless, daemon AdvancedSettingsDialog.__init__(self) + self.wired = False + self.networkid = networkID self.parent = parent - global_settings_t = language['global_settings'] - encryption_t = language['use_encryption'] - autoconnect_t = language['automatic_connect'] + global_settings_t = _('Use these settings for all networks sharing this essid') + encryption_t = _('Use Encryption') + autoconnect_t = _('Automatically connect to this network') self.global_settings_chkbox = urwid.CheckBox(global_settings_t) self.encryption_chkbox = urwid.CheckBox(encryption_t,on_state_change=self.encryption_toggle) @@ -269,15 +382,8 @@ self.encrypt_types = misc.LoadEncryptionMethods() self.set_values() - title = language['configuring_wireless'].replace('$A',wireless.GetWirelessProperty(networkID,'essid')).replace('$B',wireless.GetWirelessProperty(networkID,'bssid')) + title = _('Configuring preferences for wireless network "$A" ($B)').replace('$A',wireless.GetWirelessProperty(networkID,'essid')).replace('$B',wireless.GetWirelessProperty(networkID,'bssid')) self._w.header = urwid.Text(('header',title),align='right' ) - - def encryption_toggle(self,chkbox,new_state,user_data=None): - self.encryption_combo.set_sensitive(new_state) - self.pile_encrypt.set_sensitive(new_state) - - def combo_on_change(self,combobox,new_index,user_data=None): - self.change_encrypt_method() def set_values(self): """ Set the various network settings to the right values. """ @@ -354,7 +460,7 @@ if entry_info[0].get_edit_text() == "" \ and entry_info[1] == 'required': error(self.ui, self.parent,"%s (%s)" \ - % (language['encrypt_info_missing'], + % (_('Required encryption information is missing.'), entry_info[0].get_caption()[0:-2] ) ) return False @@ -365,7 +471,7 @@ elif not self.encryption_chkbox.get_state() and \ wireless.GetWirelessProperty(self.networkid, "encryption"): # Encrypt checkbox is off, but the network needs it. - error(self.ui, self.parent, language['enable_encryption']) + error(self.ui, self.parent, _('This network requires encryption to be enabled.')) return False else: self.set_net_prop("enctype", "None") @@ -384,45 +490,6 @@ wireless.SaveWirelessNetworkProfile(self.networkid) return True - # More or less ripped from netentry.py - def change_encrypt_method(self): - #self.lbox_encrypt = urwid.ListBox() - self.encryption_info = {} - wid,ID = self.encryption_combo.get_focus() - methods = misc.LoadEncryptionMethods() - - if self._w.body.body.__contains__(self.pile_encrypt): - self._w.body.body.pop(self._w.body.body.__len__()-1) - - # If nothing is selected, select the first entry. - if ID == -1: - self.encryption_combo.set_focus(0) - ID = 0 - - theList = [] - for type_ in ['required', 'optional']: - fields = methods[ID][type_] - for field in fields: - if language.has_key(field[1]): - edit = MaskingEdit(('editcp',language[field[1].lower().replace(' ','_')]+': ')) - else: - edit = MaskingEdit(('editcp',field[1].replace('_',' ')+': ')) - edit.set_mask_mode('no_focus') - theList.append(edit) - # Add the data to any array, so that the information - # can be easily accessed by giving the name of the wanted - # data. - self.encryption_info[field[0]] = [edit, type_] - - edit.set_edit_text(noneToBlankString( - wireless.GetWirelessProperty(self.networkid, field[0]))) - - #FIXME: This causes the entire pile to light up upon use. - # Make this into a listbox? - self.pile_encrypt = DynWrap(urwid.Pile(theList),attrs=('editbx','editnfc')) - self._w.body.body.insert(self._w.body.body.__len__(),self.pile_encrypt) - #self._w.body.body.append(self.pile_encrypt) - def ready_widgets(self,ui,body): self.ui = ui self.body = body diff -Nru wicd-1.7.0+ds1/curses/prefs_curses.py wicd-1.7.1/curses/prefs_curses.py --- wicd-1.7.0+ds1/curses/prefs_curses.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/curses/prefs_curses.py 2011-10-18 15:57:54.000000000 +0000 @@ -24,6 +24,7 @@ from wicd import misc from wicd import dbusmanager +from wicd.translations import _ from curses_misc import SelText,DynWrap,DynRadioButton,ComboBox,TabColumns daemon = None @@ -46,13 +47,13 @@ #height = 20 # Stuff that goes at the top - header0_t = language["gen_settings"] - header1_t = language["ext_programs"] - header2_t = language["advanced_settings"] + header0_t = _('General Settings') + header1_t = _('External Programs') + header2_t = _('Advanced Settings') self.header0 = urwid.AttrWrap(SelText(header0_t), 'tab active', 'focus') self.header1 = urwid.AttrWrap(SelText(header1_t), 'body', 'focus') self.header2 = urwid.AttrWrap(SelText(header2_t), 'body', 'focus') - title = language['preferences'] + title = _('Preferences') # Blank line _blank = urwid.Text('') @@ -62,63 +63,63 @@ #### # General Settings - net_cat_t = ('header', language['network_interfaces']) - wired_t = ('editcp', language['wired_interface']+': ') - wless_t = ('editcp', language['wireless_interface']+':') - always_show_wired_t = language['wired_always_on'] - prefer_wired_t = language['always_switch_to_wired'] - - global_dns_cat_t = ('header', language['global_dns_servers']) - global_dns_t = ('editcp', language['use_global_dns']) - dns_dom_t = ('editcp', ' '+language['dns_domain']+': ') - search_dom_t = ('editcp', ' '+language['search_domain']+':') - dns1_t = ('editcp', ' DNS server 1: ') - dns2_t = ('editcp', ' DNS server 2: ') - dns3_t = ('editcp', ' DNS server 3: ') - - - wired_auto_cat_t= ('header', language['wired_autoconnect_settings']) - wired_auto_1_t = language['use_default_profile'] - wired_auto_2_t = language['show_wired_list'] - wired_auto_3_t = language['use_last_used_profile'] + net_cat_t = ('header', _('Network Interfaces')) + wired_t = ('editcp', _('Wired Interface')+': ') + wless_t = ('editcp', _('Wireless Interface')+':') + always_show_wired_t = _('''Always show wired interface''') + prefer_wired_t = _('''Always switch to wired connection when available''') + + global_dns_cat_t = ('header', _('Global DNS servers')) + global_dns_t = ('editcp', _('Use global DNS servers')) + dns_dom_t = ('editcp', ' '+_('DNS domain')+': ') + search_dom_t = ('editcp', ' '+_('Search domain')+':') + dns1_t = ('editcp', ' '+_('DNS server')+' 1: ') + dns2_t = ('editcp', ' '+_('DNS server')+' 2: ') + dns3_t = ('editcp', ' '+_('DNS server')+' 3: ') + + + wired_auto_cat_t= ('header', _('Wired Autoconnect Settings')) + wired_auto_1_t = _('Use default profile on wired autoconnect') + wired_auto_2_t = _('Prompt for profile on wired autoconnect') + wired_auto_3_t = _('Use last used profile on wired autoconnect') - auto_reconn_cat_t = ('header', language['automatic_reconnection']) - auto_reconn_t = language['auto_reconnect'] + auto_reconn_cat_t = ('header', _('Automatic Reconnection')) + auto_reconn_t = _('Automatically reconnect on connection loss') #### External Programs - automatic_t = language['wicd_auto_config'] + automatic_t = _('Automatic (recommended)') - dhcp_header_t = ('header', language["dhcp_client"]) + dhcp_header_t = ('header', _('DHCP Client')) # Automatic dhcp1_t = 'dhclient' dhcp2_t = 'dhcpcd' dhcp3_t = 'pump' dhcp4_t = 'udhcpc' - wired_detect_header_t = ('header', language["wired_detect"]) + wired_detect_header_t = ('header', _('Wired Link Detection')) wired1_t = 'ethtool' wired2_t = 'mii-tool' - flush_header_t = ('header', language["route_flush"]) + flush_header_t = ('header', _('Route Table Flushing')) flush1_t = 'ip' flush2_t = 'route' #### Advanced Settings - wpa_cat_t=('header', language['wpa_supplicant']) + wpa_cat_t=('header', _('WPA Supplicant')) wpa_t=('editcp','Driver:') wpa_list = [] - wpa_warn_t = ('important', language['always_use_wext']) + wpa_warn_t = ('important', _('You should almost always use wext as the WPA supplicant driver')) - backend_cat_t = ('header', language['backend']) - backend_t = language['backend']+':' + backend_cat_t = ('header', _('Backend')) + backend_t = _('Backend')+':' backend_list = [] - debug_cat_t = ('header', language['debugging']) - debug_mode_t = language['use_debug_mode'] + debug_cat_t = ('header', _('Debugging')) + debug_mode_t = _('Enable debug mode') - wless_cat_t = ('header', language['wireless_interface']) - use_dbm_t = language['display_type_dialog'] - verify_ap_t = language['verify_ap_dialog'] + wless_cat_t = ('header', _('Wireless Interface')) + use_dbm_t = _('Use dBm to measure signal strength') + verify_ap_t = _('Ping static gateways after connecting to verify association') @@ -172,7 +173,7 @@ ]) #### External Programs tab - automatic_t = language['wicd_auto_config'] + automatic_t = _('Automatic (recommended)') self.dhcp_header = urwid.Text(dhcp_header_t) self.dhcp_l = [] @@ -248,7 +249,7 @@ self.header2 : advancedLB} #self.load_settings() - self.tabs = TabColumns(headerList,lbList,language['preferences']) + self.tabs = TabColumns(headerList,lbList,_('Preferences')) self.__super.__init__(self.tabs) def load_settings(self): diff -Nru wicd-1.7.0+ds1/curses/wicd-curses.py wicd-1.7.1/curses/wicd-curses.py --- wicd-1.7.0+ds1/curses/wicd-curses.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/curses/wicd-curses.py 2012-02-02 16:38:26.000000000 +0000 @@ -75,7 +75,7 @@ CURSES_REV=wpath.curses_revision # Fix strings in wicd-curses -from wicd.translations import language +from wicd.translations import language, _ for i in language.keys(): language[i] = language[i].decode('utf8') @@ -91,12 +91,14 @@ #gobject.source_remove(redraw_tag) loop.quit() ui.stop() - print >> sys.stderr, "\n"+language['terminated'] + print >> sys.stderr, "\n"+_('Terminated by user') #raise except DBusException: loop.quit() ui.stop() - print >> sys.stderr,"\n"+language['dbus_fail'] + print >> sys.stderr,"\n"+_('DBus failure! '\ + 'This is most likely caused by the wicd daemon stopping while wicd-curses is running. '\ + 'Please restart the daemon, and then restart wicd-curses.') raise except : # Quit the loop @@ -105,7 +107,8 @@ # Zap the screen ui.stop() # Print out standard notification: - print >> sys.stderr, "\n" + language['exception'] + # This message was far too scary for humans, so it's gone now. + # print >> sys.stderr, "\n" + _('EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:') # Flush the buffer so that the notification is always above the # backtrace sys.stdout.flush() @@ -128,7 +131,7 @@ def check_for_wired(wired_ip,set_status): """ Determine if wired is active, and if yes, set the status. """ if wired_ip and wired.CheckPluggedIn(): - set_status(language['connected_to_wired'].replace('$A',wired_ip)) + set_status(_('Connected to wired network (IP: $A)').replace('$A',wired_ip)) return True else: return False @@ -143,7 +146,7 @@ if not network: return False - network = unicode(network) + network = misc.to_unicode(network) if daemon.GetSignalDisplayType() == 0: strength = wireless.GetCurrentSignalStrength(iwconfig) else: @@ -151,12 +154,12 @@ if strength is None: return False - strength = str(strength) - ip = str(wireless_ip) - set_status(language['connected_to_wireless'].replace + strength = misc.to_unicode(daemon.FormatSignalForPrinting(strength)) + ip = misc.to_unicode(wireless_ip) + set_status(_('Connected to $A at $B (IP: $C)').replace ('$A', network).replace - ('$B', daemon.FormatSignalForPrinting(strength)).replace - ('$C', wireless_ip)) + ('$B', strength).replace + ('$C', ip)) return True @@ -189,40 +192,41 @@ ('green',"\\|| \\\\")," |+| ",('green',"// ||/ \n"), ('green'," \\\\\\")," |+| ",('green',"///")," http://wicd.net\n", -('green'," \\\\\\")," |+| ",('green',"///")," ",language["brought_to_you"],"\n", +('green'," \\\\\\")," |+| ",('green',"///")," ",_('Brought to you by:'),"\n", ('green'," \\\\\\")," |+| ",('green',"///")," Adam Blackburn\n", " ___|+|___ Dan O'Reilly\n", -" |---------| Andrew Psaltis\n", +" ____|+|____ Andrew Psaltis\n", +" |-----------| David Paleino\n", "-----------------------------------------------------"] - about = TextDialog(theText,16,55,header=('header','About Wicd')) + about = TextDialog(theText,16,55,header=('header',_('About Wicd'))) about.run(ui,body) # Modeled after htop's help def help_dialog(body): - textT = urwid.Text(('header','wicd-curses help'),'right') + textT = urwid.Text(('header',_('wicd-curses help')),'right') textSH = urwid.Text(['This is ',('blue','wicd-curses-'+CURSES_REV),' using wicd ',unicode(daemon.Hello()),'\n']) textH = urwid.Text([ -"For more detailed help, consult the wicd-curses(8) man page.\n", +_('For more detailed help, consult the wicd-curses(8) man page.')+"\n", ('bold','->'),' and ',('bold','<-')," are the right and left arrows respectively.\n"]) text1 = urwid.Text([ -('bold',' H h ?'),": Display this help dialog\n", -('bold','enter C'),": Connect to selected network\n", -('bold',' D'),": Disconnect from all networks\n", -('bold',' ESC'),": Stop a connection in progress\n", -('bold',' F5 R'),": Refresh network list\n", -('bold',' P'),": Prefrences dialog\n", +('bold',' H h ?'),": "+_('Display this help dialog')+"\n", +('bold','enter C'),": "+_('Connect to selected network')+"\n", +('bold',' D'),": "+_('Disconnect from all networks')+"\n", +('bold',' ESC'),": "+_('Stop a connection in progress')+"\n", +('bold',' F5 R'),": "+_('Refresh network list')+"\n", +('bold',' P'),": "+_('Preferences dialog')+"\n", ]) text2 = urwid.Text([ -('bold',' I'),": Scan for hidden networks\n", -('bold',' S'),": Select scripts\n", -('bold',' O'),": Set up Ad-hoc network\n", -('bold',' ->'),": Configure selected network\n", -('bold',' A'),": Display 'about' dialog\n", -('bold',' F8 q Q'),": Quit wicd-curses\n", +('bold',' I'),": "+_('Scan for hidden networks')+"\n", +('bold',' S'),": "+_('Select scripts')+"\n", +('bold',' O'),": "+_('Set up Ad-hoc network')+"\n", +('bold',' ->'),": "+_('Configure selected network')+"\n", +('bold',' A'),": "+_("Display 'about' dialog")+"\n", +('bold',' F8 q Q'),": "+_('Quit wicd-curses')+"\n", ]) - textF = urwid.Text('Press any key to return.') + textF = urwid.Text(_('Press any key to return.')) # textJ = urwid.Text(('important','Nobody expects the Spanish Inquisition!')) @@ -240,7 +244,11 @@ # Don't stop because someone let go of the mouse on the frame mouse_release = False for k in keys: - if urwid.is_mouse_event(k) and k[0] == "mouse release": + if urwid.VERSION < (1, 0, 0): + check_mouse_event = urwid.is_mouse_event + else: + check_mouse_event = urwid.util.is_mouse_event + if check_mouse_event(k) and k[0] == "mouse release": mouse_release = True break if mouse_release : @@ -260,13 +268,19 @@ profname = nettype else: profname = wireless.GetWirelessProperty( int(netname),'bssid') - theText = [ - language['cannot_edit_scripts_1'].replace('$A',configfile).replace('$B',header), + theText = [ + _('To avoid various complications, wicd-curses does not support directly editing the scripts. '\ + 'However, you can edit them manually. First, (as root), open the "$A" config file, and look '\ + 'for the section labeled by the $B in question. In this case, this is:'). + replace('$A', configfile).replace('$B', header), "\n\n["+profname+"]\n\n", -# Translation needs to be changed to accomidate this text below. -"""You can also configure the wireless networks by looking for the "[]" field in the config file. - -Once there, you can adjust (or add) the "beforescript", "afterscript", "predisconnectscript" and "postdisconnectscript" variables as needed, to change the preconnect, postconnect, predisconnect and postdisconnect scripts respectively. Note that you will be specifying the full path to the scripts - not the actual script contents. You will need to add/edit the script contents separately. Refer to the wicd manual page for more information."""] + _('You can also configure the wireless networks by looking for the "[]" field in the config file.'), + _('Once there, you can adjust (or add) the "beforescript", "afterscript", "predisconnectscript" '\ + 'and "postdisconnectscript" variables as needed, to change the preconnect, postconnect, '\ + 'predisconnect and postdisconnect scripts respectively. Note that you will be specifying '\ + 'the full path to the scripts - not the actual script contents. You will need to add/edit '\ + 'the script contents separately. Refer to the wicd manual page for more information.') + ] dialog = TextDialog(theText,20,80) dialog.run(ui,parent) # This code works with many distributions, but not all of them. So, to @@ -336,7 +350,7 @@ if wireless.GetWirelessProperty(id, 'encryption'): self.encrypt = wireless.GetWirelessProperty(id,'encryption_method') else: - self.encrypt = language['unsecured'] + self.encrypt = _('Unsecured') self.mode = wireless.GetWirelessProperty(id, 'mode') # Master, Ad-Hoc self.channel = wireless.GetWirelessProperty(id, 'channel') @@ -361,7 +375,7 @@ list : the list of wired network profiles. The rest is self-explanitory. """ def __init__(self,list): - self.ADD_PROFILE = '---'+language["add_new_profile"]+'---' + self.ADD_PROFILE = '---'+_('Add a new profile')+'---' self.__super.__init__(use_enter=False) self.set_list(list) @@ -394,7 +408,7 @@ key = ComboBox.keypress(self,size,key) if key == ' ': if self.get_focus()[1] == len(self.list)-1: - dialog = InputDialog(('header',language["add_new_wired_profile"]),7,30) + dialog = InputDialog(('header',_('Add a new wired profile')),7,30) exitcode,name = dialog.run(ui,self.parent) if exitcode == 0: name = name.strip() @@ -411,7 +425,7 @@ wired.ReadWiredNetworkProfile(self.get_selected_profile()) if key == 'delete': if len(self.theList) == 1: - error(self.ui,self.parent,language["no_delete_last_profile"]) + error(self.ui,self.parent,_('wicd-curses does not support deleting the last wired profile. Try renaming it ("F2")')) return key wired.DeleteWiredNetworkProfile(self.get_selected_profile()) # Return to the top of the list if something is deleted. @@ -424,7 +438,7 @@ self.set_list(wired.GetWiredProfileList()) self.rebuild_combobox() if key == 'f2': - dialog = InputDialog(('header',language["rename_wired_profile"]),7,30, + dialog = InputDialog(('header',_('Rename wired profile')),7,30, edit_text=unicode(self.get_selected_profile())) exitcode,name = dialog.run(ui,self.parent) if exitcode == 0: @@ -444,12 +458,12 @@ # Dialog2 that initiates an Ad-Hoc network connection class AdHocDialog(Dialog2): def __init__(self): - essid_t = language['essid'] - ip_t = language['ip'] - channel_t = language['channel'] - key_t = " " + language['key'] - use_ics_t = language['use_ics'] - use_encrypt_t = language['use_wep_encryption'] + essid_t = _('ESSID') + ip_t = _('IP') + channel_t = _('Channel') + key_t = " " + _('Key') + use_ics_t = _('Activate Internet Connection Sharing') + use_encrypt_t = _('Use Encryption (WEP only)') self.essid_edit = DynEdit(essid_t) self.ip_edit = DynEdit(ip_t) @@ -471,9 +485,9 @@ self.use_ics_chkb,self.use_encrypt_chkb,self.key_edit] body = urwid.ListBox(l) - header = ('header',language['create_adhoc_network']) + header = ('header', _('Create an Ad-Hoc Network')) Dialog2.__init__(self, header, 15, 50, body) - self.add_buttons([('OK',1),('Cancel',-1)]) + self.add_buttons([(_('OK'),1),(_('Cancel'),-1)]) self.frame.set_focus('body') def encrypt_callback(self,chkbox,new_state,user_info=None): @@ -509,16 +523,16 @@ self.size = ui.get_cols_rows() # Happy screen saying that you can't do anything because we're scanning # for networks. :-) - self.screen_locker = urwid.Filler(urwid.Text(('important',language['scanning_stand_by']), align='center')) - self.no_wlan = urwid.Filler(urwid.Text(('important',language['no_wireless_networks_found']), align='center')) - self.TITLE = language['wicd_curses'] + self.screen_locker = urwid.Filler(urwid.Text(('important',_('Scanning networks... stand by...')), align='center')) + self.no_wlan = urwid.Filler(urwid.Text(('important',_('No wireless networks found.')), align='center')) + self.TITLE = _('Wicd Curses Interface') self.WIRED_IDX = 1 self.WLESS_IDX = 3 header = urwid.AttrWrap(urwid.Text(self.TITLE,align='right'), 'header') - self.wiredH=urwid.Filler(urwid.Text("Wired Network(s)")) + self.wiredH=urwid.Filler(urwid.Text(_('Wired Networks'))) self.list_header=urwid.AttrWrap(urwid.Text(gen_list_header()),'listbar') - self.wlessH=NSelListBox([urwid.Text("Wireless Network(s)"),self.list_header]) + self.wlessH=NSelListBox([urwid.Text(_('Wireless Networks')),self.list_header]) # Init this earlier to make update_status happy self.update_tag = None @@ -538,16 +552,17 @@ # Keymappings proposed by nanotube in #wicd keys = [ - ('H' ,'Help' ,None), - ('right','Config',None), + ('H' ,_('Help'),None), + ('right',_('Config'),None), #(' ',' ',None), - ('C' ,'Connect',None), - ('D' ,'Disconn',None), - ('R' ,'Refresh',None), - ('P' ,'Prefs',None), - ('I' ,'Hidden',None), - ('A' ,'About',None), - ('Q' ,'Quit',loop.quit) + ('K' , _('RfKill'),None), + ('C' ,_('Connect'),None), + ('D' ,_('Disconn'),None), + ('R' ,_('Refresh'),None), + ('P' ,_('Prefs'),None), + ('I' ,_('Hidden'),None), + ('A' ,_('About'),None), + ('Q' ,_('Quit'),loop.quit) ] self.primaryCols = OptCols(keys,self.handle_keys) @@ -584,12 +599,12 @@ def init_other_optcols(self): # The "tabbed" preferences dialog - self.prefCols = OptCols( [ ('f10','OK'), - ('page up','Tab Left',), - ('page down', 'Tab Right'), - ('esc','Cancel') ], self.handle_keys) - self.confCols = OptCols( [ ('f10','OK'), - ('esc','Cancel') ],self.handle_keys) + self.prefCols = OptCols( [ ('f10',_('OK')), + ('page up',_('Tab Left'),), + ('page down', _('Tab Right')), + ('esc',_('Cancel')) ], self.handle_keys) + self.confCols = OptCols( [ ('f10',_('OK')), + ('esc',_('Cancel')) ],self.handle_keys) # Does what it says it does def lock_screen(self): @@ -611,7 +626,7 @@ self.update_ui() def raise_hidden_network_dialog(self): - dialog = InputDialog(('header',language["select_hidden_essid"]),7,30,language['scan']) + dialog = InputDialog(('header',_('Select Hidden Network ESSID')),7,30,_('Scan')) exitcode,hidden = dialog.run(ui,self.frame) if exitcode != -1: # That dialog will sit there for a while if I don't get rid of it @@ -720,7 +735,7 @@ self.set_status): return True else: - self.set_status(language['not_connected']) + self.set_status(_('Not connected')) self.update_ui() return True @@ -732,17 +747,12 @@ iwconfig = wireless.GetIwconfig() else: iwconfig = '' - # set_status is rigged to return false when it is not - # connecting to anything, so this should work. - return self.set_status(wireless.GetCurrentNetwork(iwconfig) + - ': ' + - language[str(wireless.CheckWirelessConnectingMessage())], - True) + essid = wireless.GetCurrentNetwork(iwconfig) + stat = wireless.CheckWirelessConnectingMessage() + return self.set_status("%s: %s" % (essid, stat), True) if wired_connecting: - return self.set_status( language['wired_network'] + - ': ' + - language[str(wired.CheckWiredConnectingMessage())], - True) + return self.set_status(_('Wired Network') + + ': ' + wired.CheckWiredConnectingMessage(), True) else: self.conn_status=False return False @@ -805,6 +815,9 @@ if "f5" in keys or 'R' in keys: self.lock_screen() self.doScan() + if 'k' in keys or 'K' in keys: + wireless.SwitchRfKill() + self.update_netlist() if "D" in keys: # Disconnect from all networks. daemon.Disconnect() @@ -814,7 +827,7 @@ focus = self.thePile.get_focus() self.frame.set_footer(urwid.Pile([self.confCols,self.footer2])) if focus == self.wiredCB: - self.diag = WiredSettingsDialog(self.wiredCB.get_body().get_selected_profile()) + self.diag = WiredSettingsDialog(self.wiredCB.get_body().get_selected_profile(),self.frame) self.frame.set_body(self.diag) else: # wireless list only other option @@ -881,7 +894,11 @@ data[4], False) for k in keys: - if urwid.is_mouse_event(k): + if urwid.VERSION < (1, 0, 0): + check_mouse_event = urwid.is_mouse_event + else: + check_mouse_event = urwid.util.is_mouse_event + if check_mouse_event(k): event, button, col, row = k self.frame.mouse_event( self.size, event, button, col, row, @@ -1009,13 +1026,17 @@ try: dbusmanager.connect_to_dbus() except DBusException: - print >> sys.stderr, language['cannot_connect_to_daemon'] + print >> sys.stderr, _("Can't connect to the daemon, trying to start it automatically...") bus = dbusmanager.get_bus() dbus_ifaces = dbusmanager.get_dbus_ifaces() daemon = dbus_ifaces['daemon'] wireless = dbus_ifaces['wireless'] wired = dbus_ifaces['wired'] + if not daemon: + print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.' + sys.exit(3) + netentry_curses.dbus_init(dbus_ifaces) return True @@ -1026,14 +1047,17 @@ ######################################## if __name__ == '__main__': try: - parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello())) + parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello()), prog="wicd-curses") except Exception, e: if "DBus.Error.AccessDenied" in e.get_dbus_name(): - print language['access_denied_wc'].replace('$A','\033[1;34m'+wpath.wicd_group+'\033[0m') + print _('ERROR: wicd-curses was denied access to the wicd daemon: '\ + 'please check that your user is in the "$A" group.').\ + replace('$A','\033[1;34m' + wpath.wicd_group + '\033[0m') sys.exit(1) else: raise #parser.add_option("-d", "--debug",action="store_true" # ,dest='debug',help="enable logging of wicd-curses (currently does nothing)") + (options,args) = parser.parse_args() main() diff -Nru wicd-1.7.0+ds1/data/wicd.glade wicd-1.7.1/data/wicd.glade --- wicd-1.7.0+ds1/data/wicd.glade 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/data/wicd.glade 1970-01-01 00:00:00.000000000 +0000 @@ -1,1670 +0,0 @@ - - - - - - 450 - 400 - True - Wicd Network Manager - center - 550 - center - - - True - - - True - both-horiz - 0 - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - True - - - gtk-network - True - True - True - - - True - - - Create an ad-hoc network - True - False - - - - True - gtk-add - - - - - - - Find a hidden network - True - Enter a hidden network to try to locate. - False - - - - True - gtk-find - - - - - - - - - - - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - _Disconnect All - True - gtk-disconnect - - - - False - True - - - - - True - True - _Refresh - True - gtk-refresh - - - - False - True - - - - - True - True - _Preferences - True - gtk-preferences - - - - False - True - - - - - True - True - _About - True - gtk-about - - - - False - True - - - - - True - GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK - True - _Quit - True - gtk-quit - - - - False - True - - - - - False - 0 - - - - - True - 0 - 10 - 10 - Choose from the networks below: - True - - - False - 1 - - - - - True - False - automatic - automatic - - - True - none - - - True - 3 - - - - - - - - - - 2 - - - - - 4 - - - Connecting... - True - Connecting... - - - 3 - 0 - - - - - gtk-cancel - True - False - False - Cancel the current connection attempt - True - - - - False - 3 - 1 - - - - - False - 3 - - - - - True - - - False - 4 - - - - - - - 416 - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - Configure Scripts - center-on-parent - dialog - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Configure scripts to run for this network: - - - False - False - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 150 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Pre-connection Script: - - - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - - - - - False - False - 5 - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 150 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Post-connection Script: - - - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - - - - - False - False - 5 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 150 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Pre-disconnection Script: - - - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - - - - - False - False - 5 - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 150 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Post-disconnection Script: - - - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - - - - - False - False - 5 - 4 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - 1 - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - - 5 - center-on-parent - dialog - False - - - True - 2 - - - True - True - - - True - 12 - 12 - 12 - 12 - - - True - True - automatic - automatic - - - True - queue - none - - - True - 20 - 2 - 4 - 4 - - - True - - - Always switch to a wired connection when available - True - True - False - True - If selected, wicd will automatically connect to a wired network -as soon as a cable is plugged in, even if a wireless connection -is already active. - True - - - - - 2 - 4 - 5 - - 24 - - - - - True - 24 - - - True - 0 - DNS domain: - - - - - 7 - 8 - - - - - - True - True - - - 1 - 2 - 7 - 8 - GTK_FILL - - - - - True - 12 - - - Automatically reconnect on network connection loss - True - True - False - True - - - - - 2 - 17 - 18 - - - - - - True - 0 - <b>Automatic Reconnection</b> - True - - - 2 - 16 - 17 - - - - - - True - 12 - - - Use last wired network profile - True - True - False - True - True - - - - - 2 - 15 - 16 - - - - - - True - 12 - - - Prompt for wired network profile - True - True - False - True - True - pref_use_last_radio - - - - - 2 - 14 - 15 - - - - - - True - 12 - - - Use default wired network profile - True - True - False - True - True - pref_use_last_radio - - - - - 2 - 13 - 14 - - - - - - True - 0 - <b>Wired automatic connection</b> - True - - - 2 - 12 - 13 - - - - - - True - 12 - - - True - 0 - Wired interface: - - - - - 2 - 3 - - - - - - True - 12 - - - True - 0 - Wireless interface: - - - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - <b>Network Interfaces</b> - True - - - 2 - - - - - - True - 24 - - - True - 0 - DNS server 3: - - - - - 11 - 12 - - - - - - True - True - - - 1 - 2 - 11 - 12 - - - - - - True - 24 - - - True - 0 - DNS server 2: - - - - - 10 - 11 - - - - - - True - 24 - - - True - 0 - DNS server 1: - - - - - 9 - 10 - - - - - - True - 24 - - - True - 0 - Search domain: - - - - - 8 - 9 - - - - - - True - 12 - - - Use global DNS servers - True - True - False - True - - - - - 2 - 6 - 7 - - - - - - True - 0 - <b>Global DNS Servers</b> - True - - - 2 - 5 - 6 - - - - - - True - True - - - 1 - 2 - 10 - 11 - - - - - - True - True - - - 1 - 2 - 9 - 10 - - - - - - True - True - - - 1 - 2 - 8 - 9 - - - - - - True - 24 - - - Always show wired interface - True - True - False - If enabled, the wired network interface will always be displayed in the main window. This can be useful if your wired network card does not detect when the interface is connected to a cable. - True - - - - - 2 - 3 - 4 - - - - - - True - 0 - <b>Notifications</b> - True - - - 2 - 18 - 19 - - - - - - True - 12 - - - Display notifications about connection status - True - True - False - True - - - - - 2 - 19 - 20 - - - - - - - - - - - - - - True - General Settings - - - False - tab - - - - - True - 12 - 12 - 12 - 12 - - - True - True - automatic - automatic - - - True - queue - none - - - True - 8 - - - True - 0 - <b>Route Table Flushing</b> - True - - - 4 - 5 - - - - - - True - 0 - <b>Wired Link Detection</b> - True - - - 2 - 3 - - - - - - True - 12 - - - True - - - Automatic (recommended) - True - True - False - True - True - - - False - 0 - - - - - ip - True - True - False - True - True - flush_auto_radio - - - False - 1 - - - - - route - True - True - False - True - True - flush_auto_radio - - - False - 2 - - - - - - - 5 - 6 - - - - - - True - 12 - - - True - - - Automatic (recommended) - True - True - False - True - True - - - False - 0 - - - - - ethtool - True - True - False - True - True - link_auto_radio - - - False - 1 - - - - - mii-tool - True - True - False - True - True - link_auto_radio - - - False - 2 - - - - - - - 3 - 4 - - - - - - True - 12 - - - True - - - Automatic (recommended) - True - True - False - True - True - dhclient_radio - - - False - 0 - - - - - dhcpcd - True - True - False - True - True - dhclient_radio - - - False - 1 - - - - - pump - True - True - False - True - True - dhclient_radio - - - False - 2 - - - - - dhclient - True - True - False - True - True - - - False - 3 - - - - - udhcpc - True - True - False - True - True - dhclient_radio - - - False - 4 - - - - - - - 1 - 2 - - - - - - True - 0 - <b>DHCP Client</b> - True - - - - - - - - True - 0 - <b>Graphical Sudo Application</b> - True - - - 6 - 7 - - - - - - True - 12 - - - True - - - Automatic (recommended) - True - True - False - True - True - - - False - 0 - - - - - gksudo - True - True - False - True - True - sudo_auto_radio - - - False - 1 - - - - - kdesu - True - True - False - True - True - sudo_auto_radio - - - False - 2 - - - - - ktsuss - True - True - False - True - True - sudo_auto_radio - - - False - 3 - - - - - - - 7 - 8 - - - - - - - - - - - 1 - - - - - True - External Programs - - - 1 - False - tab - - - - - True - 12 - 12 - 12 - 12 - - - True - 11 - 2 - - - True - 0 - Hover your mouse over the selected backend -to read its description. - True - - - 1 - 2 - 5 - 6 - - - - - - True - - - True - - - False - 0 - - - - - 1 - 2 - 1 - 2 - - - - - - True - - - 2 - 3 - GTK_FILL - - - - - - True - 12 - - - True - 0 - Driver: - - - - - 1 - 2 - - - - - - True - 12 - - - Use dBm to measure signal strength - True - True - False - True - - - - - 2 - 9 - 10 - - - - - - True - 12 - - - Enable debug mode - True - True - False - True - - - - - 2 - 7 - 8 - - - - - - True - 0 - <b>Wireless Interface</b> - True - - - 2 - 8 - 9 - - - - - - True - 0 - <b>WPA Supplicant</b> - True - - - 2 - - - - - - True - 0 - <b>Debugging</b> - True - - - 2 - 6 - 7 - - - - - - True - 12 - - - True - 0 - Backend: - - - - - 4 - 5 - - - - - - True - True - - - 1 - 2 - 4 - 5 - - - - - - True - 0 - <b>Backend</b> - True - - - 2 - 3 - 4 - - - - - - True - 0 - You should almost always use wext as the -WPA supplicant driver. - True - - - 1 - 2 - 2 - 3 - - - - - - True - - - 5 - 6 - GTK_FILL - - - - - - True - 12 - - - Ping static gateways after connecting to verify association - True - True - False - True - - - - - 2 - 10 - 11 - - - - - - - - 2 - - - - - True - Advanced Settings - - - 2 - False - tab - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - 1 - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - diff -Nru wicd-1.7.0+ds1/data/wicd.ui wicd-1.7.1/data/wicd.ui --- wicd-1.7.0+ds1/data/wicd.ui 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/data/wicd.ui 2011-12-07 21:21:29.000000000 +0000 @@ -0,0 +1,1736 @@ + + + + + + 450 + 400 + True + Wicd Network Manager + center + 550 + wicd-gtk + center + + + + + + True + vertical + + + True + both-horiz + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + True + + + gtk-network + True + True + True + accelgroup1 + + + True + + + Create an ad-hoc network + True + image1 + False + + + + + + Find a hidden network + True + Enter a hidden network to try to locate. + image2 + False + + + + + + + + + + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + _Switch Off Wi-Fi + True + gtk-media-stop + + + + False + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + _Disconnect All + True + gtk-disconnect + + + + False + True + + + + + True + True + _Refresh + True + gtk-refresh + + + + False + True + + + + + True + True + _Preferences + True + gtk-preferences + + + + False + True + + + + + True + True + _About + True + gtk-about + + + + False + True + + + + + True + GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK + True + _Quit + True + gtk-quit + + + + False + True + + + + + False + 0 + + + + + True + 0 + 10 + 10 + Choose from the networks below: + True + + + False + 1 + + + + + True + False + automatic + automatic + + + True + none + + + True + 3 + vertical + + + + + + + + + + 2 + + + + + 4 + + + Connecting... + True + Connecting... + + + 3 + 0 + + + + + gtk-cancel + True + False + False + Cancel the current connection attempt + True + + + + False + 3 + 1 + + + + + False + 3 + + + + + True + + + False + 4 + + + + + + + 416 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Configure Scripts + center-on-parent + dialog + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Configure scripts to run for this network: + + + False + False + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 150 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Pre-connection Script: + + + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + + + + + False + False + 5 + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 150 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Post-connection Script: + + + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + + + + + False + False + 5 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 150 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Pre-disconnection Script: + + + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + + + + + False + False + 5 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 150 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Post-disconnection Script: + + + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + + + + + False + False + 5 + 4 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + button3 + button4 + + + + 5 + center-on-parent + dialog + False + + + True + vertical + 2 + + + True + True + + + True + 12 + 12 + 12 + 12 + + + True + True + automatic + automatic + + + True + queue + none + + + True + 22 + 2 + 4 + 4 + + + True + + + Always switch to a wired connection when available + True + True + False + True + If selected, wicd will automatically connect to a wired network +as soon as a cable is plugged in, even if a wireless connection +is already active. + True + + + + + 2 + 4 + 5 + + 24 + + + + + True + 24 + + + True + 0 + DNS domain: + + + + + 7 + 8 + + + + + + True + True + + + 1 + 2 + 7 + 8 + GTK_FILL + + + + + True + 12 + + + Show never connect networks + True + True + False + True + + + + + 2 + 19 + 20 + + + + + + True + 0 + <b>Never Connect</b> + True + + + 2 + 18 + 19 + + + + + + True + 12 + + + Automatically reconnect on network connection loss + True + True + False + True + + + + + 2 + 17 + 18 + + + + + + True + 0 + <b>Automatic Reconnection</b> + True + + + 2 + 16 + 17 + + + + + + True + 12 + + + Use last wired network profile + True + True + False + True + True + + + + + 2 + 15 + 16 + + + + + + True + 12 + + + Prompt for wired network profile + True + True + False + True + True + pref_use_last_radio + + + + + 2 + 14 + 15 + + + + + + True + 12 + + + Use default wired network profile + True + True + False + True + True + pref_use_last_radio + + + + + 2 + 13 + 14 + + + + + + True + 0 + <b>Wired automatic connection</b> + True + + + 2 + 12 + 13 + + + + + + True + 12 + + + True + 0 + Wired interface: + + + + + 2 + 3 + + + + + + True + 12 + + + True + 0 + Wireless interface: + + + + + 1 + 2 + + + + + + True + True + + + 1 + 2 + 2 + 3 + + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + <b>Network Interfaces</b> + True + + + 2 + + + + + + True + 24 + + + True + 0 + DNS server 3: + + + + + 11 + 12 + + + + + + True + True + + + 1 + 2 + 11 + 12 + + + + + + True + 24 + + + True + 0 + DNS server 2: + + + + + 10 + 11 + + + + + + True + 24 + + + True + 0 + DNS server 1: + + + + + 9 + 10 + + + + + + True + 24 + + + True + 0 + Search domain: + + + + + 8 + 9 + + + + + + True + 12 + + + Use global DNS servers + True + True + False + True + + + + + 2 + 6 + 7 + + + + + + True + 0 + <b>Global DNS Servers</b> + True + + + 2 + 5 + 6 + + + + + + True + True + + + 1 + 2 + 10 + 11 + + + + + + True + True + + + 1 + 2 + 9 + 10 + + + + + + True + True + + + 1 + 2 + 8 + 9 + + + + + + True + 24 + + + Always show wired interface + True + True + False + If enabled, the wired network interface will always be displayed in the main window. This can be useful if your wired network card does not detect when the interface is connected to a cable. + True + + + + + 2 + 3 + 4 + + + + + + True + 0 + <b>Notifications</b> + True + + + 2 + 20 + 21 + + + + + + True + 12 + + + Display notifications about connection status + True + True + False + True + + + + + 2 + 21 + 22 + + + + + + + + + + + + + + True + General Settings + + + False + + + + + True + 12 + 12 + 12 + 12 + + + True + True + automatic + automatic + + + True + queue + none + + + True + 8 + + + True + 0 + <b>Route Table Flushing</b> + True + + + 4 + 5 + + + + + + True + 0 + <b>Wired Link Detection</b> + True + + + 2 + 3 + + + + + + True + 12 + + + True + vertical + + + Automatic (recommended) + True + True + False + True + True + + + False + 0 + + + + + ip + True + True + False + True + True + flush_auto_radio + + + False + 1 + + + + + route + True + True + False + True + True + flush_auto_radio + + + False + 2 + + + + + + + 5 + 6 + + + + + + True + 12 + + + True + vertical + + + Automatic (recommended) + True + True + False + True + True + + + False + 0 + + + + + ethtool + True + True + False + True + True + link_auto_radio + + + False + 1 + + + + + mii-tool + True + True + False + True + True + link_auto_radio + + + False + 2 + + + + + + + 3 + 4 + + + + + + True + 12 + + + True + vertical + + + Automatic (recommended) + True + True + False + True + True + dhclient_radio + + + False + 0 + + + + + dhcpcd + True + True + False + True + True + dhclient_radio + + + False + 1 + + + + + pump + True + True + False + True + True + dhclient_radio + + + False + 2 + + + + + dhclient + True + True + False + True + True + + + False + 3 + + + + + udhcpc + True + True + False + True + True + dhclient_radio + + + False + 4 + + + + + + + 1 + 2 + + + + + + True + 0 + <b>DHCP Client</b> + True + + + + + + + + True + 0 + <b>Graphical Sudo Application</b> + True + + + 6 + 7 + + + + + + True + 12 + + + True + vertical + + + Automatic (recommended) + True + True + False + True + True + + + False + 0 + + + + + gksudo + True + True + False + True + True + sudo_auto_radio + + + False + 1 + + + + + kdesu + True + True + False + True + True + sudo_auto_radio + + + False + 2 + + + + + ktsuss + True + True + False + True + True + sudo_auto_radio + + + False + 3 + + + + + + + 7 + 8 + + + + + + + + + + + 1 + + + + + True + External Programs + + + 1 + False + + + + + True + 12 + 12 + 12 + 12 + + + True + 11 + 2 + + + True + 0 + Hover your mouse over the selected backend +to read its description. + True + + + 1 + 2 + 5 + 6 + + + + + + True + vertical + + + True + + + False + 0 + + + + + 1 + 2 + 1 + 2 + + + + + + True + + + 2 + 3 + GTK_FILL + + + + + + True + 12 + + + True + 0 + Driver: + + + + + 1 + 2 + + + + + + True + 12 + + + Use dBm to measure signal strength + True + True + False + True + + + + + 2 + 9 + 10 + + + + + + True + 12 + + + Enable debug mode + True + True + False + True + + + + + 2 + 7 + 8 + + + + + + True + 0 + <b>Wireless Interface</b> + True + + + 2 + 8 + 9 + + + + + + True + 0 + <b>WPA Supplicant</b> + True + + + 2 + + + + + + True + 0 + <b>Debugging</b> + True + + + 2 + 6 + 7 + + + + + + True + 12 + + + True + 0 + Backend: + + + + + 4 + 5 + + + + + + True + True + + + 1 + 2 + 4 + 5 + + + + + + True + 0 + <b>Backend</b> + True + + + 2 + 3 + 4 + + + + + + True + 0 + You should almost always use wext as the +WPA supplicant driver. + True + + + 1 + 2 + 2 + 3 + + + + + + True + + + 5 + 6 + GTK_FILL + + + + + + True + 12 + + + Ping static gateways after connecting to verify association + True + True + False + True + + + + + 2 + 10 + 11 + + + + + + + + 2 + + + + + True + Advanced Settings + + + 2 + False + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + button2 + button1 + + + + True + gtk-add + + + True + gtk-find + + + diff -Nru wicd-1.7.0+ds1/debian/changelog wicd-1.7.1/debian/changelog --- wicd-1.7.0+ds1/debian/changelog 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/changelog 2012-02-02 19:36:08.000000000 +0000 @@ -1,3 +1,70 @@ +wicd (1.7.1-1) unstable; urgency=low + + * New upstream release + * Patches refreshed to match 1.7.1's code + + -- David Paleino Thu, 02 Feb 2012 20:36:02 +0100 + +wicd (1.7.1~b3-5) unstable; urgency=low + + * Finally, really fix the issue with ESSIDs containing \x00 + (Closes: #655159) + + -- David Paleino Tue, 31 Jan 2012 18:35:41 +0100 + +wicd (1.7.1~b3-4) unstable; urgency=low + + * Fix translations even more (Closes: #655994) + * Hopefully fixed bug with ESSIDs containing '\x00' (Closes: #655159) + * Mask out sensitive info in logfiles (Closes: #652417) + + -- David Paleino Sat, 21 Jan 2012 11:24:53 +0100 + +wicd (1.7.1~b3-3) unstable; urgency=low + + * More backports from upstream: + - fix various translation bugs (Closes: #651804) + - fix check for configfile existence (Closes: #651933) + - fix various issues with unicode (Closes: #588444, #612981) + + -- David Paleino Fri, 16 Dec 2011 12:33:29 +0100 + +wicd (1.7.1~b3-2) unstable; urgency=low + + * Don't wipe out configuration files (03-fix_configmanager_bug.patch) + * Backported upstream fixes (04-backport_upstream_fixes.patch) + - Fixed mismatch between DBus API and code (Closes: #651412) + - Fixed typo -- dict being used with () + + -- David Paleino Sun, 11 Dec 2011 20:50:33 +0100 + +wicd (1.7.1~b3-1) unstable; urgency=low + + * New upstream beta release + - useless patches removed, most of them merged upstream. + Remaining ones: + + 01-remove_unused_icons.patch + + 26-support_etc-network_scripts.patch + + 32-prefer_gksu.patch + - documented wicd-gtk's -t option (Closes: #648757) + - keep configuration files sorted (Closes: #568326) + - show correct ESSID in status bar (Closes: #535507, #647503) + - show correct ESSID when rescanning networks (Closes: #552254) + - redesigned l10n system (Closes: #572375) + * Added Dutch Debconf translation, thanks to Jeroen Schot + (Closes: #643640) + * Drop kdesu, ktsuss and sudo from wicd-gtk's Recommends. + * Make wicd-daemon Pre-Depend on debconf (>= 1.5.34) to correctly + handle sr@latin translation (Closes: #647626) + * Removed get-orig-source target from debian/rules, no more needed + * Compile translations at build-time in debian/rules, using + setup.py's machinery + * Clean files after build using debian/clean + * Workaround dhclient's bug trying to set a different hostname + (see #609851) + + -- David Paleino Tue, 06 Dec 2011 22:05:11 +0100 + wicd (1.7.0+ds1-9) unstable; urgency=high * Fix postinst: it breaks dh_python2's layout diff -Nru wicd-1.7.0+ds1/debian/clean wicd-1.7.1/debian/clean --- wicd-1.7.0+ds1/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/debian/clean 2012-02-02 19:36:08.000000000 +0000 @@ -0,0 +1,21 @@ +man/nl/wicd-curses.8 +man/nl/wicd-manager-settings.conf.5 +man/nl/wicd-wired-settings.conf.5 +man/nl/wicd-wireless-settings.conf.5 +man/nl/wicd.8 +man/wicd-cli.8 +man/wicd-curses.8 +man/wicd-manager-settings.conf.5 +man/wicd-wired-settings.conf.5 +man/wicd-wireless-settings.conf.5 +man/wicd.8 +other/50-wicd-suspend.sh +other/55wicd +other/80-wicd-connect.sh +other/WHEREAREMYFILES +other/wicd.conf +other/wicd.logrotate +vcsinfo.pyc +wicd/wpath.py +wpath.py +wpath.pyc diff -Nru wicd-1.7.0+ds1/debian/control wicd-1.7.1/debian/control --- wicd-1.7.0+ds1/debian/control 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/control 2012-02-02 19:36:08.000000000 +0000 @@ -7,6 +7,8 @@ , python (>= 2.6.6-3~) Build-Depends-Indep: po-debconf + , python-babel + , gettext Standards-Version: 3.9.2 Homepage: http://wicd.sourceforge.net/ Vcs-Browser: http://git.debian.org/?p=collab-maint/wicd.git @@ -53,6 +55,7 @@ , psmisc , iputils-ping | inetutils-ping , python-wicd (= ${source:Version}) +Pre-Depends: debconf (>= 1.5.34) Recommends: wicd-gtk (= ${source:Version}) | wicd-curses (= ${source:Version}) | wicd-cli (= ${source:Version}) | wicd-client Suggests: pm-utils Breaks: wicd (<= 1.6.2.2-4) @@ -79,7 +82,7 @@ , python-glade2 , wicd-daemon (= ${source:Version}) Recommends: - gksu | kdesu | ktsuss | sudo + gksu , python-notify Provides: wicd-client Breaks: wicd (<= 1.6.2.2-4) diff -Nru wicd-1.7.0+ds1/debian/patches/01-remove_unused_icons.patch wicd-1.7.1/debian/patches/01-remove_unused_icons.patch --- wicd-1.7.0+ds1/debian/patches/01-remove_unused_icons.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/01-remove_unused_icons.patch 2012-02-02 19:36:08.000000000 +0000 @@ -5,7 +5,7 @@ --- wicd.orig/setup.py +++ wicd/setup.py -@@ -519,15 +519,11 @@ try: +@@ -535,15 +535,11 @@ try: if not wpath.no_install_man: data.append((wpath.mandir + 'man1/', [ 'man/wicd-client.1' ])) data.append((wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-gtk.svg'])) diff -Nru wicd-1.7.0+ds1/debian/patches/02-detect_ping_flavour.patch wicd-1.7.1/debian/patches/02-detect_ping_flavour.patch --- wicd-1.7.0+ds1/debian/patches/02-detect_ping_flavour.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/02-detect_ping_flavour.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -Description: detect which flavour of ping(1) is installed - This is needed because inetutils-ping does not support - "-w deadline", but just waits timeout. -Origin: vendor: -Bug-Debian: http://bugs.debian.org/543656 -Author: David Paleino ---- - wicd/wnettools.py | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - ---- wicd.orig/wicd/wnettools.py -+++ wicd/wicd/wnettools.py -@@ -736,7 +736,16 @@ class BaseInterface(object): - trying to ping it. - - """ -- cmd = "ping -q -w 3 -c 1 %s" % gateway -+ if "iputils" in misc.Run(["ping", "-V"]): -+ cmd = "ping -q -w 3 -c 1 %s" % gateway -+ else: -+ # ping is from inetutils-ping (which doesn't support -w) -+ # or from some other package -+ # -+ # If there's no AP association, this will wait for -+ # timeout, while the above will wait (-w) 3 seconds at -+ # most. -+ cmd = "ping -q -c 1 %s" % gateway - if self.verbose: print cmd - return misc.LaunchAndWait(cmd) - diff -Nru wicd-1.7.0+ds1/debian/patches/02-workaround_dhclient_bug.patch wicd-1.7.1/debian/patches/02-workaround_dhclient_bug.patch --- wicd-1.7.0+ds1/debian/patches/02-workaround_dhclient_bug.patch 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/debian/patches/02-workaround_dhclient_bug.patch 2012-02-02 19:36:08.000000000 +0000 @@ -0,0 +1,21 @@ +From: David Paleino +Subject: workaround dhclient's bug changing hostname and not taking + the configfile passed with -cf into account (see #609851). +Origin: vendor +Forwarded: no + +--- + wicd/wnettools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- wicd.orig/wicd/wnettools.py ++++ wicd/wicd/wnettools.py +@@ -284,7 +284,7 @@ class BaseInterface(object): + + client_dict = { + "dhclient" : +- {'connect' : r"%(cmd)s -cf %(dhclientconf)s %(iface)s", ++ {'connect' : r"%(cmd)s %(iface)s", + 'release' : r"%(cmd)s -r %(iface)s", + 'id' : misc.DHCLIENT, + }, diff -Nru wicd-1.7.0+ds1/debian/patches/03-fix_typo_wicd-cli.patch wicd-1.7.1/debian/patches/03-fix_typo_wicd-cli.patch --- wicd-1.7.0+ds1/debian/patches/03-fix_typo_wicd-cli.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/03-fix_typo_wicd-cli.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -From: Clint Adams -Subject: fix typo in sourcecode -Origin: vendor, http://bugs.debian.org/567665 -Bug-Debian: http://bugs.debian.org/567665 -Forwarded: no - ---- - cli/wicd-cli.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- wicd.orig/cli/wicd-cli.py -+++ wicd/cli/wicd-cli.py -@@ -143,7 +143,7 @@ if options.network_details: - # network properties - - if options.network_property: -- options.network_property = option.network_property.lower() -+ options.network_property = options.network_property.lower() - if options.wireless: - if options.network >= 0: - is_valid_wireless_network_id(options.network) diff -Nru wicd-1.7.0+ds1/debian/patches/05-use_binsh.patch wicd-1.7.1/debian/patches/05-use_binsh.patch --- wicd-1.7.0+ds1/debian/patches/05-use_binsh.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/05-use_binsh.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From: David Paleino -Subject: don't force users to use bash -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549443 -Forwarded: no - ---- - in/scripts=wicd-client.in | 2 +- - in/scripts=wicd-curses.in | 2 +- - in/scripts=wicd.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - ---- wicd.orig/in/scripts=wicd-client.in -+++ wicd/in/scripts=wicd-client.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - BOLD=$(tput bold) - BLUE=$(tput setaf 4) - NC=$(tput sgr0) ---- wicd.orig/in/scripts=wicd-curses.in -+++ wicd/in/scripts=wicd-curses.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - if [ ! -d "$HOME/.wicd" ]; then - mkdir -p "$HOME/.wicd" - fi ---- wicd.orig/in/scripts=wicd.in -+++ wicd/in/scripts=wicd.in -@@ -1,3 +1,3 @@ --#!/bin/bash -+#!/bin/sh - - exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@ diff -Nru wicd-1.7.0+ds1/debian/patches/06-dont_bomb_out_on_configparser_error.patch wicd-1.7.1/debian/patches/06-dont_bomb_out_on_configparser_error.patch --- wicd-1.7.0+ds1/debian/patches/06-dont_bomb_out_on_configparser_error.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/06-dont_bomb_out_on_configparser_error.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -From: David Paleino -Subject: gracefully handle (and try to fix) configuration parsing errors - From time to time, it happens that an empty section "[]" is added to - wired-settings.conf. (Un)fortunately, RawConfigParser doesn't seem to - remove it with self.remove_section(""), but it automagically disappears - if the configfile is re-written again. Exceptions on errors are caught - if that was not the error. -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553197 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554949 -Forwarded: no - ---- - wicd/configmanager.py | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - ---- wicd.orig/wicd/configmanager.py -+++ wicd/wicd/configmanager.py -@@ -26,7 +26,7 @@ reusable for other purposes as well. - - import os, copy - --from ConfigParser import RawConfigParser -+from ConfigParser import RawConfigParser, ParsingError - - from wicd.misc import Noneify, to_unicode - -@@ -39,8 +39,17 @@ class ConfigManager(RawConfigParser): - self.config_file = path - self.debug = debug - self.mrk_ws = mark_whitespace -- self.read(path) -- -+ try: -+ self.read(path) -+ except ParsingError, e: -+ self.write() -+ try: -+ self.read(path) -+ except ParsingError, p: -+ import sys -+ print "Could not start wicd: %s" % p.message -+ sys.exit(1) -+ - def __repr__(self): - return self.config_file - diff -Nru wicd-1.7.0+ds1/debian/patches/08-fix_GetIP.patch wicd-1.7.1/debian/patches/08-fix_GetIP.patch --- wicd-1.7.0+ds1/debian/patches/08-fix_GetIP.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/08-fix_GetIP.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Fixes bug in GetIP(), see #519433 for full description. -Patch by Giuseppe Martino , thank you! ---- - wicd/wnettools.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- wicd-1.5.9.orig/wicd/wnettools.py -+++ wicd-1.5.9/wicd/wnettools.py -@@ -563,7 +563,7 @@ class Interface(object): - The IP address of the interface in dotted quad form. - - """ -- if not self.iface: return False -+ if not self.iface: return None - cmd = 'ifconfig ' + self.iface - if self.verbose: print cmd - output = misc.Run(cmd) diff -Nru wicd-1.7.0+ds1/debian/patches/08-fix_help_message.patch wicd-1.7.1/debian/patches/08-fix_help_message.patch --- wicd-1.7.0+ds1/debian/patches/08-fix_help_message.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/08-fix_help_message.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -From: David Paleino -Subject: fix minor issue with help message -- remove .py -Forwarded: no - ---- - curses/wicd-curses.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- wicd.orig/curses/wicd-curses.py -+++ wicd/curses/wicd-curses.py -@@ -1026,7 +1026,7 @@ setup_dbus() - ######################################## - if __name__ == '__main__': - try: -- parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello())) -+ parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello()), prog="wicd-curses") - except Exception, e: - if "DBus.Error.AccessDenied" in e.get_dbus_name(): - print language['access_denied_wc'].replace('$A','\033[1;34m'+wpath.wicd_group+'\033[0m') diff -Nru wicd-1.7.0+ds1/debian/patches/09-allow_empty_DNS.patch wicd-1.7.1/debian/patches/09-allow_empty_DNS.patch --- wicd-1.7.0+ds1/debian/patches/09-allow_empty_DNS.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/09-allow_empty_DNS.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: David Paleino -Subject: allow empty DNS fields, one might run a local forwarder -Bug-Debian: http://bugs.debian.org/552598 -Forwarded: yes, https://bugs.launchpad.net/wicd/+bug/492795 - ---- - wicd/gui.py | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - ---- wicd.orig/gtk/gui.py -+++ wicd/gtk/gui.py -@@ -598,11 +598,8 @@ class appGui(object): - - if entry.chkbox_static_dns.get_active() and \ - not entry.chkbox_global_dns.get_active(): -- req_entlist.append(entry.txt_dns_1) -- # Only append additional dns entries if they're entered. -- for ent in [entry.txt_dns_2, entry.txt_dns_3]: -- if ent.get_text() != "": -- opt_entlist.append(ent) -+ for ent in [entry.txt_dns_1, entry.txt_dns_2, entry.txt_dns_3]: -+ opt_entlist.append(ent) - - # Required entries. - for lblent in req_entlist: diff -Nru wicd-1.7.0+ds1/debian/patches/09-fix_wire_plugging_detection.patch wicd-1.7.1/debian/patches/09-fix_wire_plugging_detection.patch --- wicd-1.7.0+ds1/debian/patches/09-fix_wire_plugging_detection.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/09-fix_wire_plugging_detection.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -Fix detection of wire plugging/unplugging. -Patch provided by Giuseppe Martino , thank you! ---- - wicd/monitor.py | 10 ++++++++++ - wicd/wicd-daemon.py | 12 ++++++++++++ - 2 files changed, 22 insertions(+) - ---- wicd-1.5.9.orig/wicd/monitor.py -+++ wicd-1.5.9/wicd/monitor.py -@@ -64,6 +64,7 @@ class ConnectionStatus(object): - self.last_reconnect_time = time.time() - self.signal_changed = False - self.iwconfig = "" -+ self.plugged = False - - def check_for_wired_connection(self, wired_ip): - """ Checks for an active wired connection. -@@ -160,6 +161,15 @@ class ConnectionStatus(object): - - # Check for wired. - wired_ip = wired.GetWiredIP() -+ -+ if not self.plugged and wired.CheckPluggedIn(): -+ daemon.SendWirePluggedSignal() -+ self.plugged = True -+ -+ if self.plugged and not wired.CheckPluggedIn(): -+ daemon.SendWireUnpluggedSignal() -+ self.plugged = False -+ - wired_found = self.check_for_wired_connection(wired_ip) - if wired_found: - self.update_state(misc.WIRED, wired_ip=wired_ip) ---- wicd-1.5.9.orig/wicd/wicd-daemon.py -+++ wicd-1.5.9/wicd/wicd-daemon.py -@@ -669,6 +669,18 @@ class ConnectionWizard(dbus.service.Obje - - @dbus.service.method('org.wicd.daemon') - @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='') -+ def SendWirePluggedSignal(self): -+ """ Emits a signal announcing wire is plugged. """ -+ pass -+ -+ @dbus.service.method('org.wicd.daemon') -+ @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='') -+ def SendWireUnpluggedSignal(self): -+ """ Emits a signal announcing wire is unplugged. """ -+ pass -+ -+ @dbus.service.method('org.wicd.daemon') -+ @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='') - def SendStartScanSignal(self): - """ Emits a signal announcing a scan has started. """ - pass diff -Nru wicd-1.7.0+ds1/debian/patches/11-fix_gui_showing_from_tray.patch wicd-1.7.1/debian/patches/11-fix_gui_showing_from_tray.patch --- wicd-1.7.0+ds1/debian/patches/11-fix_gui_showing_from_tray.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/11-fix_gui_showing_from_tray.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -From: David Paleino -Subject: raise window after it was trayed when iconified -Bug-Debian: http://bugs.debian.org/549625 -Forwarded: yes, https://bugs.launchpad.net/wicd/+bug/492806 - ---- - wicd/gui.py | 1 + - 1 file changed, 1 insertion(+) - ---- wicd.orig/gtk/gui.py -+++ wicd/gtk/gui.py -@@ -789,6 +789,7 @@ class appGui(object): - - """ - self.window.present() -+ self.window.deiconify() - self.wait_for_events() - self.is_visible = True - daemon.SetGUIOpen(True) diff -Nru wicd-1.7.0+ds1/debian/patches/18-dont_run_unexpected_files_in_scripts.patch wicd-1.7.1/debian/patches/18-dont_run_unexpected_files_in_scripts.patch --- wicd-1.7.0+ds1/debian/patches/18-dont_run_unexpected_files_in_scripts.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/18-dont_run_unexpected_files_in_scripts.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -From: David Paleino -Subject: don't execute hidden or backup files in scripts directories -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563553 -Forwarded: no - ---- - wicd/misc.py | 2 ++ - 1 file changed, 2 insertions(+) - ---- wicd.orig/wicd/misc.py -+++ wicd/wicd/misc.py -@@ -186,6 +186,8 @@ def ExecuteScripts(scripts_dir, verbose= - if not os.path.exists(scripts_dir): - return - for obj in sorted(os.listdir(scripts_dir)): -+ if obj.startswith(".") or obj.endswith(("~", ".new", ".orig")): -+ continue - obj = os.path.abspath(os.path.join(scripts_dir, obj)) - if os.path.isfile(obj) and os.access(obj, os.X_OK): - ExecuteScript(os.path.abspath(obj), verbose=verbose, diff -Nru wicd-1.7.0+ds1/debian/patches/19-dhcpcd_dont_handle_link-local.patch wicd-1.7.1/debian/patches/19-dhcpcd_dont_handle_link-local.patch --- wicd-1.7.0+ds1/debian/patches/19-dhcpcd_dont_handle_link-local.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/19-dhcpcd_dont_handle_link-local.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -From: David Paleino -Subject: don't make dhcpcd handle link-local -Forwarded: no - ---- - wicd/wnettools.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- wicd.orig/wicd/wnettools.py -+++ wicd/wicd/wnettools.py -@@ -292,7 +292,7 @@ class BaseInterface(object): - 'id' : misc.PUMP, - }, - "dhcpcd" : -- {'connect' : r"%(cmd)s %(iface)s -h %(hostname)s ", -+ {'connect' : r"%(cmd)s %(iface)s -h %(hostname)s --noipv4ll ", - 'release' : r"%(cmd)s -k %(iface)s", - 'id' : misc.DHCPCD, - }, diff -Nru wicd-1.7.0+ds1/debian/patches/20-use_iniparse.patch wicd-1.7.1/debian/patches/20-use_iniparse.patch --- wicd-1.7.0+ds1/debian/patches/20-use_iniparse.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/20-use_iniparse.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From: David Paleino -Subject: use python-iniparse instead of ConfigParser, - because the former leaves the config files sorted, so that no spurious - changes appear when /etc/ is e.g. stored with etckeeper. -Forwarded: no -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568326 - ---- - wicd/configmanager.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- wicd.orig/wicd/configmanager.py -+++ wicd/wicd/configmanager.py -@@ -26,7 +26,7 @@ reusable for other purposes as well. - - import os, copy - --from ConfigParser import RawConfigParser, ParsingError -+from iniparse.compat import RawConfigParser, ParsingError - - from wicd.misc import Noneify, to_unicode - diff -Nru wicd-1.7.0+ds1/debian/patches/21-fix_ESSID_setting.patch wicd-1.7.1/debian/patches/21-fix_ESSID_setting.patch --- wicd-1.7.0+ds1/debian/patches/21-fix_ESSID_setting.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/21-fix_ESSID_setting.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From: David Paleino -Subject: use the correct ESSID-setting command... -Forwarded: no -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571100 - ---- - wicd/wnettools.py | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - ---- wicd.orig/wicd/wnettools.py -+++ wicd/wicd/wnettools.py -@@ -1097,9 +1097,7 @@ class BaseWirelessInterface(BaseInterfac - bssid -- bssid of the network - - """ -- cmd = ['iwconfig', self.iface, 'essid', essid] -- if self.verbose: print str(cmd) -- misc.Run(cmd) -+ self.SetEssid(essid) - base = "iwconfig %s" % self.iface - if channel and str(channel).isdigit(): - cmd = "%s channel %s" % (base, str(channel)) diff -Nru wicd-1.7.0+ds1/debian/patches/22-fix_deprecation.patch wicd-1.7.1/debian/patches/22-fix_deprecation.patch --- wicd-1.7.0+ds1/debian/patches/22-fix_deprecation.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/22-fix_deprecation.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -From: David Paleino -Subject: fix deprecation warnings -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571314 -Forwarded: no - ---- - gtk/gui.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- wicd.orig/gtk/gui.py -+++ wicd/gtk/gui.py -@@ -430,7 +430,7 @@ class appGui(object): - gobject.idle_add(self.all_network_list.set_sensitive, True) - gobject.idle_add(self.status_area.hide_all) - if self.statusID: -- gobject.idle_add(self.status_bar.remove, 1, self.statusID) -+ gobject.idle_add(self.status_bar.remove_message, 1, self.statusID) - - def set_connecting_state(self, info): - if not self.connecting: -@@ -445,7 +445,7 @@ class appGui(object): - gobject.idle_add(self.all_network_list.set_sensitive, False) - gobject.idle_add(self.status_area.show_all) - if self.statusID: -- gobject.idle_add(self.status_bar.remove, 1, self.statusID) -+ gobject.idle_add(self.status_bar.remove_message, 1, self.statusID) - if info[0] == "wireless": - gobject.idle_add(self.set_status, str(info[1]) + ': ' + - language[str(wireless.CheckWirelessConnectingMessage())]) -@@ -698,7 +698,7 @@ class appGui(object): - cancel_button.set_sensitive(True) - self.all_network_list.set_sensitive(False) - if self.statusID: -- gobject.idle_add(self.status_bar.remove, 1, self.statusID) -+ gobject.idle_add(self.status_bar.remove_message, 1, self.statusID) - gobject.idle_add(self.set_status, language["disconnecting_active"]) - gobject.idle_add(self.status_area.show_all) - self.wait_for_events() diff -Nru wicd-1.7.0+ds1/debian/patches/23-fix_script_macro_expansion.patch wicd-1.7.1/debian/patches/23-fix_script_macro_expansion.patch --- wicd-1.7.0+ds1/debian/patches/23-fix_script_macro_expansion.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/23-fix_script_macro_expansion.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From: Andrew Psaltis -Subject: fixed bug in script macro expansion -Origin: upstream, http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/553 - ---- - wicd/networking.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- wicd.orig/wicd/networking.py -+++ wicd/wicd/networking.py -@@ -215,8 +215,8 @@ class Controller(object): - if self.pre_disconnect_script: - print 'Running pre-disconnect script' - misc.ExecuteScript(expand_script_macros(self.pre_disconnect_script, -- 'pre-disconnection', (mac, -- name)), -+ 'pre-disconnection', -+ mac, name), - self.debug) - iface.ReleaseDHCP() - iface.SetAddress('0.0.0.0') -@@ -229,7 +229,7 @@ class Controller(object): - print 'Running post-disconnect script' - misc.ExecuteScript(expand_script_macros(self.post_disconnect_script, - 'post-disconnection', -- (mac, name)), -+ mac, name), - self.debug) - - def ReleaseDHCP(self): diff -Nru wicd-1.7.0+ds1/debian/patches/24-wait_for_DHCP_client.patch wicd-1.7.1/debian/patches/24-wait_for_DHCP_client.patch --- wicd-1.7.0+ds1/debian/patches/24-wait_for_DHCP_client.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/24-wait_for_DHCP_client.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -From: Marin Ivanov -Subject: wait for the child process to end -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=537195 -Forwarded: no - ---- - wicd/wnettools.py | 1 + - 1 file changed, 1 insertion(+) - ---- wicd.orig/wicd/wnettools.py -+++ wicd/wicd/wnettools.py -@@ -619,6 +619,7 @@ class BaseInterface(object): - else: - print "ERROR: no dhcp client found" - ret = None -+ self.dhcp_object.wait() - return ret - - @neediface(False) diff -Nru wicd-1.7.0+ds1/debian/patches/25-use_dhcpcd_also_in_Debian.patch wicd-1.7.1/debian/patches/25-use_dhcpcd_also_in_Debian.patch --- wicd-1.7.0+ds1/debian/patches/25-use_dhcpcd_also_in_Debian.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/25-use_dhcpcd_also_in_Debian.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From: David Paleino -Subject: upstream changed the client from dhcpcd to dhcpcd-bin. This patch - reverts it, so that defaults in /etc/default/dhcpcd are still observed. -Bug-Debian: http://bugs.debian.org/578014 -Forwarded: no - ---- - wicd/wnettools.py | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - ---- wicd.orig/wicd/wnettools.py -+++ wicd/wicd/wnettools.py -@@ -292,7 +292,7 @@ class BaseInterface(object): - 'id' : misc.PUMP, - }, - "dhcpcd" : -- {'connect' : r"%(cmd)s %(iface)s -h %(hostname)s --noipv4ll ", -+ {'connect' : r"%(cmd)s -h %(hostname)s --noipv4ll %(iface)s ", - 'release' : r"%(cmd)s -k %(iface)s", - 'id' : misc.DHCPCD, - }, -@@ -384,11 +384,7 @@ class BaseInterface(object): - self.dhclient_needs_verbose = True - else: - self.dhclient_needs_verbose = False -- debian_dhcpcd_cmd = self._find_program_path('dhcpcd-bin') -- if debian_dhcpcd_cmd: -- self.dhcpcd_cmd = debian_dhcpcd_cmd -- else: -- self.dhcpcd_cmd = self._find_program_path("dhcpcd") -+ self.dhcpcd_cmd = self._find_program_path("dhcpcd") - self.pump_cmd = self._find_program_path("pump") - self.udhcpc_cmd = self._find_program_path("udhcpc") - diff -Nru wicd-1.7.0+ds1/debian/patches/26-support_etc-network_scripts.patch wicd-1.7.1/debian/patches/26-support_etc-network_scripts.patch --- wicd-1.7.0+ds1/debian/patches/26-support_etc-network_scripts.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/26-support_etc-network_scripts.patch 2012-02-02 19:36:08.000000000 +0000 @@ -9,7 +9,7 @@ --- wicd.orig/wicd/networking.py +++ wicd/wicd/networking.py -@@ -210,6 +210,12 @@ class Controller(object): +@@ -211,6 +211,12 @@ class Controller(object): mac = 'X' if name in (None, ''): name = 'X' @@ -22,7 +22,7 @@ misc.ExecuteScripts(wpath.predisconnectscripts, self.debug, extra_parameters=(nettype, name, mac)) if self.pre_disconnect_script: -@@ -223,6 +229,8 @@ class Controller(object): +@@ -224,6 +230,8 @@ class Controller(object): iface.FlushRoutes() iface.Down() iface.Up() @@ -31,7 +31,7 @@ misc.ExecuteScripts(wpath.postdisconnectscripts, self.debug, extra_parameters=(nettype, name, mac)) if self.post_disconnect_script: -@@ -840,6 +848,12 @@ class WirelessConnectThread(ConnectThrea +@@ -880,6 +888,12 @@ class WirelessConnectThread(ConnectThrea self.is_connecting = True # Run pre-connection script. @@ -44,7 +44,7 @@ self.run_global_scripts_if_needed(wpath.preconnectscripts, extra_parameters=('wireless', self.network['essid'], -@@ -889,6 +903,8 @@ class WirelessConnectThread(ConnectThrea +@@ -929,6 +943,8 @@ class WirelessConnectThread(ConnectThrea self.verify_association(wiface) # Run post-connection script. @@ -53,7 +53,7 @@ self.run_global_scripts_if_needed(wpath.postconnectscripts, extra_parameters=('wireless', self.network['essid'], -@@ -1098,6 +1114,12 @@ class WiredConnectThread(ConnectThread): +@@ -1135,6 +1151,12 @@ class WiredConnectThread(ConnectThread): self.is_connecting = True # Run pre-connection script. @@ -66,7 +66,7 @@ self.run_global_scripts_if_needed(wpath.preconnectscripts, extra_parameters=('wired', 'wired', self.network['profilename']) -@@ -1120,6 +1142,8 @@ class WiredConnectThread(ConnectThread): +@@ -1162,6 +1184,8 @@ class WiredConnectThread(ConnectThread): self.set_dns_addresses(liface) # Run post-connection script. diff -Nru wicd-1.7.0+ds1/debian/patches/27-fix_resolv.conf_perms.patch wicd-1.7.1/debian/patches/27-fix_resolv.conf_perms.patch --- wicd-1.7.0+ds1/debian/patches/27-fix_resolv.conf_perms.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/27-fix_resolv.conf_perms.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -From: David Paleino -Subject: fix permissions of dhclient's template config -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582798 -Forwarded: no - ---- - wicd/wicd-daemon.py | 4 ++++ - wicd/wnettools.py | 1 + - 2 files changed, 5 insertions(+) - ---- wicd.orig/wicd/wicd-daemon.py -+++ wicd/wicd/wicd-daemon.py -@@ -948,12 +948,14 @@ class WicdDaemon(dbus.service.Object): - os.chmod(app_conf.get_config(), 0600) - os.chmod(wireless_conf, 0600) - os.chmod(wired_conf, 0600) -+ os.chmod(dhclient_conf, 0644) - - # Make root own them - print "chowning configuration files root:root..." - os.chown(app_conf.get_config(), 0, 0) - os.chown(wireless_conf, 0, 0) - os.chown(wired_conf, 0, 0) -+ os.chown(dhclient_conf, 0, 0) - - print "Using wireless interface..." + self.GetWirelessInterface() - print "Using wired interface..." + self.GetWiredInterface() -@@ -1702,6 +1704,7 @@ def main(argv): - # wicd exploded - if not os.path.exists(backup_location): - shutil.copy2('/etc/resolv.conf', backup_location) -+ os.chmod(backup_location, 0644) - except IOError: - print 'error backing up resolv.conf' - -@@ -1748,6 +1751,7 @@ def main(argv): - # restore resolv.conf on quit - try: - shutil.move(wpath.varlib + 'resolv.conf.orig', '/etc/resolv.conf') -+ os.chmod('/etc/resolv.conf', 0644) - except IOError: - print 'error restoring resolv.conf' - ---- wicd.orig/wicd/wnettools.py -+++ wicd/wicd/wnettools.py -@@ -325,6 +325,7 @@ class BaseInterface(object): - - output_conf.close() - dhclient_template.close() -+ os.chmod(dhclient_conf_path, 0644) - - if not client_name or not cmd: - print "WARNING: Failed to find a valid dhcp client!" diff -Nru wicd-1.7.0+ds1/debian/patches/28-announce_dhclient.conf.template.patch wicd-1.7.1/debian/patches/28-announce_dhclient.conf.template.patch --- wicd-1.7.0+ds1/debian/patches/28-announce_dhclient.conf.template.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/28-announce_dhclient.conf.template.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -From: David Paleino -Subject: talk about /etc/wicd/dhclient.conf.template in wicd(8) -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582817 -Forwarded: no - ---- - in/man=wicd.8.in | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- wicd.orig/in/man=wicd.8.in -+++ wicd/in/man=wicd.8.in -@@ -118,6 +118,12 @@ This file contains settings related to t - .br - See this file's own man page for more information about it. - -+.B %ETC%dhclient.conf.template -+.br -+This is used to replace /etc/dhclient.conf during Wicd activity, -+if you're using dhclient(1) as DHCP client. See dhclient.conf(5) -+for more information. -+ - .B %ENCRYPTION% - .br - This directory contains various templates for encrypted (WEP, WPA, etcetera) -@@ -156,6 +162,7 @@ log if you are having connection or othe - .BR wicd-manager-settings.conf (5), - .BR wicd-wired-settings.conf (5), - .BR wicd-wireless-settings.conf (5), -+.BR dhclient.conf (5), - .BR wicd-curses (8), - .BR ifconfig (8), - .BR iwconfig (8), diff -Nru wicd-1.7.0+ds1/debian/patches/29-document_variables_passed_to_scripts.patch wicd-1.7.1/debian/patches/29-document_variables_passed_to_scripts.patch --- wicd-1.7.0+ds1/debian/patches/29-document_variables_passed_to_scripts.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/29-document_variables_passed_to_scripts.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: David Paleino -Subject: document what variables are passed to global scripts -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570891 -Forwarded: no - ---- - in/man=wicd.8.in | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- wicd.orig/in/man=wicd.8.in -+++ wicd/in/man=wicd.8.in -@@ -138,6 +138,12 @@ when the specified event is preformed up - or to any network. Please note that pre/post disconnect scripts may be - executed multiple times on already-disconnected interfaces. - .br -+The scripts will be passed different parameters, depending if Wicd is -+acting on a wired or a wireless network. In the former case, "wired -+wired wired" will be passed (three times, just for compatibility with -+the wireless case). If Wicd is acting on a wireless network, it will -+pass "wireless ESSID BSSID" to the script. -+.br - Available directories are: - .br - %SCRIPTS%predisconnect diff -Nru wicd-1.7.0+ds1/debian/patches/30-make_connection_info_selectable.patch wicd-1.7.1/debian/patches/30-make_connection_info_selectable.patch --- wicd-1.7.0+ds1/debian/patches/30-make_connection_info_selectable.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/30-make_connection_info_selectable.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -From: David Paleino -Subject: make info in "Connection Info" dialog selectable (i.e. for copy&paste) -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571579 -Forwarded: no - ---- - gtk/wicd-client.py | 1 + - 1 file changed, 1 insertion(+) - ---- wicd.orig/gtk/wicd-client.py -+++ wicd/gtk/wicd-client.py -@@ -550,6 +550,7 @@ class TrayIcon(object): - # Create labels - self.label = gtk.Label() - self.data = gtk.Label() -+ self.data.set_selectable(True) - self.label.show() - self.data.show() - self.list = [] diff -Nru wicd-1.7.0+ds1/debian/patches/31-dont_crash_on_notification_exceptions.patch wicd-1.7.1/debian/patches/31-dont_crash_on_notification_exceptions.patch --- wicd-1.7.0+ds1/debian/patches/31-dont_crash_on_notification_exceptions.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/31-dont_crash_on_notification_exceptions.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -From: David Paleino -Subject: don't crash on notification errors, since that's not an - essential feature -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=569755 -Forwarded: no - ---- - gtk/wicd-client.py | 27 ++++++++++++++++++--------- - 1 file changed, 18 insertions(+), 9 deletions(-) - ---- wicd.orig/gtk/wicd-client.py -+++ wicd/gtk/wicd-client.py -@@ -227,15 +227,24 @@ class TrayIcon(object): - - def _show_notification(self, title, details, image=None): - if self.should_notify: -- if not self._last_bubble: -- self._last_bubble = pynotify.Notification(title, details, -- image) -- self._last_bubble.show() -- else: -- self._last_bubble.clear_actions() -- self._last_bubble.clear_hints() -- self._last_bubble.update(title, details, image) -- self._last_bubble.show() -+ try: -+ if not self._last_bubble: -+ self._last_bubble = pynotify.Notification(title, details, -+ image) -+ self._last_bubble.show() -+ else: -+ self._last_bubble.clear_actions() -+ self._last_bubble.clear_hints() -+ self._last_bubble.update(title, details, image) -+ self._last_bubble.show() -+ except Exception, e: -+ if hasattr(e, 'message') and e.message != '': -+ msg = e.message -+ elif hasattr(e, 'args') and len(e.args) > 0: -+ msg = e.args[-1] -+ else: -+ msg = str(e) -+ print "Exception during notification: %s" % msg - - self.should_notify = False - diff -Nru wicd-1.7.0+ds1/debian/patches/32-prefer_gksu.patch wicd-1.7.1/debian/patches/32-prefer_gksu.patch --- wicd-1.7.0+ds1/debian/patches/32-prefer_gksu.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/32-prefer_gksu.patch 2012-02-02 19:36:08.000000000 +0000 @@ -9,7 +9,7 @@ --- wicd.orig/wicd/misc.py +++ wicd/wicd/misc.py -@@ -459,7 +459,7 @@ def choose_sudo_prog(prog_num=0): +@@ -518,7 +518,7 @@ def choose_sudo_prog(prog_num=0): if desktop_env == "kde": progs = ["kdesu", "kdesudo", "ktsuss"] else: diff -Nru wicd-1.7.0+ds1/debian/patches/33-deepcopy_python27_fixes.patch wicd-1.7.1/debian/patches/33-deepcopy_python27_fixes.patch --- wicd-1.7.0+ds1/debian/patches/33-deepcopy_python27_fixes.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/33-deepcopy_python27_fixes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -From: Matthieu Baerts -Subject: Added the compatibility with python2.7 -Origin: vendor, http://repos.archlinux.org/wsvn/packages/wicd/trunk/deepcopy%2Bpython27-fixes.patch -Origin: upstream, http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/564 -Bug: https://bugs.launchpad.net/wicd/+bug/602825 -Forwarded: yes - ---- - wicd/configmanager.py | 39 +++++++++++++++++++++++---------------- - 1 file changed, 23 insertions(+), 16 deletions(-) - ---- wicd.orig/wicd/configmanager.py -+++ wicd/wicd/configmanager.py -@@ -24,7 +24,7 @@ reusable for other purposes as well. - # along with this program. If not, see . - # - --import os, copy -+import sys, os, copy - - from ConfigParser import RawConfigParser, ParsingError - -@@ -35,7 +35,10 @@ from dbus import Int32 - class ConfigManager(RawConfigParser): - """ A class that can be used to manage a given configuration file. """ - def __init__(self, path, debug=False, mark_whitespace="`'`"): -- RawConfigParser.__init__(self) -+ if sys.version_info >= (2, 7, 0): -+ RawConfigParser.__init__(self, allow_no_value=True) -+ else: -+ RawConfigParser.__init__(self) - self.config_file = path - self.debug = debug - self.mrk_ws = mark_whitespace -@@ -46,7 +49,6 @@ class ConfigManager(RawConfigParser): - try: - self.read(path) - except ParsingError, p: -- import sys - print "Could not start wicd: %s" % p.message - sys.exit(1) - -@@ -185,28 +187,33 @@ class ConfigManager(RawConfigParser): - - - def _copy_section(self, name): -- # Yes, deepcopy sucks, but it is robust to changes in both -- # this class and RawConfigParser. -- p = copy.deepcopy(self) -- for sname in p.sections(): -- if sname != name: -- p.remove_section(sname) -+ p = ConfigManager("", self.debug, self.mrk_ws) -+ p.add_section(name) -+ for (iname, value) in self.items(name): -+ p.set(name, iname, value) -+ # Store the filename this section was read from. - p.config_file = p.get_option(name, '_filename_', p.config_file) - p.remove_option(name, '_filename_') - return p - - def write(self): - """ Writes the loaded config file to disk. """ -- # Really don't like this deepcopy. -- p = copy.deepcopy(self) -- for sname in p.sections(): -- fname = p.get_option(sname, '_filename_') -+ in_this_file = [] -+ for sname in self.sections(): -+ fname = self.get_option(sname, '_filename_') - if fname and fname != self.config_file: - section = self._copy_section(sname) -- p.remove_section(sname) - section._write_one() -+ else: -+ # Save names of local sections -+ in_this_file.append(sname) - -- for sname in p.sections(): -+ # Make an instance with only these sections -+ p = ConfigManager("", self.debug, self.mrk_ws) -+ p.config_file = self.config_file -+ for sname in in_this_file: -+ p.add_section(sname) -+ for (iname, value) in self.items(sname): -+ p.set(sname, iname, value) - p.remove_option(sname, '_filename_') - p._write_one() -- diff -Nru wicd-1.7.0+ds1/debian/patches/34-dont_save_useless_config.patch wicd-1.7.1/debian/patches/34-dont_save_useless_config.patch --- wicd-1.7.0+ds1/debian/patches/34-dont_save_useless_config.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/34-dont_save_useless_config.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,283 +0,0 @@ -From: David Paleino -Subject: don't store variables inside configfile -Forwarded: http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/573 - ---- - gtk/gui.py | 15 +------ - gtk/netentry.py | 21 ++------- - gtk/prefs.py | 15 +------ - in/man=nl=wicd-manager-settings.conf.5.in | 12 ----- - in/man=nl=wicd-wireless-settings.conf.5.in | 3 - - in/man=wicd-manager-settings.conf.5.in | 12 ----- - in/man=wicd-wireless-settings.conf.5.in | 4 - - wicd/wicd-daemon.py | 62 ++--------------------------- - 8 files changed, 20 insertions(+), 124 deletions(-) - ---- wicd.orig/wicd/wicd-daemon.py -+++ wicd/wicd/wicd-daemon.py -@@ -690,55 +690,6 @@ class WicdDaemon(dbus.service.Object): - self.sudo_app = sudo_app - self.config.set("Settings", "sudo_app", sudo_app, write=True) - -- @dbus.service.method('org.wicd.daemon') -- def WriteWindowSize(self, width, height, win_name): -- """ Write the desired default window size. -- -- win_name should be either 'main' or 'pref', and specifies -- whether the size being given applies to the main GUI window -- or the preferences dialog window. -- -- """ -- if win_name: -- height_str = '%s_height' % win_name -- width_str = '%s_width' % win_name -- # probably don't need the else, but the previous code -- # had an else that caught everything -- else: -- height_str = "pref_height" -- width_str = "pref_width" -- -- self.config.set("Settings", width_str, width) -- self.config.set("Settings", height_str, height) -- self.config.write() -- -- @dbus.service.method('org.wicd.daemon') -- def ReadWindowSize(self, win_name): -- """Returns a list containing the desired default window size -- -- Attempts to read the default size from the config file, -- and if that fails, returns a default of 605 x 400. -- -- """ -- default_width, default_height = (-1, -1) -- if win_name: -- height_str = '%s_height' % win_name -- width_str = '%s_width' % win_name -- # probably don't need the else, but the previous code -- # had an else that caught everything -- else: -- height_str = "pref_height" -- width_str = "pref_width" -- -- width = self.config.get("Settings", width_str, default=default_width) -- height = self.config.get("Settings", height_str, default=default_height) -- self.config.write() -- -- size = [] -- size.append(int(width)) -- size.append(int(height)) -- return size -- - def _wired_autoconnect(self, fresh=True): - """ Attempts to autoconnect to a wired network. """ - wiredb = self.wired_bus -@@ -1218,11 +1169,8 @@ class WirelessDaemon(dbus.service.Object - elif self.config.has_section(bssid_key): - section = bssid_key - else: -- cur_network["has_profile"] = False - return "500: Profile Not Found" - -- cur_network["has_profile"] = True -- - for x in self.config.options(section): - if not cur_network.has_key(x) or x.endswith("script"): - cur_network[x] = misc.Noneify(self.config.get(section, x)) -@@ -1260,9 +1208,11 @@ class WirelessDaemon(dbus.service.Object - self.config.add_section(essid_key) - - for x in cur_network: -- self.config.set(bssid_key, x, cur_network[x]) -- if cur_network.get("use_settings_globally", False): -- self.config.set(essid_key, x, cur_network[x]) -+ # There's no reason to save these to a configfile... -+ if x not in ['quality', 'strength', 'bitrates', 'has_profile']: -+ self.config.set(bssid_key, x, cur_network[x]) -+ if cur_network.get("use_settings_globally", False): -+ self.config.set(essid_key, x, cur_network[x]) - - write_script_ent(bssid_key, "beforescript") - write_script_ent(bssid_key, "afterscript") -@@ -1337,7 +1287,7 @@ class WirelessDaemon(dbus.service.Object - self.Scan(sync=True) - - for x, network in enumerate(self.LastScan): -- if bool(network["has_profile"]): -+ if self.config.has_section(network['bssid']): - if self.debug_mode: - print network["essid"] + ' has profile' - if bool(network.get('automatic')): ---- wicd.orig/in/man=nl=wicd-wireless-settings.conf.5.in -+++ wicd/in/man=nl=wicd-wireless-settings.conf.5.in -@@ -79,9 +79,6 @@ Dit verzekert je ervan dat je niet per o - .br - 1 = Gebruik globale instellingen - .TP --.BI "has_profile = " --Deze parameter wordt alleen intern door Wicd gebruikt en heeft geen effect voor de gebruiker zover de gebruiker kan zien. --.TP - .BI "beforescript = " - Dit definieert een script dat gestart moet worden voordat Wicd gaat verbinden. - Dit script moet een Bourne-compatibel script zijn en moet uitvoerbaar zijn. ---- wicd.orig/in/man=wicd-wireless-settings.conf.5.in -+++ wicd/in/man=wicd-wireless-settings.conf.5.in -@@ -83,10 +83,6 @@ of commercial routers in use with "links - .br - 1 = Use settings globally - .TP --.BI "has_profile = " --This parameter is used internally by Wicd and has no effect as far as the --user is concerned. --.TP - .BI "beforescript = " - This defines a script to run before Wicd brings up the connection. - .br ---- wicd.orig/gtk/gui.py -+++ wicd/gtk/gui.py -@@ -152,16 +152,10 @@ class appGui(object): - self.wTree = gtk.glade.XML(gladefile) - self.window = self.wTree.get_widget("window1") - self.window.set_icon_name("wicd-gtk") -- size = daemon.ReadWindowSize("main") -- width = size[0] -- height = size[1] -- if width > -1 and height > -1: -- self.window.resize(int(width), int(height)) -- else: -- width = int(gtk.gdk.screen_width() / 2) -- if width > 530: -- width = 530 -- self.window.resize(width, int(gtk.gdk.screen_height() / 1.7)) -+ width = int(gtk.gdk.screen_width() / 2) -+ if width > 530: -+ width = 530 -+ self.window.resize(width, int(gtk.gdk.screen_height() / 1.7)) - - dic = { "refresh_clicked" : self.refresh_clicked, - "quit_clicked" : self.exit, -@@ -770,7 +764,6 @@ class appGui(object): - 'org.wicd.daemon') - [width, height] = self.window.get_size() - try: -- daemon.WriteWindowSize(width, height, "main") - daemon.SetGUIOpen(False) - except DBusException: - pass ---- wicd.orig/gtk/netentry.py -+++ wicd/gtk/netentry.py -@@ -68,7 +68,6 @@ class AdvancedSettingsDialog(gtk.Dialog) - self.set_default_size() - - self.connect('show', lambda *a, **k: self.set_default_size()) -- self.connect('hide', lambda *a, **k: self.write_size()) - - # Set up the Advanced Settings Dialog. - self.txt_ip = LabelEntry(language['ip']) -@@ -141,17 +140,13 @@ class AdvancedSettingsDialog(gtk.Dialog) - - - def set_default_size(self): -- width, height = daemon.ReadWindowSize('netprop') -- if width > -1 and height > -1: -- self.resize(int(width), int(height)) -+ width, height = self.get_size() -+ s_height = gtk.gdk.screen_height() -+ if s_height < 768: -+ height = s_height * .75 - else: -- width, height = self.get_size() -- s_height = gtk.gdk.screen_height() -- if s_height < 768: -- height = s_height * .75 -- else: -- height = 600 -- self.resize(int(width), int(height)) -+ height = 600 -+ self.resize(int(width), int(height)) - - def set_defaults(self, widget=None, event=None): - """ Put some default values into entries to help the user out. """ -@@ -247,10 +242,6 @@ class AdvancedSettingsDialog(gtk.Dialog) - self.destroy() - del self - -- def write_size(self): -- w, h = self.get_size() -- daemon.WriteWindowSize(w, h, 'netprop') -- - def save_settings(self): - """ Save settings common to wired and wireless settings dialogs. """ - if self.chkbox_static_ip.get_active(): ---- wicd.orig/gtk/prefs.py -+++ wicd/gtk/prefs.py -@@ -249,7 +249,6 @@ class PreferencesDialog(object): - daemon.SetSudoApp(sudo_tool) - - [width, height] = self.dialog.get_size() -- daemon.WriteWindowSize(width, height, "pref") - - not_path = os.path.join(USER_SETTINGS_DIR, 'USE_NOTIFICATIONS') - if self.notificationscheckbox.get_active(): -@@ -317,16 +316,10 @@ class PreferencesDialog(object): - self.dialog.set_title(language['preferences']) - if os.path.exists(os.path.join(wpath.images, "wicd.png")): - self.dialog.set_icon_from_file(os.path.join(wpath.images, "wicd.png")) -- size = daemon.ReadWindowSize("pref") -- width = size[0] -- height = size[1] -- if width > -1 and height > -1: -- self.dialog.resize(int(width), int(height)) -- else: -- width = int(gtk.gdk.screen_width() / 2.4) -- if width > 450: -- width = 450 -- self.dialog.resize(width, int(gtk.gdk.screen_height() / 2)) -+ width = int(gtk.gdk.screen_width() / 2.4) -+ if width > 450: -+ width = 450 -+ self.dialog.resize(width, int(gtk.gdk.screen_height() / 2)) - - self.wiredcheckbox = setup_label("pref_always_check", - 'wired_always_on') ---- wicd.orig/in/man=nl=wicd-manager-settings.conf.5.in -+++ wicd/in/man=nl=wicd-manager-settings.conf.5.in -@@ -91,18 +91,6 @@ This specifies the default search domain - 0 = disabled - .br - 1 = enabled --.TP --.BI "window_height = " " (in pixels)" --This determines the height of the client window. --.TP --.BI "window_width = " " (in pixels)" --This determines the width of the client window. --.TP --.BI "pref_height = " " (in pixels)" --This determines the height of the "Preferences" window when launched from the client. --.TP --.BI "pref_width = " " (in pixels)" --This determines the width of the "Preferences" window when launched from the client. - - - .SH "SEE ALSO" ---- wicd.orig/in/man=wicd-manager-settings.conf.5.in -+++ wicd/in/man=wicd-manager-settings.conf.5.in -@@ -91,18 +91,6 @@ This specifies the default search domain - 0 = disabled - .br - 1 = enabled --.TP --.BI "window_height = " " (in pixels)" --This determines the height of the client window. --.TP --.BI "window_width = " " (in pixels)" --This determines the width of the client window. --.TP --.BI "pref_height = " " (in pixels)" --This determines the height of the "Preferences" window when launched from the client. --.TP --.BI "pref_width = " " (in pixels)" --This determines the width of the "Preferences" window when launched from the client. - - - .SH "SEE ALSO" diff -Nru wicd-1.7.0+ds1/debian/patches/35-restrict_netmode_characters.patch wicd-1.7.1/debian/patches/35-restrict_netmode_characters.patch --- wicd-1.7.0+ds1/debian/patches/35-restrict_netmode_characters.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/35-restrict_netmode_characters.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From: Julien BLACHE -Subject: restrict network mode to some characters only -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550957 -Forwarded: http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/574 - ---- - wicd/wnettools.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- wicd.orig/wicd/wnettools.py -+++ wicd/wicd/wnettools.py -@@ -50,7 +50,7 @@ strength_pattern = re.compile('.*Quality - altstrength_pattern = re.compile('.*Signal level:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode) - signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\d*)', _re_mode) - bitrates_pattern = re.compile('(\d+\s+\S+/s)', _re_mode) --mode_pattern = re.compile('.*Mode:(.*?)\n', _re_mode) -+mode_pattern = re.compile('.*Mode:([A-Za-z-]*?)\n', _re_mode) - freq_pattern = re.compile('.*Frequency:(.*?)\n', _re_mode) - wep_pattern = re.compile('.*Encryption key:(.*?)\n', _re_mode) - altwpa_pattern = re.compile('(wpa_ie)', _re_mode) -@@ -1263,6 +1263,9 @@ class BaseWirelessInterface(BaseInterfac - - # Mode - ap['mode'] = misc.RunRegex(mode_pattern, cell) -+ if ap['mode'] is None: -+ print 'Invalid network mode string, ignoring!' -+ return None - - # Break off here if we're using a ralink card - if self.wpa_driver == RALINK_DRIVER: diff -Nru wicd-1.7.0+ds1/debian/patches/36-implement_tray-only.patch wicd-1.7.1/debian/patches/36-implement_tray-only.patch --- wicd-1.7.0+ds1/debian/patches/36-implement_tray-only.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/36-implement_tray-only.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -From: David Paleino -Subject: implement a -t/--tray switch to only run the tray icon -Forwarded: no - ---- - gtk/wicd-client.py | 18 ++++++++++++------ - other/wicd-tray.desktop | 2 +- - 2 files changed, 13 insertions(+), 7 deletions(-) - ---- wicd.orig/gtk/wicd-client.py -+++ wicd/gtk/wicd-client.py -@@ -913,6 +913,7 @@ wicd %s - wireless (and wired) connection daemon front-end. - - Arguments: -+\t-t\t--tray\tRun the wicd tray icon only. - \t-n\t--no-tray\tRun wicd without the tray icon. - \t-h\t--help\t\tPrint this help information. - \t-a\t--no-animate\tRun the tray without network traffic tray animations. -@@ -974,7 +975,8 @@ def main(argv): - - """ - try: -- opts, args = getopt.getopt(sys.argv[1:], 'nhao', ['help', 'no-tray', -+ opts, args = getopt.getopt(sys.argv[1:], 'tnhao', ['help', 'no-tray', -+ 'tray', - 'no-animate', - 'only-notifications']) - except getopt.GetoptError: -@@ -989,6 +991,9 @@ def main(argv): - if opt in ('-h', '--help'): - usage() - sys.exit(0) -+ elif opt in ('-t', '--tray'): -+ use_tray = True -+ display_app = False - elif opt in ('-n', '--no-tray'): - use_tray = False - elif opt in ('-a', '--no-animate'): -@@ -1005,14 +1010,15 @@ def main(argv): - setup_dbus() - atexit.register(on_exit) - -- if display_app and not use_tray or not ICON_AVAIL: -+ if display_app: - the_gui = gui.appGui(standalone=True) -- mainloop = gobject.MainLoop() -- mainloop.run() -- sys.exit(0) -+ if not use_tray or not ICON_AVAIL: -+ mainloop = gobject.MainLoop() -+ mainloop.run() -+ sys.exit(0) - - # Set up the tray icon GUI and backend -- tray_icon = TrayIcon(animate, displaytray=display_app) -+ tray_icon = TrayIcon(animate, displaytray=use_tray) - - # Check to see if wired profile chooser was called before icon - # was launched (typically happens on startup or daemon restart). ---- wicd.orig/other/wicd-tray.desktop -+++ wicd/other/wicd-tray.desktop -@@ -1,6 +1,6 @@ - [Desktop Entry] - Categories=Application;Network; --Exec=wicd-gtk -+Exec=wicd-gtk --tray - GenericName=Network Manager - Icon=wicd-gtk - Icon[en_US]=wicd-gtk diff -Nru wicd-1.7.0+ds1/debian/patches/37-fix_suspend_scripts.patch wicd-1.7.1/debian/patches/37-fix_suspend_scripts.patch --- wicd-1.7.0+ds1/debian/patches/37-fix_suspend_scripts.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/37-fix_suspend_scripts.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: David Paleino -Subject: fix suspend scripts -Bug-Debian: http://bugs.debian.org/635444 -Forwarded: http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/575 - ---- - in/other=50-wicd-suspend.sh.in | 2 +- - in/other=80-wicd-connect.sh.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- wicd.orig/in/other=50-wicd-suspend.sh.in -+++ wicd/in/other=50-wicd-suspend.sh.in -@@ -1,3 +1,3 @@ - #!/bin/sh - # Put wifi interface down --%LIB%suspend.py -+%DAEMON%suspend.py ---- wicd.orig/in/other=80-wicd-connect.sh.in -+++ wicd/in/other=80-wicd-connect.sh.in -@@ -1,4 +1,4 @@ - #!/bin/sh - # Bring wifi network interface back up. - --%LIB%autoconnect.py -+%DAEMON%autoconnect.py diff -Nru wicd-1.7.0+ds1/debian/patches/38-fix_libc_ctype_linking.patch wicd-1.7.1/debian/patches/38-fix_libc_ctype_linking.patch --- wicd-1.7.0+ds1/debian/patches/38-fix_libc_ctype_linking.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/38-fix_libc_ctype_linking.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: David Paleino -Subject: generalize libc linking using ctypes -Bug-Debian: http://bugs.debian.org/636941 -Forwarded: http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/572 - ---- - wicd/misc.py | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - ---- wicd.orig/wicd/misc.py -+++ wicd/wicd/misc.py -@@ -406,11 +406,8 @@ def RenameProcess(new_name): - return False - try: - import ctypes -- is_64 = os.path.exists('/lib64/libc.so.6') -- if is_64: -- libc = ctypes.CDLL('/lib64/libc.so.6') -- else: -- libc = ctypes.CDLL('/lib/libc.so.6') -+ from ctypes.util import find_library -+ libc = ctypes.CDLL(find_library('c')) - libc.prctl(15, new_name, 0, 0, 0) - return True - except: diff -Nru wicd-1.7.0+ds1/debian/patches/39-fix_channel_digit_parsing.patch wicd-1.7.1/debian/patches/39-fix_channel_digit_parsing.patch --- wicd-1.7.0+ds1/debian/patches/39-fix_channel_digit_parsing.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/39-fix_channel_digit_parsing.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -From: David Paleino -Subject: fix channel parsing -Bug-Debian: http://bugs.debian.org/640075 -Bug-Ubuntu: https://bugs.launchpad.net/wicd/+bug/545248 -Origin: upstream, http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/581 - ---- - wicd/wnettools.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- wicd.orig/wicd/wnettools.py -+++ wicd/wicd/wnettools.py -@@ -45,7 +45,7 @@ from misc import find_path - _re_mode = (re.I | re.M | re.S) - essid_pattern = re.compile('.*ESSID:"?(.*?)"?\s*\n', _re_mode) - ap_mac_pattern = re.compile('.*Address: (.*?)\n', _re_mode) --channel_pattern = re.compile('.*Channel:?=? ?(\d\d?)', _re_mode) -+channel_pattern = re.compile('.*Channel:?=? ?(\d+)', _re_mode) - strength_pattern = re.compile('.*Quality:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode) - altstrength_pattern = re.compile('.*Signal level:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode) - signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\d*)', _re_mode) diff -Nru wicd-1.7.0+ds1/debian/patches/40-checkbox_passwords.patch wicd-1.7.1/debian/patches/40-checkbox_passwords.patch --- wicd-1.7.0+ds1/debian/patches/40-checkbox_passwords.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/40-checkbox_passwords.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,244 +0,0 @@ -From: Yanick Fratantonio -Subject: add a password field to the templates -Origin: vendor, http://bazaar.launchpad.net/~reyammer/wicd/bug-476982/revision/20 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573096 -Bug-Ubuntu: https://launchpad.net/bugs/476982 -Forwarded: no - ---- - encryption/templates/eap | 1 - encryption/templates/eap-tls | 2 - - encryption/templates/leap | 1 - encryption/templates/peap | 1 - encryption/templates/peap-tkip | 1 - encryption/templates/ttls | 1 - encryption/templates/wep-hex | 1 - encryption/templates/wep-passphrase | 1 - encryption/templates/wep-shared | 1 - encryption/templates/wpa | 1 - encryption/templates/wpa-psk | 1 - gtk/guiutil.py | 40 ++++++++++++++++++++++++++++++++++++ - gtk/netentry.py | 15 +++++++++---- - wicd/misc.py | 8 +++++++ - 14 files changed, 69 insertions(+), 6 deletions(-) - ---- wicd.orig/encryption/templates/eap -+++ wicd/encryption/templates/eap -@@ -3,6 +3,7 @@ author = Adam Blackburn - version = 2 - require username *Username password *Password - optional pac_file *Path_To_PAC_File -+protected password *Password - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/encryption/templates/eap-tls -+++ wicd/encryption/templates/eap-tls -@@ -3,7 +3,7 @@ author = Dan O'Reilly - version = 1 - require identity *Identity private_key *Private_Key private_key_passwd *Private_Key_Password - optional ca_cert *Path_to_CA_Cert client_cert *Path_to_Client_Cert -- -+protected identity *Identity private_key *Private_Key private_key_passwd *Private_Key_Password - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/encryption/templates/leap -+++ wicd/encryption/templates/leap -@@ -2,6 +2,7 @@ name = LEAP with WEP - author = Adam Blackburn - version = 1 - require username *Username password *Password -+protected password *Password - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/encryption/templates/peap -+++ wicd/encryption/templates/peap -@@ -2,6 +2,7 @@ name = PEAP with GTC - author = Adam Blackburn - version = 2 - require identity *Identity password *Password -+protected password *Password - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/encryption/templates/peap-tkip -+++ wicd/encryption/templates/peap-tkip -@@ -3,6 +3,7 @@ author = Fralaltro - version = 1 - require identity *Identity password *Password - optional ca_cert *Path_to_CA_Cert -+protected password *Password - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/encryption/templates/ttls -+++ wicd/encryption/templates/ttls -@@ -2,6 +2,7 @@ name = TTLS with WEP - author = Adam Blackburn - version = 1 - require identity *Identity password *Password auth *Authentication -+protected password *Password - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/encryption/templates/wep-hex -+++ wicd/encryption/templates/wep-hex -@@ -2,6 +2,7 @@ name = WEP (Hex [0-9/A-F]) - author = Adam Blackburn - version = 1 - require key *Key -+protected key *Key - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/encryption/templates/wep-passphrase -+++ wicd/encryption/templates/wep-passphrase -@@ -2,6 +2,7 @@ name = WEP (Passphrase) - author = Adam Blackburn - version = 1 - require passphrase *Passphrase -+protected passphrase *Passphrase - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/encryption/templates/wep-shared -+++ wicd/encryption/templates/wep-shared -@@ -2,6 +2,7 @@ name = WEP Shared/Restricted - author = Dan O'Reilly - version = 1 - require key *Key -+protected key *Key - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/encryption/templates/wpa -+++ wicd/encryption/templates/wpa -@@ -2,6 +2,7 @@ name = WPA 1/2 (Passphrase) - author = Adam Blackburn - version = 1 - require key *Key -+protected key *Key - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/encryption/templates/wpa-psk -+++ wicd/encryption/templates/wpa-psk -@@ -2,6 +2,7 @@ name = WPA 1/2 (Preshared Key) - author = Adam Blackburn - version = 1 - require apsk *Preshared_Key -+protected apsk *Preshared_Key - ----- - ctrl_interface=/var/run/wpa_supplicant - network={ ---- wicd.orig/gtk/guiutil.py -+++ wicd/gtk/guiutil.py -@@ -176,3 +176,43 @@ class GreyLabel(gtk.Label): - def set_label(self, text): - self.set_markup(text) - self.set_alignment(0, 0) -+ -+ -+class ProtectedLabelEntry(gtk.HBox): -+ """ A LabelEntry with a CheckButton that protects the entry text. """ -+ def __init__(self, label_text): -+ gtk.HBox.__init__(self) -+ self.entry = gtk.Entry() -+ self.entry.set_size_request(200, -1) -+ self.entry.set_visibility(False) -+ self.label = LeftAlignedLabel() -+ self.label.set_text(label_text) -+ self.label.set_size_request(165, -1) -+ self.check = gtk.CheckButton() -+ self.check.set_size_request(5, -1) -+ self.check.set_active(False) -+ self.check.set_focus_on_click(False) -+ self.pack_start(self.label, fill=True, expand=True) -+ self.pack_start(self.check, fill=True, expand=True) -+ self.pack_start(self.entry, fill=False, expand=False) -+ self.label.show() -+ self.check.show() -+ self.entry.show() -+ self.check.connect('clicked', self.click_handler) -+ self.show() -+ -+ def set_entry_text(self, text): -+ # For compatibility... -+ self.entry.set_text(text) -+ -+ def get_entry_text(self): -+ return self.entry.get_text() -+ -+ def set_sensitive(self, value): -+ self.entry.set_sensitive(value) -+ self.label.set_sensitive(value) -+ self.check.set_sensitive(value) -+ -+ def click_handler(self, widget=None, event=None): -+ active = self.check.get_active() -+ self.entry.set_visibility(active) ---- wicd.orig/gtk/netentry.py -+++ wicd/gtk/netentry.py -@@ -30,7 +30,7 @@ import wicd.misc as misc - import wicd.wpath as wpath - import wicd.dbusmanager as dbusmanager - from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool --from guiutil import error, LabelEntry, GreyLabel, LeftAlignedLabel, string_input -+from guiutil import error, LabelEntry, GreyLabel, LeftAlignedLabel, string_input, ProtectedLabelEntry - - from wicd.translations import language - -@@ -358,7 +358,7 @@ class WirelessSettingsDialog(AdvancedSet - self.chkbox_encryption.set_active(False) - self.combo_encryption.set_sensitive(False) - self.encrypt_types = misc.LoadEncryptionMethods() -- -+ - information_button = gtk.Button(stock=gtk.STOCK_INFO) - self.button_hbox.pack_start(information_button, False, False) - information_button.connect('clicked', lambda *a, **k: WirelessInformationDialog(networkID, self)) -@@ -532,10 +532,15 @@ class WirelessSettingsDialog(AdvancedSet - fields = methods[ID][type_] - for field in fields: - if language.has_key(field[1]): -- box = LabelEntry(language[field[1].lower().replace(' ','_')]) -+ field_text = language[field[1].lower().replace(' ','_')] - else: -- box = LabelEntry(field[1].replace('_',' ')) -- box.set_auto_hidden(True) -+ field_text = field[1].replace('_',' ') -+ -+ if field in methods[ID]['protected']: -+ box = ProtectedLabelEntry(field_text) -+ else: -+ box = LabelEntry(field_text) -+ - self.vbox_encrypt_info.pack_start(box) - # Add the data to a dict, so that the information - # can be easily accessed by giving the name of the wanted ---- wicd.orig/wicd/misc.py -+++ wicd/wicd/misc.py -@@ -335,6 +335,7 @@ def _parse_enc_template(enctype): - cur_type["fields"] = [] - cur_type['optional'] = [] - cur_type['required'] = [] -+ cur_type['protected'] = [] - cur_type['name'] = "" - for index, line in enumerate(f): - if line.startswith("name") and not cur_type["name"]: -@@ -353,6 +354,13 @@ def _parse_enc_template(enctype): - # An error occured parsing the optional line. - print "Invalid 'optional' line found in template %s" % enctype - continue -+ elif line.startswith("protected"): -+ cur_type["protected"] = __parse_field_ent(parse_ent(line, "protected"), -+ field_type="protected") -+ if not cur_type["protected"]: -+ # An error occured parsing the protected line. -+ print "Invalid 'protected' line found in template %s" % enctype -+ continue - elif line.startswith("----"): - # We're done. - break diff -Nru wicd-1.7.0+ds1/debian/patches/41-add_new_templates.patch wicd-1.7.1/debian/patches/41-add_new_templates.patch --- wicd-1.7.0+ds1/debian/patches/41-add_new_templates.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/41-add_new_templates.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -From: David Paleino -Subject: add new templates -Origin: upstream, http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/582 -Bug-Debian: http://bugs.debian.org/641531 -Forwarded: not-needed - ---- - encryption/templates/active | 3 +++ - encryption/templates/wpa-peap | 17 +++++++++++++++++ - encryption/templates/wpa2-leap | 19 +++++++++++++++++++ - encryption/templates/wpa2-peap | 17 +++++++++++++++++ - 4 files changed, 56 insertions(+) - ---- wicd.orig/encryption/templates/active -+++ wicd/encryption/templates/active -@@ -1,5 +1,8 @@ - wpa -+wpa-peap - wpa-psk -+wpa2-leap -+wpa2-peap - wep-hex - wep-passphrase - wep-shared ---- /dev/null -+++ wicd/encryption/templates/wpa-peap -@@ -0,0 +1,17 @@ -+name = WPA-PEAP -+author = atiketemola -+version = 1 -+require identity *Username domain *Domain password *Password -+protected password *Password -+----- -+ctrl_interface=/var/run/wpa_supplicant -+network={ -+ ssid="$_ESSID" -+ proto=WPA -+ key_mgmt=WPA-EAP -+ pairwise=CCMP -+ eap=PEAP -+ identity="$_DOMAIN\$_IDENTITY" -+ password="$_PASSWORD" -+ phase2="auth=MSCHAPv2" -+} ---- /dev/null -+++ wicd/encryption/templates/wpa2-leap -@@ -0,0 +1,19 @@ -+name = WPA2-LEAP -+author = atiketemola -+version = 1 -+require username *Username password *Password -+protected password *Password -+----- -+ctrl_interface=/var/run/wpa_supplicant -+network={ -+ ssid="$_ESSID" -+ scan_ssid=$_SCAN -+ auth_alg=LEAP -+ key_mgmt=WPA-EAP -+ proto=WPA2 -+ pairwise=CCMP TKIP -+ group=CCMP TKIP -+ eap=LEAP -+ identity="$_USERNAME" -+ password="$_PASSWORD" -+} ---- /dev/null -+++ wicd/encryption/templates/wpa2-peap -@@ -0,0 +1,17 @@ -+name = WPA2-PEAP -+author = atiketemola -+version = 1 -+require identity *Username domain *Domain password *Password -+protected password *Password -+----- -+ctrl_interface=/var/run/wpa_supplicant -+network={ -+ ssid="$_ESSID" -+ proto=RSN -+ key_mgmt=WPA-EAP -+ pairwise=CCMP -+ eap=PEAP -+ identity="$_DOMAIN\$_IDENTITY" -+ password="$_PASSWORD" -+ phase2="auth=MSCHAPv2" -+} diff -Nru wicd-1.7.0+ds1/debian/patches/42-support_new_urwid.patch wicd-1.7.1/debian/patches/42-support_new_urwid.patch --- wicd-1.7.0+ds1/debian/patches/42-support_new_urwid.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/42-support_new_urwid.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -From: David Paleino -Subject: support new urwid 1.0.0 -Origin: vendor -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=645681 -Forwarded: http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/598 - ---- - curses/curses_misc.py | 6 +++++- - curses/wicd-curses.py | 12 ++++++++++-- - 2 files changed, 15 insertions(+), 3 deletions(-) - ---- wicd.orig/curses/curses_misc.py -+++ wicd/curses/curses_misc.py -@@ -478,7 +478,11 @@ class Dialog2(urwid.WidgetWrap): - while not keys: - keys = ui.get_input() - for k in keys: -- if urwid.is_mouse_event(k): -+ if urwid.VERSION < (1, 0, 0): -+ check_mouse_event = urwid.is_mouse_event -+ else: -+ check_mouse_event = urwid.util.is_mouse_event -+ if check_mouse_event(k): - event, button, col, row = k - overlay.mouse_event( size, - event, button, col, row, ---- wicd.orig/curses/wicd-curses.py -+++ wicd/curses/wicd-curses.py -@@ -240,7 +240,11 @@ def help_dialog(body): - # Don't stop because someone let go of the mouse on the frame - mouse_release = False - for k in keys: -- if urwid.is_mouse_event(k) and k[0] == "mouse release": -+ if urwid.VERSION < (1, 0, 0): -+ check_mouse_event = urwid.is_mouse_event -+ else: -+ check_mouse_event = urwid.util.is_mouse_event -+ if check_mouse_event(k) and k[0] == "mouse release": - mouse_release = True - break - if mouse_release : -@@ -881,7 +885,11 @@ class appGUI(): - data[4], False) - - for k in keys: -- if urwid.is_mouse_event(k): -+ if urwid.VERSION < (1, 0, 0): -+ check_mouse_event = urwid.is_mouse_event -+ else: -+ check_mouse_event = urwid.util.is_mouse_event -+ if check_mouse_event(k): - event, button, col, row = k - self.frame.mouse_event( self.size, - event, button, col, row, diff -Nru wicd-1.7.0+ds1/debian/patches/series wicd-1.7.1/debian/patches/series --- wicd-1.7.0+ds1/debian/patches/series 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/series 2012-02-02 19:36:08.000000000 +0000 @@ -1,35 +1,4 @@ 01-remove_unused_icons.patch -02-detect_ping_flavour.patch -#08-fix_GetIP.patch -#09-fix_wire_plugging_detection.patch -03-fix_typo_wicd-cli.patch -05-use_binsh.patch -06-dont_bomb_out_on_configparser_error.patch -08-fix_help_message.patch -09-allow_empty_DNS.patch -11-fix_gui_showing_from_tray.patch -18-dont_run_unexpected_files_in_scripts.patch -19-dhcpcd_dont_handle_link-local.patch -#20-use_iniparse.patch -21-fix_ESSID_setting.patch -22-fix_deprecation.patch -23-fix_script_macro_expansion.patch -24-wait_for_DHCP_client.patch -25-use_dhcpcd_also_in_Debian.patch +02-workaround_dhclient_bug.patch 26-support_etc-network_scripts.patch -27-fix_resolv.conf_perms.patch -28-announce_dhclient.conf.template.patch -29-document_variables_passed_to_scripts.patch -30-make_connection_info_selectable.patch -31-dont_crash_on_notification_exceptions.patch 32-prefer_gksu.patch -33-deepcopy_python27_fixes.patch -34-dont_save_useless_config.patch -35-restrict_netmode_characters.patch -36-implement_tray-only.patch -37-fix_suspend_scripts.patch -38-fix_libc_ctype_linking.patch -39-fix_channel_digit_parsing.patch -40-checkbox_passwords.patch -41-add_new_templates.patch -42-support_new_urwid.patch diff -Nru wicd-1.7.0+ds1/debian/patches/xx-get_translations.patch wicd-1.7.1/debian/patches/xx-get_translations.patch --- wicd-1.7.0+ds1/debian/patches/xx-get_translations.patch 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/patches/xx-get_translations.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -From: David Paleino -Subject: fix release scripts, also include .po files in the tarball -Forwarded: no - ---- - setup.py | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- wicd.orig/setup.py -+++ wicd/setup.py -@@ -436,7 +436,10 @@ class get_translations(Command): - import urllib, shutil - if os.path.exists('translations'): - shutil.rmtree('translations/') -+ if os.path.exists('po'): -+ shutil.rmtree('po/') - os.makedirs('translations') -+ os.makedirs('po') - filename, headers = urllib.urlretrieve('http://wicd.sourceforge.net/translator/idlist/') - id_file = open(filename, 'r') - lines = id_file.readlines() -@@ -452,11 +455,10 @@ class get_translations(Command): - except: - print >> sys.stderr, 'error downloading language %s' % id - else: -- shutil.move(pofile, lang_identifier+'.po') -+ shutil.move(pofile, 'po/'+lang_identifier+'.po') - os.makedirs('translations/'+lang_identifier+'/LC_MESSAGES') - os.system('msgfmt --output-file=translations/' + lang_identifier + -- '/LC_MESSAGES/wicd.mo ' + lang_identifier + '.po') -- os.remove(lang_identifier+'.po') -+ '/LC_MESSAGES/wicd.mo po/' + lang_identifier + '.po') - - - class uninstall(Command): diff -Nru wicd-1.7.0+ds1/debian/po/nl.po wicd-1.7.1/debian/po/nl.po --- wicd-1.7.0+ds1/debian/po/nl.po 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/debian/po/nl.po 2012-02-02 19:36:08.000000000 +0000 @@ -0,0 +1,33 @@ +# Dutch translation of wicd debconf templates. +# Copyright (C) 2009, David Paleino. +# This file is distributed under the same license as the wicd package. +# Jeroen Schot , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: wicd 1.7.0+ds1-6\n" +"Report-Msgid-Bugs-To: wicd@packages.debian.org\n" +"POT-Creation-Date: 2009-06-13 17:38+0200\n" +"PO-Revision-Date: 2011-09-28 11:38+0200\n" +"Last-Translator: Jeroen Schot \n" +"Language-Team: Debian l10n Dutch \n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Users to add to the netdev group:" +msgstr "Gebruikers die aan de netdev-groep moeten worden toegevoegd:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Users who should be able to run wicd clients need to be added to the group " +"\"netdev\"." +msgstr "" +"Gebruikers die wicd-clients moeten kunnen uitvoeren moeten worden toegevoegd " +"aan de groep 'netdev'." diff -Nru wicd-1.7.0+ds1/debian/rules wicd-1.7.1/debian/rules --- wicd-1.7.0+ds1/debian/rules 2011-10-22 09:25:12.000000000 +0000 +++ wicd-1.7.1/debian/rules 2012-02-02 19:36:08.000000000 +0000 @@ -16,29 +16,25 @@ --loggroup=adm \ --logperms=0640 +override_dh_auto_build: + dh_auto_build + python setup.py compile_translations + + # pybabel currently doesn't support Asturian + msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo + override_dh_auto_clean: dh_auto_clean -find . \( -name "*.pyc" -o -name "*.pyo" \) -delete - -find init/ \( -name "wicd" -o -name "rc.wicd" \) -delete - -rm -rf build/ - - dh_clean wpath.py install.log os wicd/wpath.py \ - man/*.8 man/*.5 scripts/* other/*.sh \ - other/postinst other/55wicd debian/wicd-po/*.mo \ - other/91wicd other/wicd.conf other/WHEREAREMYFILES - - # recreate directories needed during the compilation - -for i in arch debian default gentoo lunar pld redhat slackware suse; do \ - mkdir -p $(CURDIR)/init/$$i ; \ - done + -rm -rf build/ init/ scripts/ translations/ override_dh_auto_install: python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb - + find $(CURDIR)/debian/tmp -name "*.png" -exec chmod 644 {} \; find $(CURDIR)/debian/tmp/etc/wicd/ -type f -exec chmod 644 {} \; find $(CURDIR)/debian/tmp \( -name "*.glade" -o -name "*.conf" -o -name "*.desktop" \) -exec chmod 644 {} \; - + find $(CURDIR)/debian/tmp/ -name ".empty_on_purpose" -delete -rm -rf $(CURDIR)/debian/tmp/var/run @@ -55,17 +51,8 @@ dh_python2 -p wicd-curses /usr/share/wicd/curses dh_python2 -p wicd-daemon /usr/share/wicd/daemon dh_python2 -p wicd-gtk /usr/share/wicd/gtk + dh_python2 -p wicd-cli /usr/share/wicd/cli %: dh $@ \ --with python2 - -get-orig-source: - uscan --force-download --download-version $(CURVER) --destdir . --rename - tar xvf wicd_$(CURVER).orig.tar.bz2 - ( cd wicd-$(CURVER)/ ; \ - patch -p1 < ../debian/patches/xx-get_translations.patch ; \ - python setup.py get_translations ; \ - rm -rf vcsinfo.pyc ) - tar jcf wicd_$(CURVER)+ds1.orig.tar.bz2 wicd-$(CURVER)/ - rm -rf wicd_$(CURVER).orig.tar.bz2 wicd-$(CURVER)/ diff -Nru wicd-1.7.0+ds1/depends/python-iwscan/debian/changelog wicd-1.7.1/depends/python-iwscan/debian/changelog --- wicd-1.7.0+ds1/depends/python-iwscan/debian/changelog 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-iwscan/debian/changelog 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -python-iwscan (0.7.0-2) unstable; urgency=low - - * Read more closely the debian python packaging guide, and embrace the - pycentral pragma. Remove debian/pycompat and adjust debian/control and - debian/rules accordingly. - - -- Kel Modderman Tue, 08 Apr 2008 00:20:57 +1000 - -python-iwscan (0.7.0-1) unstable; urgency=low - - * Add an upstream-release: target to debian/rules, make this a non-native - package. - * Run code through uncristify, cleanup other coding style stuff. - - -- Kel Modderman Wed, 02 Apr 2008 19:24:41 +1000 - -python-iwscan (0.6.1) unstable; urgency=low - - * Minor cleanups of iwlist.py example. - * No need to use struct keyword for iwreq. - - -- Kel Modderman Thu, 27 Mar 2008 23:56:30 +1000 - -python-iwscan (0.6.0) unstable; urgency=low - - * Add enum_devices() method to iwscan, to discover wireless interfaces and - return them in a list. - * Adjust iwlist example to show iwscan.enum_devices(). - - -- Kel Modderman Thu, 27 Mar 2008 23:28:02 +1000 - -python-iwscan (0.5.1) unstable; urgency=low - - * Remove the custom element, its not very useful, nor is it handled properly - in the absence of event stream management. - - -- Kel Modderman Thu, 27 Mar 2008 02:04:12 +1000 - -python-iwscan (0.5.0) unstable; urgency=low - - * Look up cypher and key-mgmt strings from a struct adapted from iwlist.c. - - -- Kel Modderman Thu, 27 Mar 2008 01:41:26 +1000 - -python-iwscan (0.4.1) unstable; urgency=low - - * Cleanup the example iwlist.py output to be _very_ similar to iwlist. - - -- Kel Modderman Thu, 27 Mar 2008 00:27:28 +1000 - -python-iwscan (0.4.0) unstable; urgency=low - - * More cleanup, arrange key elements in in same order as they're processed. - * Process the custom iw element. - * Keep a 'qual' key, so a common index can be used to sort results. - * Put signal et. al. stats into 'stats' key. - * Update iwlist.py example. - - -- Kel Modderman Wed, 26 Mar 2008 22:36:53 +1000 - -python-iwscan (0.3.1) unstable; urgency=low - - * Cleanup iwlist.py example. - - -- Kel Modderman Wed, 26 Mar 2008 21:22:13 +1000 - -python-iwscan (0.3.0) unstable; urgency=low - - * Use iwlib to format frequency, bitrate and quality. - * Increase scan timeout to 15s, as per current iwlist.c. - * Change 'ap' key to 'bssid'. - * Add iwlist.py script, an iwlist emulator, install it as an example. - - -- Kel Modderman Wed, 26 Mar 2008 21:10:06 +1000 - -python-iwscan (0.2.0) unstable; urgency=low - - * Rename extension to 'iwscan' from 'pyiwscan'. - * Return a dict for the 'wpa' key a cells scan results, it will contain wpa - type and version, a list of authentication suites, a list of pairwaise - ciphers and the group cipher. - - -- Kel Modderman Wed, 26 Mar 2008 15:02:14 +1000 - -python-iwscan (0.1.0) unstable; urgency=low - - * Initial release. - - -- Kel Modderman Thu, 13 Mar 2008 12:21:15 +1000 diff -Nru wicd-1.7.0+ds1/depends/python-iwscan/debian/compat wicd-1.7.1/depends/python-iwscan/debian/compat --- wicd-1.7.0+ds1/depends/python-iwscan/debian/compat 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-iwscan/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -6 diff -Nru wicd-1.7.0+ds1/depends/python-iwscan/debian/control wicd-1.7.1/depends/python-iwscan/debian/control --- wicd-1.7.0+ds1/depends/python-iwscan/debian/control 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-iwscan/debian/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Source: python-iwscan -Section: python -Priority: optional -Build-Depends: debhelper (>= 6), python-all-dev (>= 2.3.5-11), python (>= 2.4), python-central (>= 0.5.6), libiw-dev -Maintainer: Kel Modderman -XS-Python-Version: >= 2.4 -Standards-Version: 3.7.3 - -Package: python-iwscan -Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends} -Provides: ${python:Provides} -XB-Python-Version: ${python:Versions} -Description: A Python interface to iwlist, using the iwlib library - This module makes the iwlib (Linux Wireless Extensions) functions available - in Python for wireless network scanning. diff -Nru wicd-1.7.0+ds1/depends/python-iwscan/debian/copyright wicd-1.7.1/depends/python-iwscan/debian/copyright --- wicd-1.7.0+ds1/depends/python-iwscan/debian/copyright 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-iwscan/debian/copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -This is the Debian package of a Python iwscan module. - -Files: * -Copyright: (c) 2008 Kel Modderman -License: LGPL-2.1 - -On Debian GNU/Linux systems, the complete text of the GNU Lesser General -Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. diff -Nru wicd-1.7.0+ds1/depends/python-iwscan/debian/examples wicd-1.7.1/depends/python-iwscan/debian/examples --- wicd-1.7.0+ds1/depends/python-iwscan/debian/examples 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-iwscan/debian/examples 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -iwlist.py diff -Nru wicd-1.7.0+ds1/depends/python-iwscan/debian/rules wicd-1.7.1/depends/python-iwscan/debian/rules --- wicd-1.7.0+ds1/depends/python-iwscan/debian/rules 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-iwscan/debian/rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -PYVERS=$(shell pyversions -r debian/control) - -build: build-stamp -build-stamp: - dh_testdir - for python in $(PYVERS); do \ - $$python setup.py build; \ - done - touch build-stamp - -clean: - dh_testdir - for python in $(PYVERS); do \ - $$python setup.py clean; \ - done - rm -rf build-stamp build - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - for python in $(PYVERS); do \ - $$python setup.py install --root=debian/python-iwscan; \ - done - -# Build architecture-independent files here. -binary-indep: build install - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs -a - dh_installexamples -a - dh_installchangelogs -a - dh_pycentral -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary - -VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version:\s*\([0-9]\+:\)\?\([^\s-]\+\).*/\2/p') -TARBALL := ../python-iwscan-$(VERSION).tar.gz -ORIGTGZ := ../tarballs/python-iwscan_$(VERSION).orig.tar.gz -DIRTREE := $(shell basename $(CURDIR)) -upstream-release: - $(RM) $(TARBALL) $(ORIGTGZ) - tar -czf $(TARBALL) --exclude='.svn' --exclude='debian' -C $(CURDIR)/../ $(DIRTREE) - install -D -m 0644 $(TARBALL) $(ORIGTGZ) diff -Nru wicd-1.7.0+ds1/depends/python-iwscan/iwlist.py wicd-1.7.1/depends/python-iwscan/iwlist.py --- wicd-1.7.0+ds1/depends/python-iwscan/iwlist.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-iwscan/iwlist.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -#!/usr/bin/python -tt - -__author__ = 'Kel Modderman' -__copyright__ = '(C) 2008 Kel Modderman ' -__license__ = 'GPLv2 or any later version' - -import iwscan -import os -import sys - -def printScanResults(results): - '''Pretty print scan results from list of dicts returned by iwscan.''' - for cellno, cell in enumerate(results): - rj = ' ' * 10 - if cell.get('bssid'): - print(rj + 'Cell %02d - Address: %s' % (cellno + 1, cell['bssid'])) - - rj += ' ' * 10 - if cell.get('essid'): - print(rj + 'ESSID:"%s"' % cell['essid']) - - if cell.get('protocol'): - print(rj + 'Protocol:%s' % cell['protocol']) - - if cell.get('mode'): - print(rj + 'Mode:%s' % cell['mode']) - - if cell.get('frequency') and cell.get('channel'): - print(rj + 'Frequency:%s (Channel %d)' % - (cell['frequency'], cell['channel'])) - - if cell.get('enc'): - enc = 'on' - else: - enc = 'off' - print(rj + 'Encryption key:%s' % enc) - - if cell.get('bitrate'): - print(rj + 'Bit Rate:%s' % cell['bitrate']) - - if cell.get('stats'): - print(rj + cell['stats']) - - if cell.get('ie'): - ie = cell['ie'] - - print(rj + 'IE: %s Version %d' % (ie['type'], ie['version'])) - - ierj = rj + ' ' * 4 - - if ie.get('group'): - print(ierj + 'Group Cipher : %s' % ie['group']) - - if ie.get('pairwise'): - print(ierj + 'Pairwise Ciphers (%d) : %s' % - (len(ie['pairwise']), ' '.join(ie['pairwise']))) - - if ie.get('auth'): - print(ierj + 'Authentication Suites (%d) : %s' % - (len(ie['auth']), ' '.join(ie['auth']))) - - print - - -if __name__ == '__main__': - try: - print('python-iwscan v%d.%d.%d' % iwscan.version()) - print('iwlib v%d - wext v%d\n' % (iwscan.iw_version(), - iwscan.we_version())) - wi = iwscan.enum_devices() - for w in wi: - res = iwscan.WirelessInterface(w).Scan() - if len(res) < 1: - print("%-10sNo scan results." % w) - else: - print("%-10sScan completed :" % w) - printScanResults(res) - except iwscan.error, e: - print("Error: %s" % e) - sys.exit(1) - else: - if len(wi) < 1: - print("No wireless devices detected!") - sys.exit(1) diff -Nru wicd-1.7.0+ds1/depends/python-iwscan/LICENSE wicd-1.7.1/depends/python-iwscan/LICENSE --- wicd-1.7.0+ds1/depends/python-iwscan/LICENSE 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-iwscan/LICENSE 1970-01-01 00:00:00.000000000 +0000 @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff -Nru wicd-1.7.0+ds1/depends/python-iwscan/pyiwscan.c wicd-1.7.1/depends/python-iwscan/pyiwscan.c --- wicd-1.7.0+ds1/depends/python-iwscan/pyiwscan.c 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-iwscan/pyiwscan.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,827 +0,0 @@ -/* - * Copyright (c) 2008 Kel Modderman - * License: LGPL v2.1 - * - * This is a fork of pyiw: http://downloads.emperorlinux.com/contrib/pyiw/ - * by jeremy@emperorlinux.com - * - * This module was inspired by (and uses) the iw library that comes with the Linux Wireless Tools - * package. Portions of this module are moderately modified snippets of iwlist.c - */ - -#include -#include -#include - -#define IWSCAN_VERSION_MAJOR 0 -#define IWSCAN_VERSION_MINOR 7 -#define IWSCAN_VERSION_MICRO 0 - -/* ------------------------------------------------------------------------------- from iwlist.c */ - -#define IWSCAN_ARRAY_LEN(x) (sizeof(x) / sizeof((x)[0])) - -/* Values for the IW_IE_CIPHER_* in GENIE */ -static const char* iwscan_ie_cypher_name[] = { - "none", - "WEP-40", - "TKIP", - "WRAP", - "CCMP", - "WEP-104", -}; -#define IWSCAN_IE_CYPHER_NUM IWSCAN_ARRAY_LEN(iwscan_ie_cypher_name) - -/* Values for the IW_IE_KEY_MGMT_* in GENIE */ -static const char* iwscan_ie_key_mgmt_name[] = { - "none", - "802.1x", - "PSK", -}; -#define IWSCAN_IE_KEY_MGMT_NUM IWSCAN_ARRAY_LEN(iwscan_ie_key_mgmt_name) - -/* --------------------------------------------------------------------------- WirelessInterface */ -typedef struct { - PyObject_HEAD - wireless_info info; - char* ifname; - int sock; -} WirelessInterface; - -typedef enum { - IWSCAN_KE_BSSID, - IWSCAN_KE_FREQUENCY, - IWSCAN_KE_CHANNEL, - IWSCAN_KE_MODE, - IWSCAN_KE_PROTOCOL, - IWSCAN_KE_ESSID, - IWSCAN_KE_ENC, - IWSCAN_KE_BITRATE, - IWSCAN_KE_QUAL, - IWSCAN_KE_STATS, - IWSCAN_KE_IE -} WirelessInterfaceKeyEnum; - -typedef struct { - WirelessInterfaceKeyEnum keys[2]; - PyObject* objs[2]; - int num; -} WirelessInterfaceScanData; - -static char* WirelessInterfaceKeys[] = { - "bssid", - "frequency", - "channel", - "mode", - "protocol", - "essid", - "enc", - "bitrate", - "qual", - "stats", - "ie", -}; -#define IWSCAN_INTERFACE_KEYS IWSCAN_ARRAY_LEN(WirelessInterfaceKeys) - -/* ------------------------------------------------------------------------ Function Definitions */ -typedef struct iw_event iwevent; -typedef struct iwreq iwreq; -typedef struct ifreq ifreq; -typedef struct timeval timeval; -typedef WirelessInterface wiface; -typedef WirelessInterfaceScanData wifacesd; - -static PyObject* iwscan_version(PyObject*, PyObject*); -static PyObject* iwscan_iw_version(PyObject*, PyObject*); -static PyObject* iwscan_we_version(PyObject*, PyObject*); -static PyObject* iwscan_enum_devices(PyObject*, PyObject*); - -static int WirelessInterface_init(wiface*, PyObject*, PyObject*); -static void WirelessInterface_dealloc(wiface*); -static void WirelessInterface_refresh(wiface*); -static int WirelessInterface_len(PyObject*); -static PyObject* WirelessInterface_seqitem(PyObject*, int); - -static PyObject* WirelessInterface_Scan(wiface*); -static PyObject* WirelessInterface_ScanCypher(unsigned int); -static PyObject* WirelessInterface_ScanKeyMgt(unsigned int); -static PyObject* WirelessInterface_ScanIe(unsigned char*, int); -static int WirelessInterface_ScanItem(wifacesd*, iwevent*, iwrange*, int); - -static PyObject* IwScanError; - -/* --------------------------------------------------------------------------- IWSCAN_DOC_STRING */ -static char* IWSCAN_DOC_STRING = - "IWSCAN defines a single class, WirelessInterface, that must be instantiated\n" - "with the name of the real wireless interface you wish to operate on. If\n" - "the interface you specify doesn't exist, or if it doesn't support wireless\n" - "extensions, object creation will fail and iwscan.error will be raised. As an\n" - "important side note: IWSCAN requires at least Wireless Extensions 18.\n\n" - "import iwscan\n" - "import sys\n\n" - "try:\n" - " for w in iwscan.enum_devices():\n" - " print 'Scanning with %s:' % w\n" - " wi = iwscan.WirelessInterface(w)\n" - " wi.Scan()\n" - "except iwscan.error, error:\n" - " print error\n" - " sys.exit(1)\n\n" -; - -/* ---------------------------------------------------------------------- WirelessInterface_init */ -static int WirelessInterface_init(wiface* self, PyObject* args, PyObject* kargs) -{ - const char* ifname; - const size_t ifnamesize; - - memset(&(self->info), 0, sizeof(wireless_info)); - - self->ifname = NULL; - self->sock = 0; - - if (PyArg_ParseTuple(args, "s#", &ifname, &ifnamesize)) { - self->sock = iw_sockets_open(); - - if (self->sock != -1) { - ifreq frq; - - self->ifname = malloc(ifnamesize + 1); - - strncpy(self->ifname, ifname, ifnamesize + 1); - strncpy(frq.ifr_name, self->ifname, IFNAMSIZ); - - if (!ioctl(self->sock, SIOCGIFFLAGS, &frq)) { - frq.ifr_flags |= IFF_UP | IFF_RUNNING; - - ioctl(self->sock, SIOCSIFFLAGS, &frq); - - WirelessInterface_refresh(self); - - return 0; - } - else - PyErr_SetString(IwScanError, "Failed to find device"); - } - else - PyErr_SetString(IwScanError, "Failed to connect to libiw"); - } - - return -1; -} - -/* ------------------------------------------------------------------- WirelessInterface_dealloc */ -static void WirelessInterface_dealloc(wiface* self) -{ - if (self->ifname) - free(self->ifname); - - iw_sockets_close(self->sock); - self->ob_type->tp_free((PyObject*)(self)); -} - -/* ------------------------------------------------------------------- WirelessInterface_refresh */ -static void WirelessInterface_refresh(wiface* self) -{ - iwreq wrq; - - iw_get_basic_config(self->sock, self->ifname, &(self->info.b)); - iw_get_range_info(self->sock, self->ifname, &(self->info.range)); - - iw_get_ext(self->sock, self->ifname, SIOCGIWRATE, &wrq); - memcpy(&(self->info.bitrate), &wrq.u.bitrate, sizeof(iwparam)); - - iw_get_ext(self->sock, self->ifname, SIOCGIWAP, &wrq); - memcpy(&(self->info.ap_addr), &wrq.u.ap_addr, sizeof(sockaddr)); - - iw_get_stats(self->sock, self->ifname, &(self->info.stats), - &(self->info.range), self->info.has_range); -} - -/* ----------------------------------------------------------------------- WirelessInterface_len */ -static int WirelessInterface_len(PyObject* self) -{ - return IWSCAN_INTERFACE_KEYS; -} - -/* ------------------------------------------------------------------- WirelessInterface_seqitem */ -static PyObject* WirelessInterface_seqitem(PyObject* self, int index) -{ - if (index >= 0 && index < IWSCAN_INTERFACE_KEYS) - return Py_BuildValue("s", WirelessInterfaceKeys[index]); - - return NULL; -} - -/* ---------------------------------------------------------------------- WirelessInterface_Scan */ -static PyObject* WirelessInterface_Scan(wiface* self) -{ - iwreq wrq; - unsigned char* buffer = NULL; - int buflen = IW_SCAN_MAX_DATA; - iwrange range; - int has_range; - timeval tv; - int timeout = 15000000; - PyObject* scan_list = NULL; - - has_range = (iw_get_range_info(self->sock, self->ifname, &range) >= 0); - - tv.tv_sec = 0; - tv.tv_usec = 250000; - wrq.u.data.pointer = NULL; - wrq.u.data.flags = 0; - wrq.u.data.length = 0; - - if (iw_set_ext(self->sock, self->ifname, SIOCSIWSCAN, &wrq) < 0) { - if (errno != EPERM) { - PyErr_SetString(IwScanError, "Interface doesn't support scanning"); - return NULL; - } - - tv.tv_usec = 0; - } - - timeout -= tv.tv_usec; - - while (1) { - fd_set rfds; - int last_fd; - int ret; - - FD_ZERO(&rfds); - last_fd = -1; - - ret = select(last_fd + 1, &rfds, NULL, NULL, &tv); - - if (ret < 0) { - if (errno == EAGAIN || errno == EINTR) - continue; - else { - PyErr_SetString(IwScanError, "Unknown scanning error"); - return NULL; - } - } - - if (!ret) { - unsigned char* newbuf; - - realloc: - newbuf = realloc(buffer, buflen); - - if (!newbuf) { - if (buffer) - free(buffer); - - PyErr_SetString(IwScanError, "Memory allocation failure in scan"); - return NULL; - } - - buffer = newbuf; - - wrq.u.data.pointer = buffer; - wrq.u.data.flags = 0; - wrq.u.data.length = buflen; - - if (iw_get_ext(self->sock, self->ifname, SIOCGIWSCAN, &wrq) < 0) { - if ((errno == E2BIG)) { - if (wrq.u.data.length > buflen) - buflen = wrq.u.data.length; - else - buflen *= 2; - - goto realloc; - } - - if (errno == EAGAIN) { - tv.tv_sec = 0; - tv.tv_usec = 100000; - timeout -= tv.tv_usec; - - if (timeout > 0) - continue; - } - - free(buffer); - - PyErr_SetString(IwScanError, "Unable to read scan data"); - return NULL; - } - else - break; - } - } - - if (wrq.u.data.length) { - iwevent iwe; - stream_descr stream; - int ret; - PyObject* scan_dict = NULL; - - scan_list = PyList_New(0); - - iw_init_event_stream(&stream, (char*)(buffer), wrq.u.data.length); - - do { - ret = iw_extract_event_stream(&stream, &iwe, range.we_version_compiled); - - if (ret > 0) { - wifacesd sd; - int sr = WirelessInterface_ScanItem(&sd, &iwe, &range, has_range); - - if (sr) { - int i; - - if (scan_dict) { - PyList_Append(scan_list, scan_dict); - Py_DECREF(scan_dict); - } - - scan_dict = PyDict_New(); - - for (i = 0; i < IWSCAN_INTERFACE_KEYS; i++) { - PyMapping_SetItemString(scan_dict, - WirelessInterfaceKeys[i], - Py_BuildValue("")); - } - } - - if (sd.num) { - int i; - - for (i = 0; i < sd.num; i++) { - PyMapping_SetItemString(scan_dict, - WirelessInterfaceKeys[sd.keys[i]], - sd.objs[i]); - - Py_DECREF(sd.objs[i]); - } - } - } - } while (ret > 0); - - PyList_Append(scan_list, scan_dict); - Py_XDECREF(scan_dict); - } - else - return Py_BuildValue("[]"); - - free(buffer); - - return scan_list; -} - -/* ---------------------------------------------------------------- WirelessInterface_ScanCypher */ -static PyObject* WirelessInterface_ScanCypher(unsigned int value) -{ - if (value >= IWSCAN_IE_CYPHER_NUM) - return Py_BuildValue(""); - - return Py_BuildValue("s", iwscan_ie_cypher_name[value]); -} - -/* ---------------------------------------------------------------- WirelessInterface_ScanKeyMgt */ -static PyObject* WirelessInterface_ScanKeyMgt(unsigned int value) -{ - if (value >= IWSCAN_IE_KEY_MGMT_NUM) - return Py_BuildValue(""); - - return Py_BuildValue("s", iwscan_ie_key_mgmt_name[value]); -} - -/* -------------------------------------------------------------------- WirelessInterface_ScanIe */ -static PyObject* WirelessInterface_ScanIe(unsigned char* iebuf, int buflen) -{ - int ielen = iebuf[1] + 2; - int offset = 2; - unsigned char wpa1_oui[3] = { 0x00, 0x50, 0xf2 }; - unsigned char wpa2_oui[3] = { 0x00, 0x0f, 0xac }; - unsigned char* wpa_oui; - int i; - uint16_t ver = 0; - uint16_t cnt = 0; - PyObject* auth_list = PyList_New(0); - PyObject* pairwise_list = PyList_New(0); - PyObject* wpa_dict = PyDict_New(); - - PyMapping_SetItemString(wpa_dict, "auth", auth_list); - PyMapping_SetItemString(wpa_dict, "group", Py_BuildValue("")); - PyMapping_SetItemString(wpa_dict, "pairwise", pairwise_list); - PyMapping_SetItemString(wpa_dict, "type", Py_BuildValue("")); - PyMapping_SetItemString(wpa_dict, "version", Py_BuildValue("")); - if (ielen > buflen) { - ielen = buflen; - } - - switch (iebuf[0]) { - case 0x30: - if (ielen < 4) { - return wpa_dict; - } - - wpa_oui = wpa2_oui; - break; - case 0xdd: - wpa_oui = wpa1_oui; - - if ((ielen < 8) - || (memcmp(&iebuf[offset], wpa_oui, 3) != 0) - || (iebuf[offset + 3] != 0x01)) - return wpa_dict; - - offset += 4; - break; - default: - return wpa_dict; - } - - ver = iebuf[offset] | (iebuf[offset + 1] << 8); - offset += 2; - - PyMapping_SetItemString(wpa_dict, "version", Py_BuildValue("i", ver)); - if (iebuf[0] == 0xdd) - PyMapping_SetItemString(wpa_dict, "type", Py_BuildValue("s", "WPA")); - if (iebuf[0] == 0x30) - PyMapping_SetItemString(wpa_dict, "type", Py_BuildValue("s", "IEEE 802.11i/WPA2")); - - if (ielen < (offset + 4)) { - PyMapping_SetItemString(wpa_dict, "group", Py_BuildValue("s", "TKIP")); - PyList_Append(pairwise_list, Py_BuildValue("s", "TKIP")); - PyMapping_SetItemString(wpa_dict, "pairwise", pairwise_list); - return wpa_dict; - } - - if (memcmp(&iebuf[offset], wpa_oui, 3) != 0) - PyMapping_SetItemString(wpa_dict, "group", Py_BuildValue("s", "Proprietary")); - else - PyMapping_SetItemString(wpa_dict, "group", WirelessInterface_ScanCypher(iebuf[offset + 3])); - - offset += 4; - - if (ielen < (offset + 2)) { - PyList_Append(pairwise_list, Py_BuildValue("s", "TKIP")); - PyMapping_SetItemString(wpa_dict, "pairwise", pairwise_list); - return wpa_dict; - } - - cnt = iebuf[offset] | (iebuf[offset + 1] << 8); - offset += 2; - - if (ielen < (offset + 4 * cnt)) - return wpa_dict; - - for (i = 0; i < cnt; i++) { - if (memcmp(&iebuf[offset], wpa_oui, 3) != 0) - PyList_Append(pairwise_list, Py_BuildValue("s", "Proprietary")); - else - PyList_Append(pairwise_list, WirelessInterface_ScanCypher(iebuf[offset + 3])); - - offset += 4; - } - PyMapping_SetItemString(wpa_dict, "pairwise", pairwise_list); - - cnt = iebuf[offset] | (iebuf[offset + 1] << 8); - offset += 2; - - if (ielen < (offset + 4 * cnt)) - return wpa_dict; - - for (i = 0; i < cnt; i++) { - if (memcmp(&iebuf[offset], wpa_oui, 3) != 0) - PyList_Append(auth_list, Py_BuildValue("s", "Proprietary")); - else - PyList_Append(auth_list, WirelessInterface_ScanKeyMgt(iebuf[offset + 3])); - - offset += 4; - } - PyMapping_SetItemString(wpa_dict, "auth", auth_list); - - return wpa_dict; -} - -/* ------------------------------------------------------------------ WirelessInterface_ScanItem */ -static int WirelessInterface_ScanItem(wifacesd* data, iwevent* event, iwrange* range, int has_range) -{ - static char buf[128]; - - memset(data, 0, sizeof(wifacesd)); - - switch (event->cmd) { - case SIOCGIWAP: { - iw_ether_ntop((const struct ether_addr*)(event->u.ap_addr.sa_data), buf); - - data->keys[0] = IWSCAN_KE_BSSID; - data->objs[0] = Py_BuildValue("s", buf); - data->num = 1; - - return 1; - } - - case SIOCGIWFREQ: { - double freq = iw_freq2float(&(event->u.freq)); - int channel; - - if (freq <= 14.0) - channel = iw_channel_to_freq((int)(freq), &freq, range); - else - channel = iw_freq_to_channel(freq, range); - - iw_print_freq_value(buf, sizeof(buf), freq); - - data->keys[0] = IWSCAN_KE_FREQUENCY; - data->keys[1] = IWSCAN_KE_CHANNEL; - data->objs[0] = Py_BuildValue("s", buf); - data->objs[1] = Py_BuildValue("i", channel); - data->num = 2; - - return 0; - } - - case SIOCGIWMODE: { - data->keys[0] = IWSCAN_KE_MODE; - data->objs[0] = Py_BuildValue("s", iw_operation_mode[event->u.mode]); - data->num = 1; - - return 0; - } - - case SIOCGIWNAME: { - data->keys[0] = IWSCAN_KE_PROTOCOL; - data->objs[0] = Py_BuildValue("s", event->u.name); - data->num = 1; - - return 0; - } - - case SIOCGIWESSID: { - memcpy(buf, event->u.essid.pointer, event->u.essid.length); - buf[event->u.essid.length] = 0x0; - - data->keys[0] = IWSCAN_KE_ESSID; - data->objs[0] = Py_BuildValue("s", buf); - data->num = 1; - - return 0; - } - - case SIOCGIWENCODE: { - PyObject* pybool; - - if (event->u.data.flags & IW_ENCODE_DISABLED) pybool = Py_False; - else pybool = Py_True; - - Py_INCREF(pybool); - - data->keys[0] = IWSCAN_KE_ENC; - data->objs[0] = pybool; - data->num = 1; - - return 0; - } - - case SIOCGIWRATE: { - iw_print_bitrate(buf, sizeof(buf), event->u.bitrate.value); - - data->keys[0] = IWSCAN_KE_BITRATE; - data->objs[0] = Py_BuildValue("s", buf); - data->num = 1; - - return 0; - } - - case IWEVQUAL: { - iw_print_stats(buf, sizeof(buf), &event->u.qual, range, has_range); - - data->keys[0] = IWSCAN_KE_QUAL; - data->keys[1] = IWSCAN_KE_STATS; - data->objs[0] = Py_BuildValue("i", event->u.qual.qual); - data->objs[1] = Py_BuildValue("s", buf); - data->num = 2; - - return 0; - } - - case IWEVGENIE: { - unsigned char* buffer = event->u.data.pointer; - int buflen = event->u.data.length; - int offset = 0; - - data->keys[0] = IWSCAN_KE_IE; - - //PyObject* ie_list = PyList_New(0); - //data->objs[0] = ie_list; - while (offset <= (buflen - 2)) { - //PyList_Append(ie_list, WirelessInterface_ScanIe(buffer + offset, buflen)); - data->objs[0] = WirelessInterface_ScanIe(buffer + offset, buflen); - offset += buffer[offset + 1] + 2; - } - - data->num = 1; - - return 0; - } - - default: - return 0; - } -} - -/* -------------------------------------------------------------------- Member/Method Structures */ -static PyMethodDef module_methods[] = { - { - "version", iwscan_version, METH_NOARGS, - "Returns the current IwScan version." - }, - { - "iw_version", iwscan_iw_version, METH_NOARGS, - "Returns the current Wireless Extnesions (libiw WE) version." - }, - { - "we_version", iwscan_we_version, METH_NOARGS, - "Returns the current Wireless Extensions (kernel-level WE) version." - }, - { - "enum_devices", iwscan_enum_devices, METH_NOARGS, - "Returns list of wireless devices." - }, - { NULL, NULL, 0, NULL } -}; - -static PyMethodDef WirelessInterface_methods[] = { - { - "Scan", (PyCFunction)(WirelessInterface_Scan), METH_NOARGS, - "This function will attempt to scan any local AP's and return a tuple\n" - "of objectes representing the data contained therein." - }, - { NULL, NULL, 0, NULL } -}; - -static PyMappingMethods WirelessInterface_mapping_methods = { - WirelessInterface_len, /* length */ -}; - -static PySequenceMethods WirelessInterface_sequence_methods = { - WirelessInterface_len, /* sq_length */ - 0, /* sq_concat */ - 0, /* sq_repeat */ - WirelessInterface_seqitem, /* sq_item */ - 0, /* sq_slice */ - 0, /* sq_ass_item */ - 0, /* sq_ass_slice */ - 0, /* sq_contains */ - 0, /* sq_inplace_concat */ - 0 /* sq_inplace_repeat */ -}; - -/* -------------------------------------------------------------------- PyType_WirelessInterface */ -static PyTypeObject PyType_WirelessInterface = { - PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "iwscan.WirelessInterface", /* tp_name */ - sizeof(WirelessInterface), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)(WirelessInterface_dealloc), /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_compare */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - &WirelessInterface_sequence_methods, /* tp_as_sequence */ - &WirelessInterface_mapping_methods, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - 0, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - WirelessInterface_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)(WirelessInterface_init), /* tp_init */ - 0, /* tp_alloc */ - PyType_GenericNew, /* tp_new */ - 0, /* tp_free */ - 0, /* tp_is_gc */ - 0, /* tp_bases */ - 0, /* tp_mro */ - 0, /* tp_cache */ - 0, /* tp_subclasses */ - 0, /* tp_weaklist */ - 0 /* tp_del */ -}; - -/* ---------------------------------------------------------------------------------- initiwscan */ -PyMODINIT_FUNC initiwscan(void) -{ - PyObject* module; - - PyType_Ready(&PyType_WirelessInterface); - - module = Py_InitModule3("iwscan", module_methods, IWSCAN_DOC_STRING); - IwScanError = PyErr_NewException("iwscan.error", NULL, NULL); - - Py_INCREF(&PyType_WirelessInterface); - Py_INCREF(IwScanError); - - PyModule_AddObject(module, "WirelessInterface", (PyObject*)(&PyType_WirelessInterface)); - PyModule_AddObject(module, "error", IwScanError); -} - -static PyObject* iwscan_version(PyObject* u1, PyObject* u2) -{ - return Py_BuildValue("(iii)", - IWSCAN_VERSION_MAJOR, - IWSCAN_VERSION_MINOR, - IWSCAN_VERSION_MICRO); -} - -static PyObject* iwscan_iw_version(PyObject* u1, PyObject* u2) -{ - return Py_BuildValue("i", WE_VERSION); -} - -static PyObject* iwscan_we_version(PyObject* u1, PyObject* u2) -{ - return Py_BuildValue("i", iw_get_kernel_we_version()); -} - -static inline char* iwscan_get_ifname(char* name, int nsize, char* buf) -{ - char* end; - - while (isspace(*buf)) - buf++; - - end = strstr(buf, ": "); - - if ((end == NULL) || (((end - buf) + 1) > nsize)) - return NULL; - - memcpy(name, buf, (end - buf)); - name[end - buf] = '\0'; - - return end; -} - -static int iwscan_ifname_hasiwname(char* ifname) -{ - int ret = 0; - int skfd; - iwreq wrq; - - if ((skfd = iw_sockets_open()) >= 0) { - if (iw_get_ext(skfd, ifname, SIOCGIWNAME, &wrq) >= 0) - ret++; - - iw_sockets_close(skfd); - } - - return ret; -} - -static PyObject* iwscan_enum_devices(PyObject* u1, PyObject* u2) -{ - char buff[1024]; - FILE* fh; - PyObject* ifnames = PyList_New(0); - - fh = fopen(PROC_NET_WIRELESS, "r"); - - if (fh != NULL) { - fgets(buff, sizeof(buff), fh); - fgets(buff, sizeof(buff), fh); - - while (fgets(buff, sizeof(buff), fh)) { - char name[IFNAMSIZ + 1]; - char *s; - - if ((buff[0] == '\0') || (buff[1] == '\0')) - continue; - - s = iwscan_get_ifname(name, sizeof(name), buff); - - if (!s) - continue; - - if (iwscan_ifname_hasiwname(name) > 0) - PyList_Append(ifnames, Py_BuildValue("s", name)); - } - fclose(fh); - } - - return ifnames; -} diff -Nru wicd-1.7.0+ds1/depends/python-iwscan/setup.py wicd-1.7.1/depends/python-iwscan/setup.py --- wicd-1.7.0+ds1/depends/python-iwscan/setup.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-iwscan/setup.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/usr/bin/python - -'''Setup script for the iwscan extension.''' - -import distutils -from distutils.core import setup -from distutils.extension import Extension - -ext = Extension(name = 'iwscan', - libraries = ['iw'], - sources = ['pyiwscan.c']) - -setup(name = 'iwscan', - description = 'Python bindings for wireless scanning via iwlib', - ext_modules = [ext]) diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/COPYING wicd-1.7.1/depends/python-wpactrl/COPYING --- wicd-1.7.0+ds1/depends/python-wpactrl/COPYING 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/COPYING 1970-01-01 00:00:00.000000000 +0000 @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/debian/changelog wicd-1.7.1/depends/python-wpactrl/debian/changelog --- wicd-1.7.0+ds1/depends/python-wpactrl/debian/changelog 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/debian/changelog 1970-01-01 00:00:00.000000000 +0000 @@ -1,173 +0,0 @@ -python-wpactrl (1.0.1-1) unstable; urgency=low - - * Mark ctrl_iface_path and attached instance attributes as readonly. - - -- Kel Modderman Fri, 25 Apr 2008 13:17:03 +1000 - -python-wpactrl (1.0.0-1) unstable; urgency=low - - * Major version 1.0.0, first release to the wild. - * Add/enhance doc strings for extension and all methods. - * Just return None for attach() and detach() methods, they can only fail - and raise error or succeed. - * Add Vcs fields to debian/control. - * Do not hardcode a python version in Makefile. - * Add DESTDIR support to Makefile. - * Use upstream Makefile in debian/rules instead of calling setup.py - directly. - * Fix lintian error in package debian/control long description by - capitalizing Python. - * Add entry for wpactrl.c in debian/copyright, adding original Authour's - name and copyright statement. - * Add a .PHONY entry to Makefile, so that 'build' can be called more than - once, for eg., multiple python versions. - * Add README file including description and installation blurbs. - * Add copyright/license information to example.py. - * Enhance the use of the attached WPACtrl struct member, explicitly checking - and setting its value. - * Don't allow an WPACtrl instance to attach() more than once, similarly only - allow the detach() method to do something if the instance previously - attach()'d. - * Remove the isattached() WPACtrl instance method. - * Remove embedded code example from wpactrl doc string. - * Expose the attached WPACtrl struct member as an instance data attribute. - - -- Kel Modderman Wed, 23 Apr 2008 13:44:28 +1000 - -python-wpactrl (0.10.0-2) unstable; urgency=low - - * Update extended package description in debian/control. - * Add reference to upstream control interface specification to wpactrl.c - header. - - -- Kel Modderman Tue, 22 Apr 2008 10:20:45 +1000 - -python-wpactrl (0.10.0-1) unstable; urgency=low - - * Add attached to wpactrl struct, to act as boolean when object as - registered as event monitor. - * Add attached() object method to return pythonic boolean based on state of - attached wpactrl struct member. - * Reorder the object method heirachy to match that of wpa_ctrl.h more - closely. - * Remove check for self->ctrl_iface in each object method, that condition - cannot be possible since object will raise an exception of - self->ctrl_iface could not be created at init. - * Adhere to the CapWords convention for the class name, renaming wpactrl - class to WPACtrl. - - -- Kel Modderman Mon, 21 Apr 2008 16:40:52 +1000 - -python-wpactrl (0.9.1-1) unstable; urgency=low - - * Rename wpactrl_dealloc() object method to wpactrl_close(). - * Add wpactrl_attach() and wpactrl_detach() object methods. - - -- Kel Modderman Mon, 21 Apr 2008 03:47:14 +1000 - -python-wpactrl (0.9.0-1) unstable; urgency=low - - * Don't open two sockets for 2-way communication, one socket returned by - wpa_ctrl_open() is sufficient for sending and receiving. - * Don't include (and allocate memory for) the sendbuf and recvbuf wpactrl - struct members. - * Fix check of path string length, to make sure we are able to allocate - enough memory to accommodate it. - * Don't rely on python's PyArg_ParseTuple() to return length of argument in - wpactrl_request() method, just use strlen instead. - * Rename socket object member to ctrl_iface_path. - * Rename close() object method to detach(). - * If wpactrl_reattach() method fails, allow exception to be raised rather - than returning false. - * Rename wpactrl_init() object method to wpactrl_open(). - - -- Kel Modderman Mon, 21 Apr 2008 02:59:30 +1000 - -python-wpactrl (0.8.0-1) unstable; urgency=low - - * Drop recevents method and helper function. - * Overhaul wpactrl_init, doing paranoid chanking that every allocation of - memory and so on is completed. - * free() send and recv buffers in wpactrl_close() to ensure we do not leak - memory should we choose to reattach(). - - -- Kel Modderman Fri, 18 Apr 2008 22:52:54 +1000 - -python-wpactrl (0.7.1-1) unstable; urgency=low - - * More code cleanups, rename wpactrlError to wpactrl_error for consistency. - * Shorten the version defines. - * Add wpactrl_members structure to provide access to path attribute of - wpactrl instances. - * Rename the path attribute to socket. Remove socket wpactrl method. - * Check if bss command returned a string starting with bssid rather than - testing string length, it could return UNKNOWN COMMAND or FAILED. - * Rename events method to recvevents, to be more descriptive about expected - action. - * Numerous trivial code beautifications. - * Bugfix output of example.py. - * Include a changelog in the tarball generated by "upstream-release". - * Check pathsize is less than allocated size. - - -- Kel Modderman Fri, 18 Apr 2008 16:47:03 +1000 - -python-wpactrl (0.7.0-1) unstable; urgency=low - - * Make all methods lower case. - * Use wpactrl namespace instead of WPACtrl. - - -- Kel Modderman Thu, 17 Apr 2008 01:20:02 +1000 - -python-wpactrl (0.6.0-1) unstable; urgency=low - - * Add -fno-strict-aliasing to compiler flags to silence noise with - python2.5. - * Global rename of 'buff' to 'buf'. - * Add Reattach() method, to reattach monitor to a wpa_ctrl path that was - previously attached by recycling the WPACtrl_init() function. - * Take better care of handling all possible return values for the - wpa_ctrl_*() functions. - * Recycle WPACtrl_Recv() when collecting a list of events for the - RecvPendingEvents() method. - * Readd the Py_BEGIN_ALLOW_THREADS and Py_END_ALLOW_THREADS keywords around - the wpa_ctrl_recv() in Recv() method, as the forked upstream seemed to - support threading at that point. - * Update example.py to show commands as they are executed, similar in - appearance to IDLE. - - -- Kel Modderman Thu, 17 Apr 2008 00:41:54 +1000 - -python-wpactrl (0.5.0-1) unstable; urgency=low - - * Ensure send or recv socket is open before attempting to access it via one - of the WPACtrl object methods. - * Take care that the Recv() method is not blocking, return None if - wpa_ctrl_pending indicates we have nothing pending. - - -- Kel Modderman Fri, 11 Apr 2008 16:32:35 +1000 - -python-wpactrl (0.4.2-1) unstable; urgency=low - - * Install example.py in examples directory. - * Retain SocketPath() method from original extension source. - - -- Kel Modderman Wed, 09 Apr 2008 21:30:13 +1000 - -python-wpactrl (0.4.1-1) unstable; urgency=low - - * Return NULL when an exception is to be raised in ScanResults() method due - to failure of wpa_ctrl_request(). - * Minor formatting cleanups. - * Remove ./build directory in debian/rules clean: target. - * Don't mark functions explicitly as inline, let the compiler make those - decisions. - * Enhance example.py to show of a few of wpactrl's methods, and to not - hardcode interface name for easier testing. - - -- Kel Modderman Tue, 08 Apr 2008 17:20:27 +1000 - -python-wpactrl (0.4.0-1) unstable; urgency=low - - * Initial release. - - -- Kel Modderman Mon, 07 Apr 2008 23:27:14 +1000 diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/debian/compat wicd-1.7.1/depends/python-wpactrl/debian/compat --- wicd-1.7.0+ds1/depends/python-wpactrl/debian/compat 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -6 diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/debian/control wicd-1.7.1/depends/python-wpactrl/debian/control --- wicd-1.7.0+ds1/depends/python-wpactrl/debian/control 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/debian/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Source: python-wpactrl -Section: python -Priority: optional -Build-Depends: debhelper (>= 6), python-all-dev (>= 2.3.5-11), python (>= 2.4), python-central (>= 0.5.6) -Maintainer: Kel Modderman -XS-Python-Version: >=2.4 -Standards-Version: 3.7.3 -Vcs-Svn: http://svn.projects.otaku42.de/python-wpactrl/trunk/ -Vcs-Browser: http://projects.otaku42.de/browser/python-wpactrl/trunk/ - -Package: python-wpactrl -Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends} -Suggests: wpasupplicant, hostapd -Provides: ${python:Provides} -XB-Python-Version: ${python:Versions} -Description: A Python extension for wpa_supplicant/hostapd control interface access - wpa_supplicant/hostapd implements a control interface that can be used by - external programs to control the operations of the wpa_supplicant/hostapd - daemon and to get status information and event notifications. The WPACtrl - class provided by python-wpactrl allows Python programs to use helper - functions to connect with the UNIX domain socket form of control interface - and communicate with a wpa_supplicant/hostapd daemon. diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/debian/copyright wicd-1.7.1/depends/python-wpactrl/debian/copyright --- wicd-1.7.0+ds1/depends/python-wpactrl/debian/copyright 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/debian/copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Files: * -Copyright: (c) 2008 Kel Modderman -License: GPL-2 - -Files: wpactrl.c -Copyright: (c) 2008 Kel Modderman - (c) 2006 Jeremy Moles -License: GPL-2 - -Files: wpa_ctrl.* -Copyright: (c) 2004-2007, Jouni Malinen -License: GPL-2 | BSD - -On Debian GNU/Linux systems, the complete text of the GNU Lesser General -Public License can be found in `/usr/share/common-licenses/GPL-2'. diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/debian/examples wicd-1.7.1/depends/python-wpactrl/debian/examples --- wicd-1.7.0+ds1/depends/python-wpactrl/debian/examples 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/debian/examples 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -example.py diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/debian/rules wicd-1.7.1/depends/python-wpactrl/debian/rules --- wicd-1.7.0+ds1/depends/python-wpactrl/debian/rules 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/debian/rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -PYVERS=$(shell pyversions -r debian/control) - -build: build-stamp -build-stamp: - dh_testdir - for python in $(PYVERS); do \ - $(MAKE) build PYTHON=$$python ; \ - done - touch build-stamp - -clean: - dh_testdir - for python in $(PYVERS); do \ - $(MAKE) clean PYTHON=$$python ; \ - done - dh_clean build-stamp - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - for python in $(PYVERS); do \ - $(MAKE) install PYTHON=$$python DESTDIR=$(CURDIR)/debian/python-wpactrl ; \ - done - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs -a - dh_installexamples -a - dh_installchangelogs -a - dh_pycentral -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary - -VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version:\s*\([0-9]\+:\)\?\([^\s-]\+\).*/\2/p') -TARBALL := $(CURDIR)/../python-wpactrl-$(VERSION).tar.gz -ORIGTGZ := $(CURDIR)/../tarballs/python-wpactrl_$(VERSION).orig.tar.gz -DIRTREE := $(shell basename $(CURDIR)) -upstream-release: - $(RM) $(TARBALL) $(ORIGTGZ) - cp $(CURDIR)/debian/changelog $(CURDIR)/CHANGELOG - tar -czf $(TARBALL) --exclude='.svn' --exclude='debian' -C $(CURDIR)/../ $(DIRTREE) - install -D -m 0644 $(TARBALL) $(ORIGTGZ) - $(RM) $(CURDIR)/CHANGELOG diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/example.py wicd-1.7.1/depends/python-wpactrl/example.py --- wicd-1.7.0+ds1/depends/python-wpactrl/example.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/example.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -#!/usr/bin/python - -'''Example usage of the wpactrl extension.''' - -__author__ = 'Kel Modderman' -__copyright__ = '(c) 2008 Kel Modderman ' -__license__ = 'GPLv2' - -import os -import sys -import time -import wpactrl - -run = '/var/run/wpa_supplicant' - -if __name__ == "__main__": - print '>>> wpactrl version %d.%d.%d ...' % wpactrl.version() - - sockets = [] - if os.path.isdir(run): - try: - sockets = [os.path.join(run, i) for i in os.listdir(run)] - except OSError, error: - print 'Error:', error - sys.exit(1) - - if len(sockets) < 1: - print 'No wpa_ctrl sockets found in %s, aborting.' % run - sys.exit(1) - - for s in sockets: - try: - print '>>> # Open a ctrl_iface connection' - print '>>> wpa = wpactrl.WPACtrl("%s")' % s - wpa = wpactrl.WPACtrl(s) - - print '>>> # Location of ctrl_iface socket' - print '>>> wpa.ctrl_iface_path' - print wpa.ctrl_iface_path - - print '>>> # Request a few commands' - print '>>> wpa.request("PING")' - print wpa.request('PING') - - print '>>> wpa.request("STATUS")' - print wpa.request('STATUS') - - print '>>> wpa.request("LIST_NETWORKS")' - print wpa.request('LIST_NETWORKS') - - time.sleep(1) - - print '>>> # Open a new ctrl_iface connection for receiving event' - print '>>> # messages' - print '>>> wpa_event = wpactrl.WPACtrl("%s")' % s - wpa_event = wpactrl.WPACtrl(s) - - print '>>> wpa_event.attached' - print wpa_event.attached - print '>>> wpa_event.attach()' - wpa_event.attach() - print '>>> wpa_event.attached' - print wpa_event.attached - - print '>>> # Request commands via original ctrl_iface connection' - print '>>> wpa.request("SCAN")' - print wpa.request('SCAN') - - time.sleep(1) - - print '>>> wpa.request("STATUS")' - print wpa.request('STATUS') - - print '>>> # Waiting 10s for pending events ...' - time.sleep(10) - - print '>>> # Check for pending events and collect them' - print '>>> while wpa_event.pending():' - print '>>> ....wpa_event.recv()' - while wpa_event.pending(): - print wpa_event.recv() - - print '>>> # Request scan results (wpa_supplicant only)' - print '>>> results = wpa.scanresults()' - print '>>> for no, bss in enumerate(results):' - print '>>> ....print \'bss(%d):\' % no' - print '>>> ....print bss' - results = wpa.scanresults() - for no, bss in enumerate(results): - print 'bss(%d):' % no - print bss - - print '>>> # Detach the event monitor' - print '>>> wpa_event.detach()' - wpa_event.detach() - - print '>>> # Finished!' - except wpactrl.error, error: - print 'Error:', error - pass diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/Makefile wicd-1.7.1/depends/python-wpactrl/Makefile --- wicd-1.7.0+ds1/depends/python-wpactrl/Makefile 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -PYTHON ?= python -SETUP := setup.py - -build: - $(PYTHON) $(SETUP) $@ - -install: -ifdef DESTDIR - $(PYTHON) $(SETUP) $@ --root=$(DESTDIR) -else - $(PYTHON) $(SETUP) $@ -endif - -clean: - $(PYTHON) $(SETUP) $@ - rm -rf build - -.PHONY: build install clean diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/README wicd-1.7.1/depends/python-wpactrl/README --- wicd-1.7.0+ds1/depends/python-wpactrl/README 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -python-wpactrl --------------- -A Python extension for wpa_supplicant/hostapd control interface access - -Description ------------ -wpactrl defines a single class, WPACtrl, that must be instantiated -with the pathname of a UNIX domain socket control interface of a -wpa_supplicant/hostapd daemon. - -Once a WPACtrl object has been instantiated, it may call several -helper methods to interact with the wpa_supplicant/hostapd daemon. -If an error occurs, a wpactrl.error exception is raised. - -The destructor of a WPACtrl instance closes the connection to the -control interface socket. - -Recommendations for the use of wpa_supplicant/hostapd control -interface access in external programs are at: - - -Installation ------------- -make -make install - -Two Makefile variables may be specified on the command line; PYTHON and -DESTDIR. - -PYTHON - Python executable that should be called (eg. python2.5) -DESTDIR - Alternative root destination directory diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/setup.py wicd-1.7.1/depends/python-wpactrl/setup.py --- wicd-1.7.0+ds1/depends/python-wpactrl/setup.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/setup.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -#!/usr/bin/python - -'''Setup script for the wpactrl extension.''' - -import distutils -from distutils.core import setup -from distutils.extension import Extension - -ext = Extension(name = 'wpactrl', sources = ['wpa_ctrl.c', 'wpactrl.c'], - extra_compile_args = ["-fno-strict-aliasing"]) - -setup(name = 'wpactrl', ext_modules = [ext], - description = 'Python bindings for wpa_supplicant/hostapd ctrl socket.') diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/wpa_ctrl.c wicd-1.7.1/depends/python-wpactrl/wpa_ctrl.c --- wicd-1.7.0+ds1/depends/python-wpactrl/wpa_ctrl.c 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/wpa_ctrl.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,256 +0,0 @@ -/* - * Modifed version of src/common/wpa_ctrl.c from wpa_supplicant, discarding - * all code paths except for CONFIG_CTRL_IFACE_UNIX. Define strlcpy inline, - * it is not provided by GNU libc. - * Copyright (c) 2008, Kel Modderman - * - * wpa_supplicant/hostapd control interface library - * Copyright (c) 2004-2007, Jouni Malinen - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Alternatively, this software may be distributed under the terms of BSD - * license. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "wpa_ctrl.h" - -/** - * strlcpy - Copy a string with size bound and NUL-termination - * @dest: Destination - * @src: Source - * @siz: Size of the target buffer - * Returns: Total length of the target string (length of src) (not including - * NUL-termination) - * - * This function matches in behavior with the strlcpy(3) function in OpenBSD. - */ -size_t strlcpy(char *dest, const char *src, size_t siz) -{ - const char *s = src; - size_t left = siz; - - if (left) { - /* Copy string up to the maximum size of the dest buffer */ - while (--left != 0) { - if ((*dest++ = *s++) == '\0') - break; - } - } - - if (left == 0) { - /* Not enough room for the string; force NUL-termination */ - if (siz != 0) - *dest = '\0'; - while (*s++) - ; /* determine total src string length */ - } - - return s - src - 1; -} - - -/** - * struct wpa_ctrl - Internal structure for control interface library - * - * This structure is used by the wpa_supplicant/hostapd control interface - * library to store internal data. Programs using the library should not touch - * this data directly. They can only use the pointer to the data structure as - * an identifier for the control interface connection and use this as one of - * the arguments for most of the control interface library functions. - */ -struct wpa_ctrl { - int s; - struct sockaddr_un local; - struct sockaddr_un dest; -}; - - -struct wpa_ctrl * wpa_ctrl_open(const char *ctrl_path) -{ - struct wpa_ctrl *ctrl; - static int counter = 0; - int ret; - size_t res; - - ctrl = malloc(sizeof(*ctrl)); - if (ctrl == NULL) - return NULL; - memset(ctrl, 0, sizeof(*ctrl)); - - ctrl->s = socket(PF_UNIX, SOCK_DGRAM, 0); - if (ctrl->s < 0) { - free(ctrl); - return NULL; - } - - ctrl->local.sun_family = AF_UNIX; - ret = snprintf(ctrl->local.sun_path, sizeof(ctrl->local.sun_path), - "/tmp/wpa_ctrl_%d-%d", getpid(), counter++); - if (ret < 0 || (size_t) ret >= sizeof(ctrl->local.sun_path)) { - close(ctrl->s); - free(ctrl); - return NULL; - } - if (bind(ctrl->s, (struct sockaddr *) &ctrl->local, - sizeof(ctrl->local)) < 0) { - close(ctrl->s); - free(ctrl); - return NULL; - } - - ctrl->dest.sun_family = AF_UNIX; - res = strlcpy(ctrl->dest.sun_path, ctrl_path, - sizeof(ctrl->dest.sun_path)); - if (res >= sizeof(ctrl->dest.sun_path)) { - close(ctrl->s); - free(ctrl); - return NULL; - } - if (connect(ctrl->s, (struct sockaddr *) &ctrl->dest, - sizeof(ctrl->dest)) < 0) { - close(ctrl->s); - unlink(ctrl->local.sun_path); - free(ctrl); - return NULL; - } - - return ctrl; -} - - -void wpa_ctrl_close(struct wpa_ctrl *ctrl) -{ - unlink(ctrl->local.sun_path); - close(ctrl->s); - free(ctrl); -} - - -int wpa_ctrl_request(struct wpa_ctrl *ctrl, const char *cmd, size_t cmd_len, - char *reply, size_t *reply_len, - void (*msg_cb)(char *msg, size_t len)) -{ - struct timeval tv; - int res; - fd_set rfds; - const char *_cmd; - char *cmd_buf = NULL; - size_t _cmd_len; - - { - _cmd = cmd; - _cmd_len = cmd_len; - } - - if (send(ctrl->s, _cmd, _cmd_len, 0) < 0) { - free(cmd_buf); - return -1; - } - free(cmd_buf); - - for (;;) { - tv.tv_sec = 2; - tv.tv_usec = 0; - FD_ZERO(&rfds); - FD_SET(ctrl->s, &rfds); - res = select(ctrl->s + 1, &rfds, NULL, NULL, &tv); - if (FD_ISSET(ctrl->s, &rfds)) { - res = recv(ctrl->s, reply, *reply_len, 0); - if (res < 0) - return res; - if (res > 0 && reply[0] == '<') { - /* This is an unsolicited message from - * wpa_supplicant, not the reply to the - * request. Use msg_cb to report this to the - * caller. */ - if (msg_cb) { - /* Make sure the message is nul - * terminated. */ - if ((size_t) res == *reply_len) - res = (*reply_len) - 1; - reply[res] = '\0'; - msg_cb(reply, res); - } - continue; - } - *reply_len = res; - break; - } else { - return -2; - } - } - return 0; -} - - -static int wpa_ctrl_attach_helper(struct wpa_ctrl *ctrl, int attach) -{ - char buf[10]; - int ret; - size_t len = 10; - - ret = wpa_ctrl_request(ctrl, attach ? "ATTACH" : "DETACH", 6, - buf, &len, NULL); - if (ret < 0) - return ret; - if (len == 3 && memcmp(buf, "OK\n", 3) == 0) - return 0; - return -1; -} - - -int wpa_ctrl_attach(struct wpa_ctrl *ctrl) -{ - return wpa_ctrl_attach_helper(ctrl, 1); -} - - -int wpa_ctrl_detach(struct wpa_ctrl *ctrl) -{ - return wpa_ctrl_attach_helper(ctrl, 0); -} - - -int wpa_ctrl_recv(struct wpa_ctrl *ctrl, char *reply, size_t *reply_len) -{ - int res; - - res = recv(ctrl->s, reply, *reply_len, 0); - if (res < 0) - return res; - *reply_len = res; - return 0; -} - - -int wpa_ctrl_pending(struct wpa_ctrl *ctrl) -{ - struct timeval tv; - fd_set rfds; - tv.tv_sec = 0; - tv.tv_usec = 0; - FD_ZERO(&rfds); - FD_SET(ctrl->s, &rfds); - select(ctrl->s + 1, &rfds, NULL, NULL, &tv); - return FD_ISSET(ctrl->s, &rfds); -} - - -int wpa_ctrl_get_fd(struct wpa_ctrl *ctrl) -{ - return ctrl->s; -} diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/wpactrl.c wicd-1.7.1/depends/python-wpactrl/wpactrl.c --- wicd-1.7.0+ds1/depends/python-wpactrl/wpactrl.c 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/wpactrl.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,428 +0,0 @@ -/* - * python-wpactrl - * -------------- - * A Python extension for wpa_supplicant/hostapd control interface access - * - * Copyright (c) 2008 Kel Modderman - * License: GPL v2 - * - * This is based on (a fork of) pywpa: - * http://downloads.emperorlinux.com/contrib/pywpa/ - * Copyright (c) 2006 Jeremy Moles - * License: LGPL v2.1 - * - */ - -#include -#include -#include - -#include "wpa_ctrl.h" - -#define WPACTRL_MAJ_VER 1 -#define WPACTRL_MIN_VER 0 -#define WPACTRL_MIC_VER 1 - -#define UNUSED __attribute__ (( __unused__ )) - -/* ------------------------------------------------------------------------------------- WPACtrl */ -typedef struct { - PyObject_HEAD - struct wpa_ctrl* ctrl_iface; - char* ctrl_iface_path; - int attached; -} WPACtrl; - -/* -------------------------------------------------------------------------Function Definitions */ -static PyObject* wpactrl_version(PyObject*, PyObject*); - -static int WPACtrl_open(WPACtrl*, PyObject*, PyObject*); -static PyObject* WPACtrl_request(WPACtrl*, PyObject*, PyObject*); -static PyObject* WPACtrl_attach(WPACtrl*); -static PyObject* WPACtrl_detach(WPACtrl*); -static PyObject* WPACtrl_pending(WPACtrl*); -static PyObject* WPACtrl_recv(WPACtrl*); -static PyObject* WPACtrl_scanresults(WPACtrl*); -static void WPACtrl_close(WPACtrl*); -static PyObject* WPACtrl_error; - -/* -------------------------------------------------------------------------- WPACTRL_DOC_STRING */ -static char* WPACTRL_DOC_STRING = - "wpactrl defines a single class, WPACtrl, that must be instantiated\n" - "with the pathname of a UNIX domain socket control interface of a\n" - "wpa_supplicant/hostapd daemon.\n" - "\n" - "Once a WPACtrl object has been instantiated, it may call several\n" - "helper methods to interact with the wpa_supplicant/hostapd daemon.\n" - "If an error occurs, a wpactrl.error exception is raised.\n" - "\n" - "The destructor of a WPACtrl instance closes the connection to the\n" - "control interface socket.\n" - "\n" - "Recommendations for the use of wpa_supplicant/hostapd control\n" - "interface access in external programs are at:\n" - " \n" -; - -/* ----------------------------------------------------------------------------- wpactrl_version */ -static PyObject* wpactrl_version(UNUSED PyObject* u1, UNUSED PyObject* u2) -{ - return Py_BuildValue("(iii)", WPACTRL_MAJ_VER, WPACTRL_MIN_VER, WPACTRL_MIC_VER); -} - -/* -------------------------------------------------------------------------------- WPACtrl_open */ -static int WPACtrl_open(WPACtrl* self, PyObject* args, UNUSED PyObject* kargs) -{ - char* path; - - if (!PyArg_ParseTuple(args, "s", &path)) { - PyErr_SetString(WPACtrl_error, "failed to parse ctrl_iface_path string"); - return -1; - } - - if (strlen(path) >= MAXPATHLEN) { - PyErr_SetString(WPACtrl_error, "ctrl_iface_path string length too long"); - return -1; - } - - self->ctrl_iface_path = malloc(MAXPATHLEN); - - if (!self->ctrl_iface_path) { - PyErr_SetString(WPACtrl_error, "failed to allocate memory for ctrl_iface_path"); - return -1; - } - - strcpy(self->ctrl_iface_path, path); - - self->ctrl_iface = wpa_ctrl_open(self->ctrl_iface_path); - - if (!self->ctrl_iface) { - PyErr_SetString(WPACtrl_error, "wpa_ctrl_open failed"); - return -1; - } - - self->attached = 0; - - return 0; -} - -/* ----------------------------------------------------------------------------- WPACtrl_request */ -static PyObject* WPACtrl_request(WPACtrl* self, PyObject* args, UNUSED PyObject* kargs) -{ - int ret; - char* cmd; - char buf[2048]; - size_t buflen = sizeof(buf) - 1; - - if (!PyArg_ParseTuple(args, "s", &cmd)) { - PyErr_SetString(WPACtrl_error, "failed to parse request command string"); - return NULL; - } - - ret = wpa_ctrl_request(self->ctrl_iface, cmd, strlen(cmd), buf, &buflen, NULL); - - switch (ret) { - case 0: - buf[buflen] = '\0'; - return Py_BuildValue("s", buf); - case -1: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_request failed"); - break; - case -2: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_request timed out"); - break; - default: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_request returned unknown error"); - break; - } - - return NULL; -} - -/* ------------------------------------------------------------------------------ WPACtrl_attach */ -static PyObject* WPACtrl_attach(WPACtrl* self) -{ - int ret; - - if (self->attached == 1) - Py_RETURN_NONE; - - ret = wpa_ctrl_attach(self->ctrl_iface); - - switch (ret) { - case 0: - self->attached = 1; - Py_RETURN_NONE; - case -1: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_attach failed"); - break; - case -2: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_attach timed out"); - break; - default: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_attach returned unknown error"); - break; - } - - return NULL; -} - -/* ------------------------------------------------------------------------------ WPACtrl_detach */ -static PyObject* WPACtrl_detach(WPACtrl* self) -{ - int ret; - - if (self->attached == 0) - Py_RETURN_NONE; - - ret = wpa_ctrl_detach(self->ctrl_iface); - - switch (ret) { - case 0: - self->attached = 0; - Py_RETURN_NONE; - case -1: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_detach failed"); - break; - case -2: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_detach timed out"); - break; - default: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_detach returned unknown error"); - break; - } - - return NULL; -} - -/* ----------------------------------------------------------------------------- WPACtrl_pending */ -static PyObject* WPACtrl_pending(WPACtrl* self) -{ - int ret; - - ret = wpa_ctrl_pending(self->ctrl_iface); - - switch (ret) { - case 1: - Py_RETURN_TRUE; - case 0: - Py_RETURN_FALSE; - case -1: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_pending failed"); - break; - default: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_pending returned unknown error"); - break; - } - - return NULL; -} - -/* -------------------------------------------------------------------------------- WPACtrl_recv */ -static PyObject* WPACtrl_recv(WPACtrl* self) -{ - int ret; - char buf[256]; - size_t buflen = sizeof(buf) - 1; - - Py_BEGIN_ALLOW_THREADS - ret = wpa_ctrl_recv(self->ctrl_iface, buf, &buflen); - Py_END_ALLOW_THREADS - - switch (ret) { - case 0: - buf[buflen] = '\0'; - return Py_BuildValue("s", buf); - case -1: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_recv failed"); - break; - default: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_recv returned unknown error"); - break; - } - - return NULL; -} - - -/* ------------------------------------------------------------------------- WPACtrl_scanresults */ -static PyObject* WPACtrl_scanresults(WPACtrl* self) -{ - int cell; - PyObject* results = PyList_New(0); - - for (cell = 0; cell < 1000; cell++) { - int ret; - char bss[10]; - char buf[2048]; - size_t buflen = sizeof(buf) - 1; - - snprintf(bss, sizeof(bss), "BSS %d", cell); - - ret = wpa_ctrl_request(self->ctrl_iface, bss, sizeof(bss), buf, &buflen, NULL); - - switch (ret) { - case 0: - buf[buflen] = '\0'; - break; - case -1: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_request failed"); - return NULL; - case -2: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_request timed out"); - return NULL; - default: - PyErr_SetString(WPACtrl_error, "wpa_ctrl_request returned unknown error"); - return NULL; - } - - if (strstr(buf, "bssid=")) - PyList_Append(results, Py_BuildValue("s", buf)); - else - break; - } - - return results; -} - -/* ------------------------------------------------------------------------------- WPACtrl_close */ -static void WPACtrl_close(WPACtrl* self) -{ - if (self->ctrl_iface) { - if (self->attached == 1) - WPACtrl_detach(self); - - wpa_ctrl_close(self->ctrl_iface); - self->ctrl_iface = NULL; - } - - if (self->ctrl_iface_path) { - free(self->ctrl_iface_path); - self->ctrl_iface_path = NULL; - } - - if (self->ob_type) - self->ob_type->tp_free((PyObject*)(self)); -} - -/* -------------------------------------------------------------------- Member/Method Structures */ -static PyMethodDef module_methods[] = { - { - "version", wpactrl_version, METH_NOARGS, - "Returns a version tuple of wpactrl consisting of 3 integers; major version,\n" - "minor version and micro version." - }, - { NULL, NULL, 0, NULL } -}; - -static PyMethodDef WPACtrl_methods[] = { - { - "request", (PyCFunction)(WPACtrl_request), METH_VARARGS, - "Send a command to wpa_supplicant/hostapd. Returns the command response\n" - "in a string." - }, - { - "attach", (PyCFunction)(WPACtrl_attach), METH_NOARGS, - "Register as an event monitor for the control interface." - }, - { - "detach", (PyCFunction)(WPACtrl_detach), METH_NOARGS, - "Unregister event monitor from the control interface." - }, - { - "pending", (PyCFunction)(WPACtrl_pending), METH_NOARGS, - "Check if any events/messages are pending. Returns True if messages are pending,\n" - "otherwise False." - }, - { - "recv", (PyCFunction)(WPACtrl_recv), METH_NOARGS, - "Recieve a pending event/message from ctrl socket. Returns a message string." - }, - { - "scanresults", (PyCFunction)(WPACtrl_scanresults), METH_NOARGS, - "Return list of scan results. Each element of the scan result list is a string\n" - "of properties for a single BSS. This method is specific to wpa_supplicant." - }, - { NULL, NULL, 0, NULL } -}; - -static PyMemberDef WPACtrl_members[] = { - { - "attached", T_INT, offsetof(WPACtrl, attached), READONLY, - "Set to value of 1 if instance has registered as an event monitor via\n" - "the attached() method, otherwise 0." - }, - { - "ctrl_iface_path", T_STRING, offsetof(WPACtrl, ctrl_iface_path), READONLY, - "Pathname of WPACtrl control interface socket." - }, - { NULL } -}; - -/* ------------------------------------------------------------------------------ PyType_WPACtrl */ -static PyTypeObject PyType_WPACtrl = { - PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "wpactrl.WPACtrl", /* tp_name */ - sizeof(WPACtrl), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)(WPACtrl_close), /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_compare */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - PyObject_GenericSetAttr, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - 0, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - WPACtrl_methods, /* tp_methods */ - WPACtrl_members, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)(WPACtrl_open), /* tp_init */ - 0, /* tp_alloc */ - PyType_GenericNew, /* tp_new */ - 0, /* tp_free */ - 0, /* tp_is_gc */ - 0, /* tp_bases */ - 0, /* tp_mro */ - 0, /* tp_cache */ - 0, /* tp_subclasses */ - 0, /* tp_weaklist */ - 0 /* tp_del */ -}; - -/* --------------------------------------------------------------------------------- initwpactrl */ -PyMODINIT_FUNC initwpactrl(void) -{ - PyObject* module; - - PyType_Ready(&PyType_WPACtrl); - - module = Py_InitModule3("wpactrl", module_methods, WPACTRL_DOC_STRING); - WPACtrl_error = PyErr_NewException("wpactrl.error", NULL, NULL); - - Py_INCREF(&PyType_WPACtrl); - Py_INCREF(WPACtrl_error); - - PyModule_AddObject(module, "WPACtrl", (PyObject*)(&PyType_WPACtrl)); - PyModule_AddObject(module, "error", WPACtrl_error); -} diff -Nru wicd-1.7.0+ds1/depends/python-wpactrl/wpa_ctrl.h wicd-1.7.1/depends/python-wpactrl/wpa_ctrl.h --- wicd-1.7.0+ds1/depends/python-wpactrl/wpa_ctrl.h 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/depends/python-wpactrl/wpa_ctrl.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,187 +0,0 @@ -/* - * Unmodifed version of src/common/wpa_ctrl.h from wpa_supplicant. - * - * wpa_supplicant/hostapd control interface library - * Copyright (c) 2004-2006, Jouni Malinen - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Alternatively, this software may be distributed under the terms of BSD - * license. - */ - -#ifndef WPA_CTRL_H -#define WPA_CTRL_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* wpa_supplicant control interface - fixed message prefixes */ - -/** Interactive request for identity/password/pin */ -#define WPA_CTRL_REQ "CTRL-REQ-" - -/** Response to identity/password/pin request */ -#define WPA_CTRL_RSP "CTRL-RSP-" - -/* Event messages with fixed prefix */ -/** Authentication completed successfully and data connection enabled */ -#define WPA_EVENT_CONNECTED "CTRL-EVENT-CONNECTED " -/** Disconnected, data connection is not available */ -#define WPA_EVENT_DISCONNECTED "CTRL-EVENT-DISCONNECTED " -/** wpa_supplicant is exiting */ -#define WPA_EVENT_TERMINATING "CTRL-EVENT-TERMINATING " -/** Password change was completed successfully */ -#define WPA_EVENT_PASSWORD_CHANGED "CTRL-EVENT-PASSWORD-CHANGED " -/** EAP-Request/Notification received */ -#define WPA_EVENT_EAP_NOTIFICATION "CTRL-EVENT-EAP-NOTIFICATION " -/** EAP authentication started (EAP-Request/Identity received) */ -#define WPA_EVENT_EAP_STARTED "CTRL-EVENT-EAP-STARTED " -/** EAP method selected */ -#define WPA_EVENT_EAP_METHOD "CTRL-EVENT-EAP-METHOD " -/** EAP authentication completed successfully */ -#define WPA_EVENT_EAP_SUCCESS "CTRL-EVENT-EAP-SUCCESS " -/** EAP authentication failed (EAP-Failure received) */ -#define WPA_EVENT_EAP_FAILURE "CTRL-EVENT-EAP-FAILURE " -/** New scan results available */ -#define WPA_EVENT_SCAN_RESULTS "CTRL-EVENT-SCAN-RESULTS " - - -/* wpa_supplicant/hostapd control interface access */ - -/** - * wpa_ctrl_open - Open a control interface to wpa_supplicant/hostapd - * @ctrl_path: Path for UNIX domain sockets; ignored if UDP sockets are used. - * Returns: Pointer to abstract control interface data or %NULL on failure - * - * This function is used to open a control interface to wpa_supplicant/hostapd. - * ctrl_path is usually /var/run/wpa_supplicant or /var/run/hostapd. This path - * is configured in wpa_supplicant/hostapd and other programs using the control - * interface need to use matching path configuration. - */ -struct wpa_ctrl * wpa_ctrl_open(const char *ctrl_path); - - -/** - * wpa_ctrl_close - Close a control interface to wpa_supplicant/hostapd - * @ctrl: Control interface data from wpa_ctrl_open() - * - * This function is used to close a control interface. - */ -void wpa_ctrl_close(struct wpa_ctrl *ctrl); - - -/** - * wpa_ctrl_request - Send a command to wpa_supplicant/hostapd - * @ctrl: Control interface data from wpa_ctrl_open() - * @cmd: Command; usually, ASCII text, e.g., "PING" - * @cmd_len: Length of the cmd in bytes - * @reply: Buffer for the response - * @reply_len: Reply buffer length - * @msg_cb: Callback function for unsolicited messages or %NULL if not used - * Returns: 0 on success, -1 on error (send or receive failed), -2 on timeout - * - * This function is used to send commands to wpa_supplicant/hostapd. Received - * response will be written to reply and reply_len is set to the actual length - * of the reply. This function will block for up to two seconds while waiting - * for the reply. If unsolicited messages are received, the blocking time may - * be longer. - * - * msg_cb can be used to register a callback function that will be called for - * unsolicited messages received while waiting for the command response. These - * messages may be received if wpa_ctrl_request() is called at the same time as - * wpa_supplicant/hostapd is sending such a message. This can happen only if - * the program has used wpa_ctrl_attach() to register itself as a monitor for - * event messages. Alternatively to msg_cb, programs can register two control - * interface connections and use one of them for commands and the other one for - * receiving event messages, in other words, call wpa_ctrl_attach() only for - * the control interface connection that will be used for event messages. - */ -int wpa_ctrl_request(struct wpa_ctrl *ctrl, const char *cmd, size_t cmd_len, - char *reply, size_t *reply_len, - void (*msg_cb)(char *msg, size_t len)); - - -/** - * wpa_ctrl_attach - Register as an event monitor for the control interface - * @ctrl: Control interface data from wpa_ctrl_open() - * Returns: 0 on success, -1 on failure, -2 on timeout - * - * This function registers the control interface connection as a monitor for - * wpa_supplicant/hostapd events. After a success wpa_ctrl_attach() call, the - * control interface connection starts receiving event messages that can be - * read with wpa_ctrl_recv(). - */ -int wpa_ctrl_attach(struct wpa_ctrl *ctrl); - - -/** - * wpa_ctrl_detach - Unregister event monitor from the control interface - * @ctrl: Control interface data from wpa_ctrl_open() - * Returns: 0 on success, -1 on failure, -2 on timeout - * - * This function unregisters the control interface connection as a monitor for - * wpa_supplicant/hostapd events, i.e., cancels the registration done with - * wpa_ctrl_attach(). - */ -int wpa_ctrl_detach(struct wpa_ctrl *ctrl); - - -/** - * wpa_ctrl_recv - Receive a pending control interface message - * @ctrl: Control interface data from wpa_ctrl_open() - * @reply: Buffer for the message data - * @reply_len: Length of the reply buffer - * Returns: 0 on success, -1 on failure - * - * This function will receive a pending control interface message. This - * function will block if no messages are available. The received response will - * be written to reply and reply_len is set to the actual length of the reply. - * wpa_ctrl_recv() is only used for event messages, i.e., wpa_ctrl_attach() - * must have been used to register the control interface as an event monitor. - */ -int wpa_ctrl_recv(struct wpa_ctrl *ctrl, char *reply, size_t *reply_len); - - -/** - * wpa_ctrl_pending - Check whether there are pending event messages - * @ctrl: Control interface data from wpa_ctrl_open() - * Returns: 1 if there are pending messages, 0 if no, or -1 on error - * - * This function will check whether there are any pending control interface - * message available to be received with wpa_ctrl_recv(). wpa_ctrl_pending() is - * only used for event messages, i.e., wpa_ctrl_attach() must have been used to - * register the control interface as an event monitor. - */ -int wpa_ctrl_pending(struct wpa_ctrl *ctrl); - - -/** - * wpa_ctrl_get_fd - Get file descriptor used by the control interface - * @ctrl: Control interface data from wpa_ctrl_open() - * Returns: File descriptor used for the connection - * - * This function can be used to get the file descriptor that is used for the - * control interface connection. The returned value can be used, e.g., with - * select() while waiting for multiple events. - * - * The returned file descriptor must not be used directly for sending or - * receiving packets; instead, the library functions wpa_ctrl_request() and - * wpa_ctrl_recv() must be used for this. - */ -int wpa_ctrl_get_fd(struct wpa_ctrl *ctrl); - -#ifdef CONFIG_CTRL_IFACE_UDP -#define WPA_CTRL_IFACE_PORT 9877 -#define WPA_GLOBAL_CTRL_IFACE_PORT 9878 -#endif /* CONFIG_CTRL_IFACE_UDP */ - - -#ifdef __cplusplus -} -#endif - -#endif /* WPA_CTRL_H */ diff -Nru wicd-1.7.0+ds1/encryption/templates/active wicd-1.7.1/encryption/templates/active --- wicd-1.7.0+ds1/encryption/templates/active 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/active 2011-09-18 08:48:13.000000000 +0000 @@ -1,5 +1,8 @@ wpa +wpa-peap wpa-psk +wpa2-leap +wpa2-peap wep-hex wep-passphrase wep-shared @@ -9,3 +12,4 @@ peap peap-tkip eap-tls +psu diff -Nru wicd-1.7.0+ds1/encryption/templates/active_wired wicd-1.7.1/encryption/templates/active_wired --- wicd-1.7.0+ds1/encryption/templates/active_wired 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/encryption/templates/active_wired 2012-02-02 16:38:26.000000000 +0000 @@ -0,0 +1 @@ +wired_8021x diff -Nru wicd-1.7.0+ds1/encryption/templates/eap wicd-1.7.1/encryption/templates/eap --- wicd-1.7.0+ds1/encryption/templates/eap 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/eap 2011-09-18 08:48:13.000000000 +0000 @@ -3,6 +3,7 @@ version = 2 require username *Username password *Password optional pac_file *Path_To_PAC_File +protected password *Password ----- ctrl_interface=/var/run/wpa_supplicant network={ @@ -11,10 +12,10 @@ proto=RSN WPA pairwise=CCMP TKIP group=CCMP TKIP - key-mgmt=WPA-EAP + key_mgmt=WPA-EAP eap=FAST identity="$_USERNAME" password="$_PASSWORD" phase1="fast_provisioning=1" - pac-file="$_PAC_FILE" + pac_file="$_PAC_FILE" } diff -Nru wicd-1.7.0+ds1/encryption/templates/eap-tls wicd-1.7.1/encryption/templates/eap-tls --- wicd-1.7.0+ds1/encryption/templates/eap-tls 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/eap-tls 2011-09-18 08:48:13.000000000 +0000 @@ -3,7 +3,7 @@ version = 1 require identity *Identity private_key *Private_Key private_key_passwd *Private_Key_Password optional ca_cert *Path_to_CA_Cert client_cert *Path_to_Client_Cert - +protected identity *Identity private_key *Private_Key private_key_passwd *Private_Key_Password ----- ctrl_interface=/var/run/wpa_supplicant network={ diff -Nru wicd-1.7.0+ds1/encryption/templates/leap wicd-1.7.1/encryption/templates/leap --- wicd-1.7.0+ds1/encryption/templates/leap 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/leap 2011-09-18 08:48:13.000000000 +0000 @@ -2,13 +2,14 @@ author = Adam Blackburn version = 1 require username *Username password *Password +protected password *Password ----- ctrl_interface=/var/run/wpa_supplicant network={ ssid="$_ESSID" scan_ssid=$_SCAN eap=LEAP - key-mgmt=IEEE8021X + key_mgmt=IEEE8021X identity="$_USERNAME" password="$_PASSWORD" } diff -Nru wicd-1.7.0+ds1/encryption/templates/peap wicd-1.7.1/encryption/templates/peap --- wicd-1.7.0+ds1/encryption/templates/peap 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/peap 2011-09-18 08:48:13.000000000 +0000 @@ -2,6 +2,7 @@ author = Adam Blackburn version = 2 require identity *Identity password *Password +protected password *Password ----- ctrl_interface=/var/run/wpa_supplicant network={ diff -Nru wicd-1.7.0+ds1/encryption/templates/peap-tkip wicd-1.7.1/encryption/templates/peap-tkip --- wicd-1.7.0+ds1/encryption/templates/peap-tkip 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/peap-tkip 2011-09-18 08:48:13.000000000 +0000 @@ -3,6 +3,7 @@ version = 1 require identity *Identity password *Password optional ca_cert *Path_to_CA_Cert +protected password *Password ----- ctrl_interface=/var/run/wpa_supplicant network={ diff -Nru wicd-1.7.0+ds1/encryption/templates/psu wicd-1.7.1/encryption/templates/psu --- wicd-1.7.0+ds1/encryption/templates/psu 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/encryption/templates/psu 2011-09-18 08:48:13.000000000 +0000 @@ -0,0 +1,15 @@ +name = PSU +author = Alexander Anisimov +version = 1 +require identity *Identity password *Password +protected password *Password +----- +ctrl_interface=/var/run/wpa_supplicant +network={ + ssid="$_ESSID" + key_mgmt=IEEE8021X + eap=PEAP + phase2="auth=MSCHAPV2" + identity="$_IDENTITY" + password="$_PASSWORD" +} diff -Nru wicd-1.7.0+ds1/encryption/templates/ttls wicd-1.7.1/encryption/templates/ttls --- wicd-1.7.0+ds1/encryption/templates/ttls 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/ttls 2011-09-18 08:48:13.000000000 +0000 @@ -2,6 +2,7 @@ author = Adam Blackburn version = 1 require identity *Identity password *Password auth *Authentication +protected password *Password ----- ctrl_interface=/var/run/wpa_supplicant network={ diff -Nru wicd-1.7.0+ds1/encryption/templates/wep-hex wicd-1.7.1/encryption/templates/wep-hex --- wicd-1.7.0+ds1/encryption/templates/wep-hex 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/wep-hex 2011-09-18 08:48:13.000000000 +0000 @@ -2,6 +2,7 @@ author = Adam Blackburn version = 1 require key *Key +protected key *Key ----- ctrl_interface=/var/run/wpa_supplicant network={ diff -Nru wicd-1.7.0+ds1/encryption/templates/wep-passphrase wicd-1.7.1/encryption/templates/wep-passphrase --- wicd-1.7.0+ds1/encryption/templates/wep-passphrase 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/wep-passphrase 2011-09-18 08:48:13.000000000 +0000 @@ -2,6 +2,7 @@ author = Adam Blackburn version = 1 require passphrase *Passphrase +protected passphrase *Passphrase ----- ctrl_interface=/var/run/wpa_supplicant network={ diff -Nru wicd-1.7.0+ds1/encryption/templates/wep-shared wicd-1.7.1/encryption/templates/wep-shared --- wicd-1.7.0+ds1/encryption/templates/wep-shared 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/wep-shared 2011-09-18 08:48:13.000000000 +0000 @@ -2,6 +2,7 @@ author = Dan O'Reilly version = 1 require key *Key +protected key *Key ----- ctrl_interface=/var/run/wpa_supplicant network={ diff -Nru wicd-1.7.0+ds1/encryption/templates/wired_8021x wicd-1.7.1/encryption/templates/wired_8021x --- wicd-1.7.0+ds1/encryption/templates/wired_8021x 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/encryption/templates/wired_8021x 2012-02-02 16:38:26.000000000 +0000 @@ -0,0 +1,17 @@ +name = 802.1x +author = Joe MacMahon +version = 1 +require identity *Identity password *Password +protected password *Password +----- +ctrl_interface=/var/run/wpa_supplicant +eapol_version=1 +fast_reauth=0 +network={ + key_mgmt=IEEE8021X + eap=PEAP + phase1="peaplabel=1" + phase2="auth=MSCHAPV2" + identity="$_IDENTITY" + password="$_PASSWORD" +} diff -Nru wicd-1.7.0+ds1/encryption/templates/wpa wicd-1.7.1/encryption/templates/wpa --- wicd-1.7.0+ds1/encryption/templates/wpa 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/wpa 2011-09-18 08:48:13.000000000 +0000 @@ -2,6 +2,7 @@ author = Adam Blackburn version = 1 require key *Key +protected key *Key ----- ctrl_interface=/var/run/wpa_supplicant network={ diff -Nru wicd-1.7.0+ds1/encryption/templates/wpa2-leap wicd-1.7.1/encryption/templates/wpa2-leap --- wicd-1.7.0+ds1/encryption/templates/wpa2-leap 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/encryption/templates/wpa2-leap 2011-09-18 08:48:13.000000000 +0000 @@ -0,0 +1,19 @@ +name = WPA2-LEAP +author = atiketemola +version = 1 +require username *Username password *Password +protected password *Password +----- +ctrl_interface=/var/run/wpa_supplicant +network={ + ssid="$_ESSID" + scan_ssid=$_SCAN + auth_alg=LEAP + key_mgmt=WPA-EAP + proto=WPA2 + pairwise=CCMP TKIP + group=CCMP TKIP + eap=LEAP + identity="$_USERNAME" + password="$_PASSWORD" +} diff -Nru wicd-1.7.0+ds1/encryption/templates/wpa2-peap wicd-1.7.1/encryption/templates/wpa2-peap --- wicd-1.7.0+ds1/encryption/templates/wpa2-peap 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/encryption/templates/wpa2-peap 2011-09-18 08:48:13.000000000 +0000 @@ -0,0 +1,17 @@ +name = WPA2-PEAP +author = atiketemola +version = 1 +require identity *Username domain *Domain password *Password +protected password *Password +----- +ctrl_interface=/var/run/wpa_supplicant +network={ + ssid="$_ESSID" + proto=RSN + key_mgmt=WPA-EAP + pairwise=CCMP + eap=PEAP + identity="$_DOMAIN\$_IDENTITY" + password="$_PASSWORD" + phase2="auth=MSCHAPv2" +} diff -Nru wicd-1.7.0+ds1/encryption/templates/wpa-peap wicd-1.7.1/encryption/templates/wpa-peap --- wicd-1.7.0+ds1/encryption/templates/wpa-peap 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/encryption/templates/wpa-peap 2011-09-18 08:48:13.000000000 +0000 @@ -0,0 +1,17 @@ +name = WPA-PEAP +author = atiketemola +version = 1 +require identity *Username domain *Domain password *Password +protected password *Password +----- +ctrl_interface=/var/run/wpa_supplicant +network={ + ssid="$_ESSID" + proto=WPA + key_mgmt=WPA-EAP + pairwise=CCMP + eap=PEAP + identity="$_DOMAIN\$_IDENTITY" + password="$_PASSWORD" + phase2="auth=MSCHAPv2" +} diff -Nru wicd-1.7.0+ds1/encryption/templates/wpa-psk wicd-1.7.1/encryption/templates/wpa-psk --- wicd-1.7.0+ds1/encryption/templates/wpa-psk 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/encryption/templates/wpa-psk 2011-09-18 08:48:13.000000000 +0000 @@ -2,6 +2,7 @@ author = Adam Blackburn version = 1 require apsk *Preshared_Key +protected apsk *Preshared_Key ----- ctrl_interface=/var/run/wpa_supplicant network={ diff -Nru wicd-1.7.0+ds1/gtk/configscript.py wicd-1.7.1/gtk/configscript.py --- wicd-1.7.0+ds1/gtk/configscript.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/gtk/configscript.py 2011-11-09 12:17:31.000000000 +0000 @@ -29,21 +29,11 @@ import sys import os import gtk -import ConfigParser -import gtk.glade from wicd import wpath -from wicd import translations +from wicd.translations import _ from wicd import dbusmanager - -_ = translations.get_gettext() - -language = {} -language['configure_scripts'] = _("Configure Scripts") -language['before_script'] = _("Pre-connection Script") -language['after_script'] = _("Post-connection Script") -language['pre_disconnect_script'] = _("Pre-disconnection Script") -language['post_disconnect_script'] = _("Post-disconnection Script") +from wicd.configmanager import ConfigManager dbus = dbusmanager.DBusManager() dbus.connect_to_dbus() @@ -74,53 +64,30 @@ else: return str(text) -def get_val(con, network, option, default="None"): - """ Returns the specified option for the given network. - - Returns the value stored in the config file for the given option, - unless the option isn't stored yet, in which case the default value - provided is stored and then returned. - - Keyword arguments: - network -- The section to search. - option -- The option to search for. - deafult -- The default value to store/return if the option isn't found. - - """ - if not con.has_option(network, option): - con.set(network, option, default) - return con.get(network, option) - - def get_script_info(network, network_type): """ Read script info from disk and load it into the configuration dialog """ info = {} - con = ConfigParser.ConfigParser() if network_type == "wired": - con.read(wired_conf) + con = ConfigManager(wired_conf) if con.has_section(network): - info["pre_entry"] = get_val(con, network, "beforescript") - info["post_entry"] = get_val(con, network, "afterscript") - info["pre_disconnect_entry"] = get_val(con, network, "predisconnectscript") - info["post_disconnect_entry"] = get_val(con, network, "postdisconnectscript") + info["pre_entry"] = con.get(network, "beforescript", None) + info["post_entry"] = con.get(network, "afterscript", None) + info["pre_disconnect_entry"] = con.get(network, "predisconnectscript", None) + info["post_disconnect_entry"] = con.get(network, "postdisconnectscript", None) else: bssid = wireless.GetWirelessProperty(int(network), "bssid") - con.read(wireless_conf) + con = ConfigManager(wireless_conf) if con.has_section(bssid): - info["pre_entry"] = get_val(con, bssid, "beforescript") - info["post_entry"] = get_val(con, bssid, "afterscript") - info["pre_disconnect_entry"] = get_val(con, bssid, "predisconnectscript") - info["post_disconnect_entry"] = get_val(con, bssid, "postdisconnectscript") + info["pre_entry"] = con.get(bssid, "beforescript", None) + info["post_entry"] = con.get(bssid, "afterscript", None) + info["pre_disconnect_entry"] = con.get(bssid, "predisconnectscript", None) + info["post_disconnect_entry"] = con.get(bssid, "postdisconnectscript", None) return info def write_scripts(network, network_type, script_info): """ Writes script info to disk and loads it into the daemon. """ - con = ConfigParser.ConfigParser() - if network_type == "wired": - con.read(wired_conf) - if not con.has_section(network): - con.add_section(network) + con = ConfigManager(wired_conf) con.set(network, "beforescript", script_info["pre_entry"]) con.set(network, "afterscript", script_info["post_entry"]) con.set(network, "predisconnectscript", script_info["pre_disconnect_entry"]) @@ -131,9 +98,7 @@ wired.SaveWiredNetworkProfile(network) else: bssid = wireless.GetWirelessProperty(int(network), "bssid") - con.read(wireless_conf) - if not con.has_section(bssid): - con.add_section(bssid) + con = ConfigManager(wireless_conf) con.set(bssid, "beforescript", script_info["pre_entry"]) con.set(bssid, "afterscript", script_info["post_entry"]) con.set(bssid, "predisconnectscript", script_info["pre_disconnect_entry"]) @@ -155,21 +120,23 @@ script_info = get_script_info(network, network_type) - gladefile = wpath.gtk + "wicd.glade" - wTree = gtk.glade.XML(gladefile) - dialog = wTree.get_widget("configure_script_dialog") - wTree.get_widget("pre_label").set_label(language['before_script'] + ":") - wTree.get_widget("post_label").set_label(language['after_script'] + ":") - wTree.get_widget("pre_disconnect_label").set_label(language['pre_disconnect_script'] + gladefile = os.path.join(wpath.gtk, "wicd.ui") + wTree = gtk.Builder() + wTree.set_translation_domain('wicd') + wTree.add_from_file(gladefile) + dialog = wTree.get_object("configure_script_dialog") + wTree.get_object("pre_label").set_label(_('Pre-connection Script') + ":") + wTree.get_object("post_label").set_label(_('Post-connection Script') + ":") + wTree.get_object("pre_disconnect_label").set_label(_('Pre-disconnection Script') + ":") - wTree.get_widget("post_disconnect_label").set_label(language['post_disconnect_script'] + wTree.get_object("post_disconnect_label").set_label(_('Post-disconnection Script') + ":") - wTree.get_widget("window1").hide() + wTree.get_object("window1").hide() - pre_entry = wTree.get_widget("pre_entry") - post_entry = wTree.get_widget("post_entry") - pre_disconnect_entry = wTree.get_widget("pre_disconnect_entry") - post_disconnect_entry = wTree.get_widget("post_disconnect_entry") + pre_entry = wTree.get_object("pre_entry") + post_entry = wTree.get_object("post_entry") + pre_disconnect_entry = wTree.get_object("pre_disconnect_entry") + post_disconnect_entry = wTree.get_object("post_disconnect_entry") pre_entry.set_text(none_to_blank(script_info.get("pre_entry"))) post_entry.set_text(none_to_blank(script_info.get("post_entry"))) diff -Nru wicd-1.7.0+ds1/gtk/gui.py wicd-1.7.1/gtk/gui.py --- wicd-1.7.0+ds1/gtk/gui.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/gtk/gui.py 2012-01-15 14:24:23.000000000 +0000 @@ -29,7 +29,6 @@ import gobject import pango import gtk -import gtk.glade from itertools import chain from dbus import DBusException @@ -37,12 +36,12 @@ from wicd import wpath from wicd import dbusmanager from wicd.misc import noneToString +from wicd.translations import _, language import prefs from prefs import PreferencesDialog import netentry from netentry import WiredNetworkEntry, WirelessNetworkEntry from guiutil import error, LabelEntry -from wicd.translations import language if __name__ == '__main__': wpath.chdir(__file__) @@ -63,8 +62,7 @@ try: dbusmanager.connect_to_dbus() except DBusException: - error(None, "Could not connect to wicd's D-Bus interface. " + - "Check the wicd log for error messages.") + error(None, _("Could not connect to wicd's D-Bus interface. Check the wicd log for error messages.")) return False else: return False @@ -84,7 +82,7 @@ DBUS_AVAIL = False if from_tray: return False print "Wicd daemon is shutting down!" - error(None, language['lost_dbus'], block=False) + error(None, _('The wicd daemon has shut down. The UI will not function properly until it is restarted.'), block=False) return False @@ -96,14 +94,14 @@ # functions and widgets it uses. wired_net_entry = WiredNetworkEntry() - dialog = gtk.Dialog(title = language['wired_network_found'], + dialog = gtk.Dialog(title = _('Wired connection detected'), flags = gtk.DIALOG_MODAL, buttons = (gtk.STOCK_CONNECT, 1, gtk.STOCK_CANCEL, 2)) dialog.set_has_separator(False) dialog.set_size_request(400, 150) - instruct_label = gtk.Label(language['choose_wired_profile'] + ':\n') - stoppopcheckbox = gtk.CheckButton(language['stop_showing_chooser']) + instruct_label = gtk.Label(_('Select or create a wired profile to connect with') + ':\n') + stoppopcheckbox = gtk.CheckButton(_('Stop Showing Autoconnect pop-up temporarily')) wired_net_entry.is_full_gui = False instruct_label.set_alignment(0, 0) @@ -140,31 +138,41 @@ dialog.destroy() +def get_wireless_prop(net_id, prop): + return wireless.GetWirelessProperty(net_id, prop) + class appGui(object): """ The main wicd GUI class. """ def __init__(self, standalone=False, tray=None): """ Initializes everything needed for the GUI. """ setup_dbus() + if not daemon: + errmsg = "Error connecting to wicd service via D-Bus." + \ + "Please ensure the wicd service is running." + d = gtk.MessageDialog(parent=None, + flags=gtk.DIALOG_MODAL, + type=gtk.MESSAGE_ERROR, + buttons=gtk.BUTTONS_OK, + message_format=errmsg) + d.run() + sys.exit(1) + self.tray = tray - gladefile = os.path.join(wpath.gtk, "wicd.glade") - self.wTree = gtk.glade.XML(gladefile) - self.window = self.wTree.get_widget("window1") - self.window.set_icon_name("wicd-gtk") - size = daemon.ReadWindowSize("main") - width = size[0] - height = size[1] - if width > -1 and height > -1: - self.window.resize(int(width), int(height)) - else: - width = int(gtk.gdk.screen_width() / 2) - if width > 530: - width = 530 - self.window.resize(width, int(gtk.gdk.screen_height() / 1.7)) + gladefile = os.path.join(wpath.gtk, "wicd.ui") + self.wTree = gtk.Builder() + self.wTree.set_translation_domain('wicd') + self.wTree.add_from_file(gladefile) + self.window = self.wTree.get_object("window1") + width = int(gtk.gdk.screen_width() / 2) + if width > 530: + width = 530 + self.window.resize(width, int(gtk.gdk.screen_height() / 1.7)) dic = { "refresh_clicked" : self.refresh_clicked, - "quit_clicked" : self.exit, + "quit_clicked" : self.exit, + "rfkill_clicked" : self.switch_rfkill, "disconnect_clicked" : self.disconnect_all, "main_exit" : self.exit, "cancel_clicked" : self.cancel_connect, @@ -173,16 +181,17 @@ "about_clicked" : self.about_dialog, "create_adhoc_clicked" : self.create_adhoc_network, } - self.wTree.signal_autoconnect(dic) + self.wTree.connect_signals(dic) # Set some strings in the GUI - they may be translated - label_instruct = self.wTree.get_widget("label_instructions") - label_instruct.set_label(language['select_a_network']) + label_instruct = self.wTree.get_object("label_instructions") + label_instruct.set_label(_('Choose from the networks below:')) - probar = self.wTree.get_widget("progressbar") - probar.set_text(language['connecting']) - - self.all_network_list = self.wTree.get_widget("network_list_vbox") + probar = self.wTree.get_object("progressbar") + probar.set_text(_('Connecting')) + + self.rfkill_button = self.wTree.get_object("rfkill_button") + self.all_network_list = self.wTree.get_object("network_list_vbox") self.all_network_list.show_all() self.wired_network_box = gtk.VBox(False, 0) self.wired_network_box.show_all() @@ -190,9 +199,9 @@ self.all_network_list.pack_start(self.wired_network_box, False, False) self.all_network_list.pack_start(self.network_list, True, True) self.network_list.show_all() - self.status_area = self.wTree.get_widget("connecting_hbox") - self.status_bar = self.wTree.get_widget("statusbar") - menu = self.wTree.get_widget("menu1") + self.status_area = self.wTree.get_object("connecting_hbox") + self.status_bar = self.wTree.get_object("statusbar") + menu = self.wTree.get_object("menu1") self.status_area.hide_all() @@ -209,8 +218,9 @@ self.refreshing = False self.prev_state = None self.update_cb = None + self._wired_showing = False self.network_list.set_sensitive(False) - label = gtk.Label("%s..." % language['scanning']) + label = gtk.Label("%s..." % _('Scanning')) self.network_list.pack_start(label) label.show() self.wait_for_events(0.2) @@ -239,27 +249,27 @@ self.refresh_clicked() def handle_connection_results(self, results): - if results not in ['Success', 'aborted'] and self.is_visible: + if results not in ['success', 'aborted'] and self.is_visible: error(self.window, language[results], block=False) def create_adhoc_network(self, widget=None): """ Shows a dialog that creates a new adhoc network. """ print "Starting the Ad-Hoc Network Creation Process..." - dialog = gtk.Dialog(title = language['create_adhoc_network'], + dialog = gtk.Dialog(title = _('Create an Ad-Hoc Network'), flags = gtk.DIALOG_MODAL, buttons=(gtk.STOCK_CANCEL, 2, gtk.STOCK_OK, 1)) dialog.set_has_separator(False) dialog.set_size_request(400, -1) - self.chkbox_use_encryption = gtk.CheckButton(language['use_wep_encryption']) + self.chkbox_use_encryption = gtk.CheckButton(_('Use Encryption (WEP only)')) self.chkbox_use_encryption.set_active(False) - ip_entry = LabelEntry(language['ip'] + ':') - essid_entry = LabelEntry(language['essid'] + ':') - channel_entry = LabelEntry(language['channel'] + ':') - self.key_entry = LabelEntry(language['key'] + ':') + ip_entry = LabelEntry(_('IP') + ':') + essid_entry = LabelEntry(_('ESSID') + ':') + channel_entry = LabelEntry(_('Channel') + ':') + self.key_entry = LabelEntry(_('Key') + ':') self.key_entry.set_auto_hidden(True) self.key_entry.set_sensitive(False) - chkbox_use_ics = gtk.CheckButton(language['use_ics']) + chkbox_use_ics = gtk.CheckButton( _('Activate Internet Connection Sharing')) self.chkbox_use_encryption.connect("toggled", self.toggle_encrypt_check) @@ -294,6 +304,16 @@ """ Toggles the encryption key entry box for the ad-hoc dialog. """ self.key_entry.set_sensitive(self.chkbox_use_encryption.get_active()) + def switch_rfkill(self, widget=None): + """ Switches wifi card on/off. """ + wireless.SwitchRfKill() + if wireless.GetRfKillEnabled(): + self.rfkill_button.set_stock_id(gtk.STOCK_MEDIA_PLAY) + self.rfkill_button.set_label(_('Switch On Wi-Fi')) + else: + self.rfkill_button.set_stock_id(gtk.STOCK_MEDIA_STOP) + self.rfkill_button.set_label(_('Switch Off Wi-Fi')) + def disconnect_all(self, widget=None): """ Disconnects from any active network. """ def handler(*args): @@ -307,7 +327,7 @@ dialog = gtk.AboutDialog() dialog.set_name("Wicd") dialog.set_version(daemon.Hello()) - dialog.set_authors([ "Adam Blackburn", "Dan O'Reilly", "Andrew Psaltis" ]) + dialog.set_authors([ "Adam Blackburn", "Dan O'Reilly", "Andrew Psaltis", "David Paleino"]) dialog.set_website("http://wicd.sourceforge.net") dialog.run() dialog.destroy() @@ -330,11 +350,11 @@ def connect_hidden(self, widget): """ Prompts the user for a hidden network, then scans for it. """ - dialog = gtk.Dialog(title=language['hidden_network'], + dialog = gtk.Dialog(title=('Hidden Network'), flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_CONNECT, 1, gtk.STOCK_CANCEL, 2)) dialog.set_has_separator(False) - lbl = gtk.Label(language['hidden_network_essid']) + lbl = gtk.Label(_('Hidden Network ESSID')) textbox = gtk.Entry() dialog.vbox.pack_start(lbl) dialog.vbox.pack_start(textbox) @@ -351,7 +371,7 @@ """ Alerts the daemon to cancel the connection process. """ #should cancel a connection if there #is one in progress - cancel_button = self.wTree.get_widget("cancel_button") + cancel_button = self.wTree.get_object("cancel_button") cancel_button.set_sensitive(False) daemon.CancelConnect() # Prevents automatic reconnecting if that option is enabled @@ -364,7 +384,7 @@ if not self.is_visible: return True try: - gobject.idle_add(self.wTree.get_widget("progressbar").pulse) + gobject.idle_add(self.wTree.get_object("progressbar").pulse) except: pass return True @@ -399,14 +419,14 @@ if self.connecting: # Adjust our state from connecting->connected. self._set_not_connecting_state() - self.set_status(language['connected_to_wired'].replace('$A', info[0])) + self.set_status(_('Connected to wired network (IP: $A)').replace('$A', info[0])) return True def set_wireless_state(self, info): if self.connecting: # Adjust our state from connecting->connected. self._set_not_connecting_state() - self.set_status(language['connected_to_wireless'].replace + self.set_status(_('Connected to $A at $B (IP: $C)').replace ('$A', info[1]).replace ('$B', daemon.FormatSignalForPrinting(info[2])).replace ('$C', info[0])) @@ -416,7 +436,7 @@ if self.connecting: # Adjust our state from connecting->not-connected. self._set_not_connecting_state() - self.set_status(language['not_connected']) + self.set_status(_('Not connected')) return True def _set_not_connecting_state(self): @@ -430,7 +450,7 @@ gobject.idle_add(self.all_network_list.set_sensitive, True) gobject.idle_add(self.status_area.hide_all) if self.statusID: - gobject.idle_add(self.status_bar.remove, 1, self.statusID) + gobject.idle_add(self.status_bar.remove_message, 1, self.statusID) def set_connecting_state(self, info): if not self.connecting: @@ -445,13 +465,13 @@ gobject.idle_add(self.all_network_list.set_sensitive, False) gobject.idle_add(self.status_area.show_all) if self.statusID: - gobject.idle_add(self.status_bar.remove, 1, self.statusID) + gobject.idle_add(self.status_bar.remove_message, 1, self.statusID) if info[0] == "wireless": - gobject.idle_add(self.set_status, str(info[1]) + ': ' + - language[str(wireless.CheckWirelessConnectingMessage())]) + stat = wireless.CheckWirelessConnectingMessage() + gobject.idle_add(self.set_status, "%s: %s" % (info[1], stat)) elif info[0] == "wired": - gobject.idle_add(self.set_status, language['wired_network'] + ': ' + - language[str(wired.CheckWiredConnectingMessage())]) + gobject.idle_add(self.set_status, _('Wired Network') + ': ' \ + + wired.CheckWiredConnectingMessage()) return True def update_connect_buttons(self, state=None, x=None, force_check=False): @@ -505,7 +525,7 @@ # Remove stuff already in there. self._remove_items_from_vbox(self.wired_network_box) self._remove_items_from_vbox(self.network_list) - label = gtk.Label("%s..." % language['scanning']) + label = gtk.Label("%s..." % _('Scanning')) self.network_list.pack_start(label) self.network_list.show_all() if wired.CheckPluggedIn() or daemon.GetAlwaysShowWiredInterface(): @@ -551,10 +571,12 @@ if self._wired_showing: printLine = True num_networks = wireless.GetNumberOfNetworks() - instruct_label = self.wTree.get_widget("label_instructions") + instruct_label = self.wTree.get_object("label_instructions") if num_networks > 0: + skip_never_connect = not daemon.GetShowNeverConnect() instruct_label.show() - for x in range(0, num_networks): + for x in xrange(0, num_networks): + if skip_never_connect and misc.to_bool(get_wireless_prop(x,'never')): continue if printLine: sep = gtk.HSeparator() self.network_list.pack_start(sep, padding=10, fill=False, @@ -576,9 +598,9 @@ else: instruct_label.hide() if wireless.GetKillSwitchEnabled(): - label = gtk.Label(language['killswitch_enabled'] + ".") + label = gtk.Label(_('Wireless Kill Switch Enabled') + ".") else: - label = gtk.Label(language['no_wireless_networks_found']) + label = gtk.Label(_('No wireless networks found.')) self.network_list.pack_start(label) label.show() self.update_connect_buttons(force_check=True) @@ -598,17 +620,14 @@ if entry.chkbox_static_dns.get_active() and \ not entry.chkbox_global_dns.get_active(): - req_entlist.append(entry.txt_dns_1) - # Only append additional dns entries if they're entered. - for ent in [entry.txt_dns_2, entry.txt_dns_3]: - if ent.get_text() != "": - opt_entlist.append(ent) + for ent in [entry.txt_dns_1, entry.txt_dns_2, entry.txt_dns_3]: + opt_entlist.append(ent) # Required entries. for lblent in req_entlist: lblent.set_text(lblent.get_text().strip()) if not misc.IsValidIP(lblent.get_text()): - error(self.window, language['invalid_address']. + error(self.window, _('Invalid address in $A entry.'). replace('$A', lblent.label.get_label())) return False @@ -616,7 +635,7 @@ for lblent in opt_entlist: lblent.set_text(lblent.get_text().strip()) if lblent.get_text() and not misc.IsValidIP(lblent.get_text()): - error(self.window, language['invalid_address']. + error(self.window, _('Invalid address in $A entry.'). replace('$A', lblent.label.get_label())) return False @@ -671,19 +690,19 @@ for entry_info in encryption_info.itervalues(): if entry_info[0].entry.get_text() == "" and \ entry_info[1] == 'required': - error(self.window, "%s (%s)" % (language['encrypt_info_missing'], + error(self.window, "%s (%s)" % (_('Required encryption information is missing.'), entry_info[0].label.get_label()) ) return False # Make sure the checkbox is checked when it should be elif not entry.chkbox_encryption.get_active() and \ wireless.GetWirelessProperty(networkid, "encryption"): - error(self.window, language['enable_encryption']) + error(self.window, _('This network requires encryption to be enabled.')) return False return True def _wait_for_connect_thread_start(self): - self.wTree.get_widget("progressbar").pulse() + self.wTree.get_object("progressbar").pulse() if not self._connect_thread_started: return True else: @@ -697,12 +716,12 @@ self._connect_thread_started = True def setup_interface_for_connection(): - cancel_button = self.wTree.get_widget("cancel_button") + cancel_button = self.wTree.get_object("cancel_button") cancel_button.set_sensitive(True) self.all_network_list.set_sensitive(False) if self.statusID: - gobject.idle_add(self.status_bar.remove, 1, self.statusID) - gobject.idle_add(self.set_status, language["disconnecting_active"]) + gobject.idle_add(self.status_bar.remove_message, 1, self.statusID) + gobject.idle_add(self.set_status, _('Disconnecting active connections...')) gobject.idle_add(self.status_area.show_all) self.wait_for_events() self._connect_thread_started = False @@ -773,7 +792,6 @@ 'org.wicd.daemon') [width, height] = self.window.get_size() try: - daemon.WriteWindowSize(width, height, "main") daemon.SetGUIOpen(False) except DBusException: pass @@ -792,6 +810,7 @@ """ self.window.present() + self.window.deiconify() self.wait_for_events() self.is_visible = True daemon.SetGUIOpen(True) diff -Nru wicd-1.7.0+ds1/gtk/guiutil.py wicd-1.7.1/gtk/guiutil.py --- wicd-1.7.0+ds1/gtk/guiutil.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/gtk/guiutil.py 2011-10-19 18:32:54.000000000 +0000 @@ -176,3 +176,43 @@ def set_label(self, text): self.set_markup(text) self.set_alignment(0, 0) + + +class ProtectedLabelEntry(gtk.HBox): + """ A LabelEntry with a CheckButton that protects the entry text. """ + def __init__(self, label_text): + gtk.HBox.__init__(self) + self.entry = gtk.Entry() + self.entry.set_size_request(200, -1) + self.entry.set_visibility(False) + self.label = LeftAlignedLabel() + self.label.set_text(label_text) + self.label.set_size_request(165, -1) + self.check = gtk.CheckButton() + self.check.set_size_request(5, -1) + self.check.set_active(False) + self.check.set_focus_on_click(False) + self.pack_start(self.label, fill=True, expand=True) + self.pack_start(self.check, fill=True, expand=True) + self.pack_start(self.entry, fill=False, expand=False) + self.label.show() + self.check.show() + self.entry.show() + self.check.connect('clicked', self.click_handler) + self.show() + + def set_entry_text(self, text): + # For compatibility... + self.entry.set_text(text) + + def get_entry_text(self): + return self.entry.get_text() + + def set_sensitive(self, value): + self.entry.set_sensitive(value) + self.label.set_sensitive(value) + self.check.set_sensitive(value) + + def click_handler(self, widget=None, event=None): + active = self.check.get_active() + self.entry.set_visibility(active) diff -Nru wicd-1.7.0+ds1/gtk/netentry.py wicd-1.7.1/gtk/netentry.py --- wicd-1.7.0+ds1/gtk/netentry.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/gtk/netentry.py 2012-02-02 16:38:26.000000000 +0000 @@ -9,6 +9,7 @@ # Copyright (C) 2008-2009 Adam Blackburn # Copyright (C) 2008-2009 Dan O'Reilly # Copyright (C) 2009 Andrew Psaltis +# Copyright (C) 2011 David Paleino # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License Version 2 as @@ -30,9 +31,9 @@ import wicd.wpath as wpath import wicd.dbusmanager as dbusmanager from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool -from guiutil import error, LabelEntry, GreyLabel, LeftAlignedLabel, string_input +from guiutil import error, LabelEntry, GreyLabel, LeftAlignedLabel, string_input, ProtectedLabelEntry -from wicd.translations import language +from wicd.translations import language, _ # These get set when a NetworkEntry is instantiated. daemon = None @@ -55,9 +56,9 @@ """ # if no network name was passed, just use Properties as the title if network_name: - title = '%s - %s' % (network_name, language['properties']) + title = '%s - %s' % (network_name, _('Properties')) else: - title = language['properties'] + title = _('Properties') gtk.Dialog.__init__(self, title=title, flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_CANCEL, @@ -68,26 +69,25 @@ self.set_default_size() self.connect('show', lambda *a, **k: self.set_default_size()) - self.connect('hide', lambda *a, **k: self.write_size()) # Set up the Advanced Settings Dialog. - self.txt_ip = LabelEntry(language['ip']) + self.txt_ip = LabelEntry(_('IP')) self.txt_ip.entry.connect('focus-out-event', self.set_defaults) - self.txt_netmask = LabelEntry(language['netmask']) - self.txt_gateway = LabelEntry(language['gateway']) - self.txt_search_dom = LabelEntry(language['search_domain']) - self.txt_domain = LabelEntry(language['dns_domain']) - self.txt_dns_1 = LabelEntry(language['dns'] + ' 1') - self.txt_dns_2 = LabelEntry(language['dns'] + ' 2') - self.txt_dns_3 = LabelEntry(language['dns'] + ' 3') + self.txt_netmask = LabelEntry(_('Netmask')) + self.txt_gateway = LabelEntry(_('Gateway')) + self.txt_search_dom = LabelEntry(_('Search domain')) + self.txt_domain = LabelEntry(_('DNS domain')) + self.txt_dns_1 = LabelEntry(_('DNS server') + ' 1') + self.txt_dns_2 = LabelEntry(_('DNS server') + ' 2') + self.txt_dns_3 = LabelEntry(_('DNS server') + ' 3') dhcp_hostname_hbox = gtk.HBox(False, 0) self.chkbox_use_dhcp_hostname = gtk.CheckButton() self.txt_dhcp_hostname = LabelEntry("DHCP Hostname") dhcp_hostname_hbox.pack_start(self.chkbox_use_dhcp_hostname, fill=False, expand=False) dhcp_hostname_hbox.pack_start(self.txt_dhcp_hostname) - self.chkbox_static_ip = gtk.CheckButton(language['use_static_ip']) - self.chkbox_static_dns = gtk.CheckButton(language['use_static_dns']) - self.chkbox_global_dns = gtk.CheckButton(language['use_global_dns']) + self.chkbox_static_ip = gtk.CheckButton(_('Use Static IPs')) + self.chkbox_static_dns = gtk.CheckButton(_('Use Static DNS')) + self.chkbox_global_dns = gtk.CheckButton(_('Use global DNS servers')) self.hbox_dns = gtk.HBox(False, 0) self.hbox_dns.pack_start(self.chkbox_static_dns) self.hbox_dns.pack_start(self.chkbox_global_dns) @@ -99,7 +99,7 @@ script_image.set_padding(4, 0) #self.script_button.set_alignment(.5, .5) self.script_button.set_image(script_image) - self.script_button.set_label(language['scripts']) + self.script_button.set_label(_('Scripts')) self.button_hbox = gtk.HBox(False, 2) self.button_hbox.pack_start(self.script_button, fill=False, expand=False) @@ -141,17 +141,13 @@ def set_default_size(self): - width, height = daemon.ReadWindowSize('netprop') - if width > -1 and height > -1: - self.resize(int(width), int(height)) - else: - width, height = self.get_size() - s_height = gtk.gdk.screen_height() - if s_height < 768: - height = s_height * .75 - else: - height = 600 - self.resize(int(width), int(height)) + width, height = self.get_size() + s_height = gtk.gdk.screen_height() + if s_height < 768: + height = s_height * .75 + else: + height = 600 + self.resize(int(width), int(height)) def set_defaults(self, widget=None, event=None): """ Put some default values into entries to help the user out. """ @@ -168,7 +164,7 @@ if stringToNone(netmask.get_text()) is None: # Make sure the netmask is blank netmask.set_text('255.255.255.0') # Fill in the most common one elif ipAddress != "": - error(None, language['invalid_ip_address']) + error(None, _('Invalid IP address entered.')) def reset_static_checkboxes(self): # Enable the right stuff @@ -234,12 +230,18 @@ """ Set the DNS entries' sensitivity based on the Global checkbox. """ global_dns_active = daemon.GetUseGlobalDNS() if not global_dns_active and self.chkbox_global_dns.get_active(): - error(None, language['global_dns_not_enabled']) + error(None, _('Global DNS has not been enabled in general preferences.')) self.chkbox_global_dns.set_active(False) if daemon.GetUseGlobalDNS() and self.chkbox_static_dns.get_active(): for w in [self.txt_dns_1, self.txt_dns_2, self.txt_dns_3, self.txt_domain, self.txt_search_dom]: w.set_sensitive(not self.chkbox_global_dns.get_active()) + + def toggle_encryption(self, widget=None): + """ Toggle the encryption combobox based on the encryption checkbox. """ + active = self.chkbox_encryption.get_active() + self.vbox_encrypt_info.set_sensitive(active) + self.combo_encryption.set_sensitive(active) def destroy_called(self, *args): """ Clean up everything. """ @@ -247,10 +249,6 @@ self.destroy() del self - def write_size(self): - w, h = self.get_size() - daemon.WriteWindowSize(w, h, 'netprop') - def save_settings(self): """ Save settings common to wired and wireless settings dialogs. """ if self.chkbox_static_ip.get_active(): @@ -287,11 +285,80 @@ self.chkbox_use_dhcp_hostname.get_active()) self.set_net_prop("dhcphostname",noneToString(self.txt_dhcp_hostname.get_text())) + def change_encrypt_method(self, widget=None): + """ Load all the entries for a given encryption method. """ + for z in self.vbox_encrypt_info: + z.destroy() # Remove stuff in there already + ID = self.combo_encryption.get_active() + methods = self.encrypt_types + self.encryption_info = {} + + # If nothing is selected, select the first entry. + if ID == -1: + self.combo_encryption.set_active(0) + ID = 0 + + for type_ in ['required', 'optional']: + fields = methods[ID][type_] + for field in fields: + try: + field_text = language[field[1].lower().replace(' ','_')] + except KeyError: + field_text = field[1].replace(' ','_') + + if field in methods[ID]['protected']: + box = ProtectedLabelEntry(field_text) + else: + box = LabelEntry(field_text) + + self.vbox_encrypt_info.pack_start(box) + # Add the data to a dict, so that the information + # can be easily accessed by giving the name of the wanted + # data. + self.encryption_info[field[0]] = [box, type_] + + if self.wired: + box.entry.set_text(noneToBlankString( + wired.GetWiredProperty(field[0]))) + else: + box.entry.set_text(noneToBlankString( + wireless.GetWirelessProperty(self.networkID, field[0]))) + self.vbox_encrypt_info.show_all() + class WiredSettingsDialog(AdvancedSettingsDialog): def __init__(self, name): """ Build the wired settings dialog. """ - AdvancedSettingsDialog.__init__(self, language['wired_network']) + AdvancedSettingsDialog.__init__(self, _('Wired Network')) + + # So we can test if we are wired or wireless (for change_encrypt_method()) + self.wired = True + + ## This section is largely copied from WirelessSettingsDialog, but with some changes + # Set up encryption stuff + self.combo_encryption = gtk.combo_box_new_text() + self.chkbox_encryption = gtk.CheckButton(_('Use Encryption')) + # Make the vbox to hold the encryption stuff. + self.vbox_encrypt_info = gtk.VBox(False, 0) + self.chkbox_encryption.set_active(bool(wired.GetWiredProperty('encryption_enabled'))) + self.combo_encryption.set_sensitive(False) + self.encrypt_types = misc.LoadEncryptionMethods(wired = True) + + # Build the encryption menu + for x, enc_type in enumerate(self.encrypt_types): + self.combo_encryption.append_text(enc_type['name']) + self.combo_encryption.set_active(0) + self.change_encrypt_method() + self.toggle_encryption() + + self.cvbox.pack_start(self.chkbox_encryption, False, False) + self.cvbox.pack_start(self.combo_encryption, False, False) + self.cvbox.pack_start(self.vbox_encrypt_info, False, False) + + # Connect signals. + self.chkbox_encryption.connect("toggled", self.toggle_encryption) + self.combo_encryption.connect("changed", self.change_encrypt_method) + self.des = self.connect("destroy", self.destroy_called) self.script_button.connect("clicked", self.edit_scripts) self.prof_name = name @@ -305,10 +372,12 @@ profile = self.prof_name cmdend = [os.path.join(wpath.gtk, "configscript.py"), profile, "wired"] if os.getuid() != 0: - cmdbase = misc.get_sudo_cmd(language['scripts_need_pass'], + cmdbase = misc.get_sudo_cmd(_('You must enter your password to configure scripts'), prog_num=daemon.GetSudoApp()) if not cmdbase: - error(None, language["no_sudo_prog"]) + error(None, _('Could not find a graphical sudo program. '\ + 'The script editor could not be launched. '\ + "You'll have to edit scripts directly your configuration file.")) return cmdbase.extend(cmdend) misc.LaunchAndWait(cmdbase) @@ -335,7 +404,39 @@ self.txt_dhcp_hostname.set_text(dhcphname) self.reset_static_checkboxes() + self.chkbox_encryption.set_active(bool(wired.GetWiredProperty('encryption_enabled'))) + self.change_encrypt_method() + self.toggle_encryption() + def save_settings(self): + # Check encryption info + encrypt_info = self.encryption_info + self.set_net_prop("encryption_enabled", self.chkbox_encryption.get_active()) + if self.chkbox_encryption.get_active(): + print "setting encryption info..." + encrypt_methods = self.encrypt_types + self.set_net_prop("enctype", + encrypt_methods[self.combo_encryption.get_active()]['type']) + # Make sure all required fields are filled in. + for entry_info in encrypt_info.itervalues(): + if entry_info[0].entry.get_text() == "" and \ + entry_info[1] == 'required': + error(self, "%s (%s)" % (_('Required encryption information is missing.'), + entry_info[0].label.get_label()) + ) + return False + # Now save all the entries. + for entry_key, entry_info in encrypt_info.iteritems(): + self.set_net_prop(entry_key, + noneToString(entry_info[0].entry.get_text())) + elif not wired and not self.chkbox_encryption.get_active() and \ + wireless.GetWirelessProperty(networkid, "encryption"): + # Encrypt checkbox is off, but the network needs it. + error(self, _('This network requires encryption to be enabled.')) + return False + else: + print "no encryption specified..." + self.set_net_prop("enctype", "None") AdvancedSettingsDialog.save_settings(self) wired.SaveWiredNetworkProfile(self.prof_name) return True @@ -356,18 +457,21 @@ def __init__(self, networkID): """ Build the wireless settings dialog. """ AdvancedSettingsDialog.__init__(self, wireless.GetWirelessProperty(networkID, 'essid')) + # So we can test if we are wired or wireless (for change_encrypt_method()) + self.wired = False + # Set up encryption stuff self.networkID = networkID self.combo_encryption = gtk.combo_box_new_text() - self.chkbox_encryption = gtk.CheckButton(language['use_encryption']) - self.chkbox_global_settings = gtk.CheckButton(language['global_settings']) + self.chkbox_encryption = gtk.CheckButton(_('Use Encryption')) + self.chkbox_global_settings = gtk.CheckButton(_('Use these settings for all networks sharing this essid')) # Make the vbox to hold the encryption stuff. self.vbox_encrypt_info = gtk.VBox(False, 0) self.toggle_encryption() self.chkbox_encryption.set_active(False) self.combo_encryption.set_sensitive(False) self.encrypt_types = misc.LoadEncryptionMethods() - + information_button = gtk.Button(stock=gtk.STOCK_INFO) self.button_hbox.pack_start(information_button, False, False) information_button.connect('clicked', lambda *a, **k: WirelessInformationDialog(networkID, self)) @@ -411,10 +515,12 @@ cmdend = [os.path.join(wpath.gtk, "configscript.py"), str(self.networkID), "wireless"] if os.getuid() != 0: - cmdbase = misc.get_sudo_cmd(language['scripts_need_pass'], + cmdbase = misc.get_sudo_cmd(_('You must enter your password to configure scripts'), prog_num=daemon.GetSudoApp()) if not cmdbase: - error(None, language["no_sudo_prog"]) + error(None, _('Could not find a graphical sudo program. '\ + 'The script editor could not be launched. '\ + "You'll have to edit scripts directly your configuration file.")) return cmdbase.extend(cmdend) misc.LaunchAndWait(cmdbase) @@ -487,7 +593,7 @@ for entry_info in encrypt_info.itervalues(): if entry_info[0].entry.get_text() == "" and \ entry_info[1] == 'required': - error(self, "%s (%s)" % (language['encrypt_info_missing'], + error(self, "%s (%s)" % (_('Required encryption information is missing.'), entry_info[0].label.get_label()) ) return False @@ -498,7 +604,7 @@ elif not self.chkbox_encryption.get_active() and \ wireless.GetWirelessProperty(networkid, "encryption"): # Encrypt checkbox is off, but the network needs it. - error(self, language['enable_encryption']) + error(self, _('This network requires encryption to be enabled.')) return False else: print "no encryption specified..." @@ -517,43 +623,6 @@ def format_entry(self, networkid, label): """ Helper method for fetching/formatting wireless properties. """ return noneToBlankString(wireless.GetWirelessProperty(networkid, label)) - - def toggle_encryption(self, widget=None): - """ Toggle the encryption combobox based on the encryption checkbox. """ - active = self.chkbox_encryption.get_active() - self.vbox_encrypt_info.set_sensitive(active) - self.combo_encryption.set_sensitive(active) - - def change_encrypt_method(self, widget=None): - """ Load all the entries for a given encryption method. """ - for z in self.vbox_encrypt_info: - z.destroy() # Remove stuff in there already - ID = self.combo_encryption.get_active() - methods = self.encrypt_types - self.encryption_info = {} - - # If nothing is selected, select the first entry. - if ID == -1: - self.combo_encryption.set_active(0) - ID = 0 - - for type_ in ['required', 'optional']: - fields = methods[ID][type_] - for field in fields: - if language.has_key(field[1]): - box = LabelEntry(language[field[1].lower().replace(' ','_')]) - else: - box = LabelEntry(field[1].replace('_',' ')) - box.set_auto_hidden(True) - self.vbox_encrypt_info.pack_start(box) - # Add the data to a dict, so that the information - # can be easily accessed by giving the name of the wanted - # data. - self.encryption_info[field[0]] = [box, type_] - - box.entry.set_text(noneToBlankString( - wireless.GetWirelessProperty(self.networkID, field[0]))) - self.vbox_encrypt_info.show_all() class NetworkEntry(gtk.HBox): @@ -597,7 +666,7 @@ self.advanced_image.set_from_stock(gtk.STOCK_EDIT, 4) self.advanced_image.set_padding(4, 0) self.advanced_button.set_alignment(.5, .5) - self.advanced_button.set_label(language['properties']) + self.advanced_button.set_label(_('Properties')) self.advanced_button.set_image(self.advanced_image) self.buttons_hbox.pack_start(self.connect_hbox, False, False) @@ -628,14 +697,14 @@ self.connect_button.show() self.name_label.set_use_markup(True) - self.name_label.set_label("" + language['wired_network'] + "") + self.name_label.set_label("" + _('Wired Network') + "") self.is_full_gui = True self.button_add = gtk.Button(stock=gtk.STOCK_ADD) self.button_delete = gtk.Button(stock=gtk.STOCK_DELETE) - self.profile_help = gtk.Label(language['wired_network_instructions']) - self.chkbox_default_profile = gtk.CheckButton(language['default_wired']) + self.profile_help = gtk.Label(_('To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add.')) + self.chkbox_default_profile = gtk.CheckButton(_('Use as default profile (overwrites any previous default)')) self.combo_profile_names = gtk.combo_box_new_text() # Format the profile help label. @@ -816,7 +885,8 @@ self.lbl_channel = GreyLabel() print "ESSID : " + self.essid - self.chkbox_autoconnect = gtk.CheckButton(language['automatic_connect']) + self.chkbox_autoconnect = gtk.CheckButton(_('Automatically connect to this network')) + self.chkbox_neverconnect = gtk.CheckButton(_('Never connect to this network')) self.set_signal_strength(wireless.GetWirelessProperty(networkID, 'quality'), @@ -837,20 +907,29 @@ # Add the wireless network specific parts to the NetworkEntry # VBox objects. self.vbox_top.pack_start(self.chkbox_autoconnect, False, False) + self.vbox_top.pack_start(self.chkbox_neverconnect, False, False) if to_bool(self.format_entry(networkID, "automatic")): self.chkbox_autoconnect.set_active(True) else: self.chkbox_autoconnect.set_active(False) + if to_bool(self.format_entry(networkID, "never")): + self.chkbox_autoconnect.set_sensitive(False) + self.connect_button.set_sensitive(False) + self.chkbox_neverconnect.set_active(True) + else: + self.chkbox_neverconnect.set_active(False) + # Connect signals. - self.chkbox_autoconnect.connect("toggled", self.update_autoconnect) + self.chkbox_autoconnect.connect("toggled", self.update_autoconnect) + self.chkbox_neverconnect.connect("toggled", self.update_neverconnect) # Show everything self.show_all() self.advanced_dialog = WirelessSettingsDialog(networkID) self.wifides = self.connect("destroy", self.destroy_called) - + def _escape(self, val): """ Escapes special characters so they're displayed correctly. """ return val.replace("&", "&").replace("<", "<").\ @@ -867,6 +946,18 @@ get_active())) wireless.SaveWirelessNetworkProperty(self.networkID, "automatic") + def update_neverconnect(self, widget=None): + """ Called when the neverconnect checkbox is toggled. """ + wireless.SetWirelessProperty(self.networkID, "never", + noneToString(self.chkbox_neverconnect.get_active())) + wireless.SaveWirelessNetworkProperty(self.networkID, "never") + if self.chkbox_neverconnect.get_active(): + self.chkbox_autoconnect.set_sensitive(False) + self.connect_button.set_sensitive(False) + else: + self.chkbox_autoconnect.set_sensitive(True) + self.connect_button.set_sensitive(True) + def destroy_called(self, *args): """ Clean up everything. """ self.disconnect(self.wifides) @@ -878,6 +969,8 @@ def update_connect_button(self, state, apbssid): """ Update the connection/disconnect button for this entry. """ + if to_bool(self.format_entry(self.networkID, "never")): + self.connect_button.set_sensitive(False) if not apbssid: apbssid = wireless.GetApBssid() if state == misc.WIRELESS and \ @@ -935,13 +1028,13 @@ if on and ttype: self.lbl_encryption.set_label(str(ttype)) if on and not ttype: - self.lbl_encryption.set_label(language['secured']) + self.lbl_encryption.set_label(_('Secured')) if not on: - self.lbl_encryption.set_label(language['unsecured']) + self.lbl_encryption.set_label(_('Unsecured')) def set_channel(self, channel): """ Set the channel value for the WirelessNetworkEntry. """ - self.lbl_channel.set_label(language['channel'] + ' ' + str(channel)) + self.lbl_channel.set_label(_('Channel') + ' ' + str(channel)) def format_entry(self, networkid, label): """ Helper method for fetching/formatting wireless properties. """ @@ -1057,13 +1150,13 @@ if on and ttype: self.lbl_encryption.set_label(str(ttype)) if on and not ttype: - self.lbl_encryption.set_label(language['secured']) + self.lbl_encryption.set_label(_('Secured')) if not on: - self.lbl_encryption.set_label(language['unsecured']) + self.lbl_encryption.set_label(_('Unsecured')) def set_channel(self, channel): """ Set the channel value for the WirelessNetworkEntry. """ - self.lbl_channel.set_label(language['channel'] + ' ' + str(channel)) + self.lbl_channel.set_label(_('Channel') + ' ' + str(channel)) def set_mode(self, mode): """ Set the mode value for the WirelessNetworkEntry. """ diff -Nru wicd-1.7.0+ds1/gtk/prefs.py wicd-1.7.1/gtk/prefs.py --- wicd-1.7.0+ds1/gtk/prefs.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/gtk/prefs.py 2011-10-19 18:32:54.000000000 +0000 @@ -28,12 +28,12 @@ import gobject #import pango import os -import gtk.glade from wicd import misc from wicd import wpath from wicd import dbusmanager from wicd.misc import checkboxTextboxToggle, noneToBlankString +from wicd.translations import _ daemon = None wireless = None @@ -81,6 +81,7 @@ self.displaytypecheckbox.set_active(daemon.GetSignalDisplayType()) self.verifyapcheckbox.set_active(daemon.GetShouldVerifyAp()) self.preferwiredcheckbox.set_active(daemon.GetPreferWiredNetwork()) + self.showneverconnectcheckbox.set_active(daemon.GetShowNeverConnect()) dhcp_list = [self.dhcpautoradio, self.dhclientradio, self.dhcpcdradio, self.pumpradio, self.udhcpcradio] @@ -162,9 +163,9 @@ if wpath.no_use_notifications: self.notificationscheckbox.set_active(False) self.notificationscheckbox.hide() - self.wTree.get_widget('label2').hide() + self.wTree.get_object('label2').hide() - self.wTree.get_widget("notebook2").set_current_page(0) + self.wTree.get_object("notebook2").set_current_page(0) def run(self): """ Runs the preferences dialog window. """ @@ -200,6 +201,7 @@ daemon.SetSignalDisplayType(int(self.displaytypecheckbox.get_active())) daemon.SetShouldVerifyAp(bool(self.verifyapcheckbox.get_active())) daemon.SetPreferWiredNetwork(bool(self.preferwiredcheckbox.get_active())) + daemon.SetShowNeverConnect(bool(self.showneverconnectcheckbox.get_active())) if self.showlistradiobutton.get_active(): daemon.SetWiredAutoConnectMethod(2) elif self.lastusedradiobutton.get_active(): @@ -249,7 +251,6 @@ daemon.SetSudoApp(sudo_tool) [width, height] = self.dialog.get_size() - daemon.WriteWindowSize(width, height, "pref") not_path = os.path.join(USER_SETTINGS_DIR, 'USE_NOTIFICATIONS') if self.notificationscheckbox.get_active(): @@ -266,14 +267,14 @@ def set_label(self, glade_str, label): """ Sets the label for the given widget in wicd.glade. """ - self.wTree.get_widget(glade_str).set_label(label) + self.wTree.get_object(glade_str).set_label(label) def prep_settings_diag(self): """ Set up anything that doesn't have to be persisted later. """ def build_combobox(lbl): """ Sets up a ComboBox using the given widget name. """ liststore = gtk.ListStore(gobject.TYPE_STRING) - combobox = self.wTree.get_widget(lbl) + combobox = self.wTree.get_object(lbl) combobox.clear() combobox.set_model(liststore) cell = gtk.CellRendererText() @@ -283,96 +284,91 @@ def setup_label(name, lbl=""): """ Sets up a label for the given widget name. """ - widget = self.wTree.get_widget(name) + widget = self.wTree.get_object(name) # if lbl: - # widget.set_label(language[lbl]) + # widget.set_label(lbl) if widget is None: raise ValueError('widget %s does not exist' % name) return widget # External Programs tab - # self.wTree.get_widget("gen_settings_label").set_label(language["gen_settings"]) - # self.wTree.get_widget("ext_prog_label").set_label(language["ext_programs"]) - # self.wTree.get_widget("dhcp_client_label").set_label(language["dhcp_client"]) - # self.wTree.get_widget("wired_detect_label").set_label(language["wired_detect"]) - # self.wTree.get_widget("route_flush_label").set_label(language["route_flush"]) - # self.wTree.get_widget("pref_backend_label").set_label(language["backend"] + ":") + # self.wTree.get_object("gen_settings_label").set_label(_('General Settings')) + # self.wTree.get_object("ext_prog_label").set_label(_('External Programs')) + # self.wTree.get_object("dhcp_client_label").set_label(_('DHCP Client')) + # self.wTree.get_object("wired_detect_label").set_label(_('Wired Link Detection')) + # self.wTree.get_object("route_flush_label").set_label(_('Route Table Flushing')) + # self.wTree.get_object("pref_backend_label").set_label(_('Backend') + ":") - # entryWiredAutoMethod = self.wTree.get_widget("pref_wired_auto_label") + # entryWiredAutoMethod = self.wTree.get_object("pref_wired_auto_label") # entryWiredAutoMethod.set_label('Wired Autoconnect Setting:') # entryWiredAutoMethod.set_alignment(0, 0) # atrlist = pango.AttrList() # atrlist.insert(pango.AttrWeight(pango.WEIGHT_BOLD, 0, 50)) # entryWiredAutoMethod.set_attributes(atrlist) - # self.set_label("pref_dns1_label", "%s %s" % (language['dns'], language['1'])) - # self.set_label("pref_dns2_label", "%s %s" % (language['dns'], language['2'])) - # self.set_label("pref_dns3_label", "%s %s" % (language['dns'], language['3'])) - # self.set_label("pref_search_dom_label", "%s:" % language['search_domain']) - # self.set_label("pref_wifi_label", "%s:" % language['wireless_interface']) - # self.set_label("pref_wired_label", "%s:" % language['wired_interface']) - # self.set_label("pref_driver_label", "%s:" % language['wpa_supplicant_driver']) + # self.set_label("pref_dns1_label", "%s 1" % _('DNS server')) + # self.set_label("pref_dns2_label", "%s 2" % _('DNS server')) + # self.set_label("pref_dns3_label", "%s 3" % _('DNS server')) + # self.set_label("pref_search_dom_label", "%s:" % _('Search domain')) + # self.set_label("pref_wifi_label", "%s:" % _('Wireless Interface')) + # self.set_label("pref_wired_label", "%s:" % _('Wired Interface')) + # self.set_label("pref_driver_label", "%s:" % _('WPA Supplicant Driver')) - self.dialog = self.wTree.get_widget("pref_dialog") - self.dialog.set_title(language['preferences']) + self.dialog = self.wTree.get_object("pref_dialog") + self.dialog.set_title(_('Preferences')) if os.path.exists(os.path.join(wpath.images, "wicd.png")): self.dialog.set_icon_from_file(os.path.join(wpath.images, "wicd.png")) - size = daemon.ReadWindowSize("pref") - width = size[0] - height = size[1] - if width > -1 and height > -1: - self.dialog.resize(int(width), int(height)) - else: - width = int(gtk.gdk.screen_width() / 2.4) - if width > 450: - width = 450 - self.dialog.resize(width, int(gtk.gdk.screen_height() / 2)) + width = int(gtk.gdk.screen_width() / 2.4) + if width > 450: + width = 450 + self.dialog.resize(width, int(gtk.gdk.screen_height() / 2)) - self.wiredcheckbox = setup_label("pref_always_check", - 'wired_always_on') + self.wiredcheckbox = setup_label("pref_always_check", _('''Always show wired interface''')) self.preferwiredcheckbox = setup_label("pref_prefer_wired_check", "prefer_wired") self.reconnectcheckbox = setup_label("pref_auto_check", - 'auto_reconnect') + _('Automatically reconnect on connection loss')) + self.showneverconnectcheckbox = setup_label("pref_show_never_connect_check", + _('Show never connect networks')) self.debugmodecheckbox = setup_label("pref_debug_check", - 'use_debug_mode') + _('Enable debug mode')) self.displaytypecheckbox = setup_label("pref_dbm_check", - 'display_type_dialog') + _('Use dBm to measure signal strength')) self.verifyapcheckbox = setup_label("pref_verify_ap_check", - 'verify_ap_dialog') + _('Ping static gateways after connecting to verify association')) self.usedefaultradiobutton = setup_label("pref_use_def_radio", - 'use_default_profile') + _('Use default profile on wired autoconnect')) self.showlistradiobutton = setup_label("pref_prompt_radio", - 'show_wired_list') + _('Prompt for profile on wired autoconnect')) self.lastusedradiobutton = setup_label("pref_use_last_radio", - 'use_last_used_profile') + _('Use last used profile on wired autoconnect')) self.notificationscheckbox = setup_label("pref_use_libnotify", - 'display_notifications') + _('Display notifications about connection status')) # DHCP Clients - self.dhcpautoradio = setup_label("dhcp_auto_radio", "wicd_auto_config") - self.dhclientradio = self.wTree.get_widget("dhclient_radio") - self.pumpradio = self.wTree.get_widget("pump_radio") - self.dhcpcdradio = self.wTree.get_widget("dhcpcd_radio") - self.udhcpcradio = self.wTree.get_widget("udhcpc_radio") + self.dhcpautoradio = setup_label("dhcp_auto_radio", _('Automatic (recommended)')) + self.dhclientradio = self.wTree.get_object("dhclient_radio") + self.pumpradio = self.wTree.get_object("pump_radio") + self.dhcpcdradio = self.wTree.get_object("dhcpcd_radio") + self.udhcpcradio = self.wTree.get_object("udhcpc_radio") # Wired Link Detection Apps - self.linkautoradio = setup_label("link_auto_radio", 'wicd_auto_config') + self.linkautoradio = setup_label("link_auto_radio", _('Automatic (recommended)')) self.linkautoradio = setup_label("link_auto_radio") self.ethtoolradio = setup_label("ethtool_radio") self.miitoolradio = setup_label("miitool_radio") # Route Flushing Apps self.flushautoradio = setup_label("flush_auto_radio", - 'wicd_auto_config') + _('Automatic (recommended)')) self.ipflushradio = setup_label("ip_flush_radio") self.routeflushradio = setup_label("route_flush_radio") # Graphical Sudo Apps - self.sudoautoradio = setup_label("sudo_auto_radio", "wicd_auto_config") + self.sudoautoradio = setup_label("sudo_auto_radio", _('Automatic (recommended)')) self.gksudoradio = setup_label("gksudo_radio") self.kdesuradio = setup_label("kdesu_radio") self.ktsussradio = setup_label("ktsuss_radio") @@ -385,17 +381,17 @@ for x in self.wpadrivers: self.wpadrivercombo.append_text(x) - self.entryWirelessInterface = self.wTree.get_widget("pref_wifi_entry") - self.entryWiredInterface = self.wTree.get_widget("pref_wired_entry") + self.entryWirelessInterface = self.wTree.get_object("pref_wifi_entry") + self.entryWiredInterface = self.wTree.get_object("pref_wired_entry") # Set up global DNS stuff self.useGlobalDNSCheckbox = setup_label("pref_global_check", 'use_global_dns') - self.searchDomEntry = self.wTree.get_widget("pref_search_dom_entry") - self.dnsDomEntry = self.wTree.get_widget("pref_dns_dom_entry") - self.dns1Entry = self.wTree.get_widget("pref_dns1_entry") - self.dns2Entry = self.wTree.get_widget("pref_dns2_entry") - self.dns3Entry = self.wTree.get_widget("pref_dns3_entry") + self.searchDomEntry = self.wTree.get_object("pref_search_dom_entry") + self.dnsDomEntry = self.wTree.get_object("pref_dns_dom_entry") + self.dns1Entry = self.wTree.get_object("pref_dns1_entry") + self.dns2Entry = self.wTree.get_object("pref_dns2_entry") + self.dns3Entry = self.wTree.get_object("pref_dns3_entry") self.backendcombo = build_combobox("pref_backend_combobox") self.backendcombo.connect("changed", self.be_combo_changed) diff -Nru wicd-1.7.0+ds1/gtk/wicd-client.py wicd-1.7.1/gtk/wicd-client.py --- wicd-1.7.0+ds1/gtk/wicd-client.py 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/gtk/wicd-client.py 2011-12-07 21:21:45.000000000 +0000 @@ -64,7 +64,7 @@ import gui from guiutil import error, can_use_notify -from wicd.translations import language +from wicd.translations import _ ICON_AVAIL = True USE_EGG = False @@ -91,7 +91,7 @@ return func(*args, **kwargs) except DBusException, e: if e.get_dbus_name() != None and "DBus.Error.AccessDenied" in e.get_dbus_name(): - error(None, language['access_denied'].replace("$A",""+wpath.wicd_group+"")) + error(None, _('Unable to contact the Wicd daemon due to an access denied error from DBus. Please check that your user is in the $A group.').replace("$A",""+wpath.wicd_group+"")) #raise raise DBusException(e) else: @@ -124,7 +124,7 @@ Base Class for implementing a tray icon to display network status. """ - def __init__(self, animate, displaytray=True): + def __init__(self, animate, displaytray=True, displayapp=False): self.cur_sndbytes = -1 self.cur_rcvbytes = -1 self.last_sndbytes = -1 @@ -136,6 +136,8 @@ self.tr = self.EggTrayIconGUI(self) else: self.tr = self.StatusTrayIconGUI(self) + if displayapp: + self.tr.toggle_wicd_gui() self.icon_info = self.TrayConnectionInfo(self, self.tr, animate) self.tr.icon_info = self.icon_info print 'displaytray %s' % displaytray @@ -208,34 +210,43 @@ Updates the trayicon tooltip based on current connection status """ if (self.network_type == "none"): - self.tr.set_tooltip(language['not_connected']) + self.tr.set_tooltip(_('Not connected')) elif (self.network_type == "wireless"): - self.tr.set_tooltip(language['connected_to_wireless'] + self.tr.set_tooltip(_('Connected to $A at $B (IP: $C)') .replace('$A', self.network_name) .replace('$B', self.network_str) .replace('$C', self.network_addr)) elif (self.network_type == "wired"): - self.tr.set_tooltip(language['connected_to_wired'] + self.tr.set_tooltip(_('Connected to wired network (IP: $A)') .replace('$A', self.network_addr)) elif (self.network_type == "killswitch"): - self.tr.set_tooltip(language['not_connected'] + "(" + - language['killswitched_enabled'] + ")") + self.tr.set_tooltip(_('Not connected') + "(" + + _('Wireless Kill Switch Enabled') + ")") elif (self.network_type == "no_daemon"): - self.tr.set_tooltip(language['no_daemon_tooltip']) + self.tr.set_tooltip(_('Wicd daemon unreachable')) return True def _show_notification(self, title, details, image=None): if self.should_notify: - if not self._last_bubble: - self._last_bubble = pynotify.Notification(title, details, - image) - self._last_bubble.show() - else: - self._last_bubble.clear_actions() - self._last_bubble.clear_hints() - self._last_bubble.update(title, details, image) - self._last_bubble.show() + try: + if not self._last_bubble: + self._last_bubble = pynotify.Notification(title, details, + image) + self._last_bubble.show() + else: + self._last_bubble.clear_actions() + self._last_bubble.clear_hints() + self._last_bubble.update(title, details, image) + self._last_bubble.show() + except Exception, e: + if hasattr(e, 'message') and e.message != '': + msg = e.message + elif hasattr(e, 'args') and len(e.args) > 0: + msg = e.args[-1] + else: + msg = str(e) + print "Exception during notification: %s" % msg self.should_notify = False @@ -251,11 +262,11 @@ self.network_addr = str(info[0]) self.network_type = "wired" self.tr.set_from_file(os.path.join(wpath.images, "wired.png")) - # status_string = language['connected_to_wired'].replace('$A', + # status_string = _('Connected to wired network (IP: $A)').replace('$A', #wired_ip) # self.tr.set_tooltip(status_string) - self._show_notification(language['wired_network'], - language['connection_established'], + self._show_notification(_('Wired Network'), + _('Connection established'), 'network-wired') self.update_tooltip() @@ -278,14 +289,14 @@ if wireless.GetWirelessProperty(cur_net_id, "encryption"): lock = "-lock" - # status_string = (language['connected_to_wireless'] + # status_string = (_('Connected to $A at $B (IP: $C)') #.replace('$A', self.network) # .replace('$B', sig_string) # .replace('$C', str(wireless_ip))) #self.tr.set_tooltip(status_string) self.set_signal_image(int(strength), lock) self._show_notification(self.network, - language['connection_established'], + _('Connection established'), 'network-wireless') @@ -295,22 +306,22 @@ """ Sets the icon info for a connecting state. """ wired = False if info[0] == 'wired' and len(info) == 1: - cur_network = language['wired_network'] + cur_network = _('Wired Network') wired = True else: cur_network = info[1] - status_string = language['connecting'] + " to " + \ + status_string = _('Connecting') + " to " + \ cur_network + "..." self.update_tooltip() # self.tr.set_tooltip(status_string) self.tr.set_from_file(os.path.join(wpath.images, "no-signal.png")) if wired: self._show_notification(cur_network, - language['establishing_connection'], + _('Establishing connection...'), 'network-wired') else: self._show_notification(cur_network, - language['establishing_connection'], + _('Establishing connection...'), 'network-wireless') @@ -319,14 +330,14 @@ """ Set the icon info for the not connected state. """ self.tr.set_from_file(wpath.images + "no-signal.png") if not DBUS_AVAIL: - status = language['no_daemon_tooltip'] + status = _('Wicd daemon unreachable') elif wireless.GetKillSwitchEnabled(): - status = (language['not_connected'] + " (" + - language['killswitch_enabled'] + ")") + status = (_('Not connected') + " (" + + _('Wireless Kill Switch Enabled') + ")") else: - status = language['not_connected'] + status = _('Not connected') # self.tr.set_tooltip(status) - self._show_notification(language['disconnected'], None, 'stop') + self._show_notification(_('Disconnected'), None, 'stop') self.update_tooltip() @catchdbus @@ -484,11 +495,11 @@ """ actions = [ ('Menu', None, 'Menu'), - ('Connect', gtk.STOCK_CONNECT, "Connect"), - ('Info', gtk.STOCK_INFO, "_Connection Info", None, - 'Information about the current connection', + ('Connect', gtk.STOCK_CONNECT, _('Connect')), + ('Info', gtk.STOCK_INFO, _('_Connection Info'), None, + _('Information about the current connection'), self.on_conn_info), - ('Quit',gtk.STOCK_QUIT,'_Quit',None,'Quit wicd-tray-icon', + ('Quit',gtk.STOCK_QUIT,_('_Quit'),None,_('Quit wicd-tray-icon'), self.on_quit), ] actg = gtk.ActionGroup('Actions') @@ -526,7 +537,7 @@ if DBUS_AVAIL: self.toggle_wicd_gui() else: - # error(None, language["daemon_unavailable"]) + # error(None, _('The wicd daemon is unavailable, so your request cannot be completed')) pass def on_quit(self, widget=None): @@ -550,6 +561,7 @@ # Create labels self.label = gtk.Label() self.data = gtk.Label() + self.data.set_selectable(True) self.label.show() self.data.show() self.list = [] @@ -588,12 +600,19 @@ # Choose info for the data if state == misc.WIRED: - text = (language['conn_info_wired'] + text = (_('''$A +$B KB/s +$C KB/s''') .replace('$A', str(info[0])) #IP .replace('$B', str(rx)) #RX .replace('$C', str(tx))) #TX elif state == misc.WIRELESS: - text = (language['conn_info_wireless'] + text = (_('''$A +$B +$C +$D +$E KB/s +$F KB/s''') .replace('$A', str(info[1])) #SSID .replace('$B', str(info[4])) #Speed .replace('$C', str(info[0])) #IP @@ -606,13 +625,22 @@ # Choose info for the labels self.list[0].set_text('\n' + text) if state == misc.WIRED: - self.list[1].set_text(language['conn_info_wired_labels']) + self.list[1].set_text(_('''Wired +IP: +RX: +TX:''')) elif state == misc.WIRELESS: - self.list[1].set_text(language['conn_info_wireless_labels']) + self.list[1].set_text(_('''Wireless +SSID: +Speed: +IP: +Strength: +RX: +TX:''')) elif state == misc.CONNECTING: - self.list[1].set_text(language['connecting']) + self.list[1].set_text(_('Connecting')) elif state in (misc.SUSPENDED, misc.NOT_CONNECTED): - self.list[1].set_text(language['disconnected']) + self.list[1].set_text(_('Disconnected')) return True @@ -755,7 +783,9 @@ sep.show() if num_networks > 0: - for x in range(0, num_networks): + skip_never_connect = not daemon.GetShowNeverConnect() + for x in xrange(0, num_networks): + if skip_never_connect and misc.to_bool(get_prop(x,"never")): continue essid = get_prop(x, "essid") if status == misc.WIRELESS and info[1] == essid: is_active = True @@ -764,7 +794,7 @@ self._add_item_to_menu(submenu, essid, "wifi", x, is_connecting, is_active) else: - no_nets_item = gtk.MenuItem(language['no_wireless_networks_found']) + no_nets_item = gtk.MenuItem(_('No wireless networks found.')) no_nets_item.set_sensitive(False) no_nets_item.show() submenu.append(no_nets_item) @@ -777,7 +807,7 @@ submenu = net_menuitem.get_submenu() self._clear_menu(submenu) - loading_item = gtk.MenuItem(language['scanning'] + "...") + loading_item = gtk.MenuItem(_('Scanning') + "...") loading_item.set_sensitive(False) loading_item.show() submenu.append(loading_item) @@ -903,6 +933,7 @@ wireless (and wired) connection daemon front-end. Arguments: +\t-t\t--tray\tRun the wicd tray icon only. \t-n\t--no-tray\tRun wicd without the tray icon. \t-h\t--help\t\tPrint this help information. \t-a\t--no-animate\tRun the tray without network traffic tray animations. @@ -921,8 +952,7 @@ try: dbusmanager.connect_to_dbus() except DBusException: - error(None, "Could not connect to wicd's D-Bus interface. " + - "Check the wicd log for error messages.") + error(None, _("Could not connect to wicd's D-Bus interface. Check the wicd log for error messages.")) return False else: return False @@ -951,7 +981,7 @@ DBUS_AVAIL = False gui.handle_no_dbus(from_tray=True) print "Wicd daemon is shutting down!" - lost_dbus_id = misc.timeout_add(5, lambda:error(None, language['lost_dbus'], + lost_dbus_id = misc.timeout_add(5, lambda:error(None, _('The wicd daemon has shut down. The UI will not function properly until it is restarted.'), block=False)) return False @@ -964,9 +994,10 @@ """ try: - opts, args = getopt.getopt(sys.argv[1:], 'nhao', ['help', 'no-tray', - 'no-animate', - 'only-notifications']) + opts, args = getopt.getopt(sys.argv[1:], 'tnhao', ['help', 'no-tray', + 'tray', + 'no-animate', + 'only-notifications']) except getopt.GetoptError: # Print help information and exit usage() @@ -979,6 +1010,8 @@ if opt in ('-h', '--help'): usage() sys.exit(0) + elif opt in ('-t', '--tray'): + display_app = False elif opt in ('-n', '--no-tray'): use_tray = False elif opt in ('-a', '--no-animate'): @@ -994,7 +1027,7 @@ print 'Loading...' setup_dbus() atexit.register(on_exit) - + if display_app and not use_tray or not ICON_AVAIL: the_gui = gui.appGui(standalone=True) mainloop = gobject.MainLoop() @@ -1002,7 +1035,7 @@ sys.exit(0) # Set up the tray icon GUI and backend - tray_icon = TrayIcon(animate, displaytray=display_app) + tray_icon = TrayIcon(animate, displaytray=use_tray, displayapp=display_app) # Check to see if wired profile chooser was called before icon # was launched (typically happens on startup or daemon restart). diff -Nru wicd-1.7.0+ds1/in/init=redhat=wicd.in wicd-1.7.1/in/init=redhat=wicd.in --- wicd-1.7.0+ds1/in/init=redhat=wicd.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/init=redhat=wicd.in 2011-09-18 10:35:01.000000000 +0000 @@ -43,7 +43,7 @@ killproc -p $pidfile wicd RETVAL=$? echo - if [ $retval -eq 0 ]; then + if [ $RETVAL -eq 0 ]; then rm -f /var/lock/subsys/$servicename rm -f $pidfile fi diff -Nru wicd-1.7.0+ds1/in/man=nl=wicd-manager-settings.conf.5.in wicd-1.7.1/in/man=nl=wicd-manager-settings.conf.5.in --- wicd-1.7.0+ds1/in/man=nl=wicd-manager-settings.conf.5.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/man=nl=wicd-manager-settings.conf.5.in 2011-09-18 08:48:13.000000000 +0000 @@ -91,18 +91,6 @@ 0 = disabled .br 1 = enabled -.TP -.BI "window_height = " " (in pixels)" -This determines the height of the client window. -.TP -.BI "window_width = " " (in pixels)" -This determines the width of the client window. -.TP -.BI "pref_height = " " (in pixels)" -This determines the height of the "Preferences" window when launched from the client. -.TP -.BI "pref_width = " " (in pixels)" -This determines the width of the "Preferences" window when launched from the client. .SH "SEE ALSO" diff -Nru wicd-1.7.0+ds1/in/man=nl=wicd-wireless-settings.conf.5.in wicd-1.7.1/in/man=nl=wicd-wireless-settings.conf.5.in --- wicd-1.7.0+ds1/in/man=nl=wicd-wireless-settings.conf.5.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/man=nl=wicd-wireless-settings.conf.5.in 2011-09-18 08:48:13.000000000 +0000 @@ -79,9 +79,6 @@ .br 1 = Gebruik globale instellingen .TP -.BI "has_profile = " -Deze parameter wordt alleen intern door Wicd gebruikt en heeft geen effect voor de gebruiker zover de gebruiker kan zien. -.TP .BI "beforescript = " Dit definieert een script dat gestart moet worden voordat Wicd gaat verbinden. Dit script moet een Bourne-compatibel script zijn en moet uitvoerbaar zijn. diff -Nru wicd-1.7.0+ds1/in/man=wicd.8.in wicd-1.7.1/in/man=wicd.8.in --- wicd-1.7.0+ds1/in/man=wicd.8.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/man=wicd.8.in 2011-09-18 08:48:13.000000000 +0000 @@ -118,6 +118,12 @@ .br See this file's own man page for more information about it. +.B %ETC%dhclient.conf.template +.br +This is used to replace /etc/dhclient.conf during Wicd activity, +if you're using dhclient(1) as DHCP client. See dhclient.conf(5) +for more information. + .B %ENCRYPTION% .br This directory contains various templates for encrypted (WEP, WPA, etcetera) @@ -132,6 +138,12 @@ or to any network. Please note that pre/post disconnect scripts may be executed multiple times on already-disconnected interfaces. .br +The scripts will be passed different parameters, depending if Wicd is +acting on a wired or a wireless network. In the former case, "wired +wired wired" will be passed (three times, just for compatibility with +the wireless case). If Wicd is acting on a wireless network, it will +pass "wireless ESSID BSSID" to the script. +.br Available directories are: .br %SCRIPTS%predisconnect @@ -156,6 +168,7 @@ .BR wicd-manager-settings.conf (5), .BR wicd-wired-settings.conf (5), .BR wicd-wireless-settings.conf (5), +.BR dhclient.conf (5), .BR wicd-curses (8), .BR ifconfig (8), .BR iwconfig (8), diff -Nru wicd-1.7.0+ds1/in/man=wicd-manager-settings.conf.5.in wicd-1.7.1/in/man=wicd-manager-settings.conf.5.in --- wicd-1.7.0+ds1/in/man=wicd-manager-settings.conf.5.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/man=wicd-manager-settings.conf.5.in 2011-09-18 08:48:13.000000000 +0000 @@ -91,18 +91,6 @@ 0 = disabled .br 1 = enabled -.TP -.BI "window_height = " " (in pixels)" -This determines the height of the client window. -.TP -.BI "window_width = " " (in pixels)" -This determines the width of the client window. -.TP -.BI "pref_height = " " (in pixels)" -This determines the height of the "Preferences" window when launched from the client. -.TP -.BI "pref_width = " " (in pixels)" -This determines the width of the "Preferences" window when launched from the client. .SH "SEE ALSO" diff -Nru wicd-1.7.0+ds1/in/man=wicd-wireless-settings.conf.5.in wicd-1.7.1/in/man=wicd-wireless-settings.conf.5.in --- wicd-1.7.0+ds1/in/man=wicd-wireless-settings.conf.5.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/man=wicd-wireless-settings.conf.5.in 2011-09-18 08:48:13.000000000 +0000 @@ -83,10 +83,6 @@ .br 1 = Use settings globally .TP -.BI "has_profile = " -This parameter is used internally by Wicd and has no effect as far as the -user is concerned. -.TP .BI "beforescript = " This defines a script to run before Wicd brings up the connection. .br diff -Nru wicd-1.7.0+ds1/in/other=50-wicd-suspend.sh.in wicd-1.7.1/in/other=50-wicd-suspend.sh.in --- wicd-1.7.0+ds1/in/other=50-wicd-suspend.sh.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/other=50-wicd-suspend.sh.in 2011-09-18 08:48:13.000000000 +0000 @@ -1,3 +1,3 @@ #!/bin/sh # Put wifi interface down -%LIB%suspend.py +%DAEMON%suspend.py diff -Nru wicd-1.7.0+ds1/in/other=55wicd.in wicd-1.7.1/in/other=55wicd.in --- wicd-1.7.0+ds1/in/other=55wicd.in 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/in/other=55wicd.in 2011-09-18 08:48:13.000000000 +0000 @@ -0,0 +1,69 @@ +#!/bin/sh + +# pm-utils hook to handle suspend/resume properly for wicd + +if [ -r "${PM_FUNCTIONS}" ]; then + . "${PM_FUNCTIONS}" +elif [ -r "${FUNCTIONS}" ]; then + . "${FUNCTIONS}" +else + # pm-utils version is too old, or something else is wrong + exit $NA +fi + +RETVAL=0 # Set this to 0 initially + +wicd_suspend() +{ + # Put wifi interface down + %DAEMON%suspend.py 1>/dev/null 2>/dev/null + RETVAL=$? +} + +wicd_resume() +{ + # Bring wifi interface back up + %DAEMON%autoconnect.py 1>/dev/null 2>/dev/null + RETVAL=$? +} + +case "$1" in + hibernate|suspend) + wicd_suspend + ;; + thaw|resume) + wicd_resume + ;; + *) exit $NA + ;; +esac + +# We can't return a nonzero exit code (aside from $NA, $DX, and $NX) to +# to pm-utils or the entire sleep operation will be inhibited, so... +# No matter what we do, the log prefix and message will conflict a bit. +case "$RETVAL" in + 0) + exit $RETVAL + ;; + 1) + # Probably the daemon isn't running if this happens + echo "Unable to connect to wicd daemon - is it running?" + exit $DX + ;; + 2) + # This will occur if the daemon encounters an error + echo "Wicd daemon was unable to suspend the network." + exit $DX + ;; + 3) + # Will only be returned by autoconnect.py + # This should never happen, but just in case... + echo "Wicd daemon failed to autoconnect on resume." + exit $DX + ;; + *) + echo "Unknown exit code." + exit $NA + ;; +esac + diff -Nru wicd-1.7.0+ds1/in/other=80-wicd-connect.sh.in wicd-1.7.1/in/other=80-wicd-connect.sh.in --- wicd-1.7.0+ds1/in/other=80-wicd-connect.sh.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/other=80-wicd-connect.sh.in 2011-09-18 08:48:13.000000000 +0000 @@ -1,4 +1,4 @@ #!/bin/sh # Bring wifi network interface back up. -%LIB%autoconnect.py +%DAEMON%autoconnect.py diff -Nru wicd-1.7.0+ds1/in/other=91wicd.in wicd-1.7.1/in/other=91wicd.in --- wicd-1.7.0+ds1/in/other=91wicd.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/other=91wicd.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -#!/bin/sh - -# pm-utils hook to handle suspend/resume properly for wicd - -if [ -r "${PM_FUNCTIONS}" ]; then - . "${PM_FUNCTIONS}" -elif [ -r "${FUNCTIONS}" ]; then - . "${FUNCTIONS}" -else - # pm-utils version is too old, or something else is wrong - exit $NA -fi - -RETVAL=0 # Set this to 0 initially - -wicd_suspend() -{ - # Put wifi interface down - %DAEMON%suspend.py 1>/dev/null 2>/dev/null - RETVAL=$? -} - -wicd_resume() -{ - # Bring wifi interface back up - %DAEMON%autoconnect.py 1>/dev/null 2>/dev/null - RETVAL=$? -} - -case "$1" in - hibernate|suspend) - wicd_suspend - ;; - thaw|resume) - wicd_resume - ;; - *) exit $NA - ;; -esac - -# We can't return a nonzero exit code (aside from $NA, $DX, and $NX) to -# to pm-utils or the entire sleep operation will be inhibited, so... -# No matter what we do, the log prefix and message will conflict a bit. -case "$RETVAL" in - 0) - exit $RETVAL - ;; - 1) - # Probably the daemon isn't running if this happens - echo "Unable to connect to wicd daemon - is it running?" - exit $DX - ;; - 2) - # This will occur if the daemon encounters an error - echo "Wicd daemon was unable to suspend the network." - exit $DX - ;; - 3) - # Will only be returned by autoconnect.py - # This should never happen, but just in case... - echo "Wicd daemon failed to autoconnect on resume." - exit $DX - ;; - *) - echo "Unknown exit code." - exit $NA - ;; -esac - diff -Nru wicd-1.7.0+ds1/in/other=wicd.logrotate.in wicd-1.7.1/in/other=wicd.logrotate.in --- wicd-1.7.0+ds1/in/other=wicd.logrotate.in 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/in/other=wicd.logrotate.in 2011-10-04 21:15:58.000000000 +0000 @@ -0,0 +1,6 @@ +%LOG%wicd.log { + missingok + notifempty + size 30k + create %LOGPERMS% root %LOGGROUP% +} diff -Nru wicd-1.7.0+ds1/in/scripts=wicd-client.in wicd-1.7.1/in/scripts=wicd-client.in --- wicd-1.7.0+ds1/in/scripts=wicd-client.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/scripts=wicd-client.in 2011-09-18 08:48:13.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh BOLD=$(tput bold) BLUE=$(tput setaf 4) NC=$(tput sgr0) diff -Nru wicd-1.7.0+ds1/in/scripts=wicd-curses.in wicd-1.7.1/in/scripts=wicd-curses.in --- wicd-1.7.0+ds1/in/scripts=wicd-curses.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/scripts=wicd-curses.in 2011-09-18 08:48:13.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ ! -d "$HOME/.wicd" ]; then mkdir -p "$HOME/.wicd" fi diff -Nru wicd-1.7.0+ds1/in/scripts=wicd.in wicd-1.7.1/in/scripts=wicd.in --- wicd-1.7.0+ds1/in/scripts=wicd.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/scripts=wicd.in 2011-09-18 08:48:13.000000000 +0000 @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@ diff -Nru wicd-1.7.0+ds1/in/wicd=wpath.py.in wicd-1.7.1/in/wicd=wpath.py.in --- wicd-1.7.0+ds1/in/wicd=wpath.py.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/wicd=wpath.py.in 2011-10-04 21:18:02.000000000 +0000 @@ -42,6 +42,9 @@ sbin = '%SBIN%' pmutils = '%PMUTILS%' dbus = '%DBUS%' +dbus_service = '%DBUS_SERVICE%' +systemd = '%SYSTEMD%' +logrotate = '%LOGROTATE%' desktop = '%DESKTOP%' backends= '%BACKENDS%' daemon = '%DAEMON%' diff -Nru wicd-1.7.0+ds1/in/wpath.py.in wicd-1.7.1/in/wpath.py.in --- wicd-1.7.0+ds1/in/wpath.py.in 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/in/wpath.py.in 2011-10-04 21:18:02.000000000 +0000 @@ -42,6 +42,9 @@ sbin = '%SBIN%' pmutils = '%PMUTILS%' dbus = '%DBUS%' +dbus_service = '%DBUS_SERVICE%' +systemd = '%SYSTEMD%' +logrotate = '%LOGROTATE%' desktop = '%DESKTOP%' backends= '%BACKENDS%' daemon = '%DAEMON%' diff -Nru wicd-1.7.0+ds1/init/debian/wicd wicd-1.7.1/init/debian/wicd --- wicd-1.7.0+ds1/init/debian/wicd 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/init/debian/wicd 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,166 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: wicd +# Required-Start: dbus +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Starts and stops Wicd +# Description: Starts and stops Wicd, a network manager +### END INIT INFO + +# Author: Adam Blackburn +# + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/usr/sbin:/usr/bin:/sbin:/bin +DESC="Network connection manager" +NAME=wicd +RUNDIR=/var/run/$NAME +DAEMON=/usr/sbin/$NAME +DAEMON_ARGS="" +PIDFILE=$RUNDIR/wicd.pid +SCRIPTNAME=/etc/init.d/wicd + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Create RUNDIR if it doesn't exist +[ -d "$RUNDIR" ] || mkdir -p "$RUNDIR" + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +[ -f /etc/default/rcS ] && . /etc/default/rcS + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# Perhaps not the best idea +# but a confirmation is nice +# when starting/stopping the daemon +VERBOSE=yes + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + # vvvv -- don't do this -- vvvv + # [ -e $PIDFILE ] && return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON -- \ + $DAEMON_ARGS > /dev/null 2> /dev/null\ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $NAME + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2 + exit 3 + ;; +esac + +: diff -Nru wicd-1.7.0+ds1/man/nl/wicd-client.1 wicd-1.7.1/man/nl/wicd-client.1 --- wicd-1.7.0+ds1/man/nl/wicd-client.1 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/man/nl/wicd-client.1 2011-11-03 09:02:50.000000000 +0000 @@ -1,20 +1,23 @@ -.TH WICD-CLIENT "1" "June 2009" "wicd-client " "User Commands" +.TH WICD-CLIENT "1" "June 2009" .SH NAME wicd-client \- frontend voor de WICD daemon .SH BESCHRIJVING draadloos (en vast) verbindingen daemon front\-end. -Als wicd-curses(8) is geïnstalleerd en je probeert wicd-client uit te voeren +Als \fBwicd-curses\fR is geïnstalleerd en je probeert wicd-client uit te voeren zonder een actieve X server in de huidige terminal, wicd-client probeert -wicd-curses in plaats daarvan te starten. Hij zal je waarschuwen als dit de +\fBwicd-curses\fR in plaats daarvan te starten. Hij zal je waarschuwen als dit de eerste keer gebeurt. -.SS "Argumenten:" +.SH OPTIES .TP -\fB\-n\fR \fB\-\-no\-tray\fR +.B \-n, \-\-no\-tray Start Wicd zonder het tray icon. .TP -\fB\-h\fR \fB\-\-help\fR +.B \-h, \-\-help Print deze helptekst. .TP -\fB\-a\fR \fB\-\-no\-animate\fR +.B \-a, \-\-no\-animate Start de tray icon zonder netwerkgebruik animaties. +.SH ZIE OOK +.BR wicd-curses (8) +.BR wicd (8) diff -Nru wicd-1.7.0+ds1/man/wicd.8 wicd-1.7.1/man/wicd.8 --- wicd-1.7.0+ds1/man/wicd.8 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/man/wicd.8 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,194 @@ +.\" Written by Robby Workman +.TH WICD 8 "wicd-1.7.1~b3" +.SH NAME +.B Wicd +\- Wired and Wireless Network Connection Manager + +.SH THEORY OF OPERATION + +Wicd is designed to give the user as much control over behavior of network +connections as possible. Every network, both wired and wireless, has its +own profile with its own configuration options and connection behavior. +Wicd will try to automatically connect only to networks the user specifies +it should try, with a preference first to a wired network, then to wireless. + +For wired connections, users have many options for determining what network +settings to use. Wicd allows creation of an unlimited number of wired +profiles, each of which has its own unique settings. The user can choose to +automatically connect to a selected default profile, choose a profile from a +pop-up window every time wicd connects, or have wicd automatically choose the +last profile used to manually connect. + +For wireless connections, users can select any number of wireless networks +to automatically connect; wicd will choose the one with the highest signal +strength to try to connect. + +If the user chooses, wicd will try to automatically reconnect when it detects +that a connection is lost. If the last known connection state is wired, wicd +will first try to reconnect to the wired network, and if it is not available, +wicd will try any available wireless networks which have automatic connection +enabled. If the last known connection state is wireless, wicd will first try +to reconnect to the previously connected network (even if that network does +not have automatic connection enabled), and should that fail, it will try both +a wired connection and any available wireless networks which have automatic +connection enabled. + +Wicd uses built-in linux wireless-tools, such as ifconfig and iwconfig, to +get and configure network info. There is some flexibility in its use of DHCP, +providing support for dhclient, dhcpcd, and pump. Wicd uses wpa_supplicant +to handle all wireless encryption settings, and uses a template-based system +to create the configuration files used by wpa_supplicant. These templates +can be edited, and new templates can be created by the user and imported into +wicd, allowing connection to networks with uncommon encryption settings. + +.SH STRUCTURE + +Wicd has two major parts: the daemon, which runs with root privileges; and the +user interface, which runs with normal user privileges. The two parts run as +separate processes and make use of D-Bus to communicate. + +The daemon is responsible for making and configuring connections, reading and +writing configuration files and logs, and monitoring the connection status. +The daemon's job is split between two processes: wicd-daemon.py and monitor.py. +All the connection status monitoring, as well as the auto-reconnection logic, +takes place in monitor.py. Everthing else is done by wicd-daemon.py. + +The user interface (stored in wicd-gtk), which is made up of a tray +icon, a main GUI window, and its child dialogs, gets configuration and network +info from the daemon either by querying it using the methods in the daemon's +dbus interface or by receiving signals emitted from the daemon over D-Bus. +Any configuration changes made in the user interface are passed back to the +daemon, which actually applies the changes and writes them to configuration +files. + +Since the user interface just queries for connection and configuration info +from the daemon, it is possible to run wicd without the GUI at all. Also, +the daemon is started by wicd's init script during system startup (before any +user logs in), making it possible to use wicd with "headless" machines. + +.SH USAGE HINTS + +.B Choosing Alternate Tools +.br +Wicd supports several alternatives regarding the networking tools on linux. +In the "External Programs" tab of the Preferences menu, you can choose your +preferred DHCP client, link detection tool, and routing tool if the defaults +aren't suitable for your particular distribution or system. + +.B Custom Scripts +.br +If you need to run any custom commands before or after connecting to or +disconnecting from a network, Wicd supports this; however, you will need to +have a graphical sudo helper installed (currently supported are kdesu, gksu, +and ktsuss). Also see /etc/wicd/scripts/ in FILES. +.br +If you do not have a graphical sudo helper installed, you still have the +ability to use custom scripts, but you will have to set them up manually. +See wicd-wired-settings.conf(5) and/or wicd-wireless-settings.conf(5) for +more information on how to do so. + +.B Automatically Connecting to Networks +.br +Wicd uses the BSSID to recognize a particular network (and thus to decide +whether it should automatically connect to it). If you are on a network +that has many different access points which all have the same ESSID +(many universities have such networks), there is an option in the "Advanced +Settings" to "Use these settings for all networks sharing this essid." +With this option enabled, Wicd will autoconnect to that network, regardless +of which node it sees. + + +.SH FILES + +.B /etc/wicd/manager-settings.conf +.br +This file contains global settings for Wicd. +.br +See this file's own man page for more information about it. + +.B /etc/wicd/wired-settings.conf +.br +This file contains settings related to the wired interface. +.br +See this file's own man page for more information about it. + +.B /etc/wicd/wireless-settings.conf +.br +This file contains settings related to the wireless interface. +.br +See this file's own man page for more information about it. + +.B /etc/wicd/dhclient.conf.template +.br +This is used to replace /etc/dhclient.conf during Wicd activity, +if you're using dhclient(1) as DHCP client. See dhclient.conf(5) +for more information. + +.B /etc/wicd/encryption/templates/ +.br +This directory contains various templates for encrypted (WEP, WPA, etcetera) +connections. If none of them fit your needs, you may create your own and +add it to this directory. If you do this, please contact the authors +(see below) of Wicd. + +.B /etc/wicd/scripts/ +.br +Dropping a script in the relevant directory will cause it to be executed +when the specified event is preformed upon connection or disconnect from +or to any network. Please note that pre/post disconnect scripts may be +executed multiple times on already-disconnected interfaces. +.br +The scripts will be passed different parameters, depending if Wicd is +acting on a wired or a wireless network. In the former case, "wired +wired wired" will be passed (three times, just for compatibility with +the wireless case). If Wicd is acting on a wireless network, it will +pass "wireless ESSID BSSID" to the script. +.br +Available directories are: +.br +/etc/wicd/scripts/predisconnect +.br +/etc/wicd/scripts/postdisconnect +.br +/etc/wicd/scripts/preconnect +.br +/etc/wicd/scripts/postconnect + +.B /var/lib/wicd/configurations/ +.br +This directory contains individual configuration files for each encrypted +network you set up in Wicd. + +.B /var/log/wicd/ +.br +This directory contains logfiles of Wicd's activity. Please refer to the +log if you are having connection or other problems. + +.SH "SEE ALSO" +.BR wicd-manager-settings.conf (5), +.BR wicd-wired-settings.conf (5), +.BR wicd-wireless-settings.conf (5), +.BR dhclient.conf (5), +.BR wicd-curses (8), +.BR ifconfig (8), +.BR iwconfig (8), +.BR wpa_supplicant (8), +.BR route (8), +.BR ip (8), +.BR mii-tool (8), +.BR ethtool (8), +.BR dhclient (8), +.BR dhcpcd (8), +.BR pump (8). + + +.SH WICD AUTHORS +Adam Blackburn +.br +Dan O'Reilly +.br +Andrew Psaltis (curses client) + +.SH MANPAGE AUTHOR +Robby Workman + diff -Nru wicd-1.7.0+ds1/man/wicd-client.1 wicd-1.7.1/man/wicd-client.1 --- wicd-1.7.0+ds1/man/wicd-client.1 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/man/wicd-client.1 2011-11-03 09:02:50.000000000 +0000 @@ -1,19 +1,25 @@ -.TH WICD-CLIENT "1" "June 2009" "wicd-client " "User Commands" +.TH WICD-CLIENT "1" "November 2011" .SH NAME wicd-client \- frontend to the WICD daemon .SH DESCRIPTION wireless (and wired) connection daemon front\-end. -If wicd-curses(8) is installed, and you attempt to run wicd-client without -an active X server on the current terminal, wicd-client will attempt to run -wicd-curses(8) instead. It will warn you the first time this happens. -.SS "Arguments:" +If \fBwicd-curses\fR is installed, and you attempt to run wicd-client without +an active X server on the current terminal, wicd-client will attempt to run +\fBwicd-curses\fR instead. It will warn you the first time this happens. +.SH OPTIONS .TP -\fB\-n\fR \fB\-\-no\-tray\fR +.B \-t, \-\-tray +Run the wicd tray icon only. +.TP +.B \-n, \-\-no\-tray Run wicd without the tray icon. .TP -\fB\-h\fR \fB\-\-help\fR +.B \-h, \-\-help Print this help information. .TP -\fB\-a\fR \fB\-\-no\-animate\fR +.B \-a, \-\-no\-animate Run the tray without network traffic tray animations. +.SH SEE ALSO +.BR wicd-curses (8) +.BR wicd (8) diff -Nru wicd-1.7.0+ds1/man/wicd-curses.8 wicd-1.7.1/man/wicd-curses.8 --- wicd-1.7.0+ds1/man/wicd-curses.8 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/man/wicd-curses.8 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,80 @@ +.\" First revision was r203 +.TH WICD-CURSES "8" "December 2009" "wicd-curses-uimod" +.SH NAME +.B wicd-curses +\- curses-based wicd(8) controller +.SH DESCRIPTION +wicd-curses is a curses-based network controller that uses the Wired/Wireless Internet Connection Daemon (wicd) to control your network connections. It is suitable to run in terminal multiplexers like screen(1). + +It is designed to imitate the GTK-based wicd-client(1) as much as possible, and uses the Urwid (http://excess.org/urwid) console widget library to vastly simplify development. + +This man page only documents the current status of wicd-curses. This may/may not be the most up-to-date document. +.SH CONTROLS +All of these are case sensitive. +.TP +.BR "C " or " enter" +Connect to selected network +.TP +.BR "F8 " or " Q " or " q" +Quit the client. +.TP +.BR D +Disconnect all devices from network connections +.TP +.BR ESC +If connecting to a network, stop doing so +.TP +.BR "F5 " or " R" +Refresh the network list +.TP +.BR P +Bring up the preferences controller +.TP +.BR I +Bring up hidden network scanning dialog +.TP +.BR "H " or " h " or " ?" +Bring up a rather simplistic help dialog. Of course, it mentions this man page first. :-) +.TP +.BR A +Raise the "About wicd-curses" dialog +.\".PP +.\"The following is a work in progress and might not be fully functional as of yet. +.TP +.BR "right-arrow" +Bring up network configuration controller for the selected network +.TP +.BR delete +Delete the selected wired network profile (from the wired network combo box at the top) +.TP +.BR F2 +Rename the selected wired network profile (from the wired network combo box at the top) +.TP +.BR S +.\"Bring up the script selector for the selected network (requires superuser privileges) +Bring up instructions on how to edit the scripts. I have implemented a way to do this in the interface itself, but making it function with all Linux distros would be difficult. Since you are reading this, you should know how to do what I suggest. ;-) +.TP +.BR O +Raise the Ad-Hoc network creation dialog + +.SH "FILES" +.TP +.I ~/.wicd/WHEREAREMYFILES +Reminder that your network configuration files are not here ;-) +.PP +.SH "SEE ALSO" +.BR wicd-client (1), +.BR wicd (8) + +.SH BUGS +Probably lots. ;-) + +If you happen to find one, ask about it on #wicd on freenode, or submit a bug report to http://launchpad.net/wicd. + +.SH WICD-CURSES AUTHOR +Andrew Psaltis + +.SH WICD AUTHORS +Adam Blackburn +.br +Dan O'Reilly diff -Nru wicd-1.7.0+ds1/man/wicd-manager-settings.conf.5 wicd-1.7.1/man/wicd-manager-settings.conf.5 --- wicd-1.7.0+ds1/man/wicd-manager-settings.conf.5 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/man/wicd-manager-settings.conf.5 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,101 @@ +.\" Written by Robby Workman +.TH WICD-MANAGER-SETTINGS.CONF 5 "wicd-1.7.1~b3" +.SH NAME +wicd-manager-settings.conf \- contains settings that control Wicd's behavior + +.SH DESCRIPTION + +This file contains general configuration information for Wicd. +.br +This file is located at /etc/wicd/manager-settings.conf + +.SH SETTINGS + +.TP +.BI "link_detect_tool = " <0|1|2> +0 = autodetect +.br +1 = ethtool +.br +2 = mii-tool +.TP +.BI "flush_tool = " <0|1|2> +0 = autodetect +.br +1 = ip +.br +2 = route +.TP +.BI "backend = " +Default is ioctl backend. +.TP +.BI "signal_display_type = " <0|1> +0 = Show signal strength as a percentage +.br +1 = Show signal strength in dBm +.TP +.BI "dhcp_client = " <0|1|2|3> +0 = autodetect +.br +1 = dhclient +.br +2 = dhcpcd +.br +3 = pump +.TP +.BI "sudo_app = " <0|1|2|3> +0 = autodetect +.br +1 = gksu +.br +2 = kdesu +.br +3 = ktsuss +.TP +.BI "wired_interface = " +.TP +.BI "always_show_wired_interface = " +.TP +.BI "wired_connect_mode = " <0|1> +0 = connect to wired interface automatically +.br +1 = do not connect to wired interface automatically +.TP +.BI "prefer_wired = " +True = Switch to wired interface if a link is detected, even if already connected to wireless +.br +False = Do not switch to wired interface automatically +.TP +.BI "wireless_interface = " +.TP +.BI "wpa_driver = " +The default (and best supported) is wext. It should work properly in most cases. +.TP +.BI "auto_reconnect = " +This settings determines whether Wicd will attempt to reconnect on connection loss. +.TP +.BI "use_global_dns = " +If set to "True" and values are specified in the global DNS settings below, +this will cause Wicd to use these DNS settings. +.TP +.BI "global_dns_dom = " +This specifies the default search domain to be used by the resolver. +.TP +.BI "global_dns_1 = " +.TP +.BI "global_dns_2 = " +.TP +.BI "global_dns_3 = " +.TP +.BI "debug_mode = " +0 = disabled +.br +1 = enabled + + +.SH "SEE ALSO" +.BR wicd (8), +.BR wicd-curses (8), +.BR wicd-wired-settings.conf (5), +.BR wicd-wireless-settings.conf (5). + diff -Nru wicd-1.7.0+ds1/man/wicd-wired-settings.conf.5 wicd-1.7.1/man/wicd-wired-settings.conf.5 --- wicd-1.7.0+ds1/man/wicd-wired-settings.conf.5 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/man/wicd-wired-settings.conf.5 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,80 @@ +.\" Written by Robby Workman +.TH WICD-WIRED-SETTINGS.CONF 5 "wicd-1.7.1~b3" +.SH NAME +wicd-wired-settings.conf \- controls Wicd's wired network settings + +.SH DESCRIPTION + +This file contains configuration information for wired interfaces in Wicd. +.br +This file is located at /etc/wicd/wired-settings.conf + + +.SH SETTINGS + +.TP +.BI "default = " <0|1> +This option decides whether to use this profile as the default. +0 = do not use this profile as default. +.br +1 = use this profile as default. +.TP +.BI "beforescript = " +This defines a script to run before Wicd brings up the connection. +The script should be a Bourne-compatible script and should be executable. +.br +IMPORTANT - scripts should ONLY be writable by root and located in a +directory that is only writable by root. +.TP +.BI "afterscript = " +This defines a script to run after Wicd brings up the connection. +The script should be a Bourne-compatible script and should be executable. +.br +IMPORTANT - scripts should ONLY be writable by root and located in a +directory that is only writable by root. +.TP +.BI "predisconnectscript = " +This defines a script to run before Wicd disconnects the interface. +The script should be a Bourne-compatible script and should be executable. +.TP +.BI "postdisconnectscript = " +This defines a script to run after Wicd disconnects the interface. +The script should be a Bourne-compatible script and should be executable. +.br +IMPORTANT - scripts should ONLY be writable by root and located in a +directory that is only writable by root. +.TP +.BI "ip = " +Use this option if you have a static ip address for your system. +.TP +.BI "netmask = " +This setting is only appropriate if a static ip address is configured above. +.TP +.BI "broadcast = " +This setting is only appropriate if a static ip address is configured above. +.TP +.BI "gateway = " +This setting is only appropriate if a static ip address is configured above. +.TP +.BI "use_static_dns = " +True = use static DNS servers instead of accepting what the dhcp server supplies. +.TP +.BI "use_global_dns = " +True = use the global DNS servers provided in wicd-manager-settings.conf(5). +This option is only appropriate if "use_static_dns = True" +.TP +.BI "dns1 = " +Static DNS address if "use_static_dns = True" and "use_global_dns = False" +.TP +.BI "dns2 = " +Static DNS address if "use_static_dns = True" and "use_global_dns = False" +.TP +.BI "dns3 = " +Static DNS address if "use_static_dns = True" and "use_global_dns = False" + +.SH "SEE ALSO" +.BR wicd (8), +.BR wicd-curses (8), +.BR wicd-manager-settings.conf (5), +.BR wicd-wireless-settings.conf (5). + diff -Nru wicd-1.7.0+ds1/man/wicd-wireless-settings.conf.5 wicd-1.7.1/man/wicd-wireless-settings.conf.5 --- wicd-1.7.0+ds1/man/wicd-wireless-settings.conf.5 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/man/wicd-wireless-settings.conf.5 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,127 @@ +.\" Written by Robby Workman +.TH WICD-WIRELESS-SETTINGS.CONF 5 "wicd-1.7.1~b3" +.SH NAME +wicd-wired-settings.conf \- controls Wicd's wireless network settings + +.SH DESCRIPTION + +This file contains configuration information for wireless interfaces in Wicd. +.br +This file is located at /etc/wicd/wireless-settings.conf + + +.SH SETTINGS + +.TP +.BI "bssid = " +This value can be found using iwconfig(8). +.TP +.BI "essid = " +This value can be found using iwconfig(8). +.TP +.BI "hidden = " +This option notes whether the network's ESSID is broadcast or not. +.TP +.BI "channel = " +Valid channels are dependent upon country. +.br +This value can be found using iwconfig(8). +.TP +.BI "mode = " +.br +This value can be found using iwconfig(8). +.TP +.BI "enctype = " +This can take the value of any encryption template shown in /etc/wicd/encryption/templates/. +.TP +.BI "encryption_method = "WEP|WPA|WPA2> +This value can be found using iwconfig(8). +.TP +.BI "key = " +Be sure this file is readable only by root. +.TP +.BI "automatic = " +This option determines whether Wicd should automatically connect to this +network. +.TP +.BI "ip = " +Use this option if you have a static ip address for your system. +.TP +.BI "netmask = " +This setting is only appropriate if a static ip address is configured above. +.TP +.BI "broadcast = " +This setting is only appropriate if a static ip address is configured above. +.TP +.BI "gateway = " +This setting is only appropriate if a static ip address is configured above. +.TP +.BI "use_static_dns = " +True = use static DNS servers instead of accepting what the dhcp server supplies. +.TP +.BI "use_global_dns = " +True = use the global DNS servers provided in wicd-manager-settings.conf(5). +.br +This option is only appropriate if "use_static_dns = True" +.TP +.BI "dns1 = " +Static DNS address if "use_static_dns = True" and "use_global_dns = False" +.TP +.BI "dns2 = " +Static DNS address if "use_static_dns = True" and "use_global_dns = False" +.TP +.BI "dns3 = " +Static DNS address if "use_static_dns = True" and "use_global_dns = False" +.TP +.BI "use_settings_globally = " <0|1> +Wicd keeps track of whether to autoconnect to networks based on bssid. +This ensures that you don't accidentally connect to another network that is +not yours but happens to have the same essid - for example, there are a lot +of commercial routers in use with "linksys" as the essid. +.br +0 = Do not use settings globally +.br +1 = Use settings globally +.TP +.BI "beforescript = " +This defines a script to run before Wicd brings up the connection. +.br +IMPORTANT - scripts should ONLY be writable by root and should be located +in a directory that is writable by only root. +.TP +.BI "afterscript = " +This defines a script to run after Wicd brings up the connection. +.br +IMPORTANT - scripts should ONLY be writable by root and located +in a directory that is writable by only root. +.TP +.BI "predisconnectscript = " +This defines a script to run before Wicd disconnects the interface. +.TP +.BI "postdisconnectscript = " +This defines a script to run after Wicd disconnects the interface. +.br +IMPORTANT - scripts should ONLY be writable by root and located +in a directory that is writable by only root. + + + +.SH OTHER +The "use_settings_globally" option determines how an individual network's +configuration stanza starts. If the option is "0" (do not use settings +globally), then the stanza's top line will be the bssid of the access +point (in this format): +.br +[00:15:3E:87:D3:68] +.br +If the "option is set to "1" (use settings globally), then the first line +of the stanza will be in this format: +.br +[essid:UA Public Wireless Network] + +.SH "SEE ALSO" +.BR wicd (8), +.BR wicd-curses (8), +.BR wicd-manager-settings.conf (5), +.BR wicd-wired-settings.conf (5). + diff -Nru wicd-1.7.0+ds1/MANIFEST.in wicd-1.7.1/MANIFEST.in --- wicd-1.7.0+ds1/MANIFEST.in 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/MANIFEST.in 2011-12-16 22:00:10.000000000 +0000 @@ -0,0 +1,26 @@ +include AUTHORS +include CHANGES +include INSTALL +include LICENSE +include MANIFEST.in +include NEWS +include README +include uninstall.sh +include vcsinfo.py + +graft cli +graft curses +graft data +graft encryption +graft in +graft other +graft po +graft tests +graft wicd + +recursive-include man wicd-client.1 +recursive-include . *.py +recursive-include . *.png + +prune build .bzr* .git* +prunt build *.log *.pyc diff -Nru wicd-1.7.0+ds1/NEWS wicd-1.7.1/NEWS --- wicd-1.7.0+ds1/NEWS 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/NEWS 2012-02-02 19:11:02.000000000 +0000 @@ -1,4 +1,55 @@ -Wicd 1.6.0 Branch +Wicd 1.7 Series +--------------- + +1.7.1: + Changes for Packagers: + - You will now want to use the --python option to setup.py configure to + make sure the right Python (python2.x) is used. With the Python 3 + transition in progress, the lack of uniformity across distros made it + difficult to find a solution that works everywhere. As a result, the + python executable path can be set (for subprocesses launched by Wicd) + with the --python option to setup.py configure, and patching of the + shebang lines may be required if `which python` is not python2.x. + - If you handle translations in your packaging process, setup.py now + needs 'pybabel' and 'xgettext' binaries. Please provide them during + the build process. + - setup.py now accepts three more parameters: --dbus-service=, --systemd= + and --logrotate=. Please set them accordingly to the paths of your + distribution. + + Major Changes: + - (New) upstream author: David Paleino :) + - The translations are now handled by Rosetta, in Launchpad. + - Implemented support for wired connections needing authentication with + wpa_supplicant (thanks Joe MacMahon!) + - Support 'Never show networks' (thanks Robin Becker!) + - Mask out sensitive information in the logfile (CVE-2012-0813) + + Minor Changes: + - Now uses gtkbuilder instead of libglade + - Fixed bug in script macro expansion + - Fixed typo in EAP-fast template + - Applied 1 patch from Archlinux (thanks Rémy Oudompheng) + - Fixed Python 2.7 support + - Works if Python3 is the default Python + - Applied 14 patches from Debian (big thank you to everyone + who contributed): + - Includes translations in source tarball + - Improved documentation + - Fixed resolv.conf permissions + - Ignore configparser errors + - Several others, please see CHANGES for more details + - Proper localization of all the code has been put in place -- every part + of the UIs and the daemon should be translated/translatable now! + - Fixed various bugs with 'unicode in ESSID' handling + - Implemented rfkill-support + - Generalized libc linking using ctypes' find_library() + - Fixed wireless connecting status message, now shows the correct ESSID + - Support wifi-channels with more than 2 digits + - Implemented in-GUI password hiding + - Implemented -t/--tray to only run the wicd-gtk tray icon + - Support alternative ifconfig output style + 1.7.0: Changes for Packagers: - Wicd now supports a -k option, which should be run by the init script diff -Nru wicd-1.7.0+ds1/other/50-wicd-suspend.sh wicd-1.7.1/other/50-wicd-suspend.sh --- wicd-1.7.0+ds1/other/50-wicd-suspend.sh 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/other/50-wicd-suspend.sh 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,3 @@ +#!/bin/sh +# Put wifi interface down +/usr/share/wicd/daemon/suspend.py diff -Nru wicd-1.7.0+ds1/other/55wicd wicd-1.7.1/other/55wicd --- wicd-1.7.0+ds1/other/55wicd 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/other/55wicd 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,69 @@ +#!/bin/sh + +# pm-utils hook to handle suspend/resume properly for wicd + +if [ -r "${PM_FUNCTIONS}" ]; then + . "${PM_FUNCTIONS}" +elif [ -r "${FUNCTIONS}" ]; then + . "${FUNCTIONS}" +else + # pm-utils version is too old, or something else is wrong + exit $NA +fi + +RETVAL=0 # Set this to 0 initially + +wicd_suspend() +{ + # Put wifi interface down + /usr/share/wicd/daemon/suspend.py 1>/dev/null 2>/dev/null + RETVAL=$? +} + +wicd_resume() +{ + # Bring wifi interface back up + /usr/share/wicd/daemon/autoconnect.py 1>/dev/null 2>/dev/null + RETVAL=$? +} + +case "$1" in + hibernate|suspend) + wicd_suspend + ;; + thaw|resume) + wicd_resume + ;; + *) exit $NA + ;; +esac + +# We can't return a nonzero exit code (aside from $NA, $DX, and $NX) to +# to pm-utils or the entire sleep operation will be inhibited, so... +# No matter what we do, the log prefix and message will conflict a bit. +case "$RETVAL" in + 0) + exit $RETVAL + ;; + 1) + # Probably the daemon isn't running if this happens + echo "Unable to connect to wicd daemon - is it running?" + exit $DX + ;; + 2) + # This will occur if the daemon encounters an error + echo "Wicd daemon was unable to suspend the network." + exit $DX + ;; + 3) + # Will only be returned by autoconnect.py + # This should never happen, but just in case... + echo "Wicd daemon failed to autoconnect on resume." + exit $DX + ;; + *) + echo "Unknown exit code." + exit $NA + ;; +esac + diff -Nru wicd-1.7.0+ds1/other/80-wicd-connect.sh wicd-1.7.1/other/80-wicd-connect.sh --- wicd-1.7.0+ds1/other/80-wicd-connect.sh 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/other/80-wicd-connect.sh 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,4 @@ +#!/bin/sh +# Bring wifi network interface back up. + +/usr/share/wicd/daemon/autoconnect.py diff -Nru wicd-1.7.0+ds1/other/org.wicd.daemon.service wicd-1.7.1/other/org.wicd.daemon.service --- wicd-1.7.0+ds1/other/org.wicd.daemon.service 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/other/org.wicd.daemon.service 2011-10-04 14:35:47.000000000 +0000 @@ -0,0 +1,11 @@ +# This D-Bus service activation file is only for systemd support since +# an auto-activated wicd would be quite surprising for those people +# who have wicd installed but turned off. Thus the Exec path available to +# D-Bus is /bin/false, but systemd knows the real Exec path due to the +# wicd systemd .service file. + +[D-BUS Service] +Name=org.wicd.daemon +Exec=/bin/false +User=root +SystemdService=dbus-org.wicd.daemon.service diff -Nru wicd-1.7.0+ds1/other/WHEREAREMYFILES wicd-1.7.1/other/WHEREAREMYFILES --- wicd-1.7.0+ds1/other/WHEREAREMYFILES 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/other/WHEREAREMYFILES 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,21 @@ +WHERE ARE MY FILES?! + +If you are reading this in /var/lib/wicd/, then you may ignore (but please don't +delete) this file. The only reason it is here is that it is definitely +constant between package updates. + +If you are reading this from your home directory, you are probably wondering +why your Wicd configuration files are not in ~/.wicd. What follows is a +summary of the folders that Wicd uses. + +For a more detailed (and complete) description what is in each directory, +consult the man pages for wicd(8) and wicd-curses(8). + +~/.wicd + User-dependent configuration files + +/etc/wicd/ + Global configuration files + +/var/lib/wicd/configurations/ + Individual network configurations diff -Nru wicd-1.7.0+ds1/other/wicd.conf wicd-1.7.1/other/wicd.conf --- wicd-1.7.0+ds1/other/wicd.conf 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/other/wicd.conf 2012-01-28 16:09:49.000000000 +0000 @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru wicd-1.7.0+ds1/other/wicd.service wicd-1.7.1/other/wicd.service --- wicd-1.7.0+ds1/other/wicd.service 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/other/wicd.service 2011-12-09 17:30:33.000000000 +0000 @@ -0,0 +1,14 @@ +[Unit] +Description=Wicd a wireless and wired network manager for Linux +After=syslog.target +Wants=network.target +Before=network.target + +[Service] +Type=dbus +BusName=org.wicd.daemon +ExecStart=/usr/sbin/wicd --no-daemon + +[Install] +WantedBy=multi-user.target +Alias=dbus-org.wicd.daemon.service diff -Nru wicd-1.7.0+ds1/other/wicd-tray.desktop wicd-1.7.1/other/wicd-tray.desktop --- wicd-1.7.0+ds1/other/wicd-tray.desktop 2010-01-15 04:49:11.000000000 +0000 +++ wicd-1.7.1/other/wicd-tray.desktop 2011-11-03 08:43:47.000000000 +0000 @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Application;Network; -Exec=wicd-gtk +Exec=wicd-gtk --tray GenericName=Network Manager Icon=wicd-gtk Icon[en_US]=wicd-gtk diff -Nru wicd-1.7.0+ds1/PKG-INFO wicd-1.7.1/PKG-INFO --- wicd-1.7.0+ds1/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/PKG-INFO 2012-02-02 19:15:23.000000000 +0000 @@ -0,0 +1,17 @@ +Metadata-Version: 1.0 +Name: wicd +Version: 1.7.1 +Summary: A wireless and wired network manager +Home-page: https://launchpad.net/wicd +Author: Adam Blackburn, Dan O'Reilly, Andrew Psaltis, David Paleino +Author-email: compwiz18@gmail.com, oreilldf@gmail.com, ampsaltis@gmail.com, d.paleino@gmail.com +License: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +Description: A complete network connection manager + Wicd supports wired and wireless networks, and capable of + creating and tracking profiles for both. It has a + template-based wireless encryption system, which allows the user + to easily add encryption methods used. It ships with some common + encryption types, such as WPA and WEP. Wicd will automatically + connect at startup to any preferred network within range. + +Platform: UNKNOWN diff -Nru wicd-1.7.0+ds1/po/ar_EG.po wicd-1.7.1/po/ar_EG.po --- wicd-1.7.0+ds1/po/ar_EG.po 2010-03-03 21:26:09.000000000 +0000 +++ wicd-1.7.1/po/ar_EG.po 2012-01-15 19:10:22.000000000 +0000 @@ -2,477 +2,1033 @@ # Translator ID 19 # /translator/edit/19/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" - -msgid "Connect" -msgstr "اتصل" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-15 20:03+0100\n" +"Last-Translator: David Paleino \n" +"Language-Team: ar_EG \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-10 05:03+0000\n" +"X-Generator: Launchpad (build 14450)\n" +"Generated-By: Babel 0.9.6\n" -msgid "IP" -msgstr "IP" +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" -msgid "Netmask" -msgstr "قناع الشبكة" +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" -msgid "Gateway" -msgstr "البوابة" +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "" -msgid "DNS" -msgstr "DNS" +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "حول Wicd" -msgid "Use Static IPs" -msgstr "استخدم IP ثابت" +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "مكن مشاركة اتصال إنترنت" -msgid "Use Static DNS" -msgstr "استخدم DNS ثابت" +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "أضف ضبطا جديدا" -msgid "Use Encryption" -msgstr "استخدم التعمية" +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "أضف ضبط شبكة سلكية جديد" +#: curses/prefs_curses.py:52 data/wicd.ui:1669 msgid "Advanced Settings" msgstr "إعدادات متقدمة" -msgid "Wired Network" -msgstr "شبكة سلكية" +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "أظهر الواجهة السلكية دائما" + +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "انتقل دائماً للشبكة السلكية عندما تكون متاحة" +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "الاستيثاق" + +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "آليا (منصوح به)" + +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "إعادة الاتصال آلياً" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 msgid "Automatically connect to this network" msgstr "اتصل آليا بهذه الشبكة" -msgid "Secured" -msgstr "مؤمّنة" +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "أعد الاتصال آليا عند قطعه" -msgid "Unsecured" -msgstr "غير مؤمّنة" +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "الطرف الخلفي" +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "كتبه" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "عاجز عن الاتصال بالناظر، ستتم محاولة تشغيله..." + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "الغِ" + +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 msgid "Channel" msgstr "القناة" -msgid "Preferences" -msgstr "تفضيلات" +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "اختر من الشبكات الآتية:" -msgid "WPA Supplicant Driver" -msgstr "تعريف داعم WPA" +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "" -msgid "Wireless Interface" -msgstr "الواجهة اللاسلكية" +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "اضبط الشبكة المنتقاة" -msgid "Wired Interface" -msgstr "الواجهة السلكية" +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "يضبط تفضيلات ضبط الشبكة السلكية \"$A\"" -msgid "Always show wired interface" -msgstr "أظهر الواجهة السلكية دائما" +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "يضبط تفضيلات الشبكة اللاسلكية \"$A\" ($B)" -msgid "Automatically reconnect on connection loss" -msgstr "أعد الاتصال آليا عند قطعه" +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "يضبط الواجهة اللاسلكية..." -msgid "Hidden Network" -msgstr "شبكة مخفية" +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "اتصل" -msgid "Hidden Network ESSID" -msgstr "اسم الشبكة الخفية" +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "اتصل بالشبكة المنتقاة" +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 msgid "Connected to $A at $B (IP: $C)" msgstr "متصل بـ$A بجودة $B (IP: $C)" +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 msgid "Connected to wired network (IP: $A)" msgstr "متصل بشبكة سلكية (IP: $A)" -msgid "Not connected" -msgstr "غير متصل" +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "يتصل" -msgid "No wireless networks found." -msgstr "لا توجد شبكات لاسلكية." +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "أُلغي الاتصال" -msgid "Key" -msgstr "المفتاح" +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "أُلغي الاتصال" -msgid "Username" -msgstr "اسم المستخدم" +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "فشل الاتصال: كلمة السر غير صحيحة" -msgid "Password" -msgstr "كلمة السر" +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "فشل الاتصال: لم يتم تلقي أي عروض DHCP." -msgid "Anonymous Identity" -msgstr "هوية مجهولة" +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "فشل الاتصل: عاجز عن جلب عنوان IP" -msgid "Identity" -msgstr "الهوية" +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "تم الاتصال" -msgid "Authentication" -msgstr "الاستيثاق" +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "فشل الاتصال : لم يستطع من الاتصال بنقطة الوصول" -msgid "Path to PAC File" -msgstr "مسار ملف PAC" +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "أُلغي الاتصال" -msgid "Choose from the networks below:" -msgstr "اختر من الشبكات الآتية:" +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"عاجز عن الاتصال بواجهة DBus الخاصة بـwicd. راجع سجل wicd لتقرأ رسائل الخطأ." -msgid "Putting interface down..." -msgstr "يغلق الواجهة..." +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"عاجز عن إيجاد برنامج sudo الرسومي. لا يمكن تشغيل محرر المخطوطات. سيكون عليك " +"تحرير المخطوطات مباشرة في ملف الضبط." -msgid "Resetting IP address..." -msgstr "يُصَفِّر عنوان IP..." +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "أنشئ شبكة مخصصة" -msgid "Putting interface up..." -msgstr "يشغّل الواجهة..." +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" +"فشل DBus! حدث هذا غالبا لأن ناظر wicd قد توقف أثناء عمل wicd-curses. رجاءً " +"أعد تشغيل الناظر ثم أعد تشغيل wicd-curses." + +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "عميل DHCP" -msgid "Removing old connection..." -msgstr "يزيل الاتصال القديم..." +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "نطاق DNS" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "خادوم DNS" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "كشف العلل" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "قطع الاتصال" + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "افصل الاتصال بجميع الشبكات" + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "قطع الاتصال" + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "فصل الاتصالات الفعالى..." + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "اعرض نافذة المساعدة هذه" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "اظهار إشعار حول حالة الاتصال" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "اعرض نافذة المساعدة هذه" + +#: wicd/translations.py:78 +msgid "Domain" +msgstr "نطاق DNS" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "تم الاتصال..." + +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "اسم الشبكة" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "مكن وضع كشف العلل" + +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "جاري الاتصال" + +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "برامج خارجية" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "يشذب جدول التسيير..." + +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "لتحصل على مساعدة مفصلة، راجع صفحة المساعدة wicd-curses(8)" + +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "البوابة" + +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "إعدادات عامة" +#: wicd/misc.py:85 msgid "Generating PSK..." msgstr "يولّد PSK..." +#: wicd/misc.py:86 msgid "Generating WPA configuration file..." msgstr "يولّد ملف ضبط WPA..." -msgid "Flushing the routing table..." -msgstr "يشذب جدول التسيير..." +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "لم يتم تمكين DNS العام في التفضيلات" -msgid "Configuring wireless interface..." -msgstr "يضبط الواجهة اللاسلكية..." +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "خوادم DNS العامة" -msgid "Setting broadcast address..." -msgstr "يُعِدّ عنوان البث..." +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "" -msgid "Setting static DNS servers..." -msgstr "يُعِدّ خواديم DNS الثابتة..." +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "" -msgid "Setting static IP addresses..." -msgstr "يُعِدّ عناوين IP الثابتة..." +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "اسم الشبكة الخفية" + +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" + +#: wicd/translations.py:79 +msgid "Identity" +msgstr "الهوية" + +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "" + +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "عنوان IP غير صحيح." + +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "العنوان في المدخلة $A غير صالح" + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +msgid "Key" +msgstr "المفتاح" + +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "قناع الشبكة" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "الواجهات الشبكية" + +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "" + +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "لا توجد شبكات لاسلكية." + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "غير متصل" + +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "موافق" +#: wicd/misc.py:91 msgid "Obtaining IP address..." msgstr "يحصل على عنوان IP..." -msgid "Done connecting..." -msgstr "تم الاتصال..." +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" +"عند وصولك لهذه النقطة، يمكنك تعديل (أو إضافة) المخطوطات التي تريد تشغيل قبل " +"الاتصال، أو أثناء الاتصال، أوعند فصل الاتصال حسب حاجتك. لاحظ أنك عليك كتابة " +"المسار الكامل للمخطوطات، وليس محتويات تلك المخطوطات ذاتها. سيكون عليك اضافة " +"أو تعديل تلك المحتويات في عملية منفصلة. راجع دليل مساعدة wicd للمزيد من " +"المعلومات." -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "لتتصل بشبكة، عليك أولا أن تنشئ ضبطا لها. لتنشئ ضبطا لشبكة، اكتب اسما يصفها، ثم اضغط على الزر أضف." +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "" -msgid "Wicd needs to access your computer's network cards." -msgstr "يحتاج Wicd إلى الوصول لبطاقات الشبكة." +#: wicd/translations.py:82 +msgid "Password" +msgstr "كلمة السر" -msgid "Run script before connect" -msgstr "شغل مخطوطة قبل الاتصال" +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "" -msgid "Run script after connect" -msgstr "شغل مخطوطة بعد الاتصال" +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "مسار ملف PAC" -msgid "Scripts" -msgstr "مخطوطات" +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "" -msgid "Enable debug mode" -msgstr "مكن وضع كشف العلل" +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "" -msgid "Use global DNS servers" -msgstr "استخدم خواديم DNS العامة" +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "" -msgid "Use default profile on wired autoconnect" -msgstr "استخدم الضبط المبدئي عند الاتصال آليا بشبكة سلكية" +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "" +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "انتق مخطوطات" + +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "تم اكتشاف اتصال سلكي" + +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "تفضيلات" + +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "نافذة التفضيلات" + +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "" + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 msgid "Prompt for profile on wired autoconnect" msgstr "اسألني عن ضبط عند الاتصال آليا بشبكة سلكية" -msgid "Use last used profile on wired autoconnect" -msgstr "استخدم آخر ضبط تم استخدامه عند الاتصال الآلي بشبكة سلكية" +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "خصائص" -msgid "Activate Internet Connection Sharing" -msgstr "مكن مشاركة اتصال إنترنت" +#: wicd/misc.py:87 +msgid "Putting interface down..." +msgstr "يغلق الواجهة..." -msgid "Use Encryption (WEP only)" -msgstr "استخدم التعمية (WEP فقط)" +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "يشغّل الواجهة..." -msgid "Use dBm to measure signal strength" -msgstr "استخدم dBm لقياس قوة الإشارة" +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "" -msgid "Wired connection detected" -msgstr "تم اكتشاف اتصال سلكي" +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "" -msgid "Stop Showing Autoconnect pop-up temporarily" -msgstr "توقف عن إظهار انبثاقات الاتصال آليا مؤقتا" +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "" -msgid "General Settings" -msgstr "إعدادات عامة" +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "" -msgid "External Programs" -msgstr "برامج خارجية" +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "حدّث قائمة الشبكات" -msgid "DHCP Client" -msgstr "عميل DHCP" +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "أعد تسمية ضبط الشبكة السلكية" -msgid "Wired Link Detection" -msgstr "اكتشاف الوصلة السلكية" +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "معلومات التعمية المتطلبة غير متوفرة." +#: wicd/misc.py:90 +msgid "Resetting IP address..." +msgstr "يُصَفِّر عنوان IP..." + +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "" + +#: curses/prefs_curses.py:103 msgid "Route Table Flushing" msgstr "تشذيب جدول التسيير" -msgid "Automatic (recommended)" -msgstr "آليا (منصوح به)" +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "ابحث" -msgid "This network requires encryption to be enabled." -msgstr "تتطلب هذه الشبكة تمكين التعمية." +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "ابحث عن شبكات مخفية" -msgid "Required encryption information is missing." -msgstr "معلومات التعمية المتطلبة غير متوفرة." +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "يبحث" -msgid "Use these settings for all networks sharing this essid" -msgstr "استخدم هذه الإعدادات لكل الشبكات التي تحمل هذا الاسم" +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "يجري البحث عن شبكات...انتظر..." + +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "مخطوطات" + +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "نطاق البحث" + +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "مؤمّنة" + +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "انتق اسم الشبكة المخفية" + +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "انتق أو أنشئ ضبط شبكة سلكية للاتصال بها" + +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "انتق مخطوطات" + +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "أنشئ شبكة مخصصة" + +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "يُعِدّ عنوان البث..." + +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "يُعِدّ خواديم DNS الثابتة..." + +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "يُعِدّ عناوين IP الثابتة..." + +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "افصل الاتصال بجميع الشبكات" + +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "توقف عن إظهار انبثاقات الاتصال آليا مؤقتا" + +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "أوقف اتصالا شبكيا جاريا" + +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "" + +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "تم الإنهاء عن طريق المستخدم" -msgid "Select or create a wired profile to connect with" -msgstr "انتق أو أنشئ ضبط شبكة سلكية للاتصال بها" +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" +"تم إغلاق ناظر wicd. لن تعمل الواجهة بصورة سليمة إلى أن تتم إعادة تشغيله." -msgid "Connection Failed: Unable to Get IP Address" -msgstr "فشل الاتصل: عاجز عن جلب عنوان IP" +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "تتطلب هذه الشبكة تمكين التعمية." -msgid "Connection Cancelled" -msgstr "أُلغي الاتصال" +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" +"لتفادي أي مضاعفات، لا يدعم wicd-curses تحرير المخطوطات مباشرة. بيد أن ذلك لا " +"يمنعك من تحرير المخطوطات يدويا، وذلك على النحو الآتي: أولا، افتح ملف الضبط " +"\"$A\" كمستخدم الجزر، وابحث عن القسم المسمى بـ$B المعني. وهو في هذه الحالة" -msgid "Connection Failed: Bad password" -msgstr "فشل الاتصال: كلمة السر غير صحيحة" +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" +"للاتصال بشبكة سلكية، عليك أن تنشئ ضبط شبكة. لتنشئ ضبطا لشبكة، أدخل اسما " +"يصفها ثم اضغط على الزر أضف." -msgid "Wireless Kill Switch Enabled" -msgstr "مبدّل الاتصال اللاسلكي معطل" +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" +"لم يستطع مخاطبة مخدم Wicd بناء على رفض الوصول.\r\n" +"خطأ من DBus . الرجاء التأكد من ان المستخدم في مجموعة $A ." -msgid "Scanning networks... stand by..." -msgstr "يجري البحث عن شبكات...انتظر..." +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "غير مؤمّنة" -msgid "Configuring preferences for wireless network \"$A\" ($B)" -msgstr "يضبط تفضيلات الشبكة اللاسلكية \"$A\" ($B)" +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "" -msgid "Scan" -msgstr "ابحث" +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "استخدم التعمية" -msgid "Always switch to wired connection when available" -msgstr "انتقل دائماً للشبكة السلكية عندما تكون متاحة" +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "استخدم التعمية (WEP فقط)" -msgid "Wired Autoconnect Settings" -msgstr "إعدادات الاتصال آليا بالشبكة السلكية" +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "استخدم DNS ثابت" -msgid "You should almost always use wext as the WPA supplicant driver" -msgstr "عليك أن تستخدم wext دائما كتعريف داعم WPA" +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "استخدم IP ثابت" -msgid "Debugging" -msgstr "كشف العلل" +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "استخدم الضبط المبدئي (ذو أسبقية على أي مبدئيات سابقة)" -msgid "WPA Supplicant" -msgstr "داعم WPA" +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "استخدم dBm لقياس قوة الإشارة" -msgid "Automatic Reconnection" -msgstr "إعادة الاتصال آلياً" +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "استخدم الضبط المبدئي عند الاتصال آليا بشبكة سلكية" -msgid "Global DNS servers" -msgstr "خوادم DNS العامة" +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "استخدم خواديم DNS العامة" -msgid "Network Interfaces" -msgstr "الواجهات الشبكية" +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "استخدم آخر ضبط تم استخدامه عند الاتصال الآلي بشبكة سلكية" -msgid "Connecting to daemon..." -msgstr "يتّصل بالناظر..." +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "استخدم هذه الإعدادات لكل الشبكات التي تحمل هذا الاسم" -msgid "Can't connect to the daemon, trying to start it automatically..." -msgstr "عاجز عن الاتصال بالناظر، ستتم محاولة تشغيله..." +#: wicd/translations.py:89 +msgid "Username" +msgstr "اسم المستخدم" -msgid "Terminated by user" -msgstr "تم الإنهاء عن طريق المستخدم" +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "يستوثق..." -msgid "Brought to you by:" -msgstr "كتبه" +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "" -msgid "Preferences dialog" -msgstr "نافذة التفضيلات" +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "داعم WPA" -msgid "Connection Failed: No DHCP offers received." -msgstr "فشل الاتصال: لم يتم تلقي أي عروض DHCP." +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "واجهة Wicd Curses" -msgid "For more detailed help, consult the wicd-curses(8) man page." -msgstr "لتحصل على مساعدة مفصلة، راجع صفحة المساعدة wicd-curses(8)" +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "عاجز عن الوصول لناظر wicd" -msgid "Unable to connect to wicd daemon DBus interface. This typically means there was a problem starting the daemon. Check the wicd log for more information." -msgstr "فشل الاتصال بواجهة DBus لناظر wicd. \" + \"يعني هذا غالبا أن هناك مشكلة في بدء الناظر. \" + \"راجع سجل wicd للمزيد من المعلومات:" +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "يحتاج Wicd إلى الوصول لبطاقات الشبكة." -msgid "Could not connect to wicd's D-Bus interface. Check the wicd log for error messages." -msgstr "عاجز عن الاتصال بواجهة DBus الخاصة بـwicd. راجع سجل wicd لتقرأ رسائل الخطأ." +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" -msgid "Disconnect from all networks" -msgstr "افصل الاتصال بجميع الشبكات" +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "إعدادات الاتصال آليا بالشبكة السلكية" -msgid "Changes to your backend won't occur until the daemon is restarted." -msgstr "أي تغييرات تطرأ على الطرف الخلفي لن تسري إلا بعد إعادة تشغيل الناظر." +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "الواجهة السلكية" -msgid "Stop a network connection in progress" -msgstr "أوقف اتصالا شبكيا جاريا" +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "اكتشاف الوصلة السلكية" -msgid "Connecting" -msgstr "يتصل" +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "شبكة سلكية" +#: curses/wicd-curses.py:533 msgid "Wired Networks" msgstr "الشبكات السلكية" -msgid "Display this help dialog" -msgstr "اعرض نافذة المساعدة هذه" +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "تم اكتشاف اتصال سلكي" -msgid "To avoid various complications, wicd-curses does not support directly editing the scripts. However, you can edit them manually. First, (as root)\", open the \"$A\" config file, and look for the section labeled by the $B in question. In this case, this is:" -msgstr "لتفادي أي مضاعفات، لا يدعم wicd-curses تحرير المخطوطات مباشرة. بيد أن ذلك لا يمنعك من تحرير المخطوطات يدويا، وذلك على النحو الآتي: أولا، افتح ملف الضبط \"$A\" كمستخدم الجزر، وابحث عن القسم المسمى بـ$B المعني. وهو في هذه الحالة" +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "" + +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "الواجهة اللاسلكية" + +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "مبدّل الاتصال اللاسلكي معطل" -msgid "You can also configure the wireless networks by looking for the \"[]\" field in the config file." -msgstr "يمكنك أيضا ضبط الشبكات اللاسلكية عن طريق تغيير الحقل \"[]\" في ملف الضبط." +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "الشبكات اللاسلكية" -msgid "Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", and \"disconnectscript\" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively. Note that you will be specifying the full path to the scripts - not the actual script contents. You will need to add/edit the script contents separately. Refer to the wicd manual page for more information." -msgstr "عند وصولك لهذه النقطة، يمكنك تعديل (أو إضافة) المخطوطات التي تريد تشغيل قبل الاتصال، أو أثناء الاتصال، أوعند فصل الاتصال حسب حاجتك. لاحظ أنك عليك كتابة المسار الكامل للمخطوطات، وليس محتويات تلك المخطوطات ذاتها. سيكون عليك اضافة أو تعديل تلك المحتويات في عملية منفصلة. راجع دليل مساعدة wicd للمزيد من المعلومات." +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" +"يمكنك أيضا ضبط الشبكات اللاسلكية عن طريق تغيير الحقل \"[]\" في ملف " +"الضبط." +#: gtk/netentry.py:300 gtk/netentry.py:408 msgid "You must enter your password to configure scripts" msgstr "يجب أن تدخل كلمة السر لتتمكن من تعديل المخطوطات" -msgid "Refresh network list" -msgstr "حدّث قائمة الشبكات" +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "عليك أن تستخدم wext دائما كتعريف داعم WPA" -msgid "Press ESC to cancel" -msgstr "اضغط ESC للإلغاء" +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "" -msgid "Scanning" -msgstr "يبحث" +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "" -msgid "Select Hidden Network ESSID" -msgstr "انتق اسم الشبكة المخفية" +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "لا يدعم wicd-curses حذف آخر ضبط شبكة سلكية. جرب إعادة تسميته ('F2')" -msgid "Add a new wired profile" -msgstr "أضف ضبط شبكة سلكية جديد" +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "" -msgid "Configure Selected Network" -msgstr "اضبط الشبكة المنتقاة" +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "" -msgid "Validating authentication..." -msgstr "يستوثق..." +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "" -msgid "Wireless Networks" -msgstr "الشبكات اللاسلكية" +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "" -msgid "Configuring preferences for wired profile \"$A\"" -msgstr "يضبط تفضيلات ضبط الشبكة السلكية \"$A\"" +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "" -msgid "Check if using madwifi/atheros drivers" -msgstr "استوثق من استخدام تعريفات madwifi أو atheros" +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "" -msgid "Properties" -msgstr "خصائص" +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "قطع الاتصال" -msgid "Setting encryption info" -msgstr "يعيّن معلومات التعمية" +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "" -msgid "About Wicd" -msgstr "حول Wicd" +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "تفضيلات" -msgid "OK" -msgstr "موافق" +#: data/wicd.ui:136 +msgid "_About" +msgstr "" -msgid "Set up Ad-hoc network" -msgstr "أنشئ شبكة مخصصة" +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "تم الاتصال..." -msgid "Select scripts" -msgstr "انتق مخطوطات" +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "" -msgid "Invalid address in $A entry." -msgstr "العنوان في المدخلة $A غير صالح" +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "" -msgid "Could not find a graphical sudo program. The script editor could not be launched. You'll have to edit scripts directly your configuration file." -msgstr "عاجز عن إيجاد برنامج sudo الرسومي. لا يمكن تشغيل محرر المخطوطات. سيكون عليك تحرير المخطوطات مباشرة في ملف الضبط." +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "" -msgid "Wicd Curses Interface" -msgstr "واجهة Wicd Curses" +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "انتق مخطوطات" -msgid "DNS domain" -msgstr "نطاق DNS" +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "" -msgid "Cancel" -msgstr "الغِ" +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "تم اكتشاف اتصال سلكي" -msgid "Backend" -msgstr "الطرف الخلفي" +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "" -msgid "All controls are case sensitive" -msgstr "جميع الأزرار حساسة لحالة الأحرف" +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "انتقل دائماً للشبكة السلكية عندما تكون متاحة" -msgid "Wicd daemon unreachable" -msgstr "عاجز عن الوصول لناظر wicd" +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" -msgid "ESSID" -msgstr "اسم الشبكة" +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "نطاق DNS" -msgid "Search domain" -msgstr "نطاق البحث" +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "" -msgid "DBus failure! This is most likely caused by the wicd daemon stopping while wicd-curses is running. Please restart the daemon, and then restart wicd-curses." -msgstr "فشل DBus! حدث هذا غالبا لأن ناظر wicd قد توقف أثناء عمل wicd-curses. رجاءً أعد تشغيل الناظر ثم أعد تشغيل wicd-curses." +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "أعد الاتصال آليا عند قطعه" -msgid "Add a new profile" -msgstr "أضف ضبطا جديدا" +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "إعادة الاتصال آلياً" -msgid "Create an Ad-Hoc Network" -msgstr "أنشئ شبكة مخصصة" +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "أعد تسمية ضبط الشبكة السلكية" -msgid "Global DNS has not been enabled in general preferences." -msgstr "لم يتم تمكين DNS العام في التفضيلات" +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "" -msgid "Connect to selected network" -msgstr "اتصل بالشبكة المنتقاة" +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "أعد تسمية ضبط الشبكة السلكية" -msgid "wicd-curses does not support deleting the last wired profile. Try renaming it ('F2')" -msgstr "لا يدعم wicd-curses حذف آخر ضبط شبكة سلكية. جرب إعادة تسميته ('F2')" +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "إعادة الاتصال آلياً" -msgid "EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:" -msgstr "خلل! رجاءً أبلغ عن هذا للمشرف على البرنامج وأرفق الآتي ببلاغك" +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "الواجهة السلكية" -msgid "DNS server" +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "الواجهة اللاسلكية" + +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "الواجهات الشبكية" + +#: data/wicd.ui:799 +msgid "DNS server 3:" msgstr "خادوم DNS" -msgid "The wicd daemon has shut down. The UI will not function properly until it is restarted." -msgstr "تم إغلاق ناظر wicd. لن تعمل الواجهة بصورة سليمة إلى أن تتم إعادة تشغيله." +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "خادوم DNS" -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "للاتصال بشبكة سلكية، عليك أن تنشئ ضبط شبكة. لتنشئ ضبطا لشبكة، أدخل اسما يصفها ثم اضغط على الزر أضف." +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "خادوم DNS" -msgid "Rename wired profile" -msgstr "أعد تسمية ضبط الشبكة السلكية" +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "نطاق البحث" -msgid "The wicd daemon is unavailable, so your request cannot be completed" -msgstr "ناظر wicd غير متوفر، ولذلك لن يتم إكمال طلبك" +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "خوادم DNS العامة" -msgid "Scan for hidden networks" -msgstr "ابحث عن شبكات مخفية" +#: data/wicd.ui:960 +msgid "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" -msgid "use urwid's raw screen controller" -msgstr "استخدم متحكم شاشة urwid الخام" +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "إشعار" -msgid "Press F8 or Q to quit." -msgstr "اضغط F8 أو Q للإنهاء" +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "تشذيب جدول التسيير" -msgid "Use as default profile (overwrites any previous default)" -msgstr "استخدم الضبط المبدئي (ذو أسبقية على أي مبدئيات سابقة)" +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "اكتشاف الوصلة السلكية" -msgid "Connection failed: Could not contact the wireless access point." -msgstr "فشل الاتصال : لم يستطع من الاتصال بنقطة الوصول" +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "" -msgid "Establishing connection..." -msgstr "جاري الاتصال" +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "" -msgid "Connection established" -msgstr "تم الاتصال" +#: data/wicd.ui:1421 +msgid "" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" -msgid "Unable to contact the Wicd daemon due to an access denied error from DBus. Please check that your user is in the $A group." +#: data/wicd.ui:1474 +msgid "Driver:" msgstr "" -"لم يستطع مخاطبة مخدم Wicd بناء على رفض الوصول.\r\n" -"خطأ من DBus . الرجاء التأكد من ان المستخدم في مجموعة $A ." -msgid "Disconnecting active connections..." -msgstr "فصل الاتصالات الفعالى..." +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "الواجهة اللاسلكية" -msgid "Notifications" -msgstr "إشعار" +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "" -msgid "Disconnected" -msgstr "قطع الاتصال" +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "كشف العلل" -msgid "Display notifications about connection status" -msgstr "اظهار إشعار حول حالة الاتصال" +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "الطرف الخلفي" -msgid "Invalid IP address entered." -msgstr "عنوان IP غير صحيح." +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "" + +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "عليك أن تستخدم wext دائما كتعريف داعم WPA" diff -Nru wicd-1.7.0+ds1/po/ar_PS.po wicd-1.7.1/po/ar_PS.po --- wicd-1.7.0+ds1/po/ar_PS.po 2010-03-03 21:28:06.000000000 +0000 +++ wicd-1.7.1/po/ar_PS.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# Translations for Arabic (ar_PS) -# Translator ID 81 -# /translator/edit/81/ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" - -msgid "Connection Failed: No DHCP offers received." -msgstr "فشل الإتصال: لم يتم إستلام عروض إعدادات تلقائية للشبكة )DHCP(" - -msgid "Connection Failed: Bad password" -msgstr "فشل الإتصال: كلمة مرور خاطئة" - -msgid "Always show wired interface" -msgstr "أظهر الوصلات السلكية دوما" - -msgid "Path to PAC File" -msgstr "المسار إلى ملف PAC" - -msgid "Disconnect from all networks" -msgstr "إفصل عن كل الشبكات" - -msgid "Connection Cancelled" -msgstr "تم إلغاء الإتصال" - -msgid "Password" -msgstr "كلمة المرور" - -msgid "Connecting" -msgstr "جاري الإتصال" - -msgid "Wired Networks" -msgstr "الشبكات السلكية" diff -Nru wicd-1.7.0+ds1/po/ast.po wicd-1.7.1/po/ast.po --- wicd-1.7.0+ds1/po/ast.po 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/po/ast.po 2012-01-18 07:05:34.000000000 +0000 @@ -0,0 +1,1033 @@ +# Asturian translation for wicd +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the wicd package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: wicd\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-17 22:23+0000\n" +"Last-Translator: ASTUR2000 \n" +"Language-Team: Asturian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-18 04:48+0000\n" +"X-Generator: Launchpad (build 14681)\n" +"Language: ast\n" + +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" + +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" +"$A\n" +"$B KB/s\n" +"$C KB/s" + +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "Tocante a" + +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "Tocantes a Wicd" + +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "Activar compartición de conexón" + +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "Añader un perfil" + +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "Añader un perfil cableáu" + +#: curses/prefs_curses.py:52 data/wicd.ui:1669 +msgid "Advanced Settings" +msgstr "Configuración avanzao" + +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Amosar siempres perfil cableáu" + +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Camudar siempres pa una conexón cableada cuando tean disponibles" + +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Identificación" + +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "Automático (encamentao)" + +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Reconexón automática" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 +msgid "Automatically connect to this network" +msgstr "Coneutar namás pa esta rede" + +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Reconeutar namás perder la conexón" + +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "Sofitáu por:" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "Nun pue coneutase col degorriu, tentando pa entamalo automáticamente" + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "Atayar" + +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 +msgid "Channel" +msgstr "Canal" + +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Esbilla dende les redes d'emabxo" + +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "Config" + +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "Configurar rede esbillada" + +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "Configurando preferencies pal perfil cableáu \"$A\"" + +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "Configurando preferencies pal perfil inalámbricu \"$A\" ($B)" + +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "Configurando rede inalámbrica" + +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "Coneutase" + +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "Coneutase a la rede esbillada" + +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 +msgid "Connected to $A at $B (IP: $C)" +msgstr "Coneutáu a $A en $B (IP: $C)" + +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 +msgid "Connected to wired network (IP: $A)" +msgstr "Coneutáu a la rede cableada (IP: $A)" + +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "Coneutando" + +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Conexón atayada" + +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Conexón fallía." + +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "Conexón fallía: conseña mala" + +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "Conexón fallía: ensin ufiertes DHCP recivies." + +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "Conexón fallía: Nun pue consiguise una direición IP" + +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "Conexón establecida" + +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "Conexón fallía: Nun pudo contautase col puntu d'accesu inalámbricu." + +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "Conexón correcha." + +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"Nun pudo coneutase a la interfaz D-Bus de Wicd. Agüeya'l log de Wicd pa " +"mensaxes d'erros" + +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"Nun pudo alcontrase un programa gráficu sudo. L'editor de scripts nun " +"s'anició. Tienes d'editar los scripts direutamente dende l'archivu de " +"configuración." + +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "Criar una rede Ad-Hoc" + +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" + +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "Cliente DHCP" + +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "Viesu d'agospiu DHCP" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "Dominiu DNS" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "Sirvidor DNS" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "Depuración" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "Descon" + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Desconeutar toles redes" + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "Desconeutáu" + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "" + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "Amosar dialogu 'tocante a'" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "Amosar notificaciones sobro l'estáu conexón" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "Amosar esti dialogu d'aida" + +#: wicd/translations.py:78 +msgid "Domain" +msgstr "Dominiu" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "" + +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" +"ERRU: wicd-curses denegóse-y l'accesu al degorriu wicd: por favor compreba " +"que'l to usuariu ta nel grupu \"$A'" + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "Activar mou depuración" + +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "Coneutándose..." + +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "Programes esternos" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "" + +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "" +"P'aida más detallada, consulta les maldiciones wicd-curses(8) del manual." + +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Puerta d'enllaz" + +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "Axustes xenerales" + +#: wicd/misc.py:85 +msgid "Generating PSK..." +msgstr "Xenerando PSK..." + +#: wicd/misc.py:86 +msgid "Generating WPA configuration file..." +msgstr "Xenerando archivu configuración de WPA" + +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "Les DNS globales nun foron activaes nes preferencies xenerales." + +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "Sirvidores globales DNS" + +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "Aida" + +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "Anubríu" + +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "Rede ESSID anubría" + +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" + +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Identidá" + +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "Información tocante la conexón actual" + +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "Puesta direición IP inválida" + +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "Direición inválida na entrada $A." + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +msgid "Key" +msgstr "Clave" + +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Mázcara de rede" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "Interfaces de rede" + +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "Tanina coneutar pa esta rede" + +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "Nun s'alcontró rede inalámbrica dala." + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "Non coneutáu" + +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "Val" + +#: wicd/misc.py:91 +msgid "Obtaining IP address..." +msgstr "Obteniendo direición IP" + +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" + +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "Fras de pasu" + +#: wicd/translations.py:82 +msgid "Password" +msgstr "Conseña" + +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "Parchear pal certificáu CA" + +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Parchear pal archivu PAC" + +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "Parchear pal certificáu de cliente" + +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "" + +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "" + +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "" + +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "" + +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "" + +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Preferencies" + +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "Diálogu preferencies" + +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "Prefs" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "Preshared key" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "Primi cualaquier tecla pa tornar." + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "Cnoseña acutada" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "Llave la conseña acutada" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "" + +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "Propiedaes" + +#: wicd/misc.py:87 +msgid "Putting interface down..." +msgstr "" + +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "Poniendo la interfaz a..." + +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "Colar" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "Colar de wicd-curses" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "Colar del iconu la bandexa" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "Anovar" + +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "Anovar llista de rede" + +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "Renomar perfil cableáu" + +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "La información d'encriptación requería ta perdía" + +#: wicd/misc.py:90 +msgid "Resetting IP address..." +msgstr "Reaniciando direición IP" + +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "RfKill" + +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "Tables de ruta Flushing" + +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "Desaminar" + +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "Desaminar por redes anubríes" + +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "Desaminando" + +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "Desaminando redes... aparar..." + +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "Scripts" + +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "Guetar dominiu" + +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Seguro" + +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "Esbillar rede ESSID anubría" + +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "Esbillar o criar un perfil cableáu con conexón con" + +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "Esbillar sripts" + +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "" + +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "" + +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "" + +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "" + +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "" + +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "" + +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "" + +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "" + +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "" + +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" + +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "" + +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" + +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" + +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" + +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "" + +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "" + +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "" + +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "" + +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "" + +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "" + +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "" + +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "" + +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "" + +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "" + +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "" + +#: wicd/translations.py:89 +msgid "Username" +msgstr "" + +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "" + +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "" + +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "" + +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "" + +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "" + +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "" + +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" + +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "" + +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "" + +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "" + +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "" + +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "" + +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "" + +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "" + +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "" + +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "" + +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "" + +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" + +#: gtk/netentry.py:300 gtk/netentry.py:408 +msgid "You must enter your password to configure scripts" +msgstr "" + +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "" + +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "" + +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "" + +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" + +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "" + +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "" + +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "" + +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "" + +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "" + +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "" + +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "" + +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "" + +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "" + +#: data/wicd.ui:136 +msgid "_About" +msgstr "" + +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "" + +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "" + +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "" + +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "" + +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "" + +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "" + +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "" + +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "" + +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "" + +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" + +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "" + +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "" + +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "" + +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "" + +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "" + +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "" + +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "" + +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "" + +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "" + +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "" + +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "" + +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "" + +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "" + +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "" + +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "" + +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "" + +#: data/wicd.ui:960 +msgid "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" + +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "" + +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "" + +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "" + +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "" + +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "" + +#: data/wicd.ui:1421 +msgid "" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" + +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "" + +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "" + +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "" + +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "" + +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "" + +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "" + +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "" diff -Nru wicd-1.7.0+ds1/po/bg.po wicd-1.7.1/po/bg.po --- wicd-1.7.0+ds1/po/bg.po 2010-03-03 21:26:11.000000000 +0000 +++ wicd-1.7.1/po/bg.po 2012-01-15 19:17:27.000000000 +0000 @@ -2,53 +2,1046 @@ # Translator ID 20 # /translator/edit/20/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-15 20:03+0100\n" +"Last-Translator: David Paleino \n" +"Language-Team: bg \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-08 05:45+0000\n" +"X-Generator: Launchpad (build 14443)\n" +"Generated-By: Babel 0.9.6\n" +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" + +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" + +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "" + +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "Относно Wicd" + +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "Споделяне на интернет връзка" + +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "Нов профил" + +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "Добавяне на нов профил" + +#: curses/prefs_curses.py:52 data/wicd.ui:1669 +msgid "Advanced Settings" +msgstr "Разширени настройки" + +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Винаги показвай кабелен интерфейс" + +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Предпочитане на кабелна връзка, когато е налична" + +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Удостоверяване" + +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "Автоматично (препоръчително)" + +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Автоматично възстановяване на връзката, в случай на прекъсване" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 +msgid "Automatically connect to this network" +msgstr "Автоматично свързване към тази мрежа" + +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Автоматично свързване при загуба на връзката" + +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "Backend" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "Предоставено от:" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "Връзка с wicd неустановена, опит за повторно стартиране..." + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "Назад" + +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 +msgid "Channel" +msgstr "Канал" + +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Избери мрежа от списъка:" + +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "" + +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "Конфигуриране на избраната мрежа" + +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "Настройване на профил \"$A\"" + +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "Настройване на безжична мрежа \"$A\" ($B)" + +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "Конфигуриране на безжичен интерфейс..." + +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 msgid "Connect" msgstr "Свържи" -msgid "IP" -msgstr "Мрежов адрес" +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "Свързване към избраната мрежа" -msgid "Netmask" -msgstr "Мрежова маска" +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 +msgid "Connected to $A at $B (IP: $C)" +msgstr "Свързан към $A oт $B (IP: $C)" -msgid "Use Static IPs" -msgstr "Използвай статичен мрежов адрес" +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 +msgid "Connected to wired network (IP: $A)" +msgstr "Свързан към кабелна мрежа (IP: $A)" -msgid "Use Static DNS" -msgstr "Използвай статичен DNS" +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "Свързване" -msgid "Use Encryption" -msgstr "Използвай криптиране" +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Връзката прекъсната" -msgid "Resetting IP address..." -msgstr "Занули IP адресите" +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Връзката прекъсната" -msgid "Preferences dialog" -msgstr "Прозорес с настройки" +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "Свързването неуспешно: грешна парола" +#: wicd/misc.py:89 msgid "Connection Failed: No DHCP offers received." msgstr "Неуспешна връзка: няма връзка с DHCP сървър" +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "Грешка при свързване: Не може да получите IP адрес" + +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "Връзката установена" + +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "Свързването неуспешно: Не е намерена безжична точка за достъп." + +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "" + +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"Wicd демона няма връзка с DBus интерфейса. Проверете wicd лога за повече " +"информация." + +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"Няма намерена графична sudo програма. Редактора на скриптове не може да бъде " +"стартиран. Ще трябва да редактирате скриптове директно в конфигурационния " +"файл." + +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "Настроване на Ad-hoc мрежа" + +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" +"DBus грешка! Най-вероятна причинена от спиране на wicd демона, докато wicd " +"интерфейса още работи. Моля, рестартирайте wicd демона, след което " +"рестартирайте wicd интерфейса." + +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "DHCP клиент" + +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "DNS домейн" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "DNS сървър" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "Диагностика" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "Връзката прекъсната" + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Прекъсване на всички мрежови връзки" + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "Връзката прекъсната" + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "Прекъсване активни връзки..." + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "Покажи прозорец с помощ" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "Показвай известия за състоянието на връзката" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "Покажи прозорец с помощ" + +#: wicd/translations.py:78 +msgid "Domain" +msgstr "DNS домейн" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "Връзка установена..." + +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" +"ГРЕШКА! Достъпа на Wicd интерфейса до DBus интерфейса е забранен. Моля, " +"проверете дали потребителя Ви е добавен в група $A." + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "ESSID" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "Включи режим за диагностика" + +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "Свързване..." + +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "Външни програми" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "Опресняване на маршрутната таблица..." + +#: curses/wicd-curses.py:210 msgid "For more detailed help, consult the wicd-curses(8) man page." msgstr "За повече информация вижте документацията" -msgid "Connection Failed: Bad password" -msgstr "Свързването неуспешно: грешна парола" +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Шлюз" + +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "Общи настройки" + +#: wicd/misc.py:85 +msgid "Generating PSK..." +msgstr "Генериране на PSK..." + +#: wicd/misc.py:86 +msgid "Generating WPA configuration file..." +msgstr "Генериране на WPA конфигурационен файл..." + +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "Глобални DNS сървъри не са настроени." + +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "Глобални DNS сървъри" + +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "" +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "" + +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "ESSID на скрита мрежа" + +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "Мрежов адрес" + +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Самоличност" + +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "" + +#: gtk/netentry.py:167 msgid "Invalid IP address entered." msgstr "Въведен грешен IP адрес." -msgid "Connecting" -msgstr "Свързване" +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "Невалиден адрес в поле $A." + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +msgid "Key" +msgstr "Ключ" + +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Мрежова маска" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "Мрежови интерфейси" + +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "" + +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "Няма намерени безжични мрежи." + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "Няма връзка" + +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "Добре" + +#: wicd/misc.py:91 +msgid "Obtaining IP address..." +msgstr "Получаване на IP адрес..." + +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" +"Там можете да промените (или добавяне) \"beforescript\", \"afterscript\" и " +"\"disconnectscript\" променливи, ако е необходимо, за да промените " +"preconnect, postconnect и disconnect скриптове. Имайте предвид, че ще се " +"посочва пълния път до скрипта - не самото съдържание на скрипта. Вие ще " +"трябва да се добавите/редактирате съдържанието на скрипта отделно. Обърнете " +"се към wicd ръководството за повече информация." + +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "" + +#: wicd/translations.py:82 +msgid "Password" +msgstr "Парола" + +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "" + +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Път до PAC файл" + +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "" + +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "Провери връзката до шлюза след успешно свързване" + +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "Стартирай post-disconnect скрипт" + +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "Стартирай post-disconnect скрипт" + +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "Стартиране на pre-disconnect скрипт" + +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "Стартиране на pre-disconnect скрипт" + +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Настройки" + +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "Настройки" + +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "" + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "Избор на профил за автоматично свързване" + +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "Свойства" + +#: wicd/misc.py:87 +msgid "Putting interface down..." +msgstr "Деактивиране на мрежови интерфейс..." + +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "Активиране на мрежови интерфейс..." + +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "" + +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "Обнови списъка с мрежи" + +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "Преименувай профил" + +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "Настройките за защитена връзка са непълни." +#: wicd/misc.py:90 +msgid "Resetting IP address..." +msgstr "Възстановяване на IP адрес..." + +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "" + +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "Опресняване на маршрутната таблица" + +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "Обнови" + +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "Търсене за скрити мрежи" + +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "Търсене" + +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "Търсене на мрежи... изчакайте..." + +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "Скриптове" + +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "Домейн за търсене" + +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Защитена" + +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "Избери ESSID на скрита мрежа" + +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "Изберете или създайте профил, за да се свъжете с" + +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "Избери скриптове" + +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "Настройване на Ad-hoc мрежа" + +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "Установи broadcast адрес..." + +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "Настройка на статични DNS сървъри..." + +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "Настройка на статичен IP адрес" + +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "Прекъсване на всички мрежови връзки" + +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "Временно не показвай прозореца за автоматично свързване" + +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "Прекъсни процеса на свързване" + +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "" + +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "Прекъсната от потребителя" + +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" +"Wicd демона не работи. Потребителският интерфейс няма да работа, докато " +"демона не бъде рестартиран." + +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "Тази мрежа е защитена." + +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" +"За да се избегнат различни усложнения, wicd интерфейса не поддържа директно " +"редактиране на скриптовете. Въпреки това, можете да ги редактирате ръчно. " +"Първо, отворете конфигурационния файл \"$A\", и потърсете секцията $B. В " +"този случай, това е:" + +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" +"За да се свържете към кабелна мрежа, трябва да създадете мрежов профил. За " +"да се създаде мрежов профил, въведете име, което описва тази мрежа, и " +"натиснете Добави." + +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" +"Достъпа на Wicd демона до DBus интерфейсае забранен. Моля, проверете дали " +"потребителя Ви е добавен в група $A." + +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "Несигурна" + +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "Използвай криптиране" + +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "Защитена връзка (WEP)" + +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "Използвай статичен DNS" + +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "Използвай статичен мрежов адрес" + +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "Използвай като профил по подразбиране" + +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "Показване на силата на сигнала в dBm" + +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "Използване на профил по подразбиране за автоматично свързване" + +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "Използвай глобални DNS сървъри" + +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "Използване на предишния профил за автоматично свързване" + +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "Използвай тези настройки за всички мрежи ползващи това ESSID" + +#: wicd/translations.py:89 +msgid "Username" +msgstr "Потребител" + +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "Удостоверяване на паролата..." + +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "Проверяване на безжичната точка за достъп" + +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "WPA Supplicant" + +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "Wicd интерфейс" + +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "Wicd демона недостъпен" + +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "" +"За да работи коректно, Wicd трябва да има достъп до мрежовите карти на този " +"компютър" + +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" + +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "Настройки за автоматично свързване" + +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "Кабелен интерфейс" + +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "Кабелна връзка открита" + +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "Кабелна мрежа" + +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "Кабелни мрежи" + +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "Кабелна връзка открита" + +#: gtk/wicd-client.py:633 msgid "" -"Wireless\r\n" -"SSID:\r\n" -"Speed:\r\n" -"IP:\r\n" -"Strength:\r\n" -"RX:\r\n" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" "TX:" msgstr "Име на мрежата: Скорост: IP: Сигнал: Получени: Изпратени" + +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "Безжичен интерфейс" + +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "Безжична мрежа изключена" + +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "Безжичните мрежи" + +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" +"Безжични мрежи могат да се конфигурират директно в конфигурационния файл, " +"като се потърси за секция \"[]\"." + +#: gtk/netentry.py:300 gtk/netentry.py:408 +msgid "You must enter your password to configure scripts" +msgstr "Трябва да въведете паролата си за да конфигурирате скриптовете" + +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "Почти винаги трябва да се използва wext за WPA supplicant драйвер" + +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "" + +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "" + +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" +"Wicd интерфейса не позволява изтриване на единствения останал профил. Може " +"да бъде преименуван ('F2')" + +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "" + +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "" + +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "" + +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "" + +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "" + +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "" + +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "Връзката прекъсната" + +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "" + +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "Настройки" + +#: data/wicd.ui:136 +msgid "_About" +msgstr "" + +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "" + +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "" + +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "Скрипт за събуждане" + +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "" + +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "Стартиране на pre-disconnect скрипт" + +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "Стартирай post-disconnect скрипт" + +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "Стартиране на pre-disconnect скрипт" + +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "Стартирай post-disconnect скрипт" + +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "Предпочитане на кабелна връзка, когато е налична" + +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" + +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "DNS домейн" + +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "" + +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "Автоматично свързване при загуба на връзката" + +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "" + +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "" + +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "" + +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "" + +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "" + +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "Кабелен интерфейс" + +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "Безжичен интерфейс" + +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "Мрежови интерфейси" + +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "DNS сървър" + +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "DNS сървър" + +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "DNS сървър" + +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "Домейн за търсене" + +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "Глобални DNS сървъри" + +#: data/wicd.ui:960 +msgid "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" + +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "Известия" + +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "Опресняване на маршрутната таблица" + +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "Кабелна връзка открита" + +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "" + +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "" + +#: data/wicd.ui:1421 +msgid "" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" + +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "" + +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "Безжичен интерфейс" + +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "" + +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "Диагностика" + +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "Backend" + +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "" + +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "Почти винаги трябва да се използва wext за WPA supplicant драйвер" diff -Nru wicd-1.7.0+ds1/po/ca.po wicd-1.7.1/po/ca.po --- wicd-1.7.0+ds1/po/ca.po 2010-03-03 21:26:14.000000000 +0000 +++ wicd-1.7.1/po/ca.po 2012-01-15 19:17:37.000000000 +0000 @@ -2,457 +2,1046 @@ # Translator ID 21 # /translator/edit/21/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-15 20:03+0100\n" +"Last-Translator: David Paleino \n" +"Language-Team: ca \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-10 05:02+0000\n" +"X-Generator: Launchpad (build 14450)\n" +"Generated-By: Babel 0.9.6\n" -msgid "Connect" -msgstr "Connecta" - -msgid "IP" -msgstr "IP" - -msgid "Netmask" -msgstr "Màscara de subxarxa" +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" -msgid "Gateway" -msgstr "Passareŀla" +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" + +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "" -msgid "DNS" -msgstr "DNS" +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "Quant a Wicd" -msgid "Use Static IPs" -msgstr "Utilitza IPs estàtiques" +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "Activa la compartició de connexió a Internet" -msgid "Use Static DNS" -msgstr "Utilitza DNS estàtiques" +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "Crea un perfil nou" -msgid "Use Encryption" -msgstr "Utilitza encriptació" +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "Crear un nou perfil de xarxa amb fil" +#: curses/prefs_curses.py:52 data/wicd.ui:1669 msgid "Advanced Settings" msgstr "Configuració avançada" -msgid "Wired Network" -msgstr "Xarxa amb fil" +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Mostra sempre la interfície amb fil" + +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Canvia a la xarxa cablejada sempre que estigui disponible" +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Autenticació" + +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "Automàtic (recomanat)" + +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Reconnexió automàtica" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 msgid "Automatically connect to this network" msgstr "Connecta automàticament a aquesta xarxa" -msgid "Secured" -msgstr "Segura" +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Reconnecta automàticament en perdre la connexió" -msgid "Unsecured" -msgstr "Insegura" +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "Dorsal" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "Presentat per:" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "" +"No es pot connectar amb el dimoni; S'està intentant iniciar-lo " +"automàticament..." + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "Cancel·la" +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 msgid "Channel" msgstr "Canal" -msgid "Preferences" -msgstr "Preferències" - -msgid "WPA Supplicant Driver" -msgstr "Connector de WPA Supplicant" +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Tria entre les següents xarxes:" -msgid "Wireless Interface" -msgstr "Interfície sense fil" +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "" + +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "Configura la xarxa seleccionada" -msgid "Wired Interface" -msgstr "Interfície amb fil" +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "S'estan configurant les preferències del perfil cablejat \"$A\"" -msgid "Always show wired interface" -msgstr "Mostra sempre la interfície amb fil" +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "" +"S'estan configurant les preferències de la xarxa sense fils \"$A\" ($B)" -msgid "Automatically reconnect on connection loss" -msgstr "Reconnecta automàticament en perdre la connexió" +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "S'està configurant la interfície sense fil" -msgid "Hidden Network" -msgstr "Xarxa amagada" +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "Connecta" -msgid "Hidden Network ESSID" -msgstr "ESSID de xarxa amagada" +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "Connecta a la xarxa seleccionada" +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 msgid "Connected to $A at $B (IP: $C)" msgstr "Connectat a $A al $B (IP: $C)" +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 msgid "Connected to wired network (IP: $A)" msgstr "Connectat a xarxa amb fil (IP: $A)" -msgid "Not connected" -msgstr "Desconnectat" +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "S'està connectant" -msgid "No wireless networks found." -msgstr "No s'han trobat xarxes sense fil." +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Connexió cancel·lada" -msgid "Key" -msgstr "Clau" +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Connexió cancel·lada" -msgid "Username" -msgstr "Nom d'usuari" +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "La connexió ha fallat: la contrasenya és incorrecta" -msgid "Password" -msgstr "Contrasenya" +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "La connexió ha fallat: No s'han rebut ofertes DHCP" -msgid "Anonymous Identity" -msgstr "Identitat anònima" +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "Connexió fallida: impossible d'obtenir una direcció IP" -msgid "Identity" -msgstr "Indentitat" +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "s'ha establert la connexió" -msgid "Authentication" -msgstr "Autenticació" +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "" +"La connexió ha fallat: no s'ha pogut contactar amb el punt d'accés sense fils" -msgid "Path to PAC File" -msgstr "Camí cap al fitxer PAC" +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "Connexió cancel·lada" -msgid "Choose from the networks below:" -msgstr "Tria entre les següents xarxes:" +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"No es pot connectar amb la interfície D-Bus de wicd. Comproveu els misstages " +"del registre de wicd." -msgid "Putting interface down..." -msgstr "S'està desactivant la interfície" +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"No es pot trobar un programa sudo gràfic. L'editor d'script no s'ha pogut " +"engegar. Haureu d'editar els scripts directament del fitxer de configuració." + +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "Crear una xarxa Ad-Hoc" -msgid "Resetting IP address..." -msgstr "S'està reiniciant l'adreça IP" +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" +"Error Dbus! Provablement causat perquè el dimoni de wicd s'ha aturat mentre " +"wicd-curses s'executava. Reinicieu el dimoni i després wicd-curses" -msgid "Putting interface up..." -msgstr "S'està activant la interfície" +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "Client DHCP" + +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "Domini DNS" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "Servidor DNS" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "S'està depurant" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "S'ha desconnectat" + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Desconnecta de totes les xarxes" + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "S'ha desconnectat" + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "S'estan aturant les connexions actives..." + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "Mostra aquest diàleg d'ajuda" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "Mostra notificacions quan a l'estat de la connexió" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "Mostra aquest diàleg d'ajuda" -msgid "Removing old connection..." -msgstr "S'està eliminant la connexió vella..." +#: wicd/translations.py:78 +msgid "Domain" +msgstr "Domini DNS" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "S'ha connectat..." + +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" +"ERROR: wicd-curses no ha pogut accedir al dimoni wicd: si us plau, comproveu " +"que l'usuari sigui al grup \"$A\"." + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "ESSID" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "Activa el mode de depuració" +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "S'està establint la connexió..." + +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "Programes externs" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "Netejant la taula d'encaminament..." + +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "" +"Per una ajuda més detallada, consulteu la pàgina man de wicd-curses(8)" + +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Passareŀla" + +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "Configuració general" + +#: wicd/misc.py:85 msgid "Generating PSK..." msgstr "S'està generant PSK..." +#: wicd/misc.py:86 msgid "Generating WPA configuration file..." msgstr "S'està generant el fitxer de configuració de WPA" -msgid "Flushing the routing table..." -msgstr "Netejant la taula d'encaminament..." +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "Les DNS globals no s'han activat a les preferències generals." -msgid "Configuring wireless interface..." -msgstr "S'està configurant la interfície sense fil" +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "Servidors DNS globals" -msgid "Setting broadcast address..." -msgstr "S'està configurant l'adreça d'emissió..." +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "" + +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "" -msgid "Setting static DNS servers..." -msgstr "s'estan configurant servidors DNS estàtics..." +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "ESSID de xarxa amagada" -msgid "Setting static IP addresses..." -msgstr "S'estan configurant adreces IP estàtiques..." +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" + +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Indentitat" + +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "" + +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "Direcció IP introduïda no vàlida." + +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "" + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +msgid "Key" +msgstr "Clau" +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Màscara de subxarxa" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "Interfícies de xarxa" + +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "" + +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "No s'han trobat xarxes sense fil." + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "Desconnectat" + +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "D'acord" + +#: wicd/misc.py:91 msgid "Obtaining IP address..." msgstr "S'està obtenint l'adreça IP..." -msgid "Done connecting..." -msgstr "S'ha connectat..." +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" +"Llavors, podeu ajustar (o afegir) les variables \"beforescript\", " +"\"afterscript\" i \"disconnectscript\" segons us calgui, per canviar els " +"scripts de preconnexió, postconnexió o desconnexió respectivament. Noteu que " +"heu d'especificar el camí complet als scripts, no el contingut dels scripts. " +"Haureu d'afegir/editar el contingut de l'script separadament. Per més " +"informació, dirigiu-vos al manual de wicd." + +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "" -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "Per a connectar a una xarxa amb fil heu de crear un perfil de xarxa. Per a crear-lo, escriviu un nom que descrigui aquesta xarxa i premeu afegir." +#: wicd/translations.py:82 +msgid "Password" +msgstr "Contrasenya" -msgid "Wicd needs to access your computer's network cards." -msgstr "Wicd necessita accedir a les tarjes de xarxa del teu ordinador." +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "" + +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Camí cap al fitxer PAC" + +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "" + +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "" + +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "Executa script de post-desconnexió" + +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "Executa script de post-desconnexió" + +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "Executa l'script predesconnexió" + +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "Executa l'script predesconnexió" + +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Preferències" + +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "Diàleg de preferències" + +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "" + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "Demana pel perfil en connectar amb una xarxa amb fil" + +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "Propietats" + +#: wicd/misc.py:87 +msgid "Putting interface down..." +msgstr "S'està desactivant la interfície" + +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "S'està activant la interfície..." + +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "" + +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "Resfresca la llista de xarxes" + +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "Reanomena el perfil de xarxa amb fil" + +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "Falta informació referent a l'encriptació." + +#: wicd/misc.py:90 +msgid "Resetting IP address..." +msgstr "S'està reiniciant l'adreça IP" + +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "" + +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "Neteja la taula de rutes" + +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "Cerca" + +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "Cerca xarxes ocultes" -msgid "Run script before connect" -msgstr "Executa un script abans de connectar" +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "S'està escanejant" -msgid "Run script after connect" -msgstr "Executa un script després de connectar" +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "S'estan cercant xarxes... espereu..." +#: gtk/netentry.py:102 msgid "Scripts" msgstr "Scripts" -msgid "Enable debug mode" -msgstr "Activa el mode de depuració" +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "Cerca el domini" -msgid "Use global DNS servers" -msgstr "Utilitza servidors DNS globals" +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Segura" -msgid "Use default profile on wired autoconnect" -msgstr "Utilitza el perfil predeterminat en connectar amb una xarxa amb fil" +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "Selecciona el ESSID de la xarxa oculta" -msgid "Prompt for profile on wired autoconnect" -msgstr "Demana pel perfil en connectar amb una xarxa amb fil" +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "Seleccioneu o creeu un perfil per a la connexió amb fil" -msgid "Use last used profile on wired autoconnect" -msgstr "Utilitza l'últim perfil usat al connectar-se a una xarxa amb fil" +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "" + +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "" -msgid "Activate Internet Connection Sharing" -msgstr "Activa la compartició de connexió a Internet" +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "S'està configurant l'adreça d'emissió..." -msgid "Use Encryption (WEP only)" -msgstr "Utilitzar Encriptació (només WEP)" +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "s'estan configurant servidors DNS estàtics..." -msgid "Use dBm to measure signal strength" -msgstr "Utilitzar dBm per mesurar la força del senyal" +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "S'estan configurant adreces IP estàtiques..." -msgid "Wired connection detected" -msgstr "S'ha detectat la connexió per cable" +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "Desconnecta de totes les xarxes" +#: gtk/gui.py:104 msgid "Stop Showing Autoconnect pop-up temporarily" msgstr "Desactiva temporalment els emergents d'autoconnexió" -msgid "General Settings" -msgstr "Configuració general" - -msgid "External Programs" -msgstr "Programes externs" - -msgid "DHCP Client" -msgstr "Client DHCP" +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "Atura una connexió en progrés" -msgid "Wired Link Detection" -msgstr "Detecció de connexió cablejada" +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "" -msgid "Route Table Flushing" -msgstr "Neteja la taula de rutes" +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "Finalitzat per l'usuari" -msgid "Automatic (recommended)" -msgstr "Automàtic (recomanat)" +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "fins que reinicia" +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 msgid "This network requires encryption to be enabled." msgstr "Aquesta xarxa requereix encriptació per activar-se." -msgid "Required encryption information is missing." -msgstr "Falta informació referent a l'encriptació." - -msgid "Use these settings for all networks sharing this essid" -msgstr "Utilitza aquesta configuració per a totes les xarxes que comparteixen aquest essid" - -msgid "Select or create a wired profile to connect with" -msgstr "Seleccioneu o creeu un perfil per a la connexió amb fil" - -msgid "Connection Failed: Unable to Get IP Address" -msgstr "Connexió fallida: impossible d'obtenir una direcció IP" +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" +"Per evitar diverses complicacions, wicd-curses no permet editar els scripts " +"directament. Malgrat tot, els podeu editar manualment. Primer, (com a " +"root)\", obriu el fitxer de configuració \"$A\", i busqueu la secció " +"etiquetada amb la $B en qüestió. En aquest cas és:" -msgid "Connection Cancelled" -msgstr "Connexió cancel·lada" +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" +"Per connectar a una xarxa sense fil, heu de crear un perfil de xarxa. Per " +"crear-ne un, escriviu un nom que descrigui aquesta xarxa, i premeu Afegeix." -msgid "Connection Failed: Bad password" -msgstr "La connexió ha fallat: la contrasenya és incorrecta" +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" +"No s'ha pogut establir contacte amb el dimoni Wicd perquè s'ha denegat " +"l'accés des de DBus. Si us plau comproveu que l'usuari sigui al grup $A ." -msgid "Wireless Kill Switch Enabled" -msgstr "L'interruptor de desconnexió inalàmbrica està activat" +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "Insegura" -msgid "Scanning networks... stand by..." -msgstr "S'estan cercant xarxes... espereu..." +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "" -msgid "Configuring preferences for wired profile \"$A\"" -msgstr "S'estan configurant les preferències del perfil cablejat \"$A\"" +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "Utilitza encriptació" -msgid "Configuring preferences for wireless network \"$A\" ($B)" -msgstr "S'estan configurant les preferències de la xarxa sense fils \"$A\" ($B)" +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "Utilitzar Encriptació (només WEP)" -msgid "Scan" -msgstr "Cerca" +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "Utilitza DNS estàtiques" -msgid "Always switch to wired connection when available" -msgstr "Canvia a la xarxa cablejada sempre que estigui disponible" +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "Utilitza IPs estàtiques" -msgid "Wired Autoconnect Settings" -msgstr "Configuració de l'autoconnexió de la xarxa cablejada" +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "Utilitza com a predefinida (sobreescriu la predefinida anteriorment)" -msgid "You should almost always use wext as the WPA supplicant driver" -msgstr "Quasi sempre s'ha d'usar wext com a controlador WPA supplicant" +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "Utilitzar dBm per mesurar la força del senyal" -msgid "Debugging" -msgstr "S'està depurant" +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "Utilitza el perfil predeterminat en connectar amb una xarxa amb fil" -msgid "WPA Supplicant" -msgstr "WPA Supplicant" +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "Utilitza servidors DNS globals" -msgid "Automatic Reconnection" -msgstr "Reconnexió automàtica" +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "Utilitza l'últim perfil usat al connectar-se a una xarxa amb fil" -msgid "Global DNS servers" -msgstr "Servidors DNS globals" +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "" +"Utilitza aquesta configuració per a totes les xarxes que comparteixen aquest " +"essid" -msgid "Network Interfaces" -msgstr "Interfícies de xarxa" +#: wicd/translations.py:89 +msgid "Username" +msgstr "Nom d'usuari" -msgid "Connecting to daemon..." -msgstr "S'està conectant al dimoni..." +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "S'està validant l'autenticació..." -msgid "Can't connect to the daemon, trying to start it automatically..." -msgstr "No es pot connectar amb el dimoni; S'està intentant iniciar-lo automàticament..." +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "S'està verificant l'associació amb el punt d'accés..." -msgid "Could not connect to wicd's D-Bus interface. Check the wicd log for error messages." -msgstr "No es pot connectar amb la interfície D-Bus de wicd. Comproveu els misstages del registre de wicd." +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "WPA Supplicant" +#: curses/wicd-curses.py:528 msgid "Wicd Curses Interface" msgstr "Interfície Wicd Curses" -msgid "Terminated by user" -msgstr "Finalitzat per l'usuari" +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "No s'ha trobat el dimoni de wicd" -msgid "DBus failure! This is most likely caused by the wicd daemon stopping while wicd-curses is running. Please restart the daemon, and then restart wicd-curses." -msgstr "Error Dbus! Provablement causat perquè el dimoni de wicd s'ha aturat mentre wicd-curses s'executava. Reinicieu el dimoni i després wicd-curses" +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "Wicd necessita accedir a les targetes de xarxa del teu ordinador." -msgid "EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:" -msgstr "EXCEPCIÓ! Informeu al mantenidor enviant un informe d'error amb la traça inversa següent:" +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" -msgid "Brought to you by:" -msgstr "Presentat per:" +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "Configuració de l'autoconnexió de la xarxa cablejada" -msgid "To avoid various complications, wicd-curses does not support directly editing the scripts. However, you can edit them manually. First, (as root)\", open the \"$A\" config file, and look for the section labeled by the $B in question. In this case, this is:" -msgstr "Per evitar diverses complicacions, wicd-curses no permet editar els scripts directament. Malgrat tot, els podeu editar manualment. Primer, (com a root)\", obriu el fitxer de configuració \"$A\", i busqueu la secció etiquetada amb la $B en qüestió. En aquest cas és:" +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "Interfície amb fil" -msgid "Add a new profile" -msgstr "Crea un perfil nou" +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "Detecció de connexió cablejada" -msgid "Add a new wired profile" -msgstr "Crear un nou perfil de xarxa amb fil" +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "Xarxa amb fil" -msgid "wicd-curses does not support deleting the last wired profile. Try renaming it ('F2')" -msgstr "wicd-curses no permet l'eliminació de l'últim perfil. Proveu de canviar-li el nom ('F2')" +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "Xarxes cablejades" -msgid "Rename wired profile" -msgstr "Reanomena el perfil de xarxa amb fil" +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "S'ha detectat la connexió per cable" -msgid "Select Hidden Network ESSID" -msgstr "Selecciona el ESSID de la xarxa oculta" +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "Wireless SSID: Velocitat: IP: Potencia: RX: TX:" -msgid "Press ESC to cancel" -msgstr "Premeu ESC per cancel·lar" +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "Interfície sense fil" -msgid "Press F8 or Q to quit." -msgstr "Premeu F8 o Q per sortir" +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "L'interruptor de desconnexió inalàmbrica està activat" -msgid "Disconnect from all networks" -msgstr "Desconnecta de totes les xarxes" +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "Xarxes sense fil" -msgid "You can also configure the wireless networks by looking for the \"[]\" field in the config file." -msgstr "També podeu configurar les xarxes sense fil buscant el camp \"[]\" al fitxer de configuració." +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" +"També podeu configurar les xarxes sense fil cercant el camp \"[]\" al " +"fitxer de configuració." +#: gtk/netentry.py:300 gtk/netentry.py:408 msgid "You must enter your password to configure scripts" msgstr "Heu d'escriure la contrasenya per configurar els scripts" -msgid "Refresh network list" -msgstr "Resfresca la llista de xarxes" +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "Quasi sempre s'ha d'usar wext com a controlador WPA supplicant" -msgid "Scanning" -msgstr "S'està escanejant" +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "" + +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "" -msgid "Connecting" -msgstr "S'està connectant" +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" +"wicd-curses no permet l'eliminació de l'últim perfil. Proveu de canviar-li " +"el nom ('F2')" + +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "" + +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "" + +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "" + +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "" + +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "" + +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "" -msgid "Configure Selected Network" -msgstr "Configura la xarxa seleccionada " +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "S'ha desconnectat" -msgid "Wireless Networks" -msgstr "Xarxes sense fil" +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "" -msgid "OK" -msgstr "D'acord" +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "Preferències" -msgid "Wired Networks" -msgstr "Xarxes cablejades" +#: data/wicd.ui:136 +msgid "_About" +msgstr "" -msgid "DNS domain" -msgstr "Domini DNS" +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "S'ha connectat..." -msgid "Verifying access point association..." -msgstr "S'està verificant l'associació amb el punt d'accés..." +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "" -msgid "Preferences dialog" -msgstr "Diàleg de preferències" +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "Continuar script" -msgid "Run pre-disconnect script" -msgstr "Executa l'script predesconnexió" +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "" -msgid "Connection Failed: No DHCP offers received." -msgstr "La connexió ha fallat: No s'han rebut ofertes DHCP" +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "Executa l'script predesconnexió" -msgid "For more detailed help, consult the wicd-curses(8) man page." -msgstr "Per una ajuda més detallada, consulteu la pàgina man de wicd-curses(8)" +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "Executa script de post-desconnexió" -msgid "Unable to connect to wicd daemon DBus interface. This typically means there was a problem starting the daemon. Check the wicd log for more information." -msgstr "No es pot connectar amb el dimoni de la interfície DBus de wicd. Això habitualment indica que hi ha hagut un problema en iniciar el dimoni. Per més informació, comproveu el registre de wicd." +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "Executa l'script predesconnexió" -msgid "Display this help dialog" -msgstr "Mostra aquest diàleg d'ajuda" +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "Executa script de post-desconnexió" -msgid "Changes to your backend won't occur until the daemon is restarted." -msgstr "Els canvis en el dorsal no es notaran fins que reinicieu el dimoni" +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "Canvia a la xarxa cablejada sempre que estigui disponible" -msgid "Stop a network connection in progress" -msgstr "Atura una connexió en progrés" +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" -msgid "Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", and \"disconnectscript\" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively. Note that you will be specifying the full path to the scripts - not the actual script contents. You will need to add/edit the script contents separately. Refer to the wicd manual page for more information." -msgstr "Llavors, podeu ajustar (o afegir) les variables \"beforescript\", \"afterscript\" i \"disconnectscript\" segons us calgui, per canviar els scripts de preconnexió, postconnexió o desconnexió respectivament. Noteu que heu d'especificar el camí complet als scripts, no el contingut dels scripts. Haureu d'afegir/editar el contingut de l'script separadament. Per més informació, dirigiu-vos al manual de wicd." +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "Domini DNS" -msgid "Search domain" -msgstr "Cerca el domini" +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "" -msgid "Connection failed: Could not contact the wireless access point." -msgstr "La connexió ha fallat: no s'ha pogut contactar amb el punt d'accés sense fils" +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "Reconnecta automàticament en perdre la connexió" -msgid "Validating authentication..." -msgstr "S'està validant l'autenticació..." +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "Reconnexió automàtica" -msgid "Check if using madwifi/atheros drivers" -msgstr "Comprova si s'estan usant els controladors madwifi/atheros" +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "Reanomena el perfil de xarxa amb fil" -msgid "Properties" -msgstr "Propietats" +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "" -msgid "Establishing connection..." -msgstr "S'està establint la connexió..." +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "Reanomena el perfil de xarxa amb fil" -msgid "Setting encryption info" -msgstr "Configuració d'informació d'encriptació" +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "Reconnexió automàtica" -msgid "About Wicd" -msgstr "Quant a Wicd" +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "Interfície amb fil" -msgid "Connection established" -msgstr "s'ha establert la connexió" +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "Interfície sense fil" -msgid "Could not find a graphical sudo program. The script editor could not be launched. You'll have to edit scripts directly your configuration file." -msgstr "No es pot trobar un programa sudo gràfic. L'editor d'script no s'ha pogut engegar. Haureu d'editar els scripts directament del fitxer de configuració." +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "Interfícies de xarxa" -msgid "Cancel" -msgstr "Cancel·la" +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "Servidor DNS" -msgid "Backend" -msgstr "Dorsal" +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "Servidor DNS" -msgid "Disconnecting active connections..." -msgstr "S'estan aturant les connexions actives..." +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "Servidor DNS" -msgid "Global DNS has not been enabled in general preferences." -msgstr "Les DNS globals no s'han activat a les preferències generals." +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "Cerca el domini" -msgid "Notifications" -msgstr "Notificacions" +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "Servidors DNS globals" -msgid "Connect to selected network" -msgstr "Connecta a la xarxa seleccionada" +#: data/wicd.ui:960 +msgid "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" + +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "Notificacions" -msgid "DNS server" -msgstr "Servidor DNS" +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "Neteja la taula de rutes" -msgid "Disconnected" -msgstr "S'ha desconnectat" +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "Detecció de connexió cablejada" -msgid "Wicd daemon unreachable" -msgstr "No s'ha trobat el dimoni de wicd" +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "" + +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "" -msgid "ESSID" -msgstr "ESSID" +#: data/wicd.ui:1421 +msgid "" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" + +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "" -msgid "Scan for hidden networks" -msgstr "Cerca xarxes ocultes" +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "Interfície sense fil" -msgid "Display notifications about connection status" -msgstr "Mostra notificacions quan a l'estat de la connexió" +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "" -msgid "Use as default profile (overwrites any previous default)" -msgstr "Utilitza com a predefinida (sobreescriu la predefinida anteriorment)" +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "S'està depurant" -msgid "Suspend script" -msgstr "Suspendre script" +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "Dorsal" -msgid "Invalid IP address entered." -msgstr "Direcció IP introduïda no vàlida." +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "" -msgid "Resume script" -msgstr "Continuar script" +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "Quasi sempre s'ha d'usar wext com a controlador WPA supplicant" diff -Nru wicd-1.7.0+ds1/po/cs.po wicd-1.7.1/po/cs.po --- wicd-1.7.0+ds1/po/cs.po 2010-03-03 21:26:18.000000000 +0000 +++ wicd-1.7.1/po/cs.po 2012-01-15 19:17:41.000000000 +0000 @@ -2,493 +2,1061 @@ # Translator ID 22 # /translator/edit/22/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-15 20:03+0100\n" +"Last-Translator: Zbyněk Schwarz \n" +"Language-Team: cs \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-15 05:33+0000\n" +"X-Generator: Launchpad (build 14487)\n" +"Generated-By: Babel 0.9.6\n" -msgid "Connect" -msgstr "Připojit" - -msgid "IP" -msgstr "IP" - -msgid "Netmask" -msgstr "Maska sítě" +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" -msgid "Gateway" -msgstr "Brána" +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" +"$A\n" +"$B KB/s\n" +"$C KB/s" + +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "O aplikaci" -msgid "DNS" -msgstr "DNS" +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "O Wicd" -msgid "Use Static IPs" -msgstr "Použít statickou IP adresu" +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "Aktivovat sdílení internetového připojení" -msgid "Use Static DNS" -msgstr "Použít statické DNS" +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "Přidat nový profil" -msgid "Use Encryption" -msgstr "Použít šifrování" +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "Přidat nový drátový profil" +#: curses/prefs_curses.py:52 data/wicd.ui:1669 msgid "Advanced Settings" msgstr "Pokročilá nastavení" -msgid "Wired Network" -msgstr "Drátová síť" +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Vždy zobrazovat drátové zařízení" + +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Vždy přepnout na drátové připojení, je-li dostupné" + +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Autentizace" + +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "Automaticky (doporučeno)" +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Automatické obnovení připojení" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 msgid "Automatically connect to this network" msgstr "Automaticky se připojit k této síti" -msgid "Secured" -msgstr "Zabezpečeno" +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Automaticky se znovu připojit po pádu spojení" -msgid "Unsecured" -msgstr "Nezabezpečeno" +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "Backend" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "Přenesený k vám přes:" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "Nemůžu se připojit k démonu, zkouším ho automaticky nastartovat..." + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "Zrušit" +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 msgid "Channel" msgstr "Kanál" -msgid "Preferences" -msgstr "Vlastnosti" +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Vyberte ze sítí zobrazených níže:" -msgid "WPA Supplicant Driver" -msgstr "Ovladač pro WPA Supplicant" +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "Nastavení" -msgid "Wireless Interface" -msgstr "Bezdrátové zařízení" +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "Nastavení vybrané sítě" -msgid "Wired Interface" -msgstr "Drátové zařízení" +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "Nastavení možností po drátový profil \"$A\"" -msgid "Always show wired interface" -msgstr "Vždy zobrazovat drátové zařízení" +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "Nastavení možností po bezdrátovou síť \"$A\" ($B)" -msgid "Automatically reconnect on connection loss" -msgstr "Automaticky se znovu připojit po pádu spojení" +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "Nastavuji bezdrátové zařízení..." -msgid "Hidden Network" -msgstr "Skrytá síť" +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "Připojit" -msgid "Hidden Network ESSID" -msgstr "ESSID skryté bezdrátové sítě" +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "Připojení k vybrané síti" +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 msgid "Connected to $A at $B (IP: $C)" msgstr "Připojeno k $A přes $B (s IP: $C)" +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 msgid "Connected to wired network (IP: $A)" msgstr "Připojeno drátovou sítí (s IP: $A)" -msgid "Not connected" -msgstr "Nepřipojeno" +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "Připojuji" -msgid "No wireless networks found." -msgstr "Nebyly nalezeny žádné bezdrátové sítě." +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Spojení zrušeno" -msgid "Key" -msgstr "Klíč" +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Spojení zrušeno" -msgid "Username" -msgstr "Uživatelské jméno" +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "Spojení selhalo: nesprávné heslo" -msgid "Password" -msgstr "Heslo" +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "Připojení selhalo: DHCP server neodpověděl." -msgid "Anonymous Identity" -msgstr "Anonymní identita" +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "Spojení selhalo: není možné získat IP adresu" -msgid "Identity" -msgstr "Identita" +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "Spojení navázáno" -msgid "Authentication" -msgstr "Autentizace" +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "Chyba spojení: Nemohu kontaktovat bezdrátový přístupový bod." -msgid "Path to PAC File" -msgstr "Cesta k PAC souboru" +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "Spojení zrušeno" -msgid "Choose from the networks below:" -msgstr "Vyberte ze sítí zobrazených níže:" +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"Nemůžu se připojit k wicd D-Bus rozhraní. Zkontrolujte chyby ve wicd logu." -msgid "Putting interface down..." -msgstr "Vypínám zařízení..." +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"Nemohu nalézt grafický sudo program. Editor skriptů nemohl být spuštěn. " +"Budete muset upravit skripty manuálně." -msgid "Resetting IP address..." -msgstr "Znovunačítám IP adresu..." +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "Vytvořit Ad-Hoc síť" -msgid "Putting interface up..." -msgstr "Zapínám zařízení..." +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" +"Chyba DBusu! To může být způsobeno zastavením wicd daemona při běhu wicd-" +"curses. Prosím, restartujte daemona a poté wicd-curses." + +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "DHCP klient" + +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "Jméno hostitele DHCP" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "DNS doména" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "DNS server" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "Ladění" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "Odpojeno" + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Odpojit od všech sítí" + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "Odpojeno" + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "Odpojuji aktivní připojení..." + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "Zobraz tuto nápovědu" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "Zobrazit upozornění o stavu spojení" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "Zobraz tuto nápovědu" + +#: wicd/translations.py:78 +msgid "Domain" +msgstr "DNS doména" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "Připojení dokončeno..." -msgid "Removing old connection..." -msgstr "Odstraňuji staré spojení..." +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" +"CHYBA: wicd-curses byl odmítnut přístup k wicd daemonu: zkontrolujte, že " +"patříte do skupiny \"$A\"." + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "ESSID" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "Povolit ladící režim" + +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "Navazuji spojení..." +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "Externí programy" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "Vyprazdňuji směrovací tabulku..." + +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "Detailnější nápovědu najdete v man stránce wicd-curses(8)." + +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Brána" + +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "Obecná nastavení" + +#: wicd/misc.py:85 msgid "Generating PSK..." msgstr "Generuji PSK..." +#: wicd/misc.py:86 msgid "Generating WPA configuration file..." msgstr "Generuji soubor s nastavením WPA..." -msgid "Flushing the routing table..." -msgstr "Vyprazdňuji směrovací tabulku..." +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "Globální DNS nebyly povoleny v Nastavení." -msgid "Configuring wireless interface..." -msgstr "Nastavuji bezdrátové zařízení..." +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "Globální DNS servery" -msgid "Setting broadcast address..." -msgstr "Nastavuji adresu broadcastu..." +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "Nápověda" + +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "Skryté" -msgid "Setting static DNS servers..." -msgstr "Nastavuji statické DNS servery..." +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "ESSID skryté bezdrátové sítě" -msgid "Setting static IP addresses..." -msgstr "Nastavuji statickou IP adresu..." +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" + +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Identita" + +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "Informace o současném připojení." + +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "Zadaná neplatná IP adresa." + +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "Špatná adresa v $A záznamu." + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +msgid "Key" +msgstr "Klíč" + +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Maska sítě" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "Síťová rozhraní" + +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "" + +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "Nebyly nalezeny žádné bezdrátové sítě." + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "Nepřipojeno" +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "Potvrdit" + +#: wicd/misc.py:91 msgid "Obtaining IP address..." msgstr "Získávám IP adresu..." -msgid "Done connecting..." -msgstr "Připojení dokončeno..." +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" +"Zde můžete změnit nebo přidat proměnné \"beforescript\", \"afterscript\" a " +"\"disconnectscript\". Zadáváte plnou cestu ke skriptu, nikoli jeho obsah. " +"Pro více informací se podívejte do manuálových stránek." + +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "Přístupové heslo" -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "K připojení k drátové síti musíte vytvořit síťový profil. K jeho vytvoření zadejte jméno a popis sítě a stiskněte Přidat." +#: wicd/translations.py:82 +msgid "Password" +msgstr "Heslo" -msgid "Wicd needs to access your computer's network cards." -msgstr "Wicd potřebuje přístup k vaší síťové kartě." +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "Cesta k cert CA" -msgid "Run script before connect" -msgstr "Spustit skript před připojením" +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Cesta k PAC souboru" -msgid "Run script after connect" -msgstr "Spustit skript po připojení" +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "Cesta k cert klienta" + +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "Pingnout statické brány kvůli ověření asociace" -msgid "Scripts" -msgstr "Skripty" +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "Spustit skript po odpojení" -msgid "Enable debug mode" -msgstr "Povolit ladící režim" +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "Spustit skript po odpojení" -msgid "Use global DNS servers" -msgstr "Použít globální DNS servery" +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "Spustit skript před odpojením" -msgid "Use default profile on wired autoconnect" -msgstr "Při automatickém připojení k drátové síti použít výchozí profil" +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "Spustit skript před odpojením" + +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Vlastnosti" + +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "Nastavení" +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "Předvolby" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "Předdefinované heslo" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "Stiskněte libovolnou klávesu pro návrat." + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "Soukromý klíč" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "Heslo soukromého klíče" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 msgid "Prompt for profile on wired autoconnect" msgstr "Zeptat se na profil při automatickém připojení k drátové síti" -msgid "Use last used profile on wired autoconnect" -msgstr "Při automatickém připojení k drátové síti použít naposledy použitý profil" - -msgid "Activate Internet Connection Sharing" -msgstr "Aktivovat sdílení internetového připojení" +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "Vlastnosti" -msgid "Use Encryption (WEP only)" -msgstr "Použít šifrování (pouze WEP)" +#: wicd/misc.py:87 +msgid "Putting interface down..." +msgstr "Vypínám zařízení..." -msgid "Use dBm to measure signal strength" -msgstr "Pro sílu signálu používat dBm jednotky" +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "Zapínám zařízení..." -msgid "Wired connection detected" -msgstr "Nalezena drátová síť" +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "Ukončit" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "Ukončit wicd-curses" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "Ukončit wicd-tray-icon" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "" -msgid "Stop Showing Autoconnect pop-up temporarily" -msgstr "Dočasné potlačení zobrazování upozornění na automatické připojení" +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "Obnovit seznam sítí" -msgid "General Settings" -msgstr "Obecná nastavení" +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "Přejmenuj drátový profil" -msgid "External Programs" -msgstr "Externí programy" +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "Chybí požadované informace o šifrování sítě" -msgid "DHCP Client" -msgstr "DHCP klient" +#: wicd/misc.py:90 +msgid "Resetting IP address..." +msgstr "Znovunačítám IP adresu..." -msgid "Wired Link Detection" -msgstr "Hledání drátové sítě" +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "RfKill" +#: curses/prefs_curses.py:103 msgid "Route Table Flushing" msgstr "Vyprázdnění směrovací tabulky" -msgid "Automatic (recommended)" -msgstr "Automaticky (doporučeno)" +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "Hledat" + +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "Vyhledat skryté sítě" + +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "Prohledávám" + +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "Prohledávám sítě... prosím vyčkejte..." -msgid "This network requires encryption to be enabled." -msgstr "Tato síť vyžaduje zapnuté šifrování." +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "Skripty" -msgid "Required encryption information is missing." -msgstr "Chybí požadované informace o šifrování sítě" +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "Hledat doménu" -msgid "Use these settings for all networks sharing this essid" -msgstr "Použít tato nastavení pro všechny sítě používající tuto ESSID" +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Zabezpečeno" +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "Vybrat ESSID skryté sítě" + +#: gtk/gui.py:103 msgid "Select or create a wired profile to connect with" msgstr "Vytvořit nebo vybrat drátový profil pro připojení" -msgid "Connection Failed: Unable to Get IP Address" -msgstr "Spojení selhalo: není možné získat IP adresu" +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "Vyber skripty" -msgid "Connection Cancelled" -msgstr "Spojení zrušeno" +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "Nastaveni Ad-hoc sítě" -msgid "Connection Failed: Bad password" -msgstr "Spojení selhalo: nesprávné heslo" +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "Nastavuji adresu broadcastu..." -msgid "Wireless Kill Switch Enabled" -msgstr "Funkce rychlého odpojení od bezdrátové sítě zapnuta" +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "Nastavuji statické DNS servery..." -msgid "Scanning networks... stand by..." -msgstr "Prohledávám sítě... prosím vyčkejte..." +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "Nastavuji statickou IP adresu..." -msgid "Configuring preferences for wired profile \"$A\"" -msgstr "Nastavení možností po drátový profil \"$A\"" +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "Odpojit od všech sítí" -msgid "Configuring preferences for wireless network \"$A\" ($B)" -msgstr "Nastavení možností po bezdrátovou síť \"$A\" ($B)" +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "Dočasné potlačení zobrazování upozornění na automatické připojení" -msgid "Scan" -msgstr "Hledat" +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "Zastavit připojování k síti" -msgid "Always switch to wired connection when available" -msgstr "Vždy přepnout na drátové připojení, je-li dostupné" +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "Vypnout Wi-Fi" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "Zapnout Wi-Fi" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "Karta doleva" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "Karta doprava" -msgid "Wired Autoconnect Settings" -msgstr "Vlastnosti automatického drátového připojení" +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "Ukončeno uživatelem" -msgid "You should almost always use wext as the WPA supplicant driver" -msgstr "Měl byste vždy používat wext jako WPA supplicant driver" +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" +"Wicd daemon byl vypnut. Grafický program nebude fungovat správně, dokud " +"daemona nerestartujete." -msgid "Debugging" -msgstr "Ladění" +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "Tato síť vyžaduje zapnuté šifrování." -msgid "WPA Supplicant" -msgstr "WPA Supplicant" +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" +"Kvůli komplikacím wicd-curses nepodporuje přímou editaci skriptů, můžete je " +"však editovat ručně. Nejprve (jako root) otevřete konfigurační soubor \"$A\" " +"a vyhledejte sekci nazvanou $B. V tomto případě to je:" -msgid "Automatic Reconnection" -msgstr "Automatické obnovení připojení" +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" +"Pro připojení k drátové síti musíte vytvořit Síťový profil. Pro vytvoření " +"síťového profilu napište jméno, které ho popisuje a stiskněte Přidat" -msgid "Global DNS servers" -msgstr "Globální DNS servery" +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" +"Nemohu zkontaktovat wicd daemona kvůli odepření přístupu z DBusu. Prosím, " +"zkontrolujte, zda je váš uživatel ve skupině $A." -msgid "Network Interfaces" -msgstr "Síťová rozhraní" +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "Nezabezpečeno" -msgid "Connecting to daemon..." -msgstr "Připojování k démonu..." +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "Použít jméno hostitele DHCP" -msgid "Can't connect to the daemon, trying to start it automatically..." -msgstr "Nemůžu se připojit k démonu, zkouším ho automaticky nastartovat..." +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "Použít šifrování" -msgid "Could not connect to wicd's D-Bus interface. Check the wicd log for error messages." -msgstr "Nemůžu se připojit k wicd D-Bus rozhraní. Zkontrolujte chyby ve wicd logu." +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "Použít šifrování (pouze WEP)" -msgid "Wicd Curses Interface" -msgstr "Wicd Curses Rozhraní" +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "Použít statické DNS" -msgid "Terminated by user" -msgstr "Ukončeno uživatelem" +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "Použít statickou IP adresu" -msgid "DBus failure! This is most likely caused by the wicd daemon stopping while wicd-curses is running. Please restart the daemon, and then restart wicd-curses." -msgstr "Chyba DBusu! To může být způsobeno zastavením wicd daemona při běhu wicd-curses. Prosím, restartujte daemona a poté wicd-curses." +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "" +"Použijte jako výchozí profil (přepíše všechny předchozí výchozí profily)" -msgid "EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:" -msgstr "VYJÍMKA! Prosím, nahlaste toto vývojářům a k hlášení o chybě připojte backtrace vypsaný níže:" +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "Pro sílu signálu používat dBm jednotky" -msgid "Brought to you by:" -msgstr "Přenesený k vám přes:" +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "Při automatickém připojení k drátové síti použít výchozí profil" -msgid "To avoid various complications, wicd-curses does not support directly editing the scripts. However, you can edit them manually. First, (as root)\", open the \"$A\" config file, and look for the section labeled by the $B in question. In this case, this is:" -msgstr "Kvůli komplikacím wicd-curses nepodporuje přímou editaci skriptů, můžete je však editovat ručně. Nejprve (jako root) otevřete konfigurační soubor \"$A\" a vyhledejte sekci nazvanou $B. V tomto případě to je:" +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "Použít globální DNS servery" -msgid "Add a new profile" -msgstr "Přidat nový profil" +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "" +"Při automatickém připojení k drátové síti použít naposledy použitý profil" -msgid "Add a new wired profile" -msgstr "Přidat nový drátový profil" +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "Použít tato nastavení pro všechny sítě používající tuto ESSID" -msgid "wicd-curses does not support deleting the last wired profile. Try renaming it ('F2')" -msgstr "wicd-curses nepodporují mazání posledního drátového profilu. Zkuste ho přejmenovat ('F2')" +#: wicd/translations.py:89 +msgid "Username" +msgstr "Uživatelské jméno" -msgid "Rename wired profile" -msgstr "Přejmenuj drátový profil" +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "Ověřuji přihlášení..." -msgid "Select Hidden Network ESSID" -msgstr "Vybrat ESSID skryté sítě" +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "Ověřuji asociace access pointu..." -msgid "Press ESC to cancel" -msgstr "Stiskněte ESC pro zrušení" +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "WPA Supplicant" -msgid "Press F8 or Q to quit." -msgstr "Stiskni F8 nebo Q pro ukončení." +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "Wicd Curses Rozhraní" -msgid "You can also configure the wireless networks by looking for the \"[]\" field in the config file." -msgstr "Můžete také konfigurovat bezdrátové sítě vyhledáním \"[]\" políčka v konfiguračním souboru." +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "Wicd daemon nedostupný" -msgid "Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", and \"disconnectscript\" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively. Note that you will be specifying the full path to the scripts - not the actual script contents. You will need to add/edit the script contents separately. Refer to the wicd manual page for more information." -msgstr "Zde můžete změnit nebo přidat proměnné \"beforescript\", \"afterscript\" a \"disconnectscript\". Zadáváte plnou cestu ke skriptu, nikoli jeho obsah. Pro více informací se podívejte do manuálových stránek." +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "Wicd potřebuje přístup k vaší síťové kartě." -msgid "Wired Networks" -msgstr "Drátová připojení" +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" +"Drátové\n" +"IP:\n" +"RX:\n" +"TX:" -msgid "Wireless Networks" -msgstr "Bezdrátová připojení" +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "Vlastnosti automatického drátového připojení" -msgid "About Wicd" -msgstr "O Wicd" +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "Drátové zařízení" -msgid "For more detailed help, consult the wicd-curses(8) man page." -msgstr "Detailnější nápovědu najdete v man stránce wicd-curses(8)." +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "Hledání drátové sítě" -msgid "All controls are case sensitive" -msgstr "Všechna nastavení rozlišují velikost písmen" +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "Drátová síť" -msgid "Display this help dialog" -msgstr "Zobraz tuto nápovědu" +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "Drátová připojení" -msgid "Connect to selected network" -msgstr "Připojení k vybrané síti" +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "Nalezena drátová síť" -msgid "Disconnect from all networks" -msgstr "Odpojit od všech sítí" +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "Bezdrátové SSID: Speed: IP: Síla: RX: TX:" -msgid "Stop a network connection in progress" -msgstr "Zastavit připojování k síti" +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "Bezdrátové zařízení" -msgid "Refresh network list" -msgstr "Obnovit seznam sítí" +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "Funkce rychlého odpojení od bezdrátové sítě zapnuta" -msgid "Preferences dialog" -msgstr "Nastavení" +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "Bezdrátová připojení" -msgid "Scan for hidden networks" -msgstr "Vyhledat skryté sítě" +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" +"Můžete také konfigurovat bezdrátové sítě vyhledáním \"[]\" políčka v " +"konfiguračním souboru." -msgid "Select scripts" -msgstr "Vyber skripty" +#: gtk/netentry.py:300 gtk/netentry.py:408 +msgid "You must enter your password to configure scripts" +msgstr "Musíte vložit Vaše heslo pro nastavení skriptů" -msgid "Set up Ad-hoc network" -msgstr "Nastaveni Ad-hoc sítě" +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "Měl byste vždy používat wext jako WPA supplicant driver" -msgid "Configure Selected Network" -msgstr "Nastavení vybrané sítě" +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "_Informace o spojení" + +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "_Ukončit" -msgid "use urwid's raw screen controller" -msgstr "použít urwid's raw screen controller" +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" +"wicd-curses nepodporují mazání posledního drátového profilu. Zkuste ho " +"přejmenovat ('F2')" + +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "nápověda wicd-curses" + +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "Správce sítě Wicd" + +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "Vytvořit síť ad-hoc" + +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "Najít skrytou síť" + +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "Pro nalezení skryté sítě zadejte její jméno." + +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "_Vypnout Wi-Fi" -msgid "OK" -msgstr "Potvrdit" +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "Odpojeno" -msgid "Cancel" -msgstr "Zrušit" +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "" -msgid "Connection Failed: No DHCP offers received." -msgstr "Připojení selhalo: DHCP server neodpověděl." +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "Vlastnosti" -msgid "Unable to connect to wicd daemon DBus interface. This typically means there was a problem starting the daemon. Check the wicd log for more information." -msgstr "Nemohu se připojit k DBbus rozhraní wicd, pravděpodobně nastal problém se spouštěním daemona. Pro více informací se podívejte do wicd logu." +#: data/wicd.ui:136 +msgid "_About" +msgstr "_O programu" -msgid "You must enter your password to configure scripts" -msgstr "Musíte vložit Vaše heslo pro nastavení skriptů" +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "Připojení dokončeno..." -msgid "Scanning" -msgstr "Prohledávám" +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "Přerušit probíhající pokus o připojení." -msgid "Connecting" -msgstr "Připojuji" +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "Obnovit skript" -msgid "Validating authentication..." -msgstr "Ověřuji přihlášení..." +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "Nastavit skripty pro spuštění na této síti:" -msgid "Check if using madwifi/atheros drivers" -msgstr "Zkontrolujte, zda používáte ovladače madwifi/atheros" +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "Spustit skript před odpojením" -msgid "Properties" -msgstr "Vlastnosti" +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "Spustit skript po odpojení" -msgid "Could not find a graphical sudo program. The script editor could not be launched. You'll have to edit scripts directly your configuration file." -msgstr "Nemohu nalézt grafický sudo program. Editor skriptů nemohl být spuštěn. Budete muset upravit skripty manuálně." +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "Spustit skript před odpojením" -msgid "DNS domain" -msgstr "DNS doména" +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "Spustit skript po odpojení" -msgid "Create an Ad-Hoc Network" -msgstr "Vytvořit Ad-Hoc síť" +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "Vždy přepnout na drátové připojení, je-li dostupné" -msgid "Global DNS has not been enabled in general preferences." -msgstr "Globální DNS nebyly povoleny v Nastavení." +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" +"Pokud je zvolena tato volba, Wicd se automaticky připojí k LAN\n" +"jakmile je připojen síťový kabel, ikdyž bezdrátové připojení je již aktivní." -msgid "DNS server" -msgstr "DNS server" +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "DNS doména" -msgid "The wicd daemon has shut down. The UI will not function properly until it is restarted." -msgstr "Wicd daemon byl vypnut. Grafický program nebude fungovat správně, dokud daemona nerestartujete." +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "Nikdy nepřipojovat" -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "Pro připojení k drátové síti musíte vytvořit Síťový profil. Pro vytvoření síťového profilu napište jméno, které ho popisuje a stiskněte Přidat" +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "Automaticky se znovu připojit po pádu spojení" -msgid "Wicd daemon unreachable" -msgstr "Wicd daemon nedostupný" +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "Automatické obnovení připojení" -msgid "ESSID" -msgstr "ESSID" +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "Přejmenuj drátový profil" -msgid "The wicd daemon is unavailable, so your request cannot be completed" -msgstr "Wicd daemon je nedostupný, takže Váš požadavek nemůže být splněn" +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "Výzva pro drátový profil sítě" -msgid "Use as default profile (overwrites any previous default)" -msgstr "Použijte jako výchozí profil (přepíše všechny předchozí výchozí profily)" +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "Přejmenuj drátový profil" -msgid "Changes to your backend won't occur until the daemon is restarted." -msgstr "Změny se projeví až po restartu démona." +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "Automatické obnovení připojení" -msgid "Search domain" -msgstr "Hledat doménu" +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "Drátové zařízení" -msgid "Connection failed: Could not contact the wireless access point." -msgstr "Chyba spojení: Nemohu kontaktovat bezdrátový přístupový bod." +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "Bezdrátové zařízení" -msgid "Establishing connection..." -msgstr "Navazuji spojení..." +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "Síťová rozhraní" -msgid "Connection established" -msgstr "Spojení navázáno" +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "DNS server" -msgid "Invalid address in $A entry." -msgstr "Špatná adresa v $A záznamu." +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "DNS server" -msgid "Unable to contact the Wicd daemon due to an access denied error from DBus. Please check that your user is in the $A group." -msgstr "Nemohu zkontaktovat wicd daemona kvůli odepření přístupu z DBusu. Prosím, zkontrolujte, zda je váš uživatel ve skupině $A." +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "DNS server" -msgid "Verifying access point association..." -msgstr "Ověřuji asociace access pointu..." +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "Hledat doménu" -msgid "Notifications" -msgstr "Upozornění" +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "Globální DNS servery" -msgid "Disconnected" -msgstr "Odpojeno" +#: data/wicd.ui:960 +msgid "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" +"Pokud je aktivováno, síťové rozhraní bude vždy zobrazeno v hlavním okně. " +"Může to být užitečné, pokud Vaše síťová karta automaticky nerozpozná " +"připojení kabelu." + +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "Upozornění" -msgid "Display notifications about connection status" -msgstr "Zobrazit upozornění o stavu spojení" +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "Vyprázdnění směrovací tabulky" -msgid "Invalid IP address entered." -msgstr "Zadaná neplatná IP adresa." +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "Hledání drátové sítě" -msgid "Disconnecting active connections..." -msgstr "Odpojuji aktivní připojení..." +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "Klient DHCP" + +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "Grafická aplikace Sudo" + +#: data/wicd.ui:1421 +msgid "" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" +"Najeďte kurzorem nad zvolenou cílovou architekturu\n" +"k zobrazení jejího popisu." + +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "Ovladač:" -msgid "Suspend script" -msgstr "Pozastavit skript" +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "Bezdrátové zařízení" -msgid "ERROR: wicd-curses was denied access to the wicd daemon: please check that your user is in the \"$A\" group." -msgstr "CHYBA: wicd-curses byl odmítnut přístup k wicd daemonu: zkontrolujte, že patříte do skupiny \"$A\"." +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "b>Suplikant WPA" -msgid "Setting encryption info" -msgstr "Nastavuji šifrovací informace" +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "Ladění" -msgid "Backend" +#: data/wicd.ui:1574 +msgid "Backend:" msgstr "Backend" -msgid "Resume script" -msgstr "Obnovit skript" +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "Cílová architektura" -msgid "Run post-disconnect script" -msgstr "Spustit skript po odpojení" +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "Měl byste vždy používat wext jako WPA supplicant driver" -msgid "Run pre-disconnect script" -msgstr "Spustit skript před odpojením" +#~ msgid "Help)" +#~ msgstr "Nápověda)" diff -Nru wicd-1.7.0+ds1/po/da.po wicd-1.7.1/po/da.po --- wicd-1.7.0+ds1/po/da.po 2010-03-03 21:26:25.000000000 +0000 +++ wicd-1.7.1/po/da.po 2012-01-15 19:18:15.000000000 +0000 @@ -2,513 +2,1046 @@ # Translator ID 23 # /translator/edit/23/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-15 20:03+0100\n" +"Last-Translator: David Paleino \n" +"Language-Team: da \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-10 05:02+0000\n" +"X-Generator: Launchpad (build 14450)\n" +"Generated-By: Babel 0.9.6\n" -msgid "Connect" -msgstr "Tilslut" +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" -msgid "IP" -msgstr "IP:" +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" + +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "" -msgid "Netmask" -msgstr "Netmaske:" +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "Om Wicd" -msgid "Gateway" -msgstr "Gateway:" +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "Aktiver Internet forbindelse deling" -msgid "DNS" -msgstr "DNS:" +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "Tilføj en ny profil" -msgid "Use Static IPs" -msgstr "Anvend statiske IP'er:" +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "Tilføje en ny kablet profil" -msgid "Use Static DNS" -msgstr "Anvend statisk DNS" +#: curses/prefs_curses.py:52 data/wicd.ui:1669 +msgid "Advanced Settings" +msgstr "Avancerede indstillinger" -msgid "Use Encryption" -msgstr "Anvend kryptering" +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Vis altid kablet netværkskort" -msgid "Advanced Settings" -msgstr "Avancerede indstillinger:" +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Skift altid til kablet forbindelse når tilgængelig" -msgid "Wired Network" -msgstr "Trådet netværk" +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Godkendelse" +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "Automatisk (anbefalet)" + +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Automatisk forbindelsesgenopretning" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 msgid "Automatically connect to this network" -msgstr "Tilslut automatisk til dette netværk" +msgstr "Forbind automatisk til dette netværk" -msgid "Secured" -msgstr "Krypteret:" +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Genopret automatisk forbindelse ved tabt forbindelse" -msgid "Unsecured" -msgstr "Ukrypteret:" +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "Motor" -msgid "Channel" -msgstr "Kanal:" +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "Leveret til dig af:" -msgid "Preferences" -msgstr "Indstillinger" +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "" +"Kan ikke skabe forbindelse til dæmonen, forsøger at starte den automatisk..." -msgid "WPA Supplicant Driver" -msgstr "WPA Supplicant driver:" +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "Afbryd" -msgid "Wireless Interface" -msgstr "Trådløst netværkskort:" +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 +msgid "Channel" +msgstr "Kanal" -msgid "Wired Interface" -msgstr "trådet interface" +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Vælg fra nedenstående netværk:" -msgid "Always show wired interface" -msgstr "Vis altid trådet netværkskort" +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "" + +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "Konfigurer det valgte netværk" -msgid "Automatically reconnect on connection loss" -msgstr "Genopret automatisk forbindelse ved tabt forbindelse:" +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "Konfigurere præferencer for den kablet profil \"$A\":" -msgid "Hidden Network" -msgstr "Skjult netværk:" +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "Konfigurere indstillingerne for det trådløse netværk \"$A\" ($B)" -msgid "Hidden Network ESSID" -msgstr "Skjult netværks-ESSID:" +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "Konfigurerer trådløst netværkskort..." +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "Forbind" + +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "Forbind til det valgte netværk" + +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 msgid "Connected to $A at $B (IP: $C)" -msgstr "Tilsluttet $A ved $B (IP: $C):" +msgstr "Tilsluttet $A ved $B (IP: $C)" +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 msgid "Connected to wired network (IP: $A)" -msgstr "Tilsluttet trådet netværk (IP: $A):" +msgstr "Tilsluttet kablet netværk (IP: $A)" -msgid "Not connected" -msgstr "Ikke tilsluttet:" +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "Forbinder" -msgid "No wireless networks found." -msgstr "Ingen trådløse netværk fundet." +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Forbindelse afbrudt" -msgid "Key" -msgstr "Nøgle:" +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Tilslutning annulleret" -msgid "Username" -msgstr "Brugernavn:" +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "Tilslutning mislykkedes: Forkert adgangskode" -msgid "Password" -msgstr "Adgangskode" +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "Forbindelse mislykkedes: Ingen DHCP tilbud modtaget." -msgid "Anonymous Identity" -msgstr "Anonym identitet:" +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "Tilslutning mislykkedes: Kunne ikke hente IP adresse" -msgid "Identity" -msgstr "Identitet:" +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "Forbindelse oprettet" -msgid "Authentication" -msgstr "Godkendelse:" +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "" +"Forbindelse mislykkedes: Kunne ikke komme i kontakt med det trådløse access " +"point." -msgid "Path to PAC File" -msgstr "Sti til PAC fil" +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "Tilslutning annulleret" -msgid "Choose from the networks below:" -msgstr "Vælg fra nedenstående netværk:" +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"Kunne ikke skabe forbindelse til wicd's D-Bus grænseflade. Kontroller wicd " +"logfilen for fejlmeddelser." -msgid "Putting interface down..." -msgstr "Deaktiverer grænseflade..." +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"Kunne ikke finde et grafisk sudo-program. Skript redigeringen kunne ikke " +"startes. Du må derfor redigere skripts direkte i din konfigurationsfil." -msgid "Resetting IP address..." -msgstr "Nulstiller IP adresse..." +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "Opret et Ad-Hoc netværk" -msgid "Putting interface up..." -msgstr "Sætter grænsefladen op..." +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" +"DBus fejl! Dette skyldes formentlig at wicd dæmonen stopper mens wicd-curses " +"kører. Genstart venligst dæmonen, og genstart derefter wicd-curses." -msgid "Removing old connection..." -msgstr "Fjerner tidligere forbindelse..." +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "DHCP klient" -msgid "Generating PSK..." -msgstr "Genererer PSK..." +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "" -msgid "Generating WPA configuration file..." -msgstr "Genererer WPA konfigurationsfil..." +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "DNS domæne" -msgid "Flushing the routing table..." -msgstr "Rydder rute tabellen..." +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "DNS server" -msgid "Configuring wireless interface..." -msgstr "Konfigurerer trådløst netværkskort..." +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "Fejlsøgning" -msgid "Setting broadcast address..." -msgstr "Indstiller broadcast adresse..." +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "Afbrudt" -msgid "Setting static DNS servers..." -msgstr "Indstiller statiske DNS-servere..." +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Afbryd alle netværk" -msgid "Setting static IP addresses..." -msgstr "Indstiller statiske IP-adresser..." +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "Afbrudt" -msgid "Obtaining IP address..." -msgstr "Henter IP adresse..." +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "Afbryder aktive forbindelser..." + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "Vis denne hjælpedialogboks" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "Vis informationer om forbindelsesstatus" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "Vis denne hjælpedialogboks" + +#: wicd/translations.py:78 +msgid "Domain" +msgstr "DNS domæne" +#: wicd/misc.py:82 msgid "Done connecting..." msgstr "Forbindelse oprettet..." -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "For at oprette forbindelse til et trådet netværk, skal du oprette en netværks profil. Indtast et navn som beskriver netværket for at oprette en netværksprofil, og tryk \"Tilføj\"." +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" +"FEJL: wicd-curses blev nægtet adgang til wicd dæmonen: kontroller venlligst " +"at din bruger er i \"$A\" gruppen." -msgid "Wicd needs to access your computer's network cards." -msgstr "Wicd har behov for adgang til din computers netværkskort." +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "ESSID" -msgid "Run script before connect" -msgstr "Kør skript før tilslutning:" +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "Aktiver debug tilstand" -msgid "Run script after connect" -msgstr "Kør skript efter tilslutning:" +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "Etablerer forbindelse..." -msgid "Scripts" -msgstr "Skripts:" +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "Eksterne programmer" -msgid "Enable debug mode" -msgstr "Aktiver fejlsøgnings tilstand" +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "Rydder rute tabellen..." -msgid "Use global DNS servers" -msgstr "Brug globale DNS-servere" +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "Se wicd-curses(8) man side for mere detaljeret hjælp." -msgid "Use default profile on wired autoconnect" -msgstr "Brug standardprofil ved trådet autoforbindelse:" +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Gateway" -msgid "Prompt for profile on wired autoconnect" -msgstr "Spørg efter profil ved kablet autoforbindelse:" +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "Generelle indstillinger" -msgid "Use last used profile on wired autoconnect" -msgstr "Brug sidst anvendte profil ved trådet autoforbindelse:" +#: wicd/misc.py:85 +msgid "Generating PSK..." +msgstr "Genererer PSK..." -msgid "Activate Internet Connection Sharing" -msgstr "Aktiver Internet forbindelse deling:" +#: wicd/misc.py:86 +msgid "Generating WPA configuration file..." +msgstr "Genererer WPA konfigurationsfil..." -msgid "Use Encryption (WEP only)" -msgstr "Brug kryptering (kun WEP):" +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "Global DNS er ikke aktiveret i generelle indstillinger." -msgid "Use dBm to measure signal strength" -msgstr "Brug dBm til at måle signal styrken" +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "Globale DNS servere" -msgid "Wired connection detected" -msgstr "Trådet forbindelse fundet:" +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "" -msgid "Stop Showing Autoconnect pop-up temporarily" -msgstr "Stop midlertidig visning af Autoforbindelse pop-up:" +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "" -msgid "General Settings" -msgstr "Generelle indstillinger:" +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "Skjult netværks-ESSID" -msgid "External Programs" -msgstr "Eksterne programmer" +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" -msgid "DHCP Client" -msgstr "DHCP klient" +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Identitet" -msgid "Wired Link Detection" -msgstr "Opdagelse af trådet netværk:" +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "" -msgid "Route Table Flushing" -msgstr "Nulstiller rute-tabel:" +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "Ugyldig IP adresse indtastet." -msgid "Automatic (recommended)" -msgstr "Automatisk (anbefalet):" +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "Forkert adresse i $A indtastningen." -msgid "This network requires encryption to be enabled." -msgstr "Dette netværk kræver kryptering aktiveret" +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +msgid "Key" +msgstr "Nøgle" -msgid "Required encryption information is missing." -msgstr "Den nødvendige krypteringsinformation mangler." +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Netmaske" -msgid "Use these settings for all networks sharing this essid" -msgstr "Brug disse indstillinger for alle netværk med dette ESSID" +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "Netværksgrænseflader" -msgid "Select or create a wired profile to connect with" -msgstr "Vælg eller opret en trådet profil for tilsluttening" +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "" -msgid "Connection Failed: Unable to Get IP Address" -msgstr "Tilslutning mislykkedes: Kunne ikke hente IP adresse:" +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "Ingen trådløse netværk fundet." -msgid "Connection Cancelled" -msgstr "Tilslutning annulleret" +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "Ikke tilsluttet" -msgid "Connection Failed: Bad password" -msgstr "Tilslutning mislykkedes: Forkert adgangskode" +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "OK" -msgid "Wireless Kill Switch Enabled" -msgstr "Trådløs hardware-afbryder aktiveret:" +#: wicd/misc.py:91 +msgid "Obtaining IP address..." +msgstr "Henter IP adresse..." -msgid "Preferences dialog" -msgstr "Indstillings dialogboks" +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" +"Når du er der kan du justerer (eller tilføje) de nødvendige variabler i " +"\"før-skript\", \"efter-skript\", og \"afbryd-skript\", for at ændre enten " +"før-, efter- eller afbryd-skripts. Du skal være opmærksom på, at du skal " +"opgive den fulde sti til skriptet - ikke det faktiske skript-indhold. Du " +"skal tilføje/redigere skriptets indhold separat. Se wicd manuel siden for " +"yderligere information." + +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "" -msgid "Connection Failed: No DHCP offers received." -msgstr "Forbindelse mislykkedes: Ingen DHCP tilbud modtaget." +#: wicd/translations.py:82 +msgid "Password" +msgstr "Adgangskode" -msgid "For more detailed help, consult the wicd-curses(8) man page." -msgstr "Se wicd-curses(8) man side for mere detaljeret hjælp." +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "" -msgid "Unable to connect to wicd daemon DBus interface. This typically means there was a problem starting the daemon. Check the wicd log for more information." -msgstr "Kunne ikke skabe forbindelse til wicd dæmonen DBus grænseflade. Dette betyder ofte at der var et problem med at starte dæmonen. Kontroller wicd log filen for mere information." +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Sti til PAC fil" -msgid "Could not connect to wicd's D-Bus interface. Check the wicd log for error messages." -msgstr "Kunne ikke skabe forbindelse til wicd's D-Bus grænseflade. Kontroller wicd log filen for fejl meddelser." +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "" -msgid "Display this help dialog" -msgstr "Vis denne hjælpe dialog" +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "" +"Ping statisk gateway efter forbindelse, for at bekræfte tilslutningen" -msgid "Disconnect from all networks" -msgstr "Afbryd alle netværk:" +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "Kør efter-afbrydelse skript" -msgid "Changes to your backend won't occur until the daemon is restarted." -msgstr "Ændringer af din \"backend\" sker ikke før dæmonen er genstartet..." +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "Kør efter-afbrydelse skript" -msgid "Stop a network connection in progress" -msgstr "Stop igangværende netværksforbindelse" +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "Kør før-afbrydelse skript" -msgid "Always switch to wired connection when available" -msgstr "Skift altid til trådet forbindelse når tilgængelig:" +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "Kør før-afbrydelse skript" -msgid "To avoid various complications, wicd-curses does not support directly editing the scripts. However, you can edit them manually. First, (as root)\", open the \"$A\" config file, and look for the section labeled by the $B in question. In this case, this is:" -msgstr "For at undgå forskellige problemer, tillader wicd-curses ikke direkte redigering af skripts. Du kan dog redigere dem manuelt. Åbn først konfigurationsfilen \"$A\", og se efter den ønskede sektion mærket med $B. Som i dette tilfælde er: " +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Indstillinger" -msgid "You can also configure the wireless networks by looking for the \"[]\" field in the config file." -msgstr "Du kan også konfigurere det trådløse netværk ved at kikke efter området \"[]\" i konfigurations filen. " +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "Indstillingsdialogboks" -msgid "Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", and \"disconnectscript\" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively. Note that you will be specifying the full path to the scripts - not the actual script contents. You will need to add/edit the script contents separately. Refer to the wicd manual page for more information." -msgstr "Når du er der kan du justerer (eller tilføje) de nødvendige variabler i \"før-skript\", \"efter-skript\", og \"afbryd-script\", for at ændre enten før-, efter- eller afbryd-skripts. Du skal være opmærksom på at du skal opgive den fulde sti til skriptet - ikke det faktiske skript-indhold. Du skal tilføje/redigere skriptets indhold separat. Se wicd manuel siden for yderligere information." +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "" -msgid "You must enter your password to configure scripts" -msgstr "Du skal indtaste din adgangskode for at konfigurere skripts" +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "" -msgid "Scanning networks... stand by..." -msgstr "søger netværk... vent venligst..." +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "" +#: wicd/translations.py:87 +msgid "Private key" +msgstr "" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "Spørg efter profil ved kablet autoforbindelse" + +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "Egenskaber" + +#: wicd/misc.py:87 +msgid "Putting interface down..." +msgstr "Deaktiverer grænseflade..." + +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "Sætter grænsefladen op..." + +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "" + +#: curses/wicd-curses.py:218 msgid "Refresh network list" msgstr "Opdater netværksliste" -msgid "Search domain" -msgstr "Søg domæne:" +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "Omdøb kablet profil" + +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "Den nødvendige krypteringsinformation mangler." + +#: wicd/misc.py:90 +msgid "Resetting IP address..." +msgstr "Nulstiller IP adresse..." + +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "" + +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "Nulstiller rutetabel" -msgid "Press ESC to cancel" -msgstr "Tryk på \"ESC\" for at afbryde" +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "Søg" +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "Søg efter skjulte netværk" + +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 msgid "Scanning" msgstr "Søger" -msgid "Brought to you by:" -msgstr "Leveret til dig af:" +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "søger netværk... vent venligst..." + +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "Skripts" + +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "Søgedomæne" +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Krypteret" + +#: curses/wicd-curses.py:629 msgid "Select Hidden Network ESSID" msgstr "Vælg skjult netværks ESSID" -msgid "You should almost always use wext as the WPA supplicant driver" -msgstr "Du bør næsten altid anvende wext som WPA supplikant-driver:" +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "Vælg eller opret en kablet profil for tilslutning" -msgid "Connecting" -msgstr "Forbinder" +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "Vælg skripts" -msgid "Connecting to daemon..." -msgstr "Forbinder til dæmon..." +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "Sæt Ad-hoc netværket op" -msgid "Add a new wired profile" -msgstr "Tilføje en ny trådet profil" +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "Indstiller broadcast adresse..." -msgid "Configure Selected Network" -msgstr "konfigurer det valgte netværk" +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "Indstiller statiske DNS-servere..." -msgid "Validating authentication..." -msgstr "validaterer godkendelse..." +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "Sætter statiske IP adresser..." -msgid "Wireless Networks" -msgstr "Trådløse netværk" +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "Afbryd alle netværk" -msgid "Configuring preferences for wired profile \"$A\"" -msgstr "Konfigurere preferencer for den trådet profil \"$A\":" +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "Stop midlertidig visning af Autoforbindelse pop-up" -msgid "Check if using madwifi/atheros drivers" -msgstr "Kontrollere om der anvendes madwifi/atheros drivere" +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "Stop igangværende netværksforbindelse" -msgid "Properties" -msgstr "Egenskaber" +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "" -msgid "Setting encryption info" -msgstr "Indstiller krypterings info" +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "Afbrudt af bruger" -msgid "About Wicd" -msgstr "Om Wicd" +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" +"Wicd dæmonen er stoppet. Brugergrænsefladen vil ikke virke korrekt inden den " +"er genstartet." -msgid "OK" -msgstr "OK" +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "Dette netværk kræver at kryptering er aktiveret" -msgid "Select scripts" -msgstr "Vælg skripts:" +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" +"For at undgå forskellige problemer, tillader wicd-curses ikke direkte " +"redigering af skripts. Du kan dog redigere dem manuelt. Åbn først " +"konfigurationsfilen \"$A\", og se efter den ønskede sektion mærket med $B. I " +"dette tilfælde er det:" -msgid "Invalid address in $A entry." -msgstr "Forkert adresse i $A indtastningen." +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" +"For at forbinde til et kablet netværk, skal du først oprette en " +"netværksprofil. Indtast et navn som beskriver netværket, og tryk Tilføj for " +"at oprette netværksprofilen." -msgid "Could not find a graphical sudo program. The script editor could not be launched. You'll have to edit scripts directly your configuration file." -msgstr "Kunne ikke finde et grafisk sudo program. Skript redigeringen kunne ikke startes. Du må redigere skripts direkte i din konfigurationsfil." +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" +"Kunne ikke kontakte wicd dæmonen på grund af en adgang nægtet fejl fra DBus. " +"Kontroller venligst at din bruger er i $A gruppen." -msgid "Wicd Curses Interface" -msgstr "Wicd Curses grænseflade:" +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "Ukrypteret" -msgid "Wired Networks" -msgstr "Trådet netværk:" +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "" -msgid "WPA Supplicant" -msgstr "WPA Supplicant:" +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "Anvend kryptering" -msgid "Global DNS servers" -msgstr "Globale DNS servere:" +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "Brug kryptering (kun WEP)" -msgid "DNS domain" -msgstr "DNS domæne" +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "Anvend statisk DNS" -msgid "Can't connect to the daemon, trying to start it automatically..." -msgstr "Kan ikke skabe forbindelse til dæmonen, forsøger at starte den automatisk..." +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "Anvend statiske IP'er" -msgid "Cancel" -msgstr "Afbryd:" +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "Anvend som standardprofil (overskriver foregående standard)" -msgid "DBus failure! This is most likely caused by the wicd daemon stopping while wicd-curses is running. Please restart the daemon, and then restart wicd-curses." -msgstr "DBus fejl! Dette skyldes formentlig at wicd dæmonen stopper mens wicd-curses kører. Genstart venligst dæmonen, og genstart derefter wicd-curses." +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "Brug dBm til at måle signal styrken" -msgid "Terminated by user" -msgstr "Afbrudt af bruger:" +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "Brug standardprofil ved kablet autoforbindelse:" -msgid "Add a new profile" -msgstr "Tilføj en ny profil:" +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "Benyt globale DNS servere" -msgid "Create an Ad-Hoc Network" -msgstr "Opret et Ad-Hoc netværk:" +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "Benyt sidst anvendte profil ved kablet autoconnect" -msgid "Global DNS has not been enabled in general preferences." -msgstr "Global DNS er ikke aktiveret i generelle indstillinger." +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "Benyt disse indstillinger for alle netværk med dette ESSID" -msgid "Connect to selected network" -msgstr "Forbind til det valgte netværk:" +#: wicd/translations.py:89 +msgid "Username" +msgstr "Brugernavn" -msgid "wicd-curses does not support deleting the last wired profile. Try renaming it ('F2')" -msgstr "wicd-curses tillader ikke sletning af den sidste trådet profil. Forsøg at omdøbe den ('F2'):" +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "Validerer godkendelse..." -msgid "EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:" -msgstr "UNDTAGELSE! Rapporter venligst dette til vedligeholderen og opret en fejlrapport med nedenstående indhold:" +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "Kontrollerer access point tilslutningen..." -msgid "DNS server" -msgstr "DNS server:" +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "WPA Supplicant" -msgid "Configuring preferences for wireless network \"$A\" ($B)" -msgstr "Konfigurere indstillingerne for det trådløse netværk \"$A\" ($B):" +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "Wicd Curses grænseflade" -msgid "The wicd daemon has shut down. The UI will not function properly until it is restarted." -msgstr "Wicd dæmonen er stoppet. Brugergrænsefladen vil ikke virke korrekt inden den er genstartet." +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "Wicd dæmon ikke tilgængelig" -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "For at forbinde til et trådet netværk, skal du først oprette en netværksprofil. Indtast et navn som beskriver netværket, og tryk Tilføj for at oprette netværksprofilen." +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "Wicd har behov for adgang til din computers netværkskort." -msgid "Wired Autoconnect Settings" -msgstr "Trådet autoforbind indstillinger:" +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" -msgid "Network Interfaces" -msgstr "Netværksgrænseflader:" +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "Trådet autoforbind indstillinger" -msgid "Scan" -msgstr "Søg:" +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "Kablet grænseflade" -msgid "Wicd daemon unreachable" -msgstr "Wicd dæmon ikke tilgængelig" +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "Opdagelse af kablet netværk" -msgid "ESSID" -msgstr "ESSID:" +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "Kablet netværk" -msgid "Rename wired profile" -msgstr "Omdøb trådet profil:" +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "Kablet netværk:" -msgid "The wicd daemon is unavailable, so your request cannot be completed" -msgstr "Wicd dæmonen er utilgængelig, så din forespørgsel kan ikke udføres:" +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "Kablet forbindelse fundet" -msgid "Scan for hidden networks" -msgstr "Skan efter skjulte netværk:" +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "Trådløs SSID: Hastighed: IP: Styrke: RX: TX:" -msgid "use urwid's raw screen controller" -msgstr "anvend urwid's rå skærm-kontroller:" +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "Trådløst netværkskort" -msgid "Automatic Reconnection" -msgstr "Automatisk forbindelses-genopretning:" +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "Trådløs hardware-afbryder aktiveret" -msgid "Press F8 or Q to quit." -msgstr "Tryk F8 eller Q for at afbryde." +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "Trådløse netværk" -msgid "Use as default profile (overwrites any previous default)" -msgstr "Anvend som standardprofil (overskriver foregående standard):" +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" +"Du kan også konfigurere det trådløse netværk ved at se efter området " +"\"[]\" i konfigurations filen." -msgid "Connection failed: Could not contact the wireless access point." -msgstr "Forbindelse mislykkedes: Kunne ikke komme i kontakt med det trådløse access point." +#: gtk/netentry.py:300 gtk/netentry.py:408 +msgid "You must enter your password to configure scripts" +msgstr "Du skal indtaste din adgangskode for at konfigurere skripts" -msgid "Establishing connection..." -msgstr "Etablerer forbindelse..." +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "Du bør næsten altid anvende wext som WPA supplikant-driver" -msgid "Set up Ad-hoc network" -msgstr "Sæt Ad-hoc netværket op:" +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "" -msgid "Connection established" -msgstr "Forbindelse oprettet" +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "" -msgid "Verifying access point association..." -msgstr "Kontrollere access point tilslutningen..." +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" +"wicd-curses tillader ikke sletning af den sidste kablet profil. Forsøg at " +"omdøbe den ('F2'):" + +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "" + +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "" + +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "" + +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "" + +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "" + +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "" -msgid "Backend" -msgstr "Motor:" +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "Afbrudt" -msgid "Disconnecting active connections..." -msgstr "Afbryder aktive forbindelser..." +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "" -msgid "All controls are case sensitive" -msgstr "Alle indstillinger er følsom overfor store og små bogstaver:" +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "Indstillinger" -msgid "Notifications" -msgstr "Informationer:" +#: data/wicd.ui:136 +msgid "_About" +msgstr "" -msgid "Disconnected" -msgstr "Afbrudt" +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "Forbindelse oprettet..." -msgid "Debugging" -msgstr "Fejlsøgning:" +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "" -msgid "Display notifications about connection status" -msgstr "Vis informationer om forbindelses status:" +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "Genoptag skript" -msgid "Unable to contact the Wicd daemon due to an access denied error from DBus. Please check that your user is in the $A group." -msgstr "Kunne ikke kontakte wicd dæmonen på grund af en adgang nægtet fejl fra DBus. Kontroller venligst at din bruger er i $A gruppen." +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "" -msgid "Run pre-disconnect script" +#: data/wicd.ui:296 +msgid "Pre-connection Script:" msgstr "Kør før-afbrydelse skript" -msgid "ERROR: wicd-curses was denied access to the wicd daemon: please check that your user is in the \"$A\" group." -msgstr "FEJL: wicd-curses blev nægtet adgang til wicd dæmonen: kontroller venlligst at din bruger er i \"$A\" gruppen." +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "Kør efter-afbrydelse skript" + +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "Kør før-afbrydelse skript" -msgid "Run post-disconnect script" +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" msgstr "Kør efter-afbrydelse skript" -msgid "Suspend script" -msgstr "Suspender skript" +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "Skift altid til kablet forbindelse når tilgængelig" -msgid "Invalid IP address entered." -msgstr "Fejlagtig IP adresse indtastet." +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" -msgid "Resume script" -msgstr "Genoptag skript" +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "DNS domæne" -msgid "Ping static gateways after connecting to verify association" -msgstr "Ping statisk gateway efter forbindelse, for at bekræfte tilslutningen" +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "" + +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "Genopret automatisk forbindelse ved tabt forbindelse" + +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "Automatisk forbindelsesgenopretning" + +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "Omdøb kablet profil" + +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "" + +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "Omdøb kablet profil" + +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "Automatisk forbindelsesgenopretning" + +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "Kablet grænseflade" + +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "Trådløst netværkskort" + +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "Netværksgrænseflader" + +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "DNS server" + +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "DNS server" + +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "DNS server" + +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "Søgedomæne" + +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "Globale DNS servere" +#: data/wicd.ui:960 msgid "" -"Wired\r\n" -"IP:\r\n" -"RX:\r\n" -"TX:" -msgstr "Trådet IP: RX; TX:" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" + +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "Informationer" + +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "Nulstiller rutetabel" + +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "Opdagelse af kablet netværk" + +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "" + +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "" +#: data/wicd.ui:1421 msgid "" -"Wireless\r\n" -"SSID:\r\n" -"Speed:\r\n" -"IP:\r\n" -"Strength:\r\n" -"RX:\r\n" -"TX:" -msgstr "Trådløs SSID: Hastighed: IP: Styrke: RX: TX:" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" + +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "" + +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "Trådløst netværkskort" + +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "" + +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "Fejlsøgning" + +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "Motor" + +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "" + +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "Du bør næsten altid anvende wext som WPA supplikant-driver" diff -Nru wicd-1.7.0+ds1/po/de_DE.po wicd-1.7.1/po/de_DE.po --- wicd-1.7.0+ds1/po/de_DE.po 2010-03-03 21:27:50.000000000 +0000 +++ wicd-1.7.1/po/de_DE.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,494 +0,0 @@ -# Translations for German (de_DE) -# Translator ID 54 -# /translator/edit/54/ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" - -msgid "Resetting IP address..." -msgstr "IP-Adresse wird zurückgesetzt..." - -msgid "Preferences dialog" -msgstr "Voreinstellungen:" - -msgid "Connection Failed: No DHCP offers received." -msgstr "Verbindung fehlgeschlagen: Keine DHCP-Adresse erhalten" - -msgid "For more detailed help, consult the wicd-curses(8) man page." -msgstr "Verwenden Sie die wicd-courses (8) man Seite für ausführlichere Hilfe." - -msgid "Connection Failed: Bad password" -msgstr "Verbindung fehlgeschlagen: Falsches Passwort" - -msgid "Unable to connect to wicd daemon DBus interface. This typically means there was a problem starting the daemon. Check the wicd log for more information." -msgstr "Kein Verbindung zum wicd Daemon DBus Interface. \" + \"In der Regel gab es ein Problem den Daemon zu starten. \" +\" Überprüfen Sie das wicd Log für weitere Informationen:" - -msgid "Always show wired interface" -msgstr "Kabelgebundenes Netzwerk immer anzeigen" - -msgid "Could not connect to wicd's D-Bus interface. Check the wicd log for error messages." -msgstr "Konnte nicht mit dem wicd D-Bus Interface verbinden. Überprüfen Sie das wicd Log auf Fehlermeldungen." - -msgid "Path to PAC File" -msgstr "Pfad zur PAC-Datei:" - -msgid "Disconnect from all networks" -msgstr "Trenne die Verbindung zu allen Netzwerken" - -msgid "Changes to your backend won't occur until the daemon is restarted." -msgstr "Die Änderungen werden erst aktiv, wenn der Daemon neu gestartet worden ist." - -msgid "Stop a network connection in progress" -msgstr "Eine Netzwerkverbindung wird getrennt:" - -msgid "Always switch to wired connection when available" -msgstr "Wechsel immer zur kabelgebundenen Verbindung, wenn verfügbar." - -msgid "Connecting" -msgstr "Verbinde:" - -msgid "Wired Networks" -msgstr "Kabelgebundene Netzwerke:" - -msgid "Display this help dialog" -msgstr "Zeige diesen Hilfe-Dialog" - -msgid "Connection Failed: Unable to Get IP Address" -msgstr "Verbindung fehlgeschlagen: Kann keine IP-Adresse beziehen" - -msgid "Connection Cancelled" -msgstr "Verbindung getrennt" - -msgid "Scanning networks... stand by..." -msgstr "Suche nach Netzwerken... etwas Geduld bitte..." - -msgid "Password" -msgstr "Passwort" - -msgid "Setting broadcast address..." -msgstr "Setze Boradcast-Adresse" - -msgid "Refresh network list" -msgstr "Netzwerkliste neu laden" - -msgid "Press ESC to cancel" -msgstr "Zum Abbrechen ESC drücken" - -msgid "Scanning" -msgstr "Suche" - -msgid "External Programs" -msgstr "Externe Programme" - -msgid "Connect" -msgstr "Verbinde" - -msgid "Use global DNS servers" -msgstr "Nutze globale DNS-Server" - -msgid "This network requires encryption to be enabled." -msgstr "Für dieses Netzwerk muss die Verschlüsselung aktiviert sein" - -msgid "Preferences" -msgstr "Einstellungen" - -msgid "Connecting to daemon..." -msgstr "Verbinde mit Dienst..." - -msgid "Add a new wired profile" -msgstr "Neues Kabel-Profil hinzufügen" - -msgid "DHCP Client" -msgstr "DHCP-Client" - -msgid "Configure Selected Network" -msgstr "Konfiguriere ausgewähltes Netzwerk" - -msgid "Key" -msgstr "Schlüssel" - -msgid "Wireless Networks" -msgstr "Kabellose Netzwerke" - -msgid "About Wicd" -msgstr "Über Wicd" - -msgid "OK" -msgstr "OK" - -msgid "Hidden Network" -msgstr "Versteckte Netzwerke" - -msgid "Use Encryption" -msgstr "Nutze Verschlüsselung" - -msgid "DNS domain" -msgstr "DNS Domain" - -msgid "DNS server" -msgstr "DNS-Server" - -msgid "Disconnected" -msgstr "Verbindung getrennt" - -msgid "Use Encryption (WEP only)" -msgstr "Nutze Verschlüsselung (nur WEP)" - -msgid "IP" -msgstr "IP" - -msgid "Authentication" -msgstr "Authentifizierung" - -msgid "Run script after connect" -msgstr "Führe Script nach dem Verbinden aus" - -msgid "Wicd daemon unreachable" -msgstr "Wicd Dienst antwortet nicht" - -msgid "Channel" -msgstr "Kanal" - -msgid "ESSID" -msgstr "ESSID" - -msgid "Scripts" -msgstr "Skripte" - -msgid "Identity" -msgstr "Identität" - -msgid "Disconnecting active connections..." -msgstr "Trenne aktive Verbindungen..." - -msgid "Run pre-disconnect script" -msgstr "Starte Skript vor der Verbindungstrennung" - -msgid "WPA Supplicant" -msgstr "WPA-Supplicant" - -msgid "To avoid various complications, wicd-curses does not support directly editing the scripts. However, you can edit them manually. First, (as root)\", open the \"$A\" config file, and look for the section labeled by the $B in question. In this case, this is:" -msgstr "Um verschiedene Probleme auszuschließen, erlaubt wicd nicht das direkte Ändern der Skripte. Trotzdem können Sie sie von Hand ändern. Öffnen Sie dazu (als Root) die Datei \"$A\" und schauen Sie nach dem Bereich unter $B. In diesem Fall ist das:" - -msgid "You can also configure the wireless networks by looking for the \"[]\" field in the config file." -msgstr "Sie können Ihre Drahtlosnetzwerke auch im Bereich hinter \"[]\" konfigurieren." - -msgid "You must enter your password to configure scripts" -msgstr "Sie müssen Ihr Passwort eingeben um die Skripte zu ändern" - -msgid "Not connected" -msgstr "Nicht verbunden" - -msgid "Use Static DNS" -msgstr "Verwende statische DNS" - -msgid "Unsecured" -msgstr "Ungesichert" - -msgid "Search domain" -msgstr "Suche Domain" - -msgid "Connection failed: Could not contact the wireless access point." -msgstr "Verbindung gescheitert. Konnte das Funknetzwerk nicht finden." - -msgid "Select Hidden Network ESSID" -msgstr "Wähle versteckte Netzwerk ESSID" - -msgid "Use last used profile on wired autoconnect" -msgstr "Nutze das zuletzt verwendete Profil bei automatischer Netzwerkverbindung" - -msgid "Automatically connect to this network" -msgstr "Verbinde automatisch mit diesem Netzwerk" - -msgid "Use dBm to measure signal strength" -msgstr "Signalstärke in dBm messen" - -msgid "Use these settings for all networks sharing this essid" -msgstr "Nutze diese Einstellungen für alle Netzwerke, die diese ESSID verwenden" - -msgid "ERROR: wicd-curses was denied access to the wicd daemon: please check that your user is in the \"$A\" group." -msgstr "Fehler! Wicd-curses wurde der Zugriff auf den Wicd-Daemon nicht gestattet. Bitte versichern sie sich, dass ihr Benutzer in der Gruppe $A ist." - -msgid "Validating authentication..." -msgstr "Überprüfe Authentifizierung..." - -msgid "Removing old connection..." -msgstr "Entferne alte Verbindung..." - -msgid "Configuring preferences for wired profile \"$A\"" -msgstr "Erstelle Einstellungen für das Kabelnetzwerk \"$A\" " - -msgid "No wireless networks found." -msgstr "Kein Funknetzwerk gefunden!" - -msgid "Check if using madwifi/atheros drivers" -msgstr "Prüfen Sie, ob Madwifi oder Atheros Treiber verwendet werden!" - -msgid "Properties" -msgstr "Eigenschaften" - -msgid "Establishing connection..." -msgstr "Stelle Verbindung her..." - -msgid "Setting encryption info" -msgstr "Verschlüsselungsinformationen einstellen" - -msgid "Set up Ad-hoc network" -msgstr "Ad-hoc-Netzwerk einrichten" - -msgid "Connection established" -msgstr "Verbindung hergestellt" - -msgid "Select scripts" -msgstr "Skripte auswählen" - -msgid "Invalid address in $A entry." -msgstr "Ungültige Adresse im Eintrag $A" - -msgid "Configuring wireless interface..." -msgstr "Konfiguriere WLAN-Gerät..." - -msgid "Generating PSK..." -msgstr "Erstelle PSK..." - -msgid "Enable debug mode" -msgstr "Schalte Debug-Modus ein" - -msgid "Anonymous Identity" -msgstr "Anonyme Identität" - -msgid "Connected to wired network (IP: $A)" -msgstr "Verbunden mit Kabelnetzwerk (IP: $A)" - -msgid "Wireless Interface" -msgstr "WLAN-Gerät" - -msgid "Could not find a graphical sudo program. The script editor could not be launched. You'll have to edit scripts directly your configuration file." -msgstr "Konnte kein grafisches sudo-Programm finden. Der Skript-Editor konnte nicht gestartet werden. Sie müssen das Skript direkt in der Konfigurationsdatei ändern." - -msgid "Verifying access point association..." -msgstr "Überprüfe Verbindung zum Zugangspunkt..." - -msgid "Global DNS servers" -msgstr "Globale DNS-Server" - -msgid "Done connecting..." -msgstr "Verbindung erfolgreich..." - -msgid "Can't connect to the daemon, trying to start it automatically..." -msgstr "Kann nicht mit dem Dienst verbinden. versuche den automatischen Start..." - -msgid "Cancel" -msgstr "Abbrechen" - -msgid "Putting interface up..." -msgstr "Starte das Gerät..." - -msgid "Terminated by user" -msgstr "Vom Nutzer abgebrochen" - -msgid "Add a new profile" -msgstr "Neues Profil hinzufügen" - -msgid "Create an Ad-Hoc Network" -msgstr "Erstelle ein Ad-Hoc-Netzwerk" - -msgid "Global DNS has not been enabled in general preferences." -msgstr "Globale DNS wurde in den Einstellungen noch nicht freigeschaltet" - -msgid "DNS" -msgstr "DNS" - -msgid "Advanced Settings" -msgstr "Erweiterte Einstellungen" - -msgid "Username" -msgstr "Benutzername" - -msgid "Automatic (recommended)" -msgstr "Automatisch (empfohlen)" - -msgid "Wired connection detected" -msgstr "Kabelverbindung gefunden" - -msgid "Notifications" -msgstr "Benachrichtigungen" - -msgid "Choose from the networks below:" -msgstr "Wählen Sie eines der folgenden Netzwerke aus:" - -msgid "Connect to selected network" -msgstr "Verbinde mit dem ausgewählten Netzwerk" - -msgid "Select or create a wired profile to connect with" -msgstr "Kabelnetzwerk auswählen, mit dem eine Verbindung hergestellt werden soll." - -msgid "General Settings" -msgstr "Allgemeine Einstellungen" - -msgid "Connected to $A at $B (IP: $C)" -msgstr "Verbunden mit $A unter $B (IP: $C)" - -msgid "EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:" -msgstr "Ausnahmefehler! Bitte melden Sie das Problem an den Programmierer!" - -msgid "Configuring preferences for wireless network \"$A\" ($B)" -msgstr "Einstellungen festlegen für das Funknetzwerk \"$A\" ($B)" - -msgid "Obtaining IP address..." -msgstr "Warte auf IP-Adresse..." - -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "Um mit einem Kabelnetzwerk Verbindung aufzunehmen, müssen Sie ein Netzwerkprofil erstellen. Geben Sie eine Bezeichnung für das Netzwerk ein und klicken Sie auf \"Add\"." - -msgid "Required encryption information is missing." -msgstr "Die benötigte Verschlüsselungs-Information fehlt!" - -msgid "The wicd daemon has shut down. The UI will not function properly until it is restarted." -msgstr "Der Wicd-Dienst ist abgeschaltet. Sie müssen den Dienst neu starten, damit er wieder funktioniert." - -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "Um mit einem Kabelnetzwerk Verbindung aufzunehmen, müssen Sie ein Netzwerkprofil anlegen. Geben Sie eine Bezeichnung ein und Klicken Sie auf \"Hinzufügen\"." - -msgid "Automatically reconnect on connection loss" -msgstr "Automatische Neuverbindung bei Abbruch" - -msgid "Wired Autoconnect Settings" -msgstr "Einstellungen für automatische Verbindung bei Kabelnetzwerk" - -msgid "Run script before connect" -msgstr "Starte Skript vor der Verbindung" - -msgid "Debugging" -msgstr "Fehlersuche" - -msgid "Network Interfaces" -msgstr "Netzwerkgeräte" - -msgid "Use default profile on wired autoconnect" -msgstr "Voreingestelltes Profil bei Kabelverbindung wählen" - -msgid "Scan" -msgstr "Suche" - -msgid "Generating WPA configuration file..." -msgstr "Erstelle die WPA-Konfigurationsdatei..." - -msgid "WPA Supplicant Driver" -msgstr "WPA-Supplikant-Treiber" - -msgid "Wicd needs to access your computer's network cards." -msgstr "Wicd muss auf die Netzwerkkarten Ihres Computers zugreifen" - -msgid "Wireless Kill Switch Enabled" -msgstr "Funkverbindung abschalten - Schalter aktiv" - -msgid "Hidden Network ESSID" -msgstr "Versteckte Netzwerk-ESSID" - -msgid "Secured" -msgstr "Gesichert" - -msgid "Putting interface down..." -msgstr "Schalte Gerät ab..." - -msgid "Rename wired profile" -msgstr "Profil für Kabelnetzwerk umbenennen" - -msgid "The wicd daemon is unavailable, so your request cannot be completed" -msgstr "Der Wicd-Dienst ist nicht verfügbar, Ihre Anfrage kann nicht abgeschlossen werden" - -msgid "Setting static IP addresses..." -msgstr "Setze statische IP-Adresse..." - -msgid "Scan for hidden networks" -msgstr "Suche nach versteckten Netzwerken" - -msgid "Use Static IPs" -msgstr "Verwende statische IPs" - -msgid "Automatic Reconnection" -msgstr "Automatische Neuverbindung" - -msgid "Wired Interface" -msgstr "Netzwerkkarte" - -msgid "Press F8 or Q to quit." -msgstr "Drücken Sie zum Beenden F8 oder Q " - -msgid "Wired Network" -msgstr "Kabelgebundenes Netzwerk" - -msgid "wicd-curses does not support deleting the last wired profile. Try renaming it ('F2')" -msgstr "Wicd-curses unterstützt das Löschen des letzten kabelgebundenen Netzwerkprofils nicht. Versuchen Sie es umzubenennen ('F2')" - -msgid "All controls are case sensitive" -msgstr "Alle Einstellungen berücksichtigen Groß- und Kleinschreibung" - -msgid "Flushing the routing table..." -msgstr "Leere die Routing-Tabelle..." - -msgid "Brought to you by:" -msgstr "Zur Verfügung gestellt von:" - -msgid "You should almost always use wext as the WPA supplicant driver" -msgstr "Sie sollten in der Regel wext als Treiber für den WPA-Supplikanten verwenden" - -msgid "Stop Showing Autoconnect pop-up temporarily" -msgstr "Vorübergehend das Pop-Up für automatische Verbindung nicht anzeigen" - -msgid "Unable to contact the Wicd daemon due to an access denied error from DBus. Please check that your user is in the $A group." -msgstr "Konnte den Wicd-Daemon nicht ansprechen, da DBus einen \"Zugriff verweigert\"-Fehler ausgibt. Bitte versichern sie sich, dass ihr Benutzer in der Gruppe $A ist." - -msgid "Setting static DNS servers..." -msgstr "Stelle statische DNS-Server ein..." - -msgid "Display notifications about connection status" -msgstr "Benachrichtigungen über den Verbindungsstatus anzeigen" - -msgid "Use as default profile (overwrites any previous default)" -msgstr "Als Standardprofil verwenden (überschreibt jede vorherige Standardeinstellung)" - -msgid "Suspend script" -msgstr "Unterbreche Skript" - -msgid "Invalid IP address entered." -msgstr "Ungültige IP-Adresse eingegeben." - -msgid "Resume script" -msgstr "Skript fortsetzen" - -msgid "Run post-disconnect script" -msgstr "Starte \"Nach-Trennungs\"-Skript" - -msgid "Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", and \"disconnectscript\" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively. Note that you will be specifying the full path to the scripts - not the actual script contents. You will need to add/edit the script contents separately. Refer to the wicd manual page for more information." -msgstr "Dort können Sie die Skripte erstellen oder anpassen, die vor und nach Verbindungsaufbau sowie bei Verbindungsabbruch ausgeführt werden sollen. Tragen Sie dazu den vollständigen Pfad zu den Skripten (nicht den eigentlichen Skriptinhalt - den müssen sie separat in die entsprechenden Dateien eintragen) in die entsprechenden Felder. Schauen Sie in das wicd-Handbuch für mehr Informationen." - -msgid "Gateway" -msgstr "Gateway" - -msgid "DBus failure! This is most likely caused by the wicd daemon stopping while wicd-curses is running. Please restart the daemon, and then restart wicd-curses." -msgstr "Verbindung mit DBus fehlgeschlagen! Sehr wahrscheinlich wurde der Wicd-Daemon gestoppt, während Wicd-curses noch läuft. Starten Sie bitte zunächst den Daemon und dann Wicd-curses neu." - -msgid "Wired Link Detection" -msgstr "kabelgebundene Netzwerkerkennung" - -msgid "Activate Internet Connection Sharing" -msgstr "aktiviere Internetverbindungsfreigabe" - -msgid "Netmask" -msgstr "Netzmaske" - -msgid "Wicd Curses Interface" -msgstr "Wicd Text-Oberfläche" - -msgid "use urwid's raw screen controller" -msgstr "Benutze urwid's direkte Bildschirm Steuerung " - -msgid "Route Table Flushing" -msgstr "Route Tabelle löschen" - -msgid "Prompt for profile on wired autoconnect" -msgstr "Nach Profil für automatische kabelgebundene Verbindung fragen" - -msgid "Backend" -msgstr "Backend" diff -Nru wicd-1.7.0+ds1/po/de.po wicd-1.7.1/po/de.po --- wicd-1.7.0+ds1/po/de.po 2010-03-03 21:26:27.000000000 +0000 +++ wicd-1.7.1/po/de.po 2012-02-02 16:35:22.000000000 +0000 @@ -1,529 +1,1090 @@ -# Translations for German (de) -# Translator ID 24 -# /translator/edit/24/ +# Translations for German (de_DE) +# Translator ID 54 +# /translator/edit/54/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-02-01 09:47+0000\n" +"Last-Translator: Fabian Nowak \n" +"Language-Team: de \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-02-02 06:13+0000\n" +"X-Generator: Launchpad (build 14738)\n" +"Generated-By: Babel 0.9.6\n" -msgid "Connect" -msgstr "Verbinden" - -msgid "IP" -msgstr "IP-Adresse" +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" -msgid "Netmask" -msgstr "Netzwerkmaske" +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" +"$A\n" +"$B KB/s\n" +"$C KB/s" -msgid "Gateway" -msgstr "Gateway" +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "Über" -msgid "DNS" -msgstr "DNS" +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "Über Wicd" -msgid "Use Static IPs" -msgstr "Statische IP-Adresse verwenden" +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "Internetverbindung freigeben" -msgid "Use Static DNS" -msgstr "Statischen DNS verwenden" +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "Neues Profil anlegen" -msgid "Use Encryption" -msgstr "Verschlüsselung verwenden" +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "Neues Kabel-Profil hinzufügen" +#: curses/prefs_curses.py:52 data/wicd.ui:1669 msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" -msgid "Wired Network" -msgstr "Kabelgebundenes Netzwerk" +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Kabelgebundenes Netzwerk immer anzeigen" + +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Wenn verfügbar, immer zu Kabelverbindung wechseln" + +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Anmeldeinformationen" + +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "Automatisch (empfohlen)" +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Automatisches Wiederverbinden" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 msgid "Automatically connect to this network" msgstr "Automatisch mit diesem Netzwerk verbinden" -msgid "Secured" -msgstr "Gesichert" +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Automatisch wiederverbinden bei Verbindungsabbruch" -msgid "Unsecured" -msgstr "Ungesichert" +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "Backend" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "Zur Verfügung gestellt von:" +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "" +"Kann nicht mit dem Dienst verbinden, versuche ihn automatisch zu starten" + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "Abbrechen" + +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 msgid "Channel" msgstr "Kanal" -msgid "Preferences" +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Wählen Sie eines der folgenden Netzwerke aus:" + +#: curses/wicd-curses.py:556 +msgid "Config" msgstr "Einstellungen" -msgid "WPA Supplicant Driver" -msgstr "Treiber für WPA-Supplicant" +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "Ausgewähltes Netzwerk konfigurieren" -msgid "Wireless Interface" -msgstr "Drahtloser Netzwerkadapter" - -msgid "Wired Interface" -msgstr "Kabelgebundener Netzwerkadapter" +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "Einstellungen für das Kabelnetzwerk \"$A\" festlegen" -msgid "Always show wired interface" -msgstr "Kabelgebundenes Netzwerk immer anzeigen" +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "Einstellungen für das Funknetzwerk \"$A\" ($B) festlegen" -msgid "Automatically reconnect on connection loss" -msgstr "Bei Verbindungsabbruch automatisch neu verbinden" +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "Konfiguriere WLAN-Gerät..." -msgid "Hidden Network" -msgstr "Verstecktes Netzwerk" +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "Verbinde" -msgid "Hidden Network ESSID" -msgstr "ESSID des versteckten Netzwerks" +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "Verbinde mit dem ausgewählten Netzwerk" +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 msgid "Connected to $A at $B (IP: $C)" -msgstr "Verbunden mit $A bei $B (IP: $C)" +msgstr "Verbunden mit $A unter $B (IP: $C)" +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 msgid "Connected to wired network (IP: $A)" -msgstr "Mit Kabelnetzwerk verbunden (IP: $A)" +msgstr "Verbunden mit Kabelnetzwerk (IP: $A)" -msgid "Not connected" -msgstr "Nicht verbunden" +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "Verbindung wird hergestellt" -msgid "No wireless networks found." -msgstr "Keine Drahtlos-Netzwerke gefunden." +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Verbindung getrennt" -msgid "Key" -msgstr "Schlüssel" +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Verbindung fehlgeschlagen" -msgid "Username" -msgstr "Benutzername" +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "Verbindung fehlgeschlagen: Falsches Passwort" -msgid "Password" -msgstr "Kennwort" +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "Verbindung fehlgeschlagen: Keine Angebote über DHCP erhalten" -msgid "Anonymous Identity" -msgstr "Anonyme Identität" +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "Verbindung fehlgeschlagen: Kann keine IP-Adresse beziehen" -msgid "Identity" -msgstr "Identität" +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "Verbindung hergestellt" -msgid "Authentication" -msgstr "Authentifizierung" +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "Verbindung gescheitert. Konnte das Funknetzwerk nicht finden." -msgid "Path to PAC File" -msgstr "Verzeichnispfad der PAC-Datei" +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "Verbindung erfolgreich" -msgid "Choose from the networks below:" -msgstr "Wählen Sie eines der folgenden Netzwerke:" +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"Konnte nicht mit der D-Bus-Schnittstelle für wicd verbinden. Überprüfen Sie " +"das Log von wicd auf Fehlermeldungen." -msgid "Putting interface down..." -msgstr "Netzwerkadapter wird deaktiviert..." +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"Konnte kein grafisches sudo-Programm finden. Der Skript-Editor konnte nicht " +"gestartet werden. Sie müssen das Skript direkt in der Konfigurationsdatei " +"ändern." -msgid "Resetting IP address..." -msgstr "IP-Adresse zurücksetzen..." +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "Ad-Hoc-Netzwerk erstellen" -msgid "Putting interface up..." -msgstr "Netzwerkadapter wird aktiviert..." +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" +"Verbindung mit D-Bus fehlgeschlagen! Sehr wahrscheinlich wurde der Wicd-" +"Daemon gestoppt, während Wicd-curses noch lief. Starten Sie bitte zunächst " +"den Daemon und dann Wicd-curses neu." -msgid "Removing old connection..." -msgstr "Alte Verbindung wird entfernt..." +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "DHCP-Client" -msgid "Generating PSK..." -msgstr "PSK generieren..." +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "DHCP-Hostname" -msgid "Generating WPA configuration file..." -msgstr "WPA-Konfigurationsdatei generieren..." +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "DNS-Domain" -msgid "Flushing the routing table..." -msgstr "Routing-Tabelle aktualisieren..." +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "DNS-Server" -msgid "Configuring wireless interface..." -msgstr "Drahtlosadapter konfigurieren..." +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "Fehlersuche" -msgid "Setting broadcast address..." -msgstr "Broadcast-Adresse setzen..." +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "Verbindung getrennt" -msgid "Setting static DNS servers..." -msgstr "Statischen DNS-Server setzen..." +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Verbindungen mit allen Netzwerken trennen" -msgid "Setting static IP addresses..." -msgstr "Statische IP-Adresse setzen..." +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "Verbindung getrennt" -msgid "Obtaining IP address..." -msgstr "IP-Adresse ermitteln..." +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "Trenne aktive Verbindungen..." -msgid "Done connecting..." -msgstr "Verbindung hergestellt." +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "Zeige diesen Hilfe-Dialog" -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "Um eine Verbindung zu einem kabelgebundenen Netzwerk herzustellen, müssen Sie ein Netzwerkprofil erstellen. Geben Sie einen Namen für das Netzwerk ein und klicken Sie auf \"Hinzufügen\"." +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "Benachrichtigungen über den Verbindungsstatus anzeigen" -msgid "Wicd needs to access your computer's network cards." -msgstr "Wicd muss auf die Netzwerkkarten des Rechners zugreifen können." +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "Diesen Hilfe-Dialog zeigen" -msgid "Run script before connect" -msgstr "Skript vor Verbindungsaufbau ausführen" +#: wicd/translations.py:78 +msgid "Domain" +msgstr "Domain" -msgid "Run script after connect" -msgstr "Skript nach Verbindungsaufbau ausführen" +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "Verbindung erfolgreich..." -msgid "Scripts" -msgstr "Skripte" +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" +"Fehler! Wicd-curses wurde der Zugriff auf den Wicd-Daemon nicht gestattet. " +"Bitte stellen Sie sicher, dass Ihr Benutzer in der Gruppe $A ist." + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "ESSID" +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 msgid "Enable debug mode" -msgstr "Debug-Modus aktivieren" +msgstr "Debug-Modus einschalten" -msgid "Use global DNS servers" -msgstr "Globale DNS-Server verwenden" +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "Stelle Verbindung her..." -msgid "Use default profile on wired autoconnect" -msgstr "Standard-Profil für automatische Kabelverbindung benutzen" +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "Externe Programme" -msgid "Prompt for profile on wired autoconnect" -msgstr "Frage nach Profil für automatische Kabelverbindung" +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "Leere die Routing-Tabelle..." -msgid "Use last used profile on wired autoconnect" -msgstr "Zuletzt verwendetes Profil für automatische Kabelverbindung benutzen" +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "" +"Verwenden Sie die man-Seite wicd-curses(8) für ausführlichere Hilfe." -msgid "Activate Internet Connection Sharing" -msgstr "Erlaube Mitbenutzung der Internetverbindung" +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Gateway" -msgid "Use Encryption (WEP only)" -msgstr "Verschlüsselung verwenden (nur WEP)" +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "Allgemeine Einstellungen" -msgid "Use dBm to measure signal strength" -msgstr "dBm zur Messung der Signalstärke benutzen" +#: wicd/misc.py:85 +msgid "Generating PSK..." +msgstr "Erstelle PSK..." -msgid "Wired connection detected" -msgstr "Kabelnetzwerk erkannt" +#: wicd/misc.py:86 +msgid "Generating WPA configuration file..." +msgstr "Erstelle die WPA-Konfigurationsdatei..." -msgid "Stop Showing Autoconnect pop-up temporarily" -msgstr "Popup bei automatischer Verbindung vorübergehend nicht anzeigen" +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "Globale DNS wurde in den Einstellungen noch nicht freigeschaltet" -msgid "General Settings" -msgstr "Allgemeine Einstellungen" +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "Globale DNS-Server" -msgid "External Programs" -msgstr "Externe Programme:" +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "Hilfe" -msgid "DHCP Client" -msgstr "DHCP-Client" +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "Versteckt" -msgid "Wired Link Detection" -msgstr "Erkennung eines kabelgebundenen Netzwerks" +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "Versteckte Netzwerk-ESSID" -msgid "Route Table Flushing" -msgstr "Leeren der Routing-Tabelle" +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" -msgid "Automatic (recommended)" -msgstr "Automatisch (empfohlen)" +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Identität" -msgid "This network requires encryption to be enabled." -msgstr "Dieses Netzwerk benötigt eine aktivierte Verschlüsselung." +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "Information über die aktuelle Verbindung" -msgid "Required encryption information is missing." -msgstr "Benötigte Verschlüsselungsinformationen fehlen." +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "Ungültige IP-Adresse eingegeben." -msgid "Use these settings for all networks sharing this essid" -msgstr "Diese Einstellungen für alle Netzwerke mit dieser ESSID verwenden" +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "Ungültige Adresse im Eintrag $A" -msgid "Select or create a wired profile to connect with" -msgstr "Wählen oder erstellen Sie ein Profil für ein kabelgebundenes Netzwerk, um sich damit zu verbinden." +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +msgid "Key" +msgstr "Schlüssel" -msgid "Connection Failed: Unable to Get IP Address" -msgstr "Verbindung fehlgeschlagen: Keine IP-Adresse erhalten" +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Netzwerkmaske" -msgid "Connection Cancelled" -msgstr "Verbindung abgebrochen" +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "Netzwerkgeräte" -msgid "Connection Failed: Bad password" -msgstr "Verbindung fehlgeschlagen: Falsches Passwort" +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "Niemals mit diesem Netzwerk verbinden" -msgid "Wireless Kill Switch Enabled" -msgstr "Drahtloser Kill-Schalter aktiviert" +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "Kein Funknetzwerk gefunden!" -msgid "Scanning networks... stand by..." -msgstr "Suche nach Netzwerken... bitte warten..." +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "Nicht verbunden" -msgid "Scan" -msgstr "Suchen" +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "OK" -msgid "Debugging" -msgstr "Debugging" +#: wicd/misc.py:91 +msgid "Obtaining IP address..." +msgstr "Warte auf IP-Adresse..." -msgid "WPA Supplicant" -msgstr "WPA Supplicant" +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" +"Dort können Sie die Skripte erstellen oder anpassen, die vor und nach " +"Verbindungsaufbau sowie bei Verbindungsabbruch ausgeführt werden sollen. " +"Tragen Sie dazu den vollständigen Pfad zu den Skripten (nicht den " +"eigentlichen Skriptinhalt - den müssen Sie separat in die entsprechenden " +"Dateien eintragen) in die entsprechenden Felder. Schauen Sie die man-Seite " +"für mehr Informationen an." -msgid "Automatic Reconnection" -msgstr "Automatische Neuverbindung" +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "Kennwort" -msgid "Global DNS servers" -msgstr "Globaler DNS-Server" +#: wicd/translations.py:82 +msgid "Password" +msgstr "Passwort" -msgid "Network Interfaces" -msgstr "Netzwerkschnittstellen" +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "Pfad zum CA-Zertifikat" -msgid "Connecting to daemon..." -msgstr "Zu Daemon verbinden..." +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Pfad zur PAC-Datei" -msgid "Can't connect to the daemon, trying to start it automatically..." -msgstr "Kann nicht zu Daemon verbinden, versuche ihn automatisch zu starten..." +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "Pfad zum Client-Zertifikat" -msgid "Terminated by user" -msgstr "Durch Benutzer abgebrochen" +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "" +"Nach Verbindungsaufbau Ping an statische Gateways senden, um Verbindung zu " +"prüfen" + +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "Skript nach der Verbindungsherstellung" + +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "Skript nach der Verbindungstrennung" + +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "Skript vor der Verbindungsherstellung" + +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "Skript vor der Verbindungstrennung" -msgid "Add a new profile" -msgstr "Neues Profil hinzufügen" +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Einstellungen" -msgid "Press ESC to cancel" -msgstr "Drücken Sie ESC, um abzubrechen" +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "Einstellungsdialog" -msgid "Press F8 or Q to quit." -msgstr "Drücken Sie F8 oder Q, um zu beenden." +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "Einstellungen" -msgid "Display this help dialog" -msgstr "Diesen Hilfe-Dialog anzeigen" +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "vorinstallierter Schlüssel" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "Drücken Sie eine beliebige Taste" + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "Privater Schlüssel" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "Passwort für privaten Schlüssel" -msgid "You must enter your password to configure scripts" -msgstr "Geben Sie Ihr Kennwort ein, um die Skripte zu konfigurieren" +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "Nach Profil für automatische kabelgebundene Verbindung fragen" -msgid "Refresh network list" -msgstr "Netzwerk-Liste aktualisieren" +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "Eigenschaften" -msgid "Scanning" -msgstr "Suche" +#: wicd/misc.py:87 +msgid "Putting interface down..." +msgstr "Schalte Gerät ab..." -msgid "Select Hidden Network ESSID" -msgstr "Wählen Sie die ESSID für das versteckte Netzwerk:" +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "Starte das Gerät..." -msgid "You should almost always use wext as the WPA supplicant driver" -msgstr "In den meisten Fällen sollte der wext-Treiber für WPA-Supplicant funktionieren" +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "Beenden" -msgid "Add a new wired profile" -msgstr "Neues kabelgebundenes Netzwerk hinzufügen" +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "Wicd-curses beenden" -msgid "Configure Selected Network" -msgstr "Das gewählte Netzwerk konfigurieren" +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "Wicd-Tray-Icon beenden" -msgid "Wireless Networks" -msgstr "Drahtlos-Netzwerke" +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "Aktualisieren" -msgid "Properties" -msgstr "Eigenschaften" +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "Netzwerkliste aktualisieren" -msgid "About Wicd" -msgstr "Über Wicd" +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "Profil für Kabelnetzwerk umbenennen" -msgid "Set up Ad-hoc network" -msgstr "Ad-Hoc Netzwerk einrichten" +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "Die benötigte Verschlüsselungs-Information fehlt!" -msgid "Could not find a graphical sudo program. The script editor could not be launched. You'll have to edit scripts directly your configuration file." -msgstr "Konnte kein grafisches sudo-Programm finden. Der Skript-Editor konnte nicht gestartet werden. Sie müssen die Skripte manuell in der Konfigurations-Datei anpassen." +#: wicd/misc.py:90 +msgid "Resetting IP address..." +msgstr "IP-Adresse zurücksetzen..." -msgid "DNS domain" -msgstr "DNS-Domain" +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "RfKill" -msgid "DNS server" -msgstr "DNS-Server" +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "Route Tabelle löschen" -msgid "Configuring preferences for wireless network \"$A\" ($B)" -msgstr "Einstellungen für Drahtlos-Netzwerk \"$A\" ($B)" +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "Suche" -msgid "The wicd daemon has shut down. The UI will not function properly until it is restarted." -msgstr "Der wicd-Daemon wurde gestoppt. Die Benutzer-Schnittstelle funktioniert erst, wenn der Daemon neugestartet wird." +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "Suche nach versteckten Netzwerken" -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "Um mit sich einem kabelgebundenen Netzwerk verbinden zu können, müssen Sie zuerst ein Netzwerkprofil erstellen, indem Sie einen Namen eingeben und auf \"Hinzufügen\" klicken." +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "Suche" -msgid "Wired Autoconnect Settings" -msgstr "Automatisches Verbinden (kabelgebunden)" +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "Suche nach Netzwerken... etwas Geduld bitte..." -msgid "Wicd daemon unreachable" -msgstr "Der wicd-Daemon ist nicht erreichbar" +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "Skripte" -msgid "Scan for hidden networks" -msgstr "Versteckte Netzwerke suchen" +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "Such-Domain" -msgid "Connection Failed: No DHCP offers received." -msgstr "Verbindung fehlgeschlagen: Keine DHCP-Adresse erhalten" +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Gesichert" -msgid "Disconnect from all networks" -msgstr "Von allen Netzwerken trennen" +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "Versteckte Netzwerk-ESSID wählen" -msgid "Always switch to wired connection when available" -msgstr "Immer mit kabelgebundenem Netzwerk verbinden wenn verfügbar" +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "" +"Kabelnetzwerk auswählen, mit dem eine Verbindung hergestellt werden soll." -msgid "Connecting" -msgstr "Verbinden..." +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "Skripte auswählen" -msgid "Wired Networks" -msgstr "Kabelgebundene Netzwerke" +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "Ad-hoc-Netzwerk einrichten" -msgid "Preferences dialog" -msgstr "Voreinstellungsdialog:" +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "Setze Broadcast-Adresse..." -msgid "Use as default profile (overwrites any previous default)" -msgstr "Als Standardprofil benutzen (überschreibt jede vorige Einstellung)" +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "Stelle statische DNS-Server ein..." -msgid "For more detailed help, consult the wicd-curses(8) man page." -msgstr "Verwenden Sie die wicd-curses (8) man-page für ausführlichere Hilfe." +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "Setze statische IP-Adresse..." -msgid "Could not connect to wicd's D-Bus interface. Check the wicd log for error messages." -msgstr "Konnte keine Verbindumg zur D-Bus-Schnittstelle von Wicd herstellen. Suchen Sie in der wicd-Logdatei nach den Fehlermeldungen." +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "Niemals genutzte Netzwerke zeigen" -msgid "Changes to your backend won't occur until the daemon is restarted." -msgstr "Änderungen am Backend werden bis zum Neustart des Deamons nicht angewandt." +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "Vorübergehend das Pop-Up für automatische Verbindung nicht anzeigen" -msgid "Stop a network connection in progress" -msgstr "Eine Netzwerkverbindung im Aufbau anhalten" +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "Eine Netzwerkverbindung wird getrennt:" -msgid "Brought to you by:" -msgstr "Präsentiert von:" +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "Wi-Fi ausschalten" -msgid "Validating authentication..." -msgstr "Authentifizierung überprüfen..." +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "Wi-Fi einschalten" -msgid "Configuring preferences for wired profile \"$A\"" -msgstr "Konfiguriere Einstellungen für das kabelgebundene Profil \"$A\"" +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "Tabulator nach links (zurück)" -msgid "Setting encryption info" -msgstr "Verschlüsselungsinformation setzen..." +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "Tabulator nach rechts (vor)" -msgid "Select scripts" -msgstr "Skripte wählen" +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "Vom Nutzer abgebrochen" -msgid "Invalid address in $A entry." -msgstr "Unzulässige Adresse im Eintrag $A." +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" +"Der Wicd-Dienst ist abgeschaltet. Sie müssen den Dienst neu starten, damit " +"diese Schnittstelle wieder funktioniert." -msgid "Cancel" -msgstr "Abbrechen" +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "" +"Dieses Netzwerk verlangt nach einem Schlüssel um es benutzen zu können." -msgid "Create an Ad-Hoc Network" -msgstr "Ad-Hoc-Netzwerk einrichten" +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" +"Um verschiedene Probleme auszuschließen, erlaubt wicd nicht das direkte " +"Ändern der Skripte. Trotzdem können Sie sie von Hand ändern. Öffnen Sie dazu " +"(als Root) die Datei \"$A\" und schauen Sie nach dem Bereich unter $B. In " +"diesem Fall ist das:" -msgid "Global DNS has not been enabled in general preferences." -msgstr "Globaler DNS ist in den Einstellungen nicht aktiviert." +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" +"Um mit einem Kabelnetzwerk Verbindung aufzunehmen, müssen Sie ein " +"Netzwerkprofil anlegen. Geben Sie eine Bezeichnung ein und klicken Sie auf " +"\"Hinzufügen\"." -msgid "Search domain" -msgstr "Suchdomain" +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" +"Konnte den Wicd-Daemon nicht ansprechen, da D-Bus einen \"Zugriff " +"verweigert\"-Fehler ausgibt. Bitte stellen Sie sicher, dass Ihr Benutzer in " +"der Gruppe $A ist." -msgid "Check if using madwifi/atheros drivers" -msgstr "Aktivieren, falls madwifi/atheros-Treiber genutzt werden" +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "Ungesichert" -msgid "OK" -msgstr "OK" +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "DHCP-Hostname verwenden" -msgid "Backend" -msgstr "Backend" +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "Verschlüsselung verwenden" -msgid "Connect to selected network" -msgstr "Mit ausgewähltem Netzwerk verbinden" +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "Verschlüsselung verwenden (nur WEP)" -msgid "ESSID" -msgstr "ESSID" +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "Statische DNS verwenden" -msgid "Establishing connection..." -msgstr "Verbindung wird hergestellt..." +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "Statische IP-Adressem verwenden" -msgid "Connection established" -msgstr "Verbindung hergestellt" +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "" +"Als Standardprofil verwenden (überschreibt jede vorherige " +"Standardeinstellung)" -msgid "DBus failure! This is most likely caused by the wicd daemon stopping while wicd-curses is running. Please restart the daemon, and then restart wicd-curses." -msgstr "D-Bus-Fehler! Ursache ist wahrscheinlich einStop des wicd-Daemons, während wicd-curses lief. Bitte den Daemon neustarten, dann wicd-curses neustarten." +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "Signalstärke in dBm messen" -msgid "Notifications" -msgstr "Hinweise" +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "Das Standard-Profil für automatische Kabelverbindung verwenden" -msgid "Disconnected" -msgstr "Verbindung getrennt" +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "Globale DNS-Server verwenden" -msgid "Connection failed: Could not contact the wireless access point." -msgstr "Verbindung fehlgeschlagen. Der Drahtlos-Zugangspunkt konnte nicht kontaktiert werden." +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "" +"Das zuletzt verwendete Profil bei automatischer Kabelverbindung verwenden" -msgid "Rename wired profile" -msgstr "Kabelnetzwerkprofil umbenennen" +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "" +"Diese Einstellungen bei alle Netzwerken anwenden, die diese ESSID verwenden" -msgid "The wicd daemon is unavailable, so your request cannot be completed" -msgstr "Der wicd-Daemon ist unerreichbar, Ihre Anforderung konnte nicht durchgeführt werden." +#: wicd/translations.py:89 +msgid "Username" +msgstr "Benutzername" -msgid "Display notifications about connection status" -msgstr "Hinweise zum Verbindungsstatus anzeigen" +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "Überprüfe Authentifizierung..." -msgid "Unable to connect to wicd daemon DBus interface. This typically means there was a problem starting the daemon. Check the wicd log for more information." -msgstr "Fehler bei der Verbindung zur D-Bus-Schnittstelle des Wicd-Daemons. In der Regel liegt ein Problem beim Starten des Daemons vor. Bitte wicd-Logdatei überprüfen." +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "Überprüfe Verbindung zum Zugangspunkt..." -msgid "To avoid various complications, wicd-curses does not support directly editing the scripts. However, you can edit them manually. First, (as root)\", open the \"$A\" config file, and look for the section labeled by the $B in question. In this case, this is:" -msgstr "wicd-curses erlaubt kein direktes Bearbeiten der Skripte. Manuelles Bearbeiten ist möglich. Als root die Konfigurationsdatei \"$A\" öffnen und Abschnitt $B bearbeiten:" +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "WPA-Supplicant" +#: curses/wicd-curses.py:528 msgid "Wicd Curses Interface" -msgstr "Curses-Schnittstelle für Wicd" +msgstr "Wicd Text-Oberfläche" -msgid "Verifying access point association..." -msgstr "Zugangspunkt wird überprüft..." +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "Wicd Dienst antwortet nicht" -msgid "All controls are case sensitive" -msgstr "Bei allen Eingaben auf Groß-/Kleinschreibung achten" +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "Wicd muss auf die Netzwerkkarten Ihres Computers zugreifen" -msgid "wicd-curses does not support deleting the last wired profile. Try renaming it ('F2')" -msgstr "Wicd-curses erlaubt das Löschen des letzten Kabelnetzwerk-Profils nicht. Versuchen Sie, es umzubennen ('F2'): " +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" +"Kabelgebunden\n" +"IP:\n" +"RX:\n" +"TX:" -msgid "EXCEPTION! Please report this to the maintainer and file a bug report with the backtrace below:" -msgstr "Ausnahmefehler! Bitte melden Sie diesen und reichen Sie einen Fehlerbericht mit dem Backtrace ein:" +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "Einstellungen für automatische Verbindung bei Kabelnetzwerk" -msgid "You can also configure the wireless networks by looking for the \"[]\" field in the config file." -msgstr "Konfiguration des Drahtlos-Netzwerkes auch durch Bearbeiten des Felds \"[]\" in der Konfigurationsdatei." +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "Netzwerkkarte" -msgid "Unable to contact the Wicd daemon due to an access denied error from DBus. Please check that your user is in the $A group." -msgstr "Kein Kontakt zum wicd-Daemon. Zugriff von D-Bus verweigert. Bitte D-Bus-Konfiguration prüfen." +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "Erkennen von Kabelverbindungen" -msgid "use urwid's raw screen controller" -msgstr "Urwid's Raw-Screen-Controller benutzen" +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "Kabelgebundenes Netzwerk" -msgid "Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", and \"disconnectscript\" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively. Note that you will be specifying the full path to the scripts - not the actual script contents. You will need to add/edit the script contents separately. Refer to the wicd manual page for more information." -msgstr "Die \"beforescript\"-, \"afterscript\"- und \"disconnectscript\"-Variablen können angepasst werden. Angegeben wird der volle Pfad zu den Skripten. Weitere Informationen auf der wicd-Handbuch-Seite." +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "Kabelgebundene Netzwerke:" -msgid "Disconnecting active connections..." -msgstr "Aktive Verbindungen trennen..." +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "Kabelverbindung gefunden" -msgid "Run pre-disconnect script" -msgstr "Vor-Trennungs-Script ausführen" +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "" +"Drahtlos\n" +"SSID:\n" +"Geschwindigkeit:\n" +"IP:\n" +"Stärke:\n" +"RX:\n" +"TX:" -msgid "Suspend script" -msgstr "Ruhezustands-Skript" +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "WLAN-Gerät" -msgid "ERROR: wicd-curses was denied access to the wicd daemon: please check that your user is in the \"$A\" group." -msgstr "FEHLER: wicd-curses wurde der Zugriff auf den wicd-Daemon verweigert: Bitte prüfen Sie, ob Ihr Benutzer in der Gruppe \"$A\" ist." +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "Funkverbindung abgeschaltet" -msgid "Resume script" -msgstr "Wiederaufnahme-Skript" +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "Kabellose Netzwerke" -msgid "Run post-disconnect script" -msgstr "Nach-Trennung-Skript ausführen" +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" +"In der Konfigurationsdatei können Sie die Funknetzwerke auch im Feld " +"\"[]\" festlegen." -msgid "Invalid IP address entered." -msgstr "Ungültige IP-Adresse" +#: gtk/netentry.py:300 gtk/netentry.py:408 +msgid "You must enter your password to configure scripts" +msgstr "Sie müssen Ihr Passwort eingeben, um die Skripte zu ändern" -msgid "Ping static gateways after connecting to verify association" -msgstr "Überprüfe Verbindungsaufbau zu statischen Gateways mittels Ping" +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "" +"Sie sollten in der Regel wext als Treiber für den WPA-Supplikanten verwenden" + +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "_Verbindungsinfo" + +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "_Beenden" +#: curses/wicd-curses.py:428 msgid "" -"$A\r\n" -"$B KB/s\r\n" -"$C KB/s" -msgstr "$A $B KB/s $C KB/s " +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" +"Wicd-curses unterstützt das Löschen des letzten kabelgebundenen " +"Netzwerkprofils nicht. Versuchen Sie es umzubenennen ('F2')" + +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "wicd-curses Hilfe" + +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "Wicd Netzwerk Manager" + +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "Erstelle ein ad-hoc Netzwerk" + +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "Ein verborgenes Netzwerk finden" + +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "Mit einem verborgenen Netzwerk verbinden" + +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "Wi-Fi aus_schalten" + +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "Alle Verbin_dungen trennen" + +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "_Aktualisieren" + +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "Einstellungen" +#: data/wicd.ui:136 +msgid "_About" +msgstr "_Über" + +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "Verbindung wird aufgebaut ..." + +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "Aktuellen Verbindungsversuch abbrechen" + +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "Skript fortsetzen" + +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "Lege Skripte für dieses Netzwerk fest:" + +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "Skript vor der Herstellung der Verbindung" + +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "Skript nach der Herstellung der Verbindung" + +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "Skript vor der Trennung der Verbindung" + +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "Skript nach der Trennung der Verbindung" + +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "Sobald eine Kabelverbindung möglich ist, immer zu dieser wechseln." + +#: data/wicd.ui:519 msgid "" -"$A\r\n" -"$B\r\n" -"$C\r\n" -"$D\r\n" -"$E KB/s\r\n" -"$F KB/s" -msgstr "$A $B $C $D $E KB/s $F KB/s " +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" +"Wicd versucht mit dieser Option eine Verbindung über das Kabel herzustellen, " +"sobald dieses eingesteckt wird. Auch wenn eine kabellose Verbindung aktiv " +"ist." + +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "DNS-Domain:" + +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "Nie verbinden" + +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "Automatisch wiederverbinden bei Abbruch der Netzwerkverbindung" + +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "Automatisches Wiederverbinden" + +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "Letzte Kabel-Netzwerkverbindung verwenden" + +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "Nach kabelgebundenen Netzwerkprofilen fragen" + +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "Standard-Kabelnetzwerk verwenden" + +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "Automatische Kabelverbindung" + +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "Netzwerkkarte:" + +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "WLAN-Gerät:" + +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "Netzwerkgerät" + +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "DNS-Server 3:" + +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "DNS-Server 2:" + +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "DNS-Server 1:" + +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "Such-Domain:" + +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "Globale DNS-Server" +#: data/wicd.ui:960 msgid "" -"Wired\r\n" -"IP:\r\n" -"RX:\r\n" -"TX:" -msgstr "Kabelnetz IP: RX: TX: " +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" +"Die Netzwerkkarte für Kabelverbindungen im Hauptfenster immer anzeigen. Das " +"kann nützlich sein, wenn ihre Netzwerkkarte nicht feststellen kann, ob ein " +"Kabel eingesteckt ist." + +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "Benachrichtigungen" + +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "Routen-Tabelle löschen" + +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "Kabelgebundene Netzwerkerkennung" + +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "DHCP Client" + +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "Grafische Sudo-Anwendung" +#: data/wicd.ui:1421 msgid "" -"Wireless\r\n" -"SSID:\r\n" -"Speed:\r\n" -"IP:\r\n" -"Strength:\r\n" -"RX:\r\n" -"TX:" -msgstr "Drahtlosnetzwerk SSID: Geschwindigkeit: IP: Stärke: RX: TX: " +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" +"Um die Beschreibung lesen zu können, fahren Sie mit der Maus über das " +"gewählte Backend." + +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "Treiber:" + +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "WLAN-Gerät" + +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "WPA Supplicant" + +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "Fehlersuche" + +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "Backend:" + +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "Backend" + +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "" +"Sie sollten in der Regel wext als Treiber für das WPA-Anmeldeprogramm (WPA-" +"Supplicant) verwenden" + +#~ msgid "Help)" +#~ msgstr "Hilfe)" diff -Nru wicd-1.7.0+ds1/po/el.po wicd-1.7.1/po/el.po --- wicd-1.7.0+ds1/po/el.po 2010-03-03 21:26:32.000000000 +0000 +++ wicd-1.7.1/po/el.po 2012-01-15 19:18:31.000000000 +0000 @@ -2,464 +2,1047 @@ # Translator ID 25 # /translator/edit/25/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" - -msgid "Connect" -msgstr "Σύνδεση" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-15 20:03+0100\n" +"Last-Translator: David Paleino \n" +"Language-Team: el \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-10 05:02+0000\n" +"X-Generator: Launchpad (build 14450)\n" +"Generated-By: Babel 0.9.6\n" -msgid "IP" -msgstr "IP" +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" -msgid "Netmask" -msgstr "Μάσκα Δικτύου" +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" -msgid "Gateway" -msgstr "Πύλη" +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "" -msgid "DNS" -msgstr "DNS" +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "Σχετικά με την εφαρμογή Wicd" -msgid "Use Static IPs" -msgstr "Χρήση στατικών διευθύνσεων IP" +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "Ενεργοποίηση κοινόχρηστης σύνδεσης Internet" -msgid "Use Static DNS" -msgstr "χρήση στατικών DNS" +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "Προσθήκη νέου προφίλ" -msgid "Use Encryption" -msgstr "Χρήση κρυπτογράφησης" +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "Προσθήκη νέου προφίλ για ενσύρματο δίκτυο" +#: curses/prefs_curses.py:52 data/wicd.ui:1669 msgid "Advanced Settings" msgstr "Προχωρημένες ρυθμίσεις" -msgid "Wired Network" -msgstr "Ενσύρματο δίκτυο" +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Προβολή πάντα των ενσύρματων συσκευών" + +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Πάντα σύνδεση με το ενσύρματο δίκτυο αν υπάρχει" + +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Πιστοποίηση" +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "Αυτόματο (προτείνεται)" + +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Αυτόματη επανασύνδεση" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 msgid "Automatically connect to this network" msgstr "Αυτόματη σύνδεση στο δίκτυο" -msgid "Secured" -msgstr "Ασφαλής" +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Αυτόματη επανασύνδεση κατά την αποσύνδεση" -msgid "Unsecured" -msgstr "Ανασφαλής" +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "Προσφορά από:" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "" +"Δεν είναι δυνατή η σύνδεση με την υπηρεσία, γίνεται προσπάθεια αυτόματης " +"εκκίνησης..." +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "Ακύρωση" + +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 msgid "Channel" msgstr "Κανάλι" -msgid "Preferences" -msgstr "Προτιμήσεις" +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Επιλέξτε από τα δίκτυα:" -msgid "WPA Supplicant Driver" -msgstr "Οδηγός WPA" +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "" -msgid "Wireless Interface" -msgstr "Ασύρματη διεπαφή" +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "Ρύθμιση επιλεγμένου δικτύου" -msgid "Wired Interface" -msgstr "Ενσύρματη συσκευή" +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "Ρύθμιση προτιμήσεων για το ενσύρματο δίκτυο \"$A\"" -msgid "Always show wired interface" -msgstr "Προβολή πάντα των ενσύρματων συσκευών" +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "Ρύθμιση προτιμήσεων για το ασύρματο δίκτυο \"$A\" ($B)" -msgid "Automatically reconnect on connection loss" -msgstr "Αυτόματη επανασύνδεση κατά την αποσύνδεση" +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "Ρύθμιση ασύρματης διεπαφής..." -msgid "Hidden Network" -msgstr "Κρυφό δίκτυο" +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "Σύνδεση" -msgid "Hidden Network ESSID" -msgstr "Κρυφό ESSID δικτύου" +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "Σύνδεση στο επιλεγμένο δίκτυο" +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 msgid "Connected to $A at $B (IP: $C)" msgstr "Συνδεδεμένο στο $A με $B (IP: $C)" +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 msgid "Connected to wired network (IP: $A)" msgstr "Συνδεδεμένο με το ενσύρματο δίκτυο (IP: $A)" -msgid "Not connected" -msgstr "Αποσυνδεμένο" +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "Σύνδεση" -msgid "No wireless networks found." -msgstr "Δεν βρέθηκαν ασύρματα δίκτυα." +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Ακύρωση Σύνδεσης" + +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Ακύρωση Σύνδεσης" + +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "Αποτυχία Σύνδεσης: Λάθος κωδικός" +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "Η σύνδεση απέτυχε: Η αυτόματη απόδοση διεύθυνσης IP απέτυχε." + +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "Αποτυχία σύνδεσης: Αδυναμία ανάκτησης IP διεύθυνσης" + +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "Η σύνδεση ολοκληρώθηκε" + +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "Σφλαμα σύνδεσης: Η σύνδεση με τον ασύρματο σταθμό απέτυχε." + +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "Ακύρωση Σύνδεσης" + +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"Αποτυχία σύνδεσης με το D-Bus. Δείτε το αρχείο καταγραφής σφαλμάτων του wicd." + +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"Δεν είναι δυνατή η εύρεση γραφικού περιβάλλοντος για το πρόγραμμα sudo. Ο " +"διορθωτής αρχείου δέσμης δεν μπορεί να ξεκινήσει. Πρέπει να διορθώσετε τα " +"αρχεία δέσμης κατευθείαν στο αρχείο ρυθμίσεων." + +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "Δημιουργία Ad-Hoc δικτύου" + +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" +"Αποτυχία DBus! Πιθανόν προκλήθηκε επειδή ο δαίμονας wicd σταμάτησε την ώρα " +"που τρέχει το wicd-curses. Παρακαλώ επανεκκινήστε τον δαίμονα και μετά " +"επανεκκινηστε το wicd-curses." + +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "Πελάτης DHCP" + +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "Όνομα DNS" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "Εξυπηρετητής DNS:" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "Αποσφαλμάτωση" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "Αποσυνδεμένο." + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Αποσύνδεση από όλα τα δίκτυα" + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "Αποσυνδεμένο." + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "Αποσυνδέονται οι ενεργές συνδέσεις" + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "Προβολή του διαλόγου βοήθειας" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "Προβολή υπενθυμίσεων σχετικά με την κατάσταση σύνδεσης" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "Προβολή του διαλόγου βοήθειας" + +#: wicd/translations.py:78 +msgid "Domain" +msgstr "Όνομα DNS" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "Η σύνδεση ολοκληρώθηκε..." + +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "ESSID" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "Ενεργοποίηση λειτουργίας αποσφαλμάτωσης" + +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "Προσπάθεια σύνδεσης σε εξέλιξη..." + +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "Εξωτερικά Προγράμματα" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "Καθάρισμα πινάκα δρομολόγησης..." + +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "" +"Για πιο λεπτομερή βοήθεια, συμβουλευτείτε το αρχείο βοήθειας wicd-curses.\r\n" +"Από κονσόλα, δώστε man wicd-curses" + +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Πύλη" + +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "Γενικές Ρυθμίσεις" + +#: wicd/misc.py:85 +msgid "Generating PSK..." +msgstr "Δημιουργία PSK..." + +#: wicd/misc.py:86 +msgid "Generating WPA configuration file..." +msgstr "Δημιουργία αρχείου ρύθμισης WPA..." + +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "" +"Ο κύριος διακομιστής DNS δεν έχει ενεργοποιηθεί στις γενικές προτιμήσεις" + +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "Κύριοι Διακομιστές Ονομάτων" + +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "" + +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "" + +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "Κρυφό ESSID δικτύου" + +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" + +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Ταυτότητα" + +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "" + +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "Εισήχθη άκυρη διεύθυνση IP." + +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "Άκυρη διεύθυνση στην καταχώρηση $A" + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 msgid "Key" msgstr "Κλειδί" -msgid "Username" -msgstr "Όνομα" +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Μάσκα Δικτύου" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "Διεπαφές δικτύου" +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "" + +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "Δεν βρέθηκαν ασύρματα δίκτυα." + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "Αποσυνδεμένο" + +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "Εντάξει" + +#: wicd/misc.py:91 +msgid "Obtaining IP address..." +msgstr "Ανάκτηση διεύθυνσης IP..." + +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" +"Εκεί, μπορείτε να τροποποιήσετε (ή να προσθέσετε) τις μεταβλητές " +"beforescript\", \"afterscript\", και \"disconnectscript\" αναλόγος. " +"Σημειώστε ότι θα πρέπει να προσδιορίσετε την πλήρη διαδρομή προς τα αρχεία - " +"όχι τα περιεχόμενά τους. Θα χρειαστεί να προσθέσετε/επεξεργαστείτε τα " +"περιεχόμενα ξεχωρηστά. Περισσότερες πληροφορίες μπορείτε να βρείτε στις " +"σελίδες εγχειριδίου του wicd." + +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "" + +#: wicd/translations.py:82 msgid "Password" msgstr "Κωδικός" -msgid "Anonymous Identity" -msgstr "Ανώνυμη ταυτότητα" +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "" -msgid "Identity" -msgstr "Ταυτότητα" +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Διαδρομή για το αρχείο PAC" -msgid "Authentication" -msgstr "Πιστοποίηση" +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "" -msgid "Path to PAC File" -msgstr "Διαδρομή για το αρχείο PAC" +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "" +"Επικοινωνία με στατικές πύλες μετά την σύνδεση για επιβεβαίωση συσχετισμού" -msgid "Choose from the networks below:" -msgstr "Επιλέξτε από τα δίκτυα:" +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "Εκτέλεση του αρχείου δέσμης προ-αποσύνδεσης." + +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "Εκτέλεση του αρχείου δέσμης προ-αποσύνδεσης." + +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "Εκτέλεση του αρχείου δέσμης προ-αποσύνδεσης." + +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "Εκτέλεση του αρχείου δέσμης προ-αποσύνδεσης." + +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Προτιμήσεις" + +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "Διάλογος προτιμήσεων" + +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "" + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "Ζητηση προφιλ ενσυρματου δικτυου" + +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "Ιδιότητες" +#: wicd/misc.py:87 msgid "Putting interface down..." msgstr "Απενεργοποίηση κάρτας δικτύου" +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "Ενεργοποίηση διεπαφής..." + +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "" + +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "Ανανέωση λίστας δικτύων" + +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "Μετονομασία ενσύρματου προφίλ" + +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "Η απαιτούμενη πληροφορία κρυπτογράφησης δεν υπάρχει." + +#: wicd/misc.py:90 msgid "Resetting IP address..." msgstr "Επανάκτηση Διεύθυνσης IP..." -msgid "Putting interface up..." -msgstr "Ενεργοποίηση διεπαφής..." +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "" -msgid "Removing old connection..." -msgstr "Αφαίρεση παλιάς σύνδεσης..." +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "Σβήσιμο πίνακα δρομολόγησης:" -msgid "Generating PSK..." -msgstr "Δημιουργία PSK..." +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "Σάρωση" -msgid "Generating WPA configuration file..." -msgstr "Δημιουργία αρχείου ρύθμισης WPA..." +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "Σάρωση για κρυφά δίκτυα" -msgid "Flushing the routing table..." -msgstr "Καθάρισμα πινάκα δρομολόγησης..." +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "Σάρωση" -msgid "Configuring wireless interface..." -msgstr "Ρύθμιση ασύρματης διεπαφής..." +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "Σάρωση δικτύων...αναμείνατε..." +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "Σενάρια" + +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "Αναζήτηση τομέα" + +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Ασφαλής" + +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "Επιλογή κρυφού δικτύου ESSID" + +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "Επιλέξτε ή δημιουργήστε προφίλ για την ενσύρματη σύνδεση με" + +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "Επιλογή σεναρίων" + +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "Ρύθμιση δικτύου Ad-hoc" + +#: wicd/misc.py:92 msgid "Setting broadcast address..." msgstr "Ρύθμιση διεύθυνσης εκπομπής..." +#: wicd/misc.py:93 msgid "Setting static DNS servers..." msgstr "Ρύθμιση στατικού διακομιστή DNS..." +#: wicd/misc.py:94 msgid "Setting static IP addresses..." msgstr "Ρύθμιση στατικής διεύθυνσης IP..." -msgid "Obtaining IP address..." -msgstr "Ανάκτηση διεύθυνσης IP..." - -msgid "Done connecting..." -msgstr "Η σύνδεση ολοκληρώθηκε..." +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "Αποσύνδεση από όλα τα δίκτυα" -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "Για μια ενσύρματη σύνδεση, απαιτείται ένα προφίλ δικτύου. Για τη δημιουργία προφίλ, πληκτρολογήστε ένα όνομα και επιλέξτε Προσθήκη..." +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "Διακοπή εμφάνισης μηνύματος επανασύνδεσης" -msgid "Wicd needs to access your computer's network cards." -msgstr "Το WICD χρειάζεται πρόσβαση στις κάρτες δικτύου του Η/Υ σας." +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "Σταματήστε την σύνδεση που βρίσκεται σε εξέλιξη" -msgid "Run script before connect" -msgstr "Εκτέλεση σεναρίου πριν τη σύνδεση" +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "" -msgid "Run script after connect" -msgstr "Εκτέλεση σεναρίου μετά τη σύνδεση" +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "" -msgid "Scripts" -msgstr "Σενάρια" +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "" -msgid "Enable debug mode" -msgstr "Ενεργοποίηση λειτουργίας αποσφαλμάτωσης" +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "" -msgid "Use global DNS servers" -msgstr "Χρήση κύριων Διακομιστών Ονομάτων" +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "Τερματισμός από το χρήστη" -msgid "Use default profile on wired autoconnect" -msgstr "Χρήση προεπιλεγμένου προφίλ σε ενσύρματο δίκτυο" +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" +"Ο δαίμονας του wicd τερματίστηκε. Το γραφικό περιβάλλον δεν θα λειτουργεί " +"σωστά εάν δεν επανεκκινηθεί ο δαίμονας." -msgid "Prompt for profile on wired autoconnect" -msgstr "Ζητηση προφιλ ενσυρματου δικτυου" +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "Το δίκτυο απαιτεί ενεργοποιημένη κρυπτογράφηση." -msgid "Use last used profile on wired autoconnect" -msgstr "Χρήση τελευταίου χρησιμοποιημένου προφίλ σε επανασύνδεση" +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" +"Για την αποφυγή διαφόρων επιπλοκών το wicd-curses δεν επιτρέπει την " +"απευθείας επεξεργασία των αρχείων. Μπορείτε να τα επεξεργαστείτε " +"χειροκίνητα. Πρώτα (σαν root) ανοιχτε το \"$A\" αρχείο ρυθμίσεων και βρείτε " +"τον τομέα με τον τίτλο $B. Σε αυτήν την περίπτωση είναι:" -msgid "Activate Internet Connection Sharing" -msgstr "Ενεργοποίηση κοινόχρηστης σύνδεσης Internet" +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" +"Για να συνδεθείτε σε ένα ενσύρματο δίκτυο θα πρέπει να δημιουργήσετε ένα " +"προφίλ δικτύου.\r\n" +"Για την δημιουργία προφίλ, εισάγετε ένα όνομα και πιέστε Προσθήκη." -msgid "Use Encryption (WEP only)" -msgstr "Χρήση κρυπτογράφησης (μόνο WEP)" +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" +"Η σύνδεση με τον δαίμονα του Wicd είναι αδύνατη, εξ' αιτίας απαγόρευσης " +"πρόσβασης από το DBus. Επιβαιβεώστε ότι ο χρήστης ανήκει στην ομάδα $A" -msgid "Use dBm to measure signal strength" -msgstr "Χρήση dBm για μέτρηση ισχύος σήματος" +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "Ανασφαλής" -msgid "Wired connection detected" -msgstr "Βρέθηκε ενσύρματη σύνδεση" +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "" -msgid "Stop Showing Autoconnect pop-up temporarily" -msgstr "Διακοπή εμφάνισης μηνύματος επανασύνδεσης" +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "Χρήση κρυπτογράφησης" -msgid "General Settings" -msgstr "Γενικές Ρυθμίσεις" +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "Χρήση κρυπτογράφησης (μόνο WEP)" -msgid "External Programs" -msgstr "Εξωτερικά Προγράμματα" +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "χρήση στατικών DNS" -msgid "DHCP Client" -msgstr "Πελάτης DHCP" +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "Χρήση στατικών διευθύνσεων IP" -msgid "Wired Link Detection" -msgstr "Ανίχνευση ενσύρματου δικτύου" +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "Χρήση ως προεπιλεγμένου προφίλ (αντικαθιστά τα προηγούμενα)" -msgid "Route Table Flushing" -msgstr "Σβήσιμο πίνακα δρομολόγησης:" +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "Χρήση dBm για μέτρηση ισχύος σήματος" -msgid "Automatic (recommended)" -msgstr "Αυτόματο (προτείνεται)" +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "Χρήση προεπιλεγμένου προφίλ σε ενσύρματο δίκτυο" -msgid "This network requires encryption to be enabled." -msgstr "Το δίκτυο απαιτεί ενεργοποιημένη κρυπτογράφηση." +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "Χρήση κύριων Διακομιστών Ονομάτων" -msgid "Required encryption information is missing." -msgstr "Η απαιτούμενη πληροφορία κρυπτογράφησης δεν υπάρχει." +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "Χρήση τελευταίου χρησιμοποιημένου προφίλ σε επανασύνδεση" +#: curses/netentry_curses.py:255 gtk/netentry.py:357 msgid "Use these settings for all networks sharing this essid" msgstr "Χρήση αυτών των ρυθμίσεων για όλα τα δίκτυα που μοιράζονται το essid" -msgid "Select or create a wired profile to connect with" -msgstr "Επιλέξτε ή δημιουργήστε προφίλ για την ενσύρματη σύνδεση με" - -msgid "Connection Failed: Unable to Get IP Address" -msgstr "Αποτυχία σύνδεσης: Αδυναμία ανάκτησης IP διεύθυνσης" +#: wicd/translations.py:89 +msgid "Username" +msgstr "Όνομα" -msgid "Connection Cancelled" -msgstr "Ακύρωση Σύνδεσης" +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "Έλεγχος εξουσιοδότησης..." -msgid "Connection Failed: Bad password" -msgstr "Αποτυχία Σύνδεσης: Λάθος κωδικός" +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "Επιβεβαίωση συσχέτισης με το Σημείο Πρόσβασης" -msgid "Wireless Kill Switch Enabled" -msgstr "Ενεργοποίηση του διακόπτη wifi" +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "" -msgid "Preferences dialog" -msgstr "Διάλογος προτιμήσεων" +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "Διεπαφή Wicd Curses" -msgid "Display this help dialog" -msgstr "Προβολή του διαλόγου βοήθειας" +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "Η σύνδεση με τον δαίμονα του wicd είναι ανέφικτη." -msgid "Disconnect from all networks" -msgstr "Αποσύνδεση από όλα τα δίκτυα" +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "Το WICD χρειάζεται πρόσβαση στις κάρτες δικτύου του Η/Υ σας." -msgid "Scanning networks... stand by..." -msgstr "Σάρωση δικτύων...αναμείνατε..." +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" -msgid "Refresh network list" -msgstr "Ανανέωση λίστας δικτύων" +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "Ρυθμίσεις ενσύρματης αυτόματης σύνδεσης" -msgid "Search domain" -msgstr "Αναζήτηση τομέα" +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "Ενσύρματη συσκευή" -msgid "Press ESC to cancel" -msgstr "Πατήστε Esc για ακύρωση" +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "Ανίχνευση ενσύρματου δικτύου" -msgid "Scanning" -msgstr "Σάρωση" +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "Ενσύρματο δίκτυο" -msgid "Select Hidden Network ESSID" -msgstr "Επιλογή κρυφού δικτύου ESSID" +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "Ενσύρματα δίκτυα" -msgid "Connecting" -msgstr "Σύνδεση" +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "Βρέθηκε ενσύρματη σύνδεση" -msgid "Connecting to daemon..." -msgstr "Σύνδεση στο δαίμονα..." +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "Ασύρματο SSID: Ταχύτητα: IP: Ισχύς: RX: TX:" -msgid "Configure Selected Network" -msgstr "Ρύθμιση επιλεγμένου δικτύου" +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "Ασύρματη διεπαφή" -msgid "Validating authentication..." -msgstr "Έλεγχος εξουσιοδότησης..." +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "Ενεργοποίηση του διακόπτη wifi" +#: curses/wicd-curses.py:535 msgid "Wireless Networks" msgstr "Ασύρματα δίκτυα" -msgid "Check if using madwifi/atheros drivers" -msgstr "Έλεγχος για χρήση οδηγών madwifi/atheros" - -msgid "Properties" -msgstr "Ιδιότητες" +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" +"Μπορείτε επίσης να ρυθμίσετε τα ασύρματα δίκτυα ψάχνοντας το πεδίο " +"\"[]\" στο αρχείο ρυθμίσεων" -msgid "About Wicd" -msgstr "Σχετικά με την εφαρμογή Wicd" +#: gtk/netentry.py:300 gtk/netentry.py:408 +msgid "You must enter your password to configure scripts" +msgstr "Πρέπει να βάλετε τον κωδικό σας για να επεξεργαστείτε τις εντολές" -msgid "OK" -msgstr "Εντάξει" +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "Θα πρέπει σχεδόν πάντα να χρησιμοποιείτε το wext για συνδέσεις WPA" -msgid "Select scripts" -msgstr "Επιλογή σεναρίων" +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "" -msgid "Wired Networks" -msgstr "Ενσύρματα δίκτυα" +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "" -msgid "Global DNS servers" -msgstr "Κύριοι Διακομιστές Ονομάτων" +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" +"To wicd-curses δεν υποστηρίζει την διαγραφή του τελευταίου ενσύρματου " +"δικτύου. Δοκιμάστε να το μετονομάσετε ('F2')" -msgid "DNS domain" -msgstr "Όνομα DNS" +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "" -msgid "Cancel" -msgstr "Ακύρωση" +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "" -msgid "Terminated by user" -msgstr "Τερματισμός από το χρήστη" +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "" -msgid "Add a new profile" -msgstr "Προσθήκη νέου προφίλ" +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "" -msgid "Create an Ad-Hoc Network" -msgstr "Δημιουργία Ad-Hoc δικτύου" +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "" -msgid "Connect to selected network" -msgstr "Σύνδεση στο επιλεγμένο δίκτυο" +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "" -msgid "Wired Autoconnect Settings" -msgstr "Ρυθμίσεις ενσύρματης αυτόματης σύνδεσης" +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "Αποσυνδεμένο." -msgid "Debugging" -msgstr "Αποσφαλμάτωση" +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "" -msgid "Network Interfaces" -msgstr "Διεπαφές δικτύου" +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "Προτιμήσεις" -msgid "Scan" -msgstr "Σάρωση" +#: data/wicd.ui:136 +msgid "_About" +msgstr "" -msgid "ESSID" -msgstr "ESSID" +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "Η σύνδεση ολοκληρώθηκε..." -msgid "Rename wired profile" -msgstr "Μετονομασία ενσύρματου προφίλ" +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "" -msgid "Scan for hidden networks" -msgstr "Σάρωση για κρυφά δίκτυα" +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "Συνέχιση εκτέλεσης αρχείου δέσμης" -msgid "Automatic Reconnection" -msgstr "Αυτόματη επανασύνδεση" +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "" -msgid "Press F8 or Q to quit." -msgstr "Επιλέξτε F8 ή Q για έξοδο" +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "Εκτέλεση του αρχείου δέσμης προ-αποσύνδεσης." -msgid "Use as default profile (overwrites any previous default)" -msgstr "Χρήση ως προεπιλεγμένου προφίλ (αντικαθιστά τα προηγούμενα)" +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "Εκτέλεση του αρχείου δέσμης προ-αποσύνδεσης." -msgid "DNS server" -msgstr "Εξυπηρετητής DNS:" +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "Εκτέλεση του αρχείου δέσμης προ-αποσύνδεσης." -msgid "The wicd daemon is unavailable, so your request cannot be completed" -msgstr "Ο δαίμονας του wicd δεν είναι διαθέσιμος, συνεπώς το αίτημά σας δεν μπορεί να ολοκληρωθεί:" +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "Εκτέλεση του αρχείου δέσμης προ-αποσύνδεσης." -msgid "Always switch to wired connection when available" +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" msgstr "Πάντα σύνδεση με το ενσύρματο δίκτυο αν υπάρχει" -msgid "Verifying access point association..." -msgstr "Επιβεβαίωση συσχέτισης με το Σημείο Πρόσβασης" - -msgid "Stop a network connection in progress" -msgstr "Σταματήστε την σύνδεση που βρίσκεται σε εξέλιξη" - -msgid "You must enter your password to configure scripts" -msgstr "Πρέπει να βάλετε τον κωδικό σας για να επεξεργαστείτε τις εντολές" +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" -msgid "Notifications" -msgstr "Υπενθυμίσεις" +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "Όνομα DNS" -msgid "Display notifications about connection status" -msgstr "Προβολή υπενθυμίσεων σχετικά με την κατάσταση σύνδεσης" +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "" -msgid "Connection failed: Could not contact the wireless access point." -msgstr "Σφλαμα σύνδεσης: Η σύνδεση με τον ασύρματο σταθμό απέτυχε." +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "Αυτόματη επανασύνδεση κατά την αποσύνδεση" -msgid "You should almost always use wext as the WPA supplicant driver" -msgstr "Θα πρέπει σχεδόν πάντα να χρησιμοποιείτε το wext για συνδέσεις WPA " +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "Αυτόματη επανασύνδεση" -msgid "Add a new wired profile" -msgstr "Προσθήκη νέου προφίλ για ενσύρματο δίκτυο" +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "Μετονομασία ενσύρματου προφίλ" -msgid "Establishing connection..." -msgstr "Προσπάθεια σύνδεσης σε εξέλιξη..." +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "" -msgid "Connection established" -msgstr "Η σύνδεση ολοκληρώθηκε" +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "Μετονομασία ενσύρματου προφίλ" -msgid "Can't connect to the daemon, trying to start it automatically..." -msgstr "Δεν είναι δυνατή η σύνδεση με την υπηρεσία, γίνεται προσπάθεια αυτόματης εκκίνησης..." +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "Αυτόματη επανασύνδεση" -msgid "Disconnecting active connections..." -msgstr "Αποσυνδέονται οι ενεργές συνδέσεις" +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "Ενσύρματη συσκευή" -msgid "Global DNS has not been enabled in general preferences." -msgstr "Ο κύριος διακομηστής DNS δεν έχει ενεργοποιηθεί στις γενικές προτιμήσεις" +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "Ασύρματη διεπαφή" -msgid "wicd-curses does not support deleting the last wired profile. Try renaming it ('F2')" -msgstr "To wicd-curses δεν υποστηρίζει την διαγραφή του τελευταίου ενσύρματου δικτύου. Δοκιμάστε να το μετονομάσετε ('F2')" +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "Διεπαφές δικτύου" -msgid "Disconnected" -msgstr "Αποσυνδεμένο." +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "Εξυπηρετητής DNS:" -msgid "The wicd daemon has shut down. The UI will not function properly until it is restarted." -msgstr "Ο δαίμονας του wicd τερματίστηκε. Το γραφικό περιβάλλον δεν θα λειτουργεί σωστά εάν δεν επανεκκινηθεί ο δαίμονας." +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "Εξυπηρετητής DNS:" -msgid "To connect to a wired network, you must create a network profile. To create a network profile, type a name that describes this network, and press Add." -msgstr "" -"Για να συνδεθείτε σε ένα ενσύρματο δίκτυο θα πρέπει να δημιουργήσετε ένα προφίλ δικτύου.\r\n" -"Για την δημιουργία προφίλ, εισάγετε ένα όνομα και πιέστε Προσθήκη." +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "Εξυπηρετητής DNS:" -msgid "Wicd daemon unreachable" -msgstr "Η σύνδεση με τον δαίμονα του wicd είναι ανέφικτη." +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "Αναζήτηση τομέα" -msgid "Run pre-disconnect script" -msgstr "Εκτέλεση του αρχείου δέσμης προ-αποσύνδεσης." +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "Κύριοι Διακομιστές Ονομάτων" -msgid "For more detailed help, consult the wicd-curses(8) man page." +#: data/wicd.ui:960 +msgid "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." msgstr "" -"Για πιο λεπτομερή βοήθεια, συμβουλευτείτε το αρχείο βοήθειας wicd-curses.\r\n" -"Από κονσόλα, δώστε man wicd-curses" - -msgid "Could not connect to wicd's D-Bus interface. Check the wicd log for error messages." -msgstr "Αποτυχία σύνδεσης με το D-Bus. Δείτε το αρχείο καταγραφής σφαλμάτων του wicd." -msgid "Suspend script" -msgstr "Διακοπή εκτέλεσης αρχείου δέσμης" +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "Υπενθυμίσεις" -msgid "Invalid IP address entered." -msgstr "Εισήχθη άκυρη διεύθυνση IP." - -msgid "Configuring preferences for wired profile \"$A\"" -msgstr "Ρύθμιση προτιμήσεων για το ενσύρματο δίκτυο \"$A\"" - -msgid "Set up Ad-hoc network" -msgstr "Ρύθμιση δικτύου Ad-hoc" +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "Σβήσιμο πίνακα δρομολόγησης:" -msgid "Invalid address in $A entry." -msgstr "Άκυρη διεύθυνση στην καταχώρηση $A" +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "Ανίχνευση ενσύρματου δικτύου" -msgid "Unable to contact the Wicd daemon due to an access denied error from DBus. Please check that your user is in the $A group." -msgstr "Η σύνδεση με τον δαίμονα του Wicd είναι αδύνατη, εξ' αιτίας απαγόρευσης πρόσβασης από το DBus. Επιβαιβεώστε ότι ο χρήστης ανήκει στην ομάδα $A" +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "" -msgid "Wicd Curses Interface" -msgstr "Διεπαφή Wicd Curses" +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "" -msgid "Configuring preferences for wireless network \"$A\" ($B)" -msgstr "Ρύθμιση προτιμήσεων για το ασύρματο δίκτυο \"$A\" ($B)" +#: data/wicd.ui:1421 +msgid "" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" -msgid "Resume script" -msgstr "Συνέχιση εκτέλεσης αρχείου δέσμης" +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "" -msgid "Connection Failed: No DHCP offers received." -msgstr "Η σύνδεση απέτυχε: Η αυτόματη απόδοση διεύθυνσης IP απέτυχε." +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "Ασύρματη διεπαφή" -msgid "Unable to connect to wicd daemon DBus interface. This typically means there was a problem starting the daemon. Check the wicd log for more information." -msgstr "Η σύνδεση με τον δαίμονα του wicd απέτυχε. Αυτό συνήθως συμβαίνει όταν είναι αδύνατη η εκκίνηση του δαίμονα. Ελέγξτε τα αρχεία καταγραφής του wicd για περισσότερες λεμπομέρειες" +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "" -msgid "Changes to your backend won't occur until the daemon is restarted." -msgstr "Για να ενεργοποιηθούν οι αλλαγές, πρέπει να επανεκκινηθεί ο δαίμονας του wicd." +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "Αποσφαλμάτωση" -msgid "Brought to you by:" -msgstr "Προσφορά από:" +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "" -msgid "Setting encryption info" -msgstr "Ρύθμιση πληροφοριών κρυπτογράφησης" +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "" -msgid "Could not find a graphical sudo program. The script editor could not be launched. You'll have to edit scripts directly your configuration file." -msgstr "Δεν είναι δυνατή η εύρεση γραφικού περιβάλλοντος για το πρόγραμμα sudo. Ο διορθωτής αρχείου δέσμης δεν μπορεί να ξεκινήσει. Πρέπει να διορθώσετε τα αρχεία δέσμης κατευθείαν στο αρχείο ρυθμίσεων." +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "Θα πρέπει σχεδόν πάντα να χρησιμοποιείτε το wext για συνδέσεις WPA" diff -Nru wicd-1.7.0+ds1/po/en_CA.po wicd-1.7.1/po/en_CA.po --- wicd-1.7.0+ds1/po/en_CA.po 2010-03-03 21:28:02.000000000 +0000 +++ wicd-1.7.1/po/en_CA.po 2012-01-15 19:09:03.000000000 +0000 @@ -2,13 +2,1016 @@ # Translator ID 68 # /translator/edit/68/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-15 20:03+0100\n" +"Last-Translator: David Paleino \n" +"Language-Team: en_CA \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-08 05:46+0000\n" +"X-Generator: Launchpad (build 14443)\n" +"Generated-By: Babel 0.9.6\n" -msgid "Could not find a graphical sudo program. The script editor could not be launched. You'll have to edit scripts directly your configuration file." -msgstr "Could not find a graphical sudo program. The script editor could not be launched. You'll have to edit scripts directly using your configuration file." +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" + +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" + +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "" + +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "" + +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "" + +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "" + +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "" + +#: curses/prefs_curses.py:52 data/wicd.ui:1669 +msgid "Advanced Settings" +msgstr "" + +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "" + +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "" + +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "" + +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "" + +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 +msgid "Automatically connect to this network" +msgstr "" + +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "" + +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "" + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "" + +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 +msgid "Channel" +msgstr "" + +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "" + +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "" + +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "" + +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "" + +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "" + +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "" + +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "" + +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "" + +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 +msgid "Connected to $A at $B (IP: $C)" +msgstr "" + +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 +msgid "Connected to wired network (IP: $A)" +msgstr "" + +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "" + +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "" + +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "" + +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "" + +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "" + +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "" + +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "" + +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "" + +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "" + +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" + +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly using your configuration " +"file." + +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "" + +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" + +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "" + +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "" + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "" + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "" + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "" + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "" + +#: wicd/translations.py:78 +msgid "Domain" +msgstr "" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "" + +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "" + +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "" + +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "" + +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "" + +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "" + +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "" + +#: wicd/misc.py:85 +msgid "Generating PSK..." +msgstr "" + +#: wicd/misc.py:86 +msgid "Generating WPA configuration file..." +msgstr "" + +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "" + +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "" + +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "" + +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "" + +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "" + +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "" + +#: wicd/translations.py:79 +msgid "Identity" +msgstr "" + +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "" + +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "" + +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "" + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +msgid "Key" +msgstr "" + +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "" + +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "" + +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "" + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "" + +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "" + +#: wicd/misc.py:91 +msgid "Obtaining IP address..." +msgstr "" + +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "" + +#: wicd/translations.py:82 +msgid "Password" +msgstr "" + +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "" + +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "" + +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "" + +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "" + +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "" + +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "" + +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "" + +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "" + +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "" + +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "" + +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "" + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "" + +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "" + +#: wicd/misc.py:87 msgid "Putting interface down..." msgstr "Closing interface..." -msgid "Run script after connect" -msgstr "Run script after connecting" +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "" + +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "" + +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "" + +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "" + +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "" + +#: wicd/misc.py:90 +msgid "Resetting IP address..." +msgstr "" + +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "" + +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "" + +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "" + +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "" + +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "" + +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "" + +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "" + +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "" + +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "" + +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "" + +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "" + +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "" + +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "" + +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "" + +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "" + +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "" + +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "" + +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "" + +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "" + +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "" + +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "" + +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" + +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "" + +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" + +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" + +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" + +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "" + +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "" + +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "" + +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "" + +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "" + +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "" + +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "" + +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "" + +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "" + +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "" + +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "" + +#: wicd/translations.py:89 +msgid "Username" +msgstr "" + +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "" + +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "" + +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "" + +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "" + +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "" + +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "" + +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" + +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "" + +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "" + +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "" + +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "" + +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "" + +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "" + +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "" + +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "" + +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "" + +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "" + +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" + +#: gtk/netentry.py:300 gtk/netentry.py:408 +msgid "You must enter your password to configure scripts" +msgstr "" + +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "" + +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "" + +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "" + +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" + +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "" + +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "" + +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "" + +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "" + +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "" + +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "" + +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "" + +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "" + +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "" + +#: data/wicd.ui:136 +msgid "_About" +msgstr "" + +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "" + +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "" + +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "" + +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "" + +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "" + +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "" + +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "" + +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "" + +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "" + +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" + +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "" + +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "" + +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "" + +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "" + +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "" + +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "" + +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "" + +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "" + +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "" + +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "" + +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "" + +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "" + +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "" + +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "" + +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "" + +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "" + +#: data/wicd.ui:960 +msgid "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" + +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "" + +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "" + +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "" + +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "" + +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "" + +#: data/wicd.ui:1421 +msgid "" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" + +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "" + +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "" + +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "" + +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "" + +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "" + +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "" + +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "" diff -Nru wicd-1.7.0+ds1/po/en_GB.po wicd-1.7.1/po/en_GB.po --- wicd-1.7.0+ds1/po/en_GB.po 1970-01-01 00:00:00.000000000 +0000 +++ wicd-1.7.1/po/en_GB.po 2012-01-15 19:09:03.000000000 +0000 @@ -0,0 +1,1075 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-15 20:03+0100\n" +"Last-Translator: David Paleino \n" +"Language-Team: en_GB \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-08 05:46+0000\n" +"X-Generator: Launchpad (build 14443)\n" +"Generated-By: Babel 0.9.6\n" + +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" + +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" +"$A\n" +"$B KB/s\n" +"$C KB/s" + +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "About" + +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "About Wicd" + +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "Activate Internet Connection Sharing" + +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "Add a new profile" + +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "Add a new wired profile" + +#: curses/prefs_curses.py:52 data/wicd.ui:1669 +msgid "Advanced Settings" +msgstr "Advanced Settings" + +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Always show wired interface" + +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Always switch to wired connection when available" + +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Authentication" + +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "Automatic (recommended)" + +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Automatic Reconnection" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 +msgid "Automatically connect to this network" +msgstr "Automatically connect to this network" + +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Automatically reconnect on connection loss" + +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "Backend" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "Brought to you by:" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "Can't connect to the daemon, trying to start it automatically..." + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "Cancel" + +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 +msgid "Channel" +msgstr "Channel" + +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Choose from the networks below:" + +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "Config" + +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "Configure selected network" + +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "Configuring preferences for wired profile \"$A\"" + +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "Configuring preferences for wireless network \"$A\" ($B)" + +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "Configuring wireless interface..." + +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "Connect" + +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "Connect to selected network" + +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 +msgid "Connected to $A at $B (IP: $C)" +msgstr "Connected to $A at $B (IP: $C)" + +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 +msgid "Connected to wired network (IP: $A)" +msgstr "Connected to wired network (IP: $A)" + +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "Connecting" + +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Connection Cancelled" + +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Connection Failed." + +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "Connection Failed: Bad password" + +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "Connection Failed: No DHCP offers received." + +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "Connection Failed: Unable to Get IP Address" + +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "Connection established" + +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "Connection failed: Could not contact the wireless access point." + +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "Connection successful." + +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." + +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." + +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "Create an Ad-Hoc Network" + +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." + +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "DHCP Client" + +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "DHCP Hostname" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "DNS domain" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "DNS server" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "Debugging" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "Disconn" + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Disconnect from all networks" + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "Disconnected" + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "Disconnecting active connections..." + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "Display 'about' dialog" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "Display notifications about connection status" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "Display this help dialog" + +#: wicd/translations.py:78 +msgid "Domain" +msgstr "Domain" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "Done connecting..." + +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "ESSID" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "Enable debug mode" + +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "Establishing connection..." + +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "External Programs" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "Flushing the routing table..." + +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "For more detailed help, consult the wicd-curses(8) man page." + +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Gateway" + +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "General Settings" + +#: wicd/misc.py:85 +msgid "Generating PSK..." +msgstr "Generating PSK..." + +#: wicd/misc.py:86 +msgid "Generating WPA configuration file..." +msgstr "Generating WPA configuration file..." + +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "Global DNS has not been enabled in general preferences." + +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "Global DNS servers" + +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "Help" + +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "Hidden" + +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "Hidden Network ESSID" + +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" + +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Identity" + +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "Information about the current connection" + +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "Invalid IP address entered." + +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "Invalid address in $A entry." + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +msgid "Key" +msgstr "Key" + +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Netmask" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "Network Interfaces" + +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "Never connect to this network" + +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "No wireless networks found." + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "Not connected" + +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "OK" + +#: wicd/misc.py:91 +msgid "Obtaining IP address..." +msgstr "Obtaining IP address..." + +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." + +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "Passphrase" + +#: wicd/translations.py:82 +msgid "Password" +msgstr "Password" + +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "Path to CA cert" + +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Path to PAC file" + +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "Path to client cert" + +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "Ping static gateways after connecting to verify association" + +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "Post-connection Script" + +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "Post-disconnection Script" + +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "Pre-connection Script" + +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "Pre-disconnection Script" + +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Preferences" + +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "Preferences dialog" + +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "Prefs" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "Preshared key" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "Press any key to return." + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "Private key" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "Private key password" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "Prompt for profile on wired autoconnect" + +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "Properties" + +#: wicd/misc.py:87 +msgid "Putting interface down..." +msgstr "Putting interface down..." + +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "Putting interface up..." + +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "Quit" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "Quit wicd-curses" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "Quit wicd-tray-icon" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "Refresh" + +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "Refresh network list" + +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "Rename wired profile" + +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "Required encryption information is missing." + +#: wicd/misc.py:90 +msgid "Resetting IP address..." +msgstr "Resetting IP address..." + +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "RfKill" + +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "Route Table Flushing" + +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "Scan" + +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "Scan for hidden networks" + +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "Scanning" + +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "Scanning networks... stand by..." + +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "Scripts" + +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "Search domain" + +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Secured" + +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "Select Hidden Network ESSID" + +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "Select or create a wired profile to connect with" + +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "Select scripts" + +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "Set up Ad-hoc network" + +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "Setting broadcast address..." + +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "Setting static DNS servers..." + +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "Setting static IP addresses..." + +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "Show never connect networks" + +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "Stop Showing Autoconnect pop-up temporarily" + +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "Stop a connection in progress" + +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "Switch Off Wi-Fi" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "Switch On Wi-Fi" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "Tab Left" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "Tab Right" + +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "Terminated by user" + +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." + +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "This network requires encryption to be enabled." + +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" + +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." + +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." + +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "Unsecured" + +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "Use DHCP Hostname" + +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "Use Encryption" + +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "Use Encryption (WEP only)" + +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "Use Static DNS" + +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "Use Static IPs" + +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "Use as default profile (overwrites any previous default)" + +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "Use dBm to measure signal strength" + +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "Use default profile on wired autoconnect" + +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "Use global DNS servers" + +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "Use last used profile on wired autoconnect" + +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "Use these settings for all networks sharing this essid" + +#: wicd/translations.py:89 +msgid "Username" +msgstr "Username" + +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "Validating authentication..." + +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "Verifying access point association..." + +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "WPA Supplicant" + +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "Wicd Curses Interface" + +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "Wicd daemon unreachable" + +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "Wicd needs to access your computer's network cards." + +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" + +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "Wired Autoconnect Settings" + +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "Wired Interface" + +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "Wired Link Detection" + +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "Wired Network" + +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "Wired Networks" + +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "Wired connection detected" + +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" + +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "Wireless Interface" + +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "Wireless Kill Switch Enabled" + +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "Wireless Networks" + +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." + +#: gtk/netentry.py:300 gtk/netentry.py:408 +msgid "You must enter your password to configure scripts" +msgstr "You must enter your password to configure scripts" + +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "You should almost always use wext as the WPA supplicant driver" + +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "" + +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "_Quit" + +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" + +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "wicd-curses help" + +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "Wicd Network Manager" + +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "" + +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "" + +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "Enter a hidden network to try to locate." + +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "_Switch Off Wi-Fi" + +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "_Disconnect All" + +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "_Refresh" + +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "_Preferences" + +#: data/wicd.ui:136 +msgid "_About" +msgstr "_About" + +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "Connecting..." + +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "Cancel the current connection attempt" + +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "Configure Scripts" + +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "Configure scripts to run for this network:" + +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "Pre-connection Script:" + +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "Post-connection Script:" + +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "Pre-disconnection Script:" + +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "Post-disconnection Script:" + +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "Always switch to a wired connection when available" + +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." + +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "DNS domain:" + +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "Never Connect" + +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "Automatically reconnect on network connection loss" + +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "Automatic Reconnection" + +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "Use last wired network profile" + +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "Prompt for wired network profile" + +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "Use default wired network profile" + +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "Wired automatic connection" + +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "Wired interface:" + +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "Wireless interface:" + +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "Network Interfaces" + +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "DNS server 3:" + +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "DNS server 2:" + +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "DNS server 1:" + +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "Search domain:" + +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "Global DNS Servers" + +#: data/wicd.ui:960 +msgid "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." + +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "Notifications" + +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "Route Table Flushing" + +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "Wired Link Detection" + +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "DHCP Client" + +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "Graphical Sudo Application" + +#: data/wicd.ui:1421 +msgid "" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" +"Hover your mouse over the selected backend \n" +"to read its description." + +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "Driver:" + +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "Wireless Interface" + +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "WPA Supplicant" + +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "Debugging" + +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "Backend:" + +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "Backend" + +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "" +"You should almost always use wext as the\n" +"WPA supplicant driver." diff -Nru wicd-1.7.0+ds1/po/eo.po wicd-1.7.1/po/eo.po --- wicd-1.7.0+ds1/po/eo.po 2010-03-03 21:26:34.000000000 +0000 +++ wicd-1.7.1/po/eo.po 2012-01-18 07:05:34.000000000 +0000 @@ -2,181 +2,1033 @@ # Translator ID 26 # /translator/edit/26/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-17 22:33+0000\n" +"Last-Translator: David Paleino \n" +"Language-Team: eo \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-18 04:48+0000\n" +"X-Generator: Launchpad (build 14681)\n" +"Generated-By: Babel 0.9.6\n" -msgid "Connect" -msgstr "Konekti" +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" -msgid "IP" -msgstr "IP" +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" +"$A\n" +"$B KB/s\n" +"$C KB/s" + +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "Pri" + +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "Pri Wicd" -msgid "Netmask" -msgstr "Retmasko" +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "Aktivigi kunhavadon de interreta konekto" -msgid "Gateway" -msgstr "Kluzo" +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "Aldoni nova profilo" + +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "Aldoni nova drata profilo" -msgid "DNS" -msgstr "DNS" +#: curses/prefs_curses.py:52 data/wicd.ui:1669 +msgid "Advanced Settings" +msgstr "Specialaj agordoj" -msgid "Use Static IPs" -msgstr "Uzi fiksitan IP-adreson" +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Ĉiam montri dratan interfacon" -msgid "Use Static DNS" -msgstr "Uzi fiksitan DNS-on" +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Ĉiam vergu al drata konekton kiam disponebla" -msgid "Use Encryption" -msgstr "Uzi ĉifradon" +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Aŭtentokontrolo" -msgid "Advanced Settings" -msgstr "Specialaj agordoj" +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "Aŭtomate (rekomendata)" -msgid "Wired Network" -msgstr "Drata reto" +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Aŭtomata Rekonekto" +#: curses/netentry_curses.py:257 gtk/netentry.py:817 msgid "Automatically connect to this network" msgstr "Aŭtomate enkonekti tiun reton" -msgid "Secured" -msgstr "Sekurigita" +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Aŭtomate rekonekti post perdo de konekto" -msgid "Unsecured" -msgstr "Nesekurigita" +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "Modulo" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "Prezentita al vi per:" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "" + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "Nuligi" +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 msgid "Channel" msgstr "Kanalo" -msgid "Preferences" -msgstr "Agordoj" - -msgid "Wireless Interface" -msgstr "Sendrata interfaco" - -msgid "Wired Interface" -msgstr "Drata interfaco" +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Elekti el retoj sube:" -msgid "Always show wired interface" -msgstr "Ĉiam montri dratan interfacon" +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "Agordi" + +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "Agordi elektan reton" + +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "Agordas drata profilo \"$A\"" + +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "Agordas sendrata reto \"$A\" ($B)" -msgid "Automatically reconnect on connection loss" -msgstr "Aŭtomate rekonekti post perdo de konekto" +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "Agordado de sendratan interfacon..." -msgid "Hidden Network" -msgstr "Kaŝita reto" +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "Konekti" -msgid "Hidden Network ESSID" -msgstr "Kaŝita reto ESSID" +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "Konekti al elekta reto" +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 msgid "Connected to $A at $B (IP: $C)" msgstr "Konekti en $A je $B (IP: $C)" +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 msgid "Connected to wired network (IP: $A)" msgstr "Konekti en sendrata reto (IP: $A)" -msgid "Not connected" -msgstr "Nekonektita" +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "Konektanta" -msgid "No wireless networks found." -msgstr "Sendrata reto netrovita" +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Konekto rezignita" + +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Malsukcesa Konekto." + +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "Konekto fiaskis: Malbona pasvorto" + +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "Konekto malsukcesi: neniu DHCP oferto riceva." + +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "Konekto fiaskis: Neebla akiri IP adresojn" + +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "Establa konekto." + +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "" + +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "Sukcesa konekto." + +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" + +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" + +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "Krei Ad-Hoc Reto" + +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" + +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "DHCP kliento" + +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "DNS domajno" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "Servilo DNS" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "Sencimigi" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "Malknkt" + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Malkonekti de tutaj retoj" + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "Malkonektita" + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "Malkonektas aktivaj konektoj..." + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "" + +#: wicd/translations.py:78 +msgid "Domain" +msgstr "Domajno" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "Bone konektita..." + +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "ESSID" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "Ŝalti sencimigan reĝinon" + +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "Establas konekton..." +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "Eksteraj programaroj" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "" + +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "" + +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Kluzo" + +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "Ĝeneralaj agordoj" + +#: wicd/misc.py:85 +msgid "Generating PSK..." +msgstr "Generado de PSK..." + +#: wicd/misc.py:86 +msgid "Generating WPA configuration file..." +msgstr "Generado de WPA agordan dosieron" + +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "" + +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "Universalaj DNS serviloj" + +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "Helpo" + +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "Kaŝita" + +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "Kaŝita reto ESSID" + +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" + +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Idento" + +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "Informaĵo pri la kurenta konekto" + +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "" + +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "" + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 msgid "Key" msgstr "Ŝlosilo" -msgid "Username" -msgstr "Uzantnomo" +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Retmasko" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "Retinterfacoj" + +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "Neniam konekti al tio ĉi reto" + +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "Sendrata reto netrovita" + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "Nekonektita" +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "Bone" + +#: wicd/misc.py:91 +msgid "Obtaining IP address..." +msgstr "Akirado de IP adresoj..." + +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" + +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "Pasfrazo" + +#: wicd/translations.py:82 msgid "Password" msgstr "Pasvorto" -msgid "Anonymous Identity" -msgstr "Anonima idento" +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "" -msgid "Identity" -msgstr "Idento" +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Vojo je PAS dosiero" -msgid "Authentication" -msgstr "Aŭtentokontrolo" +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "" + +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "" + +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "" + +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "" -msgid "Path to PAC File" -msgstr "Vojo je PAS dosiero" +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "Drata konekto detektita:" -msgid "Choose from the networks below:" -msgstr "Elekti el retoj sube:" +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "Drata konekto detektita:" + +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Agordoj" +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "" + +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "Prefrj" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "" + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "Privata klavo" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "Privata klava pasvorto" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "" + +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "Atributoj" + +#: wicd/misc.py:87 +msgid "Putting interface down..." +msgstr "" + +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "" + +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "Eliri" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "Eliri wicd-curses" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "Eliri wicd-tray-icon" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "Aktualigi" + +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "Aktualigi reta listo" + +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "Rebapti drata profilo" + +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "" + +#: wicd/misc.py:90 msgid "Resetting IP address..." msgstr "Rekomencado de IP adresojn..." -msgid "Removing old connection..." -msgstr "Forigado de malnovan konekton..." +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "RfKill" + +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "" + +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "Skani" + +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "" + +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "Skanas" + +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "" -msgid "Generating PSK..." -msgstr "Generado de PSK..." +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "Skriptoj" -msgid "Generating WPA configuration file..." -msgstr "Generado de WPA agordan dosieron" +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "Serĉa domajno" -msgid "Configuring wireless interface..." -msgstr "Agordado de sendratan interfacon..." +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Sekurigita" +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "" + +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "Elekti aŭ krei dratan profilon por konektado" + +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "" + +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "Aranĝi Ad-hoc reto" + +#: wicd/misc.py:92 msgid "Setting broadcast address..." msgstr "Agordado de elsendajn adresojn..." +#: wicd/misc.py:93 msgid "Setting static DNS servers..." msgstr "Agordado de statikaj DNS serviloj..." +#: wicd/misc.py:94 msgid "Setting static IP addresses..." msgstr "Agordado de statikaj IP adresoj..." -msgid "Obtaining IP address..." -msgstr "Akirado de IP adresoj..." +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "" + +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "" + +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "Fermi progresanta konekto" + +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "Liva Tangeto" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "Dekstra Tangeto" + +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "Finata de uzanto" -msgid "Done connecting..." -msgstr "Bone konektita..." +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" + +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "" -msgid "Run script before connect" -msgstr "Lanĉu skripton antaŭ konekto" +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" -msgid "Run script after connect" -msgstr "Lanĉu skripton post konekto" +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" -msgid "Scripts" -msgstr "Skriptoj" +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" -msgid "Enable debug mode" -msgstr "Ŝalti sencimigan reĝinon" +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "Nesekurigita" -msgid "Use global DNS servers" -msgstr "Uzi globalajn DNS servilojn" +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "" -msgid "Activate Internet Connection Sharing" -msgstr "Aktivigi kunhavadon de interreta konekto" +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "Uzi ĉifradon" +#: curses/wicd-curses.py:466 gtk/gui.py:263 msgid "Use Encryption (WEP only)" msgstr "Uzi ĉifradon (nur WEP)" +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "Uzi fiksitan DNS-on" + +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "Uzi fiksitan IP-adreson" + +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "" + +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "" + +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "" + +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "Uzi globalajn DNS servilojn" + +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "" + +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "" + +#: wicd/translations.py:89 +msgid "Username" +msgstr "Uzantnomo" + +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "Validigas aŭtentikecon..." + +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "" + +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "" + +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "" + +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "Wicd dajmono malatingebla" + +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "" + +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" +"Drata\n" +"IP:\n" +"RX:\n" +"TX:" + +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "" + +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "Drata interfaco" + +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "" + +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "Drata reto" + +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "Drataj retoj" + +#: gtk/gui.py:97 msgid "Wired connection detected" msgstr "Drata konekto detektita:" -msgid "General Settings" -msgstr "Ĝeneralaj agordoj" +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "" +"Sendrata\n" +"SSID:\n" +"Rapideco:\n" +"IP:\n" +"Signalo:\n" +"RX:\n" +"TX:" -msgid "External Programs" -msgstr "Eksteraj programaroj" +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "Sendrata interfaco" -msgid "DHCP Client" -msgstr "DHCP kliento" +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "" + +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "Sendrataj Retoj" -msgid "Automatic (recommended)" -msgstr "Aŭtomate (rekomendata)" +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" + +#: gtk/netentry.py:300 gtk/netentry.py:408 +msgid "You must enter your password to configure scripts" +msgstr "" + +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "" + +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "" + +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "_Eliri" -msgid "Select or create a wired profile to connect with" -msgstr "Elekti aŭ krei dratan profilon por konektado" +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" + +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "wicd-curses helpo" + +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "Wicd Reta Administranto" + +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "" + +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "" + +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "" + +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "" + +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "_Malkonekti Tuta" + +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "_Aktualigi" + +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "Agor_doj" + +#: data/wicd.ui:136 +msgid "_About" +msgstr "_Pri" + +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "Konektanta..." + +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "" + +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "" + +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "" + +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "" + +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "" -msgid "Connection Failed: Unable to Get IP Address" -msgstr "Konekto fiaskis: Neebla akiri IP adresojn" +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "Drata konekto detektita:" -msgid "Connection Cancelled" -msgstr "Konekto rezignita" +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "" + +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "" -msgid "Connection Failed: Bad password" -msgstr "Konekto fiaskis: Malbona pasvorto" +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" + +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "DNS domajno:" + +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "Neniamo Konekti" + +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "Aŭtomate rekonekti post perdo de konekto" + +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "Aŭtomata Rekonekti" + +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "Uzi lasta drata reta profilo" + +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "" + +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "Uzi defaŭlta drata reta profilo" + +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "Drata aŭtomata konekto" + +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "Drata interfaco:" + +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "Sendrata interfaco:" + +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "Retaj interfacoj" + +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "DNS servilo 3:" + +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "DNS servilo 2:" + +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "DNS servilo 1:" + +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "Serĉa domajno:" + +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "Globalaj DNS Serviloj" + +#: data/wicd.ui:960 +msgid "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" + +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "Avizoj" + +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "" + +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "Drata Ligila Detekto" + +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "" + +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "" + +#: data/wicd.ui:1421 +msgid "" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" + +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "Pelilo:" + +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "Sendrata Interfaco" + +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "" + +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "" + +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "" + +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "" + +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "" diff -Nru wicd-1.7.0+ds1/po/es_AR.po wicd-1.7.1/po/es_AR.po --- wicd-1.7.0+ds1/po/es_AR.po 2010-03-03 21:28:00.000000000 +0000 +++ wicd-1.7.1/po/es_AR.po 2012-01-15 19:18:49.000000000 +0000 @@ -2,22 +2,1040 @@ # Translator ID 66 # /translator/edit/66/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-15 20:03+0100\n" +"Last-Translator: David Paleino \n" +"Language-Team: es_AR \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-10 05:02+0000\n" +"X-Generator: Launchpad (build 14450)\n" +"Generated-By: Babel 0.9.6\n" -msgid "Resetting IP address..." -msgstr "Reseteando dirección IP" +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" -msgid "Preferences dialog" -msgstr "Diálogo de preferencias" +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" + +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "" + +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "Acerca de Wicd" + +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "Activar Compartición de Conexión a Internet" + +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "Agregar un nuevo perfil" + +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "Agregar un nuevo perfil cableado" + +#: curses/prefs_curses.py:52 data/wicd.ui:1669 +msgid "Advanced Settings" +msgstr "Ajustes avanzados" + +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Siempre mostrar las conexiones cableadas" + +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Siempre cambiarse a conexión cabelada si está disponible" + +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Autenticación" + +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "Automático (recomendado)" + +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Reconexión automática" + +#: curses/netentry_curses.py:257 gtk/netentry.py:817 +msgid "Automatically connect to this network" +msgstr "Conectarse automáticamente a esta red" + +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Automáticamente reconectar cuando se pierda la conexión" + +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "Backend" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "Traído a Ud. por:" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "" +"No se puede conectar con el demonio, tratando de iniciarlo automáticamente..." + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "Cancelar" + +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 +msgid "Channel" +msgstr "Canal" + +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Elija de las redes abajo:" + +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "" + +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "Configurar red seleccionada" + +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "Configurando preferencias para perfil cableado \"$A\"" + +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "Configurando preferencia para red inalámbrica \"$A\" ($B)" + +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "Configurando interface inalámbrica" + +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "Conectar" +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "Conectar a red seleccionada" + +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 +msgid "Connected to $A at $B (IP: $C)" +msgstr "Conectado a $A a $B (IP: $C)" + +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 +msgid "Connected to wired network (IP: $A)" +msgstr "Conectado a red cableada (IP: $A)" + +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "Conectando" + +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Conexión cancelada" + +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Conexión cancelada" + +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "La conección falló: Password incorrecto" + +#: wicd/misc.py:89 msgid "Connection Failed: No DHCP offers received." -msgstr "La conección falló: no se han recibido ofertas DHCP" +msgstr "La conexión falló: no se han recibido ofertas DHCP" + +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "Conexión falló: Imposible obtener dirección IP" + +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "Coneccion establecida" + +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "" + +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "Conexión cancelada" + +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"No se pudo conectar a la interfez D-Bus de wicd. Chequee el log de wicd en " +"busca de mensajes de error." + +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" +"No se pudo encontrar un programa de sudo gráfico. El editor de scripts no " +"pudo ser iniciado. Tendrá que editar scripts directamente en su archivo de " +"configuración." + +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "Crear una red Ad-Hoc" + +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" +"Fallo de DBus! Esto seguramente es causado por la detención del demonio wicd " +"mientras wicd-curses se ejecuta. Por favor reinicie el demonio, y luego " +"reinicie wicd-curses." + +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "Cliente DHCP" + +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "Dominio DNS" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "Debugging" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "Desconectado" + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Desconectarse de todas las redes" + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "Desconectado" + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "Desconectando conecciones activas..." + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "Mostrar este diálogo de ayuda" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "Mostrar este diálogo de ayuda" +#: wicd/translations.py:78 +msgid "Domain" +msgstr "Dominio DNS" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "Conexión completada..." + +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "ESSID" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "Habilitar modo debug" + +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "Estableciendo coneccion..." + +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "Programas Externos" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "Vaciando la tabla de ruteo..." + +#: curses/wicd-curses.py:210 msgid "For more detailed help, consult the wicd-curses(8) man page." msgstr "Para una ayuda mas detallada, consulte el manual de wicd-curses" -msgid "Connection Failed: Bad password" -msgstr "La conección falló: Password incorrecto" +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Puerta de acceso" -msgid "Always show wired interface" -msgstr "Siempre mostrar las conexiones cableadas" +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "Ajustes generales" + +#: wicd/misc.py:85 +msgid "Generating PSK..." +msgstr "Generando PSK..." + +#: wicd/misc.py:86 +msgid "Generating WPA configuration file..." +msgstr "Generando archivo de configuración WPA..." + +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "El DNS Global no fue habilitado en las preferencias generales." + +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "Servidores DNS Globales" + +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "" + +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "" + +#: gtk/gui.py:357 +msgid "Hidden Network ESSID" +msgstr "ESSID de red oculta" + +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" + +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Identidad" + +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "" + +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "Direccion IP invalida." + +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "Dirección inválida en entrada $A" + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 +msgid "Key" +msgstr "Contraseña" + +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Máscara de red" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "Interfaces de red" + +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "" + +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "No se encontaron redes inalámbricas." + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "No conectado" + +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "Aceptar" + +#: wicd/misc.py:91 +msgid "Obtaining IP address..." +msgstr "Obteniendo dirección IP..." + +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" +"Una vez allí, puede ajustar (o agregar) las variables \"beforescript\", " +"\"afterscript\", y \"disconectscript\" según sus necesidades, para cambiar " +"los scripts de preconexión, postconexión y desconexión respectivamente. " +"Deberá especificar la ruta completa a los scripts, no el contenido del " +"script. Necesitará agregar/editar los contenidos de los scripts por " +"separado. Revise el manual de wicd para mas información." + +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "" + +#: wicd/translations.py:82 +msgid "Password" +msgstr "Contraseña" + +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "" + +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Ruta al archivo PAC" + +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "" + +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "" + +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "Ejectuar un script de pre-desconexión" + +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "Ejectuar un script de pre-desconexión" + +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "Ejectuar un script de pre-desconexión" + +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "Ejectuar un script de pre-desconexión" + +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Preferencias" + +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "Diálogo de preferencias" + +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "" + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "Solicitar perfil en autoconexión cableada" + +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "Propiedades" + +#: wicd/misc.py:87 +msgid "Putting interface down..." +msgstr "Apagando interfaz..." + +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "Construyendo interface..." + +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "" + +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "Actualizar lista de redes" + +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "Renombrar perfil cableado" + +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "Falta información de encriptación requerida." + +#: wicd/misc.py:90 +msgid "Resetting IP address..." +msgstr "Reseteando dirección IP" + +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "" + +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "Vaciado de Tabla de ruteo" + +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "Escanear" + +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "Escanear en busca de redes ocultas" + +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "Escaneando" + +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "Escaneando redes... aguarde un momento..." + +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "Scripts" + +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "Buscar dominio" + +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Seguro" + +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "Seleccionar ESSID de Red Oculta" + +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "Seleccione o cree un perfil cableado para conectarse" + +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "Seleccionar Scripts" + +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "Establecer red Ad-Hoc" + +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "Estableciendo dirección de broadcast..." + +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "Estableciendo servidores DNS estáticos..." + +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "Estableciendo direcciones IP estáticas..." + +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" +msgstr "Desconectarse de todas las redes" + +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "Dejar de mostrar temporariamente el aviso de Autoconexión" + +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" +msgstr "Detener una conexión en progreso." + +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "" + +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "Finalizado por usuario." + +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" +"El demonio wicd ha sido apagado. La interface de usuario no funcionará " +"correctamente hasta que sea reiniciado." + +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "Esta red requiere encriptación para ser habilitada" + +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" +"Para evitar algunas complicaciones, wicd-curses no soporta la edición " +"directa de scripts. Sin embargo, puede editarlas manualmente. Primero, (como " +"root), abra el archivo de configuración \"$A\", y busque la sección " +"etiquetada por el $B en cuestión. En este caso, esto sería:" + +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" +"Para conectar a una red cableada, debe crear un perfil de red. Para crear un " +"perfil de red, escriba un nombre que describa esa red, y presione Agregar." + +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" + +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "No seguro" + +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "Usar encriptación" + +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "Usar encriptación (WEP only)" + +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "Usar DNS estático" + +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "Usar IPs estáticos" + +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "" + +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "Usar dBm para medir la intensidad de la señal" + +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "Usar perfil por defecto en autoconexión cableada" + +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "Usar servidores DNS globales" + +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "Usar el último perfil usado en autoconexión cableada" + +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "Usar estos ajustes para todas las redes que compartan este essid" + +#: wicd/translations.py:89 +msgid "Username" +msgstr "Nombre de usuario" + +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "Validando autenticación..." + +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "Verificando asociación de access point..." + +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "Suplicante WPA" + +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "Interface Wicd Curses" + +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "No se puede alcanzar el demonio wicd" + +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "Wicd necesita acceder a la tarjeta de red de su computadora" + +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" + +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "Ajustes de Autoconexión Cableada" + +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "Interfaz cableada" + +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "Detección de Enlace Cableado" + +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "Red cableada" + +#: curses/wicd-curses.py:533 +msgid "Wired Networks" +msgstr "Redes Cableadas" + +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "Conexión cableada detectada" + +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "" + +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "Interface Inalámbrica" + +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "Kill Switch inalámbrico Habilitado" + +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "Redes inalámbricas" + +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" +"También puede configurar las redes inalámbricas buscando el campo " +"\"[]\" en el archivo de configuración." + +#: gtk/netentry.py:300 gtk/netentry.py:408 +msgid "You must enter your password to configure scripts" +msgstr "Debe ingresar su contraseña para configurar scripts" + +#: curses/prefs_curses.py:111 +msgid "You should almost always use wext as the WPA supplicant driver" +msgstr "Debería usar casi siempre wext como el driver suplicante de WPA" + +#: gtk/wicd-client.py:499 +msgid "_Connection Info" +msgstr "" + +#: gtk/wicd-client.py:502 data/wicd.ui:151 +msgid "_Quit" +msgstr "" + +#: curses/wicd-curses.py:428 +msgid "" +"wicd-curses does not support deleting the last wired profile. Try renaming " +"it (\"F2\")" +msgstr "" +"wicd-curses no soporta la eliminación del último perfil cableado. Pruebe " +"renombrarlo ('F2')" + +#: curses/wicd-curses.py:206 +msgid "wicd-curses help" +msgstr "" + +#: data/wicd.ui:9 +msgid "Wicd Network Manager" +msgstr "" + +#: data/wicd.ui:46 +msgid "Create an ad-hoc network" +msgstr "" + +#: data/wicd.ui:55 +msgid "Find a hidden network" +msgstr "" + +#: data/wicd.ui:57 +msgid "Enter a hidden network to try to locate." +msgstr "" + +#: data/wicd.ui:79 +msgid "_Switch Off Wi-Fi" +msgstr "" + +#: data/wicd.ui:94 +msgid "_Disconnect All" +msgstr "Desconectado" + +#: data/wicd.ui:108 +msgid "_Refresh" +msgstr "" + +#: data/wicd.ui:122 +msgid "_Preferences" +msgstr "Preferencias" + +#: data/wicd.ui:136 +msgid "_About" +msgstr "" + +#: data/wicd.ui:213 data/wicd.ui:215 +msgid "Connecting..." +msgstr "Conexión completada..." + +#: data/wicd.ui:228 +msgid "Cancel the current connection attempt" +msgstr "" + +#: data/wicd.ui:260 +msgid "Configure Scripts" +msgstr "" + +#: data/wicd.ui:279 +msgid "Configure scripts to run for this network:" +msgstr "" + +#: data/wicd.ui:296 +msgid "Pre-connection Script:" +msgstr "Ejectuar un script de pre-desconexión" + +#: data/wicd.ui:329 +msgid "Post-connection Script:" +msgstr "Ejectuar un script de pre-desconexión" + +#: data/wicd.ui:362 +msgid "Pre-disconnection Script:" +msgstr "Ejectuar un script de pre-desconexión" + +#: data/wicd.ui:395 +msgid "Post-disconnection Script:" +msgstr "Ejectuar un script de pre-desconexión" + +#: data/wicd.ui:514 +msgid "Always switch to a wired connection when available" +msgstr "Siempre cambiarse a conexión cabelada si está disponible" + +#: data/wicd.ui:519 +msgid "" +"If selected, wicd will automatically connect to a wired network\n" +"as soon as a cable is plugged in, even if a wireless connection \n" +"is already active." +msgstr "" + +#: data/wicd.ui:542 +msgid "DNS domain:" +msgstr "Dominio DNS" + +#: data/wicd.ui:590 +msgid "Never Connect" +msgstr "" + +#: data/wicd.ui:606 +msgid "Automatically reconnect on network connection loss" +msgstr "Automáticamente reconectar cuando se pierda la conexión" + +#: data/wicd.ui:625 +msgid "Automatic Reconnection" +msgstr "Reconexión automática" + +#: data/wicd.ui:641 +msgid "Use last wired network profile" +msgstr "Renombrar perfil cableado" + +#: data/wicd.ui:663 +msgid "Prompt for wired network profile" +msgstr "" + +#: data/wicd.ui:686 +msgid "Use default wired network profile" +msgstr "Renombrar perfil cableado" + +#: data/wicd.ui:707 +msgid "Wired automatic connection" +msgstr "Reconexión automática" + +#: data/wicd.ui:725 +msgid "Wired interface:" +msgstr "Interfaz cableada" + +#: data/wicd.ui:743 +msgid "Wireless interface:" +msgstr "Interface Inalámbrica" + +#: data/wicd.ui:783 +msgid "Network Interfaces" +msgstr "Interfaces de red" + +#: data/wicd.ui:799 +msgid "DNS server 3:" +msgstr "" + +#: data/wicd.ui:830 +msgid "DNS server 2:" +msgstr "" + +#: data/wicd.ui:848 +msgid "DNS server 1:" +msgstr "" + +#: data/wicd.ui:866 +msgid "Search domain:" +msgstr "Buscar dominio" + +#: data/wicd.ui:901 +msgid "Global DNS Servers" +msgstr "Servidores DNS Globales" + +#: data/wicd.ui:960 +msgid "" +"If enabled, the wired network interface will always be displayed in the main " +"window. This can be useful if your wired network card does not detect when " +"the interface is connected to a cable." +msgstr "" + +#: data/wicd.ui:976 +msgid "Notifications" +msgstr "" + +#: data/wicd.ui:1050 +msgid "Route Table Flushing" +msgstr "Vaciado de Tabla de ruteo" + +#: data/wicd.ui:1063 +msgid "Wired Link Detection" +msgstr "Detección de Enlace Cableado" + +#: data/wicd.ui:1289 +msgid "DHCP Client" +msgstr "" + +#: data/wicd.ui:1300 +msgid "Graphical Sudo Application" +msgstr "" + +#: data/wicd.ui:1421 +msgid "" +"Hover your mouse over the selected backend \n" +"to read its description." +msgstr "" + +#: data/wicd.ui:1474 +msgid "Driver:" +msgstr "" + +#: data/wicd.ui:1530 +msgid "Wireless Interface" +msgstr "Interface Inalámbrica" + +#: data/wicd.ui:1544 +msgid "WPA Supplicant" +msgstr "" + +#: data/wicd.ui:1556 +msgid "Debugging" +msgstr "Debugging" + +#: data/wicd.ui:1574 +msgid "Backend:" +msgstr "Backend" + +#: data/wicd.ui:1601 +msgid "Backend" +msgstr "" + +#: data/wicd.ui:1615 +msgid "" +"You should almost always use wext as the\n" +"WPA supplicant driver." +msgstr "Debería usar casi siempre wext como el driver suplicante de WPA" diff -Nru wicd-1.7.0+ds1/po/es_CL.po wicd-1.7.1/po/es_CL.po --- wicd-1.7.0+ds1/po/es_CL.po 2010-03-03 21:26:38.000000000 +0000 +++ wicd-1.7.1/po/es_CL.po 2012-01-15 19:18:52.000000000 +0000 @@ -2,166 +2,1024 @@ # Translator ID 28 # /translator/edit/28/ msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8\n" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-07 23:04+0100\n" +"PO-Revision-Date: 2012-01-15 20:03+0100\n" +"Last-Translator: David Paleino \n" +"Language-Team: es_CL \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-10 05:03+0000\n" +"X-Generator: Launchpad (build 14450)\n" +"Generated-By: Babel 0.9.6\n" -msgid "Connect" -msgstr "Conectar" - -msgid "IP" -msgstr "IP" - -msgid "Netmask" -msgstr "Mascara de Subred" +#: gtk/wicd-client.py:610 +msgid "" +"$A\n" +"$B\n" +"$C\n" +"$D\n" +"$E KB/s\n" +"$F KB/s" +msgstr "" -msgid "Gateway" -msgstr "Gateway" +#: gtk/wicd-client.py:603 +msgid "" +"$A\n" +"$B KB/s\n" +"$C KB/s" +msgstr "" + +#: curses/wicd-curses.py:564 +msgid "About" +msgstr "" + +#: curses/wicd-curses.py:201 +msgid "About Wicd" +msgstr "" + +#: curses/wicd-curses.py:465 gtk/gui.py:272 +msgid "Activate Internet Connection Sharing" +msgstr "" + +#: curses/wicd-curses.py:378 +msgid "Add a new profile" +msgstr "" + +#: curses/wicd-curses.py:411 +msgid "Add a new wired profile" +msgstr "" -msgid "DNS" -msgstr "DNS" +#: curses/prefs_curses.py:52 data/wicd.ui:1669 +msgid "Advanced Settings" +msgstr "Configuracion Avanzada" -msgid "Use Static IPs" -msgstr "Usar IPs estaticas" +#: curses/prefs_curses.py:69 gtk/prefs.py:326 data/wicd.ui:956 +msgid "Always show wired interface" +msgstr "Siempre mostrar interfaces cableadas" -msgid "Use Static DNS" -msgstr "Usar DNS estatica" +#: curses/prefs_curses.py:70 +msgid "Always switch to wired connection when available" +msgstr "Siempre cambiar a la conexión cableada cuando esté disponible." -msgid "Use Encryption" -msgstr "Usar encripcion" +#: wicd/translations.py:77 +msgid "Authentication" +msgstr "Autenticacion" -msgid "Advanced Settings" -msgstr "Configuracion Avanzada" +#: curses/prefs_curses.py:90 curses/prefs_curses.py:176 gtk/prefs.py:352 +#: gtk/prefs.py:359 gtk/prefs.py:366 gtk/prefs.py:371 data/wicd.ui:1082 +#: data/wicd.ui:1143 data/wicd.ui:1204 data/wicd.ui:1319 +msgid "Automatic (recommended)" +msgstr "" -msgid "Wired Network" -msgstr "Red Cableada" +#: curses/prefs_curses.py:86 +msgid "Automatic Reconnection" +msgstr "Reconexión automática" +#: curses/netentry_curses.py:257 gtk/netentry.py:817 msgid "Automatically connect to this network" msgstr "Conectar automaticamente a esta red" -msgid "Secured" -msgstr "Segura" +#: curses/prefs_curses.py:87 gtk/prefs.py:331 +msgid "Automatically reconnect on connection loss" +msgstr "Reconectar automaticamente cuando se pierda la conexion" -msgid "Unsecured" -msgstr "Insegura" +#: curses/prefs_curses.py:113 curses/prefs_curses.py:114 +msgid "Backend" +msgstr "" + +#: curses/wicd-curses.py:195 +msgid "Brought to you by:" +msgstr "" + +#: curses/wicd-curses.py:1029 +msgid "Can't connect to the daemon, trying to start it automatically..." +msgstr "" + +#: curses/configscript_curses.py:74 curses/curses_misc.py:535 +#: curses/netentry_curses.py:65 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:605 curses/wicd-curses.py:607 +msgid "Cancel" +msgstr "" +#: curses/wicd-curses.py:463 gtk/gui.py:267 gtk/netentry.py:966 +#: gtk/netentry.py:1088 msgid "Channel" msgstr "Canal" -msgid "Preferences" -msgstr "Preferencias" +#: gtk/gui.py:188 data/wicd.ui:173 +msgid "Choose from the networks below:" +msgstr "Escoja de entre las redes:" -msgid "Wireless Interface" -msgstr "Interfaz Inalambrica" +#: curses/wicd-curses.py:556 +msgid "Config" +msgstr "" + +#: curses/wicd-curses.py:225 +msgid "Configure selected network" +msgstr "" + +#: curses/netentry_curses.py:196 +msgid "Configuring preferences for wired profile \"$A\"" +msgstr "" + +#: curses/netentry_curses.py:272 +msgid "Configuring preferences for wireless network \"$A\" ($B)" +msgstr "" -msgid "Wired Interface" -msgstr "Interfaz Cableada" +#: wicd/misc.py:80 +msgid "Configuring wireless interface..." +msgstr "Configurando la interfaz inalambrica" -msgid "Always show wired interface" -msgstr "Siempre mostrar interfaces cableadas" +#: curses/wicd-curses.py:559 gtk/wicd-client.py:498 +msgid "Connect" +msgstr "Conectar" -msgid "Automatically reconnect on connection loss" -msgstr "Reconectar automaticamente cuando se pierda la conexion" +#: curses/wicd-curses.py:215 +msgid "Connect to selected network" +msgstr "" + +#: curses/wicd-curses.py:159 gtk/gui.py:429 gtk/wicd-client.py:215 +msgid "Connected to $A at $B (IP: $C)" +msgstr "" + +#: curses/wicd-curses.py:134 gtk/gui.py:422 gtk/wicd-client.py:220 +msgid "Connected to wired network (IP: $A)" +msgstr "" + +#: gtk/gui.py:191 gtk/wicd-client.py:313 gtk/wicd-client.py:641 +msgid "Connecting" +msgstr "Conectando:" + +#: wicd/misc.py:77 +msgid "Connection Cancelled" +msgstr "Conexión cancelada:" -msgid "Hidden Network" -msgstr "Red Oculta" +#: wicd/misc.py:83 +msgid "Connection Failed." +msgstr "Conexión cancelada:" + +#: wicd/misc.py:79 +msgid "Connection Failed: Bad password" +msgstr "Error al conectar: Contraseña incorrecta:" +#: wicd/misc.py:89 +msgid "Connection Failed: No DHCP offers received." +msgstr "Fallo de conexión: No se recibió asignación de DHCP" + +#: wicd/misc.py:81 +msgid "Connection Failed: Unable to Get IP Address" +msgstr "" + +#: gtk/wicd-client.py:269 gtk/wicd-client.py:299 +msgid "Connection established" +msgstr "" + +#: wicd/misc.py:78 +msgid "Connection failed: Could not contact the wireless access point." +msgstr "" + +#: wicd/misc.py:95 +msgid "Connection successful." +msgstr "Conexión cancelada:" + +#: gtk/gui.py:65 gtk/wicd-client.py:955 +msgid "" +"Could not connect to wicd's D-Bus interface. Check the wicd log for error " +"messages." +msgstr "" +"No se pudo conectar a la interfase D-Bus de wicd. Revise el log de wicd " +"para mensages de error." + +#: gtk/netentry.py:303 gtk/netentry.py:411 +msgid "" +"Could not find a graphical sudo program. The script editor could not be " +"launched. You'll have to edit scripts directly your configuration file." +msgstr "" + +#: curses/wicd-curses.py:488 gtk/gui.py:258 +msgid "Create an Ad-Hoc Network" +msgstr "" + +#: curses/wicd-curses.py:99 +msgid "" +"DBus failure! This is most likely caused by the wicd daemon stopping while " +"wicd-curses is running. Please restart the daemon, and then restart wicd-" +"curses." +msgstr "" + +#: curses/prefs_curses.py:92 +msgid "DHCP Client" +msgstr "" + +#: curses/netentry_curses.py:63 +msgid "DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:56 curses/prefs_curses.py:74 gtk/netentry.py:79 +msgid "DNS domain" +msgstr "Dominio DNS:" + +#: curses/netentry_curses.py:58 curses/netentry_curses.py:59 +#: curses/netentry_curses.py:60 curses/prefs_curses.py:76 +#: curses/prefs_curses.py:77 curses/prefs_curses.py:78 gtk/netentry.py:80 +#: gtk/netentry.py:81 gtk/netentry.py:82 +msgid "DNS server" +msgstr "Servidor DNS" + +#: curses/prefs_curses.py:117 +msgid "Debugging" +msgstr "" + +#: curses/wicd-curses.py:560 +msgid "Disconn" +msgstr "" + +#: curses/wicd-curses.py:216 +msgid "Disconnect from all networks" +msgstr "Desconectar de todas las redes." + +#: gtk/wicd-client.py:340 gtk/wicd-client.py:643 +msgid "Disconnected" +msgstr "" + +#: gtk/gui.py:725 +msgid "Disconnecting active connections..." +msgstr "" + +#: curses/wicd-curses.py:226 +msgid "Display 'about' dialog" +msgstr "" + +#: gtk/prefs.py:349 data/wicd.ui:992 +msgid "Display notifications about connection status" +msgstr "" + +#: curses/wicd-curses.py:214 +msgid "Display this help dialog" +msgstr "" + +#: wicd/translations.py:78 +msgid "Domain" +msgstr "Dominio DNS:" + +#: wicd/misc.py:82 +msgid "Done connecting..." +msgstr "" + +#: curses/wicd-curses.py:1053 +msgid "" +"ERROR: wicd-curses was denied access to the wicd daemon: please check that " +"your user is in the \"$A\" group." +msgstr "" + +#: curses/wicd-curses.py:461 gtk/gui.py:266 +msgid "ESSID" +msgstr "" + +#: curses/prefs_curses.py:118 gtk/prefs.py:335 data/wicd.ui:1511 +msgid "Enable debug mode" +msgstr "" + +#: gtk/wicd-client.py:320 gtk/wicd-client.py:324 +msgid "Establishing connection..." +msgstr "" + +#: curses/prefs_curses.py:51 data/wicd.ui:1398 +msgid "External Programs" +msgstr "" + +#: wicd/misc.py:84 +msgid "Flushing the routing table..." +msgstr "" + +#: curses/wicd-curses.py:210 +msgid "For more detailed help, consult the wicd-curses(8) man page." +msgstr "" +"Para ayuda más detallada, consulte la página del manual wicd-curses(8)" + +#: curses/netentry_curses.py:52 gtk/netentry.py:77 +msgid "Gateway" +msgstr "Gateway" + +#: curses/prefs_curses.py:50 data/wicd.ui:1018 +msgid "General Settings" +msgstr "" + +#: wicd/misc.py:85 +msgid "Generating PSK..." +msgstr "Generando PSK" + +#: wicd/misc.py:86 +msgid "Generating WPA configuration file..." +msgstr "Generando el archivo de configuracion WPA" + +#: gtk/netentry.py:233 +msgid "Global DNS has not been enabled in general preferences." +msgstr "" + +#: curses/prefs_curses.py:72 +msgid "Global DNS servers" +msgstr "" + +#: curses/wicd-curses.py:555 +msgid "Help" +msgstr "" + +#: curses/wicd-curses.py:563 +msgid "Hidden" +msgstr "" + +#: gtk/gui.py:357 msgid "Hidden Network ESSID" msgstr "SSID de la Red Oculta" -msgid "Not connected" -msgstr "No Conectado" +#: curses/netentry_curses.py:50 curses/wicd-curses.py:462 gtk/gui.py:265 +#: gtk/netentry.py:74 +msgid "IP" +msgstr "IP" -msgid "No wireless networks found." -msgstr "No se han encontrado redes" +#: wicd/translations.py:79 +msgid "Identity" +msgstr "Identidad" +#: gtk/wicd-client.py:500 +msgid "Information about the current connection" +msgstr "" + +#: gtk/netentry.py:167 +msgid "Invalid IP address entered." +msgstr "" + +#: gtk/gui.py:631 gtk/gui.py:639 +msgid "Invalid address in $A entry." +msgstr "" + +#: curses/wicd-curses.py:464 gtk/gui.py:268 wicd/translations.py:80 msgid "Key" msgstr "Clave" -msgid "Username" -msgstr "Usuario" +#: curses/netentry_curses.py:51 gtk/netentry.py:76 +msgid "Netmask" +msgstr "Mascara de Subred" + +#: curses/prefs_curses.py:66 +msgid "Network Interfaces" +msgstr "" + +#: gtk/netentry.py:818 +msgid "Never connect to this network" +msgstr "" +#: curses/wicd-curses.py:527 gtk/gui.py:604 gtk/wicd-client.py:797 +msgid "No wireless networks found." +msgstr "No se han encontrado redes" + +#: curses/wicd-curses.py:738 gtk/gui.py:439 gtk/wicd-client.py:213 +#: gtk/wicd-client.py:223 gtk/wicd-client.py:335 gtk/wicd-client.py:338 +msgid "Not connected" +msgstr "No Conectado" + +#: curses/configscript_curses.py:73 curses/curses_misc.py:527 +#: curses/netentry_curses.py:66 curses/wicd-curses.py:490 +#: curses/wicd-curses.py:602 curses/wicd-curses.py:606 +msgid "OK" +msgstr "" + +#: wicd/misc.py:91 +msgid "Obtaining IP address..." +msgstr "" + +#: curses/wicd-curses.py:278 +msgid "" +"Once there, you can adjust (or add) the \"beforescript\", \"afterscript\", " +"\"predisconnectscript\" and \"postdisconnectscript\" variables as needed, to " +"change the preconnect, postconnect, predisconnect and postdisconnect scripts " +"respectively. Note that you will be specifying the full path to the scripts " +"- not the actual script contents. You will need to add/edit the script " +"contents separately. Refer to the wicd manual page for more information." +msgstr "" + +#: wicd/translations.py:81 +msgid "Passphrase" +msgstr "" + +#: wicd/translations.py:82 msgid "Password" msgstr "Contraseña" -msgid "Anonymous Identity" -msgstr "Identidad Anonima" +#: wicd/translations.py:83 +msgid "Path to CA cert" +msgstr "" -msgid "Identity" -msgstr "Identidad" +#: wicd/translations.py:85 +msgid "Path to PAC file" +msgstr "Ruta al archivo PAC" -msgid "Authentication" -msgstr "Autenticacion" +#: wicd/translations.py:84 +msgid "Path to client cert" +msgstr "" + +#: curses/prefs_curses.py:122 gtk/prefs.py:339 data/wicd.ui:1644 +msgid "Ping static gateways after connecting to verify association" +msgstr "" + +#: curses/configscript_curses.py:57 gtk/configscript.py:129 +msgid "Post-connection Script" +msgstr "Ejecute script de pre-desconexión." + +#: curses/configscript_curses.py:59 gtk/configscript.py:132 +msgid "Post-disconnection Script" +msgstr "Ejecute script de pre-desconexión." + +#: curses/configscript_curses.py:56 gtk/configscript.py:128 +msgid "Pre-connection Script" +msgstr "Ejecute script de pre-desconexión." + +#: curses/configscript_curses.py:58 gtk/configscript.py:130 +msgid "Pre-disconnection Script" +msgstr "Ejecute script de pre-desconexión." -msgid "Path to PAC File" -msgstr "Ruta al archivo PAC" +#: curses/prefs_curses.py:56 curses/prefs_curses.py:252 gtk/prefs.py:318 +msgid "Preferences" +msgstr "Preferencias" -msgid "Choose from the networks below:" -msgstr "Escoja de entre las redes:" +#: curses/wicd-curses.py:219 +msgid "Preferences dialog" +msgstr "Diálogo de preferencias" + +#: curses/wicd-curses.py:562 +msgid "Prefs" +msgstr "" + +#: wicd/translations.py:86 +msgid "Preshared key" +msgstr "" + +#: curses/wicd-curses.py:229 +msgid "Press any key to return." +msgstr "" + +#: wicd/translations.py:87 +msgid "Private key" +msgstr "" + +#: wicd/translations.py:88 +msgid "Private key password" +msgstr "" + +#: curses/prefs_curses.py:83 gtk/prefs.py:343 +msgid "Prompt for profile on wired autoconnect" +msgstr "" + +#: gtk/netentry.py:59 gtk/netentry.py:61 gtk/netentry.py:598 +msgid "Properties" +msgstr "" +#: wicd/misc.py:87 msgid "Putting interface down..." msgstr "Desconectando de la interfaz" +#: wicd/misc.py:88 +msgid "Putting interface up..." +msgstr "Conectando a la interfaz" + +#: curses/wicd-curses.py:565 +msgid "Quit" +msgstr "" + +#: curses/wicd-curses.py:227 +msgid "Quit wicd-curses" +msgstr "" + +#: gtk/wicd-client.py:502 +msgid "Quit wicd-tray-icon" +msgstr "" + +#: curses/wicd-curses.py:561 +msgid "Refresh" +msgstr "" + +#: curses/wicd-curses.py:218 +msgid "Refresh network list" +msgstr "" + +#: curses/wicd-curses.py:441 +msgid "Rename wired profile" +msgstr "" + +#: curses/netentry_curses.py:357 gtk/gui.py:694 gtk/netentry.py:486 +msgid "Required encryption information is missing." +msgstr "" + +#: wicd/misc.py:90 msgid "Resetting IP address..." msgstr "Reseteando la direccion IP" -msgid "Putting interface up..." -msgstr "Conectando a la interfaz" +#: curses/wicd-curses.py:558 +msgid "RfKill" +msgstr "" + +#: curses/prefs_curses.py:103 +msgid "Route Table Flushing" +msgstr "" + +#: curses/wicd-curses.py:629 +msgid "Scan" +msgstr "" -msgid "Removing old connection..." -msgstr "Removiendo la conexion antigua" +#: curses/wicd-curses.py:222 +msgid "Scan for hidden networks" +msgstr "Buscar redes ocultas:" -msgid "Generating PSK..." -msgstr "Generando PSK" +#: gtk/gui.py:223 gtk/gui.py:529 gtk/wicd-client.py:810 +msgid "Scanning" +msgstr "" + +#: curses/wicd-curses.py:526 +msgid "Scanning networks... stand by..." +msgstr "" -msgid "Generating WPA configuration file..." -msgstr "Generando el archivo de configuracion WPA" +#: gtk/netentry.py:102 +msgid "Scripts" +msgstr "Scripts:" -msgid "Configuring wireless interface..." -msgstr "Configurando la interfaz inalambrica" +#: curses/netentry_curses.py:57 curses/prefs_curses.py:75 gtk/netentry.py:78 +msgid "Search domain" +msgstr "" -msgid "For more detailed help, consult the wicd-curses(8) man page." -msgstr "Para ayuda más detallada, consulte la página del manual wicd-curses(8)" +#: gtk/netentry.py:960 gtk/netentry.py:1082 +msgid "Secured" +msgstr "Segura" -msgid "Connection Failed: Bad password" -msgstr "Error al conectar: Contraseña incorrecta:" +#: curses/wicd-curses.py:629 +msgid "Select Hidden Network ESSID" +msgstr "" + +#: gtk/gui.py:103 +msgid "Select or create a wired profile to connect with" +msgstr "" + +#: curses/wicd-curses.py:223 +msgid "Select scripts" +msgstr "" + +#: curses/wicd-curses.py:224 +msgid "Set up Ad-hoc network" +msgstr "" + +#: wicd/misc.py:92 +msgid "Setting broadcast address..." +msgstr "" + +#: wicd/misc.py:93 +msgid "Setting static DNS servers..." +msgstr "" + +#: wicd/misc.py:94 +msgid "Setting static IP addresses..." +msgstr "" -msgid "Disconnect from all networks" +#: gtk/prefs.py:333 data/wicd.ui:571 +msgid "Show never connect networks" msgstr "Desconectar de todas las redes." -msgid "Stop a network connection in progress" +#: gtk/gui.py:104 +msgid "Stop Showing Autoconnect pop-up temporarily" +msgstr "" + +#: curses/wicd-curses.py:217 +msgid "Stop a connection in progress" msgstr "Detener una conexión en proceso:" -msgid "Always switch to wired connection when available" -msgstr "Siempre cambiar a la conexión cableada cuando esté disponible." +#: gtk/gui.py:315 +msgid "Switch Off Wi-Fi" +msgstr "" + +#: gtk/gui.py:312 +msgid "Switch On Wi-Fi" +msgstr "" + +#: curses/wicd-curses.py:603 +msgid "Tab Left" +msgstr "" + +#: curses/wicd-curses.py:604 +msgid "Tab Right" +msgstr "" + +#: curses/wicd-curses.py:94 +msgid "Terminated by user" +msgstr "" -msgid "You must enter your password to configure scripts" -msgstr "Debe ingresar su contraseña para configurar scripts:" +#: gtk/gui.py:85 gtk/wicd-client.py:984 +msgid "" +"The wicd daemon has shut down. The UI will not function properly until it is " +"restarted." +msgstr "" + +#: curses/netentry_curses.py:368 gtk/gui.py:701 gtk/netentry.py:497 +msgid "This network requires encryption to be enabled." +msgstr "" -msgid "Connection Cancelled" -msgstr "Conexión cancelada:" +#: curses/wicd-curses.py:272 +msgid "" +"To avoid various complications, wicd-curses does not support directly " +"editing the scripts. However, you can edit them manually. First, (as root), " +"open the \"$A\" config file, and look for the section labeled by the $B in " +"question. In this case, this is:" +msgstr "" +"Para evitar varias complicaciones, wicd-curses no soporta la edición directa " +"de los scripts. Sin embargo, puede editarlos manualmente. Primero, (como " +"root)\", abra el archivo de configuración \"$A\" y busque la sección " +"etiquetada como $B. En este caso,es:" -msgid "Connecting" -msgstr "Conectando:" +#: gtk/netentry.py:635 +msgid "" +"To connect to a wired network, you must create a network profile. To create " +"a network profile, type a name that describes this network, and press Add." +msgstr "" + +#: gtk/wicd-client.py:94 +msgid "" +"Unable to contact the Wicd daemon due to an access denied error from DBus. " +"Please check that your user is in the $A group." +msgstr "" + +#: curses/wicd-curses.py:353 gtk/netentry.py:962 gtk/netentry.py:1084 +msgid "Unsecured" +msgstr "Insegura" + +#: curses/netentry_curses.py:62 +msgid "Use DHCP Hostname" +msgstr "" + +#: curses/netentry_curses.py:256 gtk/netentry.py:356 +msgid "Use Encryption" +msgstr "Usar encripcion" + +#: curses/wicd-curses.py:466 gtk/gui.py:263 +msgid "Use Encryption (WEP only)" +msgstr "" + +#: curses/netentry_curses.py:54 gtk/netentry.py:89 +msgid "Use Static DNS" +msgstr "Usar DNS estatica" + +#: curses/netentry_curses.py:49 gtk/netentry.py:88 +msgid "Use Static IPs" +msgstr "Usar IPs estaticas" + +#: curses/netentry_curses.py:190 gtk/netentry.py:636 +msgid "Use as default profile (overwrites any previous default)" +msgstr "" +"Usar como perfil predeterminado (se sobreescribirá cualquier perfil " +"predeterminado anterior):" + +#: curses/prefs_curses.py:121 gtk/prefs.py:337 data/wicd.ui:1490 +msgid "Use dBm to measure signal strength" +msgstr "" + +#: curses/prefs_curses.py:82 gtk/prefs.py:341 +msgid "Use default profile on wired autoconnect" +msgstr "" + +#: curses/netentry_curses.py:55 curses/prefs_curses.py:73 gtk/netentry.py:90 +#: data/wicd.ui:882 +msgid "Use global DNS servers" +msgstr "" + +#: curses/prefs_curses.py:84 gtk/prefs.py:345 +msgid "Use last used profile on wired autoconnect" +msgstr "" + +#: curses/netentry_curses.py:255 gtk/netentry.py:357 +msgid "Use these settings for all networks sharing this essid" +msgstr "" + +#: wicd/translations.py:89 +msgid "Username" +msgstr "Usuario" + +#: wicd/misc.py:96 +msgid "Validating authentication..." +msgstr "" + +#: wicd/misc.py:97 +msgid "Verifying access point association..." +msgstr "Verificando la asociación al punto de acceso..." + +#: curses/prefs_curses.py:108 +msgid "WPA Supplicant" +msgstr "" + +#: curses/wicd-curses.py:528 +msgid "Wicd Curses Interface" +msgstr "" + +#: gtk/wicd-client.py:226 gtk/wicd-client.py:333 +msgid "Wicd daemon unreachable" +msgstr "" + +#: wicd/misc.py:196 +msgid "Wicd needs to access your computer's network cards." +msgstr "" +#: gtk/wicd-client.py:628 +msgid "" +"Wired\n" +"IP:\n" +"RX:\n" +"TX:" +msgstr "" + +#: curses/prefs_curses.py:81 +msgid "Wired Autoconnect Settings" +msgstr "" + +#: curses/prefs_curses.py:67 +msgid "Wired Interface" +msgstr "Interfaz Cableada" + +#: curses/prefs_curses.py:99 +msgid "Wired Link Detection" +msgstr "" + +#: curses/wicd-curses.py:754 gtk/gui.py:474 gtk/netentry.py:286 +#: gtk/netentry.py:629 gtk/wicd-client.py:268 gtk/wicd-client.py:309 +msgid "Wired Network" +msgstr "Red Cableada" + +#: curses/wicd-curses.py:533 msgid "Wired Networks" msgstr "Redes cableadas" -msgid "DNS domain" +#: gtk/gui.py:97 +msgid "Wired connection detected" +msgstr "" + +#: gtk/wicd-client.py:633 +msgid "" +"Wireless\n" +"SSID:\n" +"Speed:\n" +"IP:\n" +"Strength:\n" +"RX:\n" +"TX:" +msgstr "" + +#: curses/prefs_curses.py:68 curses/prefs_curses.py:120 +msgid "Wireless Interface" +msgstr "Interfaz Inalambrica" + +#: gtk/gui.py:602 gtk/wicd-client.py:224 gtk/wicd-client.py:336 +msgid "Wireless Kill Switch Enabled" +msgstr "" + +#: curses/wicd-curses.py:535 +msgid "Wireless Networks" +msgstr "" + +#: curses/wicd-curses.py:277 +msgid "" +"You can also configure the wireless networks by looking for the " +"\"[]\" field in the config file." +msgstr "" +"Tambien puede configurar las redes inalámbricas el campo \"[