From 3c4f3b69c676dd22e4713e454de6d04d92526241 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 16 Dec 2008 14:51:21 -0500 Subject: [PATCH 01/45] Remove VPN daemons They each have their own repos on svn.gnome.org now. --- vpn-daemons/.cvsignore | 2 - vpn-daemons/README | 156 -- vpn-daemons/openvpn/.cvsignore | 30 - vpn-daemons/openvpn/AUTHORS | 4 - vpn-daemons/openvpn/ChangeLog | 685 -------- vpn-daemons/openvpn/Makefile.am | 37 - vpn-daemons/openvpn/NEWS | 0 vpn-daemons/openvpn/README | 15 - vpn-daemons/openvpn/auth-dialog/.cvsignore | 3 - vpn-daemons/openvpn/auth-dialog/Makefile.am | 33 - .../auth-dialog/gnome-two-password-dialog.c | 762 --------- .../auth-dialog/gnome-two-password-dialog.h | 118 -- vpn-daemons/openvpn/auth-dialog/main.c | 390 ----- vpn-daemons/openvpn/autogen.sh | 23 - vpn-daemons/openvpn/common-gnome/Makefile.am | 15 - .../openvpn/common-gnome/keyring-helpers.c | 156 -- .../openvpn/common-gnome/keyring-helpers.h | 43 - vpn-daemons/openvpn/configure.in | 129 -- .../example-vpnc-system-wide-connection.sh | 28 - ...me-mime-application-x-openvpn-settings.png | Bin 2595 -> 0 bytes vpn-daemons/openvpn/nm-openvpn-service.conf | 16 - .../openvpn/nm-openvpn-service.name.in | 9 - vpn-daemons/openvpn/nm-openvpn.desktop.in | 11 - vpn-daemons/openvpn/po/.cvsignore | 7 - vpn-daemons/openvpn/po/ChangeLog | 707 --------- vpn-daemons/openvpn/po/LINGUAS | 42 - vpn-daemons/openvpn/po/POTFILES.in | 11 - vpn-daemons/openvpn/po/ar.po | 521 ------- vpn-daemons/openvpn/po/bg.po | 490 ------ vpn-daemons/openvpn/po/ca.po | 485 ------ vpn-daemons/openvpn/po/cs.po | 221 --- vpn-daemons/openvpn/po/da.po | 427 ----- vpn-daemons/openvpn/po/de.po | 243 --- vpn-daemons/openvpn/po/dz.po | 464 ------ vpn-daemons/openvpn/po/el.po | 238 --- vpn-daemons/openvpn/po/en_GB.po | 474 ------ vpn-daemons/openvpn/po/es.po | 278 ---- vpn-daemons/openvpn/po/et.po | 381 ----- vpn-daemons/openvpn/po/eu.po | 225 --- vpn-daemons/openvpn/po/fi.po | 519 ------ vpn-daemons/openvpn/po/fr.po | 240 --- vpn-daemons/openvpn/po/gl.po | 468 ------ vpn-daemons/openvpn/po/hu.po | 240 --- vpn-daemons/openvpn/po/it.po | 223 --- vpn-daemons/openvpn/po/ja.po | 476 ------ vpn-daemons/openvpn/po/ka.po | 515 ------ vpn-daemons/openvpn/po/ko.po | 467 ------ vpn-daemons/openvpn/po/lt.po | 241 --- vpn-daemons/openvpn/po/lv.po | 457 ------ vpn-daemons/openvpn/po/mk.po | 425 ----- vpn-daemons/openvpn/po/nb.po | 420 ----- vpn-daemons/openvpn/po/nl.po | 229 --- vpn-daemons/openvpn/po/pa.po | 432 ----- vpn-daemons/openvpn/po/pl.po | 434 ------ vpn-daemons/openvpn/po/ps.po | 234 --- vpn-daemons/openvpn/po/pt.po | 447 ------ vpn-daemons/openvpn/po/pt_BR.po | 503 ------ vpn-daemons/openvpn/po/ru.po | 243 --- vpn-daemons/openvpn/po/sk.po | 429 ----- vpn-daemons/openvpn/po/sl.po | 422 ----- vpn-daemons/openvpn/po/sv.po | 543 ------- vpn-daemons/openvpn/po/th.po | 438 ------ vpn-daemons/openvpn/po/uk.po | 444 ------ vpn-daemons/openvpn/po/vi.po | 418 ----- vpn-daemons/openvpn/po/zh_CN.po | 373 ----- vpn-daemons/openvpn/po/zh_HK.po | 449 ------ vpn-daemons/openvpn/po/zh_TW.po | 452 ------ vpn-daemons/openvpn/properties/.cvsignore | 2 - vpn-daemons/openvpn/properties/Makefile.am | 45 - vpn-daemons/openvpn/properties/auth-helpers.c | 1107 ------------- vpn-daemons/openvpn/properties/auth-helpers.h | 77 - .../openvpn/properties/import-export.c | 379 ----- .../openvpn/properties/import-export.h | 32 - .../properties/nm-openvpn-dialog.glade | 1134 -------------- vpn-daemons/openvpn/properties/nm-openvpn.c | 766 --------- vpn-daemons/openvpn/properties/nm-openvpn.h | 87 -- vpn-daemons/openvpn/src/.cvsignore | 4 - vpn-daemons/openvpn/src/Makefile.am | 32 - .../src/nm-openvpn-service-openvpn-helper.c | 398 ----- vpn-daemons/openvpn/src/nm-openvpn-service.c | 1081 ------------- vpn-daemons/openvpn/src/nm-openvpn-service.h | 83 - vpn-daemons/pptp/.cvsignore | 30 - vpn-daemons/pptp/AUTHORS | 4 - vpn-daemons/pptp/COPYING | 340 ---- vpn-daemons/pptp/ChangeLog | 257 --- vpn-daemons/pptp/INSTALL | 229 --- vpn-daemons/pptp/Makefile.am | 37 - vpn-daemons/pptp/NEWS | 0 vpn-daemons/pptp/README | 17 - vpn-daemons/pptp/TODO | 147 -- vpn-daemons/pptp/auth-dialog/.cvsignore | 5 - vpn-daemons/pptp/auth-dialog/Makefile.am | 34 - .../auth-dialog/gnome-two-password-dialog.c | 743 --------- .../auth-dialog/gnome-two-password-dialog.h | 116 -- vpn-daemons/pptp/auth-dialog/main.c | 187 --- vpn-daemons/pptp/autogen.sh | 23 - vpn-daemons/pptp/common-gnome/Makefile.am | 17 - .../pptp/common-gnome/keyring-helpers.c | 158 -- .../pptp/common-gnome/keyring-helpers.h | 47 - vpn-daemons/pptp/configure.in | 142 -- .../example-pptp-system-wide-connection.sh | 25 - ...gnome-mime-application-x-pptp-settings.png | Bin 2595 -> 0 bytes vpn-daemons/pptp/nm-pptp-service.conf | 24 - vpn-daemons/pptp/nm-pptp-service.name.in | 8 - vpn-daemons/pptp/nm-pptp.desktop.in | 13 - vpn-daemons/pptp/po/.cvsignore | 8 - vpn-daemons/pptp/po/ChangeLog | 530 ------- vpn-daemons/pptp/po/LINGUAS | 40 - vpn-daemons/pptp/po/POTFILES.in | 9 - vpn-daemons/pptp/po/ar.po | 556 ------- vpn-daemons/pptp/po/be@latin.po | 180 --- vpn-daemons/pptp/po/bg.po | 548 ------- vpn-daemons/pptp/po/ca.po | 652 -------- vpn-daemons/pptp/po/cs.po | 175 --- vpn-daemons/pptp/po/da.po | 642 -------- vpn-daemons/pptp/po/de.po | 196 --- vpn-daemons/pptp/po/dz.po | 206 --- vpn-daemons/pptp/po/el.po | 191 --- vpn-daemons/pptp/po/en_GB.po | 591 ------- vpn-daemons/pptp/po/es.po | 191 --- vpn-daemons/pptp/po/et.po | 475 ------ vpn-daemons/pptp/po/eu.po | 176 --- vpn-daemons/pptp/po/fi.po | 757 --------- vpn-daemons/pptp/po/fr.po | 178 --- vpn-daemons/pptp/po/gl.po | 582 ------- vpn-daemons/pptp/po/he.po | 558 ------- vpn-daemons/pptp/po/hu.po | 176 --- vpn-daemons/pptp/po/it.po | 175 --- vpn-daemons/pptp/po/ja.po | 616 -------- vpn-daemons/pptp/po/ka.po | 658 -------- vpn-daemons/pptp/po/ko.po | 587 ------- vpn-daemons/pptp/po/lt.po | 178 --- vpn-daemons/pptp/po/mk.po | 574 ------- vpn-daemons/pptp/po/nb.po | 558 ------- vpn-daemons/pptp/po/nl.po | 178 --- vpn-daemons/pptp/po/pa.po | 583 ------- vpn-daemons/pptp/po/pl.po | 567 ------- vpn-daemons/pptp/po/pt.po | 585 ------- vpn-daemons/pptp/po/pt_BR.po | 186 --- vpn-daemons/pptp/po/ru.po | 176 --- vpn-daemons/pptp/po/sv.po | 592 ------- vpn-daemons/pptp/po/th.po | 573 ------- vpn-daemons/pptp/po/uk.po | 576 ------- vpn-daemons/pptp/po/vi.po | 575 ------- vpn-daemons/pptp/po/zh_CN.po | 564 ------- vpn-daemons/pptp/po/zh_HK.po | 173 -- vpn-daemons/pptp/po/zh_TW.po | 173 -- vpn-daemons/pptp/properties/.cvsignore | 4 - vpn-daemons/pptp/properties/Makefile.am | 44 - vpn-daemons/pptp/properties/advanced-dialog.c | 453 ------ vpn-daemons/pptp/properties/advanced-dialog.h | 37 - vpn-daemons/pptp/properties/import-export.c | 58 - vpn-daemons/pptp/properties/import-export.h | 32 - .../pptp/properties/nm-pptp-dialog.glade | 586 ------- vpn-daemons/pptp/properties/nm-pptp.c | 726 --------- vpn-daemons/pptp/properties/nm-pptp.h | 87 -- vpn-daemons/pptp/src/.cvsignore | 7 - vpn-daemons/pptp/src/Makefile.am | 57 - vpn-daemons/pptp/src/nm-ppp-status.h | 22 - vpn-daemons/pptp/src/nm-pptp-pppd-plugin.c | 324 ---- vpn-daemons/pptp/src/nm-pptp-pppd-service.xml | 21 - vpn-daemons/pptp/src/nm-pptp-service.c | 1219 --------------- vpn-daemons/pptp/src/nm-pptp-service.h | 82 - vpn-daemons/vpnc/.cvsignore | 32 - vpn-daemons/vpnc/AUTHORS | 3 - vpn-daemons/vpnc/ChangeLog | 692 -------- vpn-daemons/vpnc/Makefile.am | 37 - vpn-daemons/vpnc/NEWS | 0 vpn-daemons/vpnc/README | 0 vpn-daemons/vpnc/auth-dialog/.cvsignore | 3 - vpn-daemons/vpnc/auth-dialog/Makefile.am | 32 - .../auth-dialog/gnome-two-password-dialog.c | 523 ------- .../auth-dialog/gnome-two-password-dialog.h | 94 -- vpn-daemons/vpnc/auth-dialog/main.c | 362 ----- vpn-daemons/vpnc/autogen.sh | 23 - vpn-daemons/vpnc/common-gnome/Makefile.am | 17 - .../vpnc/common-gnome/keyring-helpers.c | 200 --- .../vpnc/common-gnome/keyring-helpers.h | 52 - vpn-daemons/vpnc/configure.in | 125 -- .../example-vpnc-system-wide-connection.sh | 23 - ...-mime-application-x-cisco-vpn-settings.png | Bin 2595 -> 0 bytes vpn-daemons/vpnc/nm-vpnc-service.conf | 16 - vpn-daemons/vpnc/nm-vpnc-service.name.in | 8 - vpn-daemons/vpnc/nm-vpnc.desktop.in | 13 - vpn-daemons/vpnc/po/.cvsignore | 7 - vpn-daemons/vpnc/po/ChangeLog | 569 ------- vpn-daemons/vpnc/po/LINGUAS | 38 - vpn-daemons/vpnc/po/POTFILES.in | 10 - vpn-daemons/vpnc/po/ar.po | 322 ---- vpn-daemons/vpnc/po/bg.po | 286 ---- vpn-daemons/vpnc/po/ca.po | 316 ---- vpn-daemons/vpnc/po/cs.po | 178 --- vpn-daemons/vpnc/po/da.po | 276 ---- vpn-daemons/vpnc/po/de.po | 319 ---- vpn-daemons/vpnc/po/dz.po | 247 --- vpn-daemons/vpnc/po/el.po | 194 --- vpn-daemons/vpnc/po/en_GB.po | 307 ---- vpn-daemons/vpnc/po/es.po | 212 --- vpn-daemons/vpnc/po/et.po | 255 --- vpn-daemons/vpnc/po/eu.po | 179 --- vpn-daemons/vpnc/po/fi.po | 193 --- vpn-daemons/vpnc/po/fr.po | 182 --- vpn-daemons/vpnc/po/gl.po | 267 ---- vpn-daemons/vpnc/po/hu.po | 177 --- vpn-daemons/vpnc/po/it.po | 178 --- vpn-daemons/vpnc/po/ja.po | 292 ---- vpn-daemons/vpnc/po/ka.po | 320 ---- vpn-daemons/vpnc/po/ko.po | 301 ---- vpn-daemons/vpnc/po/lt.po | 181 --- vpn-daemons/vpnc/po/mk.po | 170 -- vpn-daemons/vpnc/po/nb.po | 254 --- vpn-daemons/vpnc/po/nl.po | 316 ---- vpn-daemons/vpnc/po/pa.po | 246 --- vpn-daemons/vpnc/po/pl.po | 305 ---- vpn-daemons/vpnc/po/pt.po | 278 ---- vpn-daemons/vpnc/po/pt_BR.po | 330 ---- vpn-daemons/vpnc/po/ru.po | 169 -- vpn-daemons/vpnc/po/sl.po | 234 --- vpn-daemons/vpnc/po/sv.po | 359 ----- vpn-daemons/vpnc/po/th.po | 266 ---- vpn-daemons/vpnc/po/uk.po | 254 --- vpn-daemons/vpnc/po/vi.po | 269 ---- vpn-daemons/vpnc/po/zh_CN.po | 239 --- vpn-daemons/vpnc/po/zh_HK.po | 249 --- vpn-daemons/vpnc/po/zh_TW.po | 250 --- vpn-daemons/vpnc/properties/.cvsignore | 2 - vpn-daemons/vpnc/properties/Makefile.am | 41 - .../vpnc/properties/nm-vpnc-dialog.glade | 368 ----- vpn-daemons/vpnc/properties/nm-vpnc.c | 1387 ----------------- vpn-daemons/vpnc/properties/nm-vpnc.h | 81 - vpn-daemons/vpnc/properties/pcf-file.c | 158 -- vpn-daemons/vpnc/properties/pcf-file.h | 23 - vpn-daemons/vpnc/src/.cvsignore | 4 - vpn-daemons/vpnc/src/Makefile.am | 40 - .../vpnc/src/nm-vpnc-service-vpnc-helper.c | 380 ----- vpn-daemons/vpnc/src/nm-vpnc-service.c | 598 ------- vpn-daemons/vpnc/src/nm-vpnc-service.h | 58 - 237 files changed, 62502 deletions(-) delete mode 100644 vpn-daemons/.cvsignore delete mode 100644 vpn-daemons/README delete mode 100644 vpn-daemons/openvpn/.cvsignore delete mode 100644 vpn-daemons/openvpn/AUTHORS delete mode 100644 vpn-daemons/openvpn/ChangeLog delete mode 100644 vpn-daemons/openvpn/Makefile.am delete mode 100644 vpn-daemons/openvpn/NEWS delete mode 100644 vpn-daemons/openvpn/README delete mode 100644 vpn-daemons/openvpn/auth-dialog/.cvsignore delete mode 100644 vpn-daemons/openvpn/auth-dialog/Makefile.am delete mode 100644 vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c delete mode 100644 vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h delete mode 100644 vpn-daemons/openvpn/auth-dialog/main.c delete mode 100755 vpn-daemons/openvpn/autogen.sh delete mode 100644 vpn-daemons/openvpn/common-gnome/Makefile.am delete mode 100644 vpn-daemons/openvpn/common-gnome/keyring-helpers.c delete mode 100644 vpn-daemons/openvpn/common-gnome/keyring-helpers.h delete mode 100644 vpn-daemons/openvpn/configure.in delete mode 100755 vpn-daemons/openvpn/doc/example-vpnc-system-wide-connection.sh delete mode 100644 vpn-daemons/openvpn/gnome-mime-application-x-openvpn-settings.png delete mode 100644 vpn-daemons/openvpn/nm-openvpn-service.conf delete mode 100644 vpn-daemons/openvpn/nm-openvpn-service.name.in delete mode 100644 vpn-daemons/openvpn/nm-openvpn.desktop.in delete mode 100644 vpn-daemons/openvpn/po/.cvsignore delete mode 100644 vpn-daemons/openvpn/po/ChangeLog delete mode 100644 vpn-daemons/openvpn/po/LINGUAS delete mode 100644 vpn-daemons/openvpn/po/POTFILES.in delete mode 100644 vpn-daemons/openvpn/po/ar.po delete mode 100644 vpn-daemons/openvpn/po/bg.po delete mode 100644 vpn-daemons/openvpn/po/ca.po delete mode 100644 vpn-daemons/openvpn/po/cs.po delete mode 100644 vpn-daemons/openvpn/po/da.po delete mode 100644 vpn-daemons/openvpn/po/de.po delete mode 100644 vpn-daemons/openvpn/po/dz.po delete mode 100644 vpn-daemons/openvpn/po/el.po delete mode 100644 vpn-daemons/openvpn/po/en_GB.po delete mode 100644 vpn-daemons/openvpn/po/es.po delete mode 100644 vpn-daemons/openvpn/po/et.po delete mode 100644 vpn-daemons/openvpn/po/eu.po delete mode 100644 vpn-daemons/openvpn/po/fi.po delete mode 100644 vpn-daemons/openvpn/po/fr.po delete mode 100644 vpn-daemons/openvpn/po/gl.po delete mode 100644 vpn-daemons/openvpn/po/hu.po delete mode 100644 vpn-daemons/openvpn/po/it.po delete mode 100644 vpn-daemons/openvpn/po/ja.po delete mode 100644 vpn-daemons/openvpn/po/ka.po delete mode 100644 vpn-daemons/openvpn/po/ko.po delete mode 100644 vpn-daemons/openvpn/po/lt.po delete mode 100644 vpn-daemons/openvpn/po/lv.po delete mode 100644 vpn-daemons/openvpn/po/mk.po delete mode 100644 vpn-daemons/openvpn/po/nb.po delete mode 100644 vpn-daemons/openvpn/po/nl.po delete mode 100644 vpn-daemons/openvpn/po/pa.po delete mode 100644 vpn-daemons/openvpn/po/pl.po delete mode 100644 vpn-daemons/openvpn/po/ps.po delete mode 100644 vpn-daemons/openvpn/po/pt.po delete mode 100644 vpn-daemons/openvpn/po/pt_BR.po delete mode 100644 vpn-daemons/openvpn/po/ru.po delete mode 100644 vpn-daemons/openvpn/po/sk.po delete mode 100644 vpn-daemons/openvpn/po/sl.po delete mode 100644 vpn-daemons/openvpn/po/sv.po delete mode 100644 vpn-daemons/openvpn/po/th.po delete mode 100644 vpn-daemons/openvpn/po/uk.po delete mode 100644 vpn-daemons/openvpn/po/vi.po delete mode 100644 vpn-daemons/openvpn/po/zh_CN.po delete mode 100644 vpn-daemons/openvpn/po/zh_HK.po delete mode 100755 vpn-daemons/openvpn/po/zh_TW.po delete mode 100644 vpn-daemons/openvpn/properties/.cvsignore delete mode 100644 vpn-daemons/openvpn/properties/Makefile.am delete mode 100644 vpn-daemons/openvpn/properties/auth-helpers.c delete mode 100644 vpn-daemons/openvpn/properties/auth-helpers.h delete mode 100644 vpn-daemons/openvpn/properties/import-export.c delete mode 100644 vpn-daemons/openvpn/properties/import-export.h delete mode 100644 vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade delete mode 100644 vpn-daemons/openvpn/properties/nm-openvpn.c delete mode 100644 vpn-daemons/openvpn/properties/nm-openvpn.h delete mode 100644 vpn-daemons/openvpn/src/.cvsignore delete mode 100644 vpn-daemons/openvpn/src/Makefile.am delete mode 100644 vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c delete mode 100644 vpn-daemons/openvpn/src/nm-openvpn-service.c delete mode 100644 vpn-daemons/openvpn/src/nm-openvpn-service.h delete mode 100644 vpn-daemons/pptp/.cvsignore delete mode 100644 vpn-daemons/pptp/AUTHORS delete mode 100644 vpn-daemons/pptp/COPYING delete mode 100644 vpn-daemons/pptp/ChangeLog delete mode 100644 vpn-daemons/pptp/INSTALL delete mode 100644 vpn-daemons/pptp/Makefile.am delete mode 100644 vpn-daemons/pptp/NEWS delete mode 100644 vpn-daemons/pptp/README delete mode 100644 vpn-daemons/pptp/TODO delete mode 100644 vpn-daemons/pptp/auth-dialog/.cvsignore delete mode 100644 vpn-daemons/pptp/auth-dialog/Makefile.am delete mode 100644 vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c delete mode 100644 vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h delete mode 100644 vpn-daemons/pptp/auth-dialog/main.c delete mode 100755 vpn-daemons/pptp/autogen.sh delete mode 100644 vpn-daemons/pptp/common-gnome/Makefile.am delete mode 100644 vpn-daemons/pptp/common-gnome/keyring-helpers.c delete mode 100644 vpn-daemons/pptp/common-gnome/keyring-helpers.h delete mode 100644 vpn-daemons/pptp/configure.in delete mode 100755 vpn-daemons/pptp/doc/example-pptp-system-wide-connection.sh delete mode 100644 vpn-daemons/pptp/gnome-mime-application-x-pptp-settings.png delete mode 100644 vpn-daemons/pptp/nm-pptp-service.conf delete mode 100644 vpn-daemons/pptp/nm-pptp-service.name.in delete mode 100644 vpn-daemons/pptp/nm-pptp.desktop.in delete mode 100644 vpn-daemons/pptp/po/.cvsignore delete mode 100644 vpn-daemons/pptp/po/ChangeLog delete mode 100644 vpn-daemons/pptp/po/LINGUAS delete mode 100644 vpn-daemons/pptp/po/POTFILES.in delete mode 100644 vpn-daemons/pptp/po/ar.po delete mode 100644 vpn-daemons/pptp/po/be@latin.po delete mode 100644 vpn-daemons/pptp/po/bg.po delete mode 100644 vpn-daemons/pptp/po/ca.po delete mode 100644 vpn-daemons/pptp/po/cs.po delete mode 100644 vpn-daemons/pptp/po/da.po delete mode 100644 vpn-daemons/pptp/po/de.po delete mode 100644 vpn-daemons/pptp/po/dz.po delete mode 100644 vpn-daemons/pptp/po/el.po delete mode 100644 vpn-daemons/pptp/po/en_GB.po delete mode 100644 vpn-daemons/pptp/po/es.po delete mode 100644 vpn-daemons/pptp/po/et.po delete mode 100644 vpn-daemons/pptp/po/eu.po delete mode 100644 vpn-daemons/pptp/po/fi.po delete mode 100644 vpn-daemons/pptp/po/fr.po delete mode 100644 vpn-daemons/pptp/po/gl.po delete mode 100644 vpn-daemons/pptp/po/he.po delete mode 100644 vpn-daemons/pptp/po/hu.po delete mode 100644 vpn-daemons/pptp/po/it.po delete mode 100644 vpn-daemons/pptp/po/ja.po delete mode 100644 vpn-daemons/pptp/po/ka.po delete mode 100644 vpn-daemons/pptp/po/ko.po delete mode 100644 vpn-daemons/pptp/po/lt.po delete mode 100644 vpn-daemons/pptp/po/mk.po delete mode 100644 vpn-daemons/pptp/po/nb.po delete mode 100644 vpn-daemons/pptp/po/nl.po delete mode 100644 vpn-daemons/pptp/po/pa.po delete mode 100644 vpn-daemons/pptp/po/pl.po delete mode 100644 vpn-daemons/pptp/po/pt.po delete mode 100644 vpn-daemons/pptp/po/pt_BR.po delete mode 100644 vpn-daemons/pptp/po/ru.po delete mode 100644 vpn-daemons/pptp/po/sv.po delete mode 100644 vpn-daemons/pptp/po/th.po delete mode 100644 vpn-daemons/pptp/po/uk.po delete mode 100644 vpn-daemons/pptp/po/vi.po delete mode 100644 vpn-daemons/pptp/po/zh_CN.po delete mode 100644 vpn-daemons/pptp/po/zh_HK.po delete mode 100644 vpn-daemons/pptp/po/zh_TW.po delete mode 100644 vpn-daemons/pptp/properties/.cvsignore delete mode 100644 vpn-daemons/pptp/properties/Makefile.am delete mode 100644 vpn-daemons/pptp/properties/advanced-dialog.c delete mode 100644 vpn-daemons/pptp/properties/advanced-dialog.h delete mode 100644 vpn-daemons/pptp/properties/import-export.c delete mode 100644 vpn-daemons/pptp/properties/import-export.h delete mode 100644 vpn-daemons/pptp/properties/nm-pptp-dialog.glade delete mode 100644 vpn-daemons/pptp/properties/nm-pptp.c delete mode 100644 vpn-daemons/pptp/properties/nm-pptp.h delete mode 100644 vpn-daemons/pptp/src/.cvsignore delete mode 100644 vpn-daemons/pptp/src/Makefile.am delete mode 100644 vpn-daemons/pptp/src/nm-ppp-status.h delete mode 100644 vpn-daemons/pptp/src/nm-pptp-pppd-plugin.c delete mode 100644 vpn-daemons/pptp/src/nm-pptp-pppd-service.xml delete mode 100644 vpn-daemons/pptp/src/nm-pptp-service.c delete mode 100644 vpn-daemons/pptp/src/nm-pptp-service.h delete mode 100644 vpn-daemons/vpnc/.cvsignore delete mode 100644 vpn-daemons/vpnc/AUTHORS delete mode 100644 vpn-daemons/vpnc/ChangeLog delete mode 100644 vpn-daemons/vpnc/Makefile.am delete mode 100644 vpn-daemons/vpnc/NEWS delete mode 100644 vpn-daemons/vpnc/README delete mode 100644 vpn-daemons/vpnc/auth-dialog/.cvsignore delete mode 100644 vpn-daemons/vpnc/auth-dialog/Makefile.am delete mode 100644 vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c delete mode 100644 vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h delete mode 100644 vpn-daemons/vpnc/auth-dialog/main.c delete mode 100755 vpn-daemons/vpnc/autogen.sh delete mode 100644 vpn-daemons/vpnc/common-gnome/Makefile.am delete mode 100644 vpn-daemons/vpnc/common-gnome/keyring-helpers.c delete mode 100644 vpn-daemons/vpnc/common-gnome/keyring-helpers.h delete mode 100644 vpn-daemons/vpnc/configure.in delete mode 100755 vpn-daemons/vpnc/doc/example-vpnc-system-wide-connection.sh delete mode 100644 vpn-daemons/vpnc/gnome-mime-application-x-cisco-vpn-settings.png delete mode 100644 vpn-daemons/vpnc/nm-vpnc-service.conf delete mode 100644 vpn-daemons/vpnc/nm-vpnc-service.name.in delete mode 100644 vpn-daemons/vpnc/nm-vpnc.desktop.in delete mode 100644 vpn-daemons/vpnc/po/.cvsignore delete mode 100644 vpn-daemons/vpnc/po/ChangeLog delete mode 100644 vpn-daemons/vpnc/po/LINGUAS delete mode 100644 vpn-daemons/vpnc/po/POTFILES.in delete mode 100644 vpn-daemons/vpnc/po/ar.po delete mode 100644 vpn-daemons/vpnc/po/bg.po delete mode 100644 vpn-daemons/vpnc/po/ca.po delete mode 100644 vpn-daemons/vpnc/po/cs.po delete mode 100644 vpn-daemons/vpnc/po/da.po delete mode 100644 vpn-daemons/vpnc/po/de.po delete mode 100644 vpn-daemons/vpnc/po/dz.po delete mode 100644 vpn-daemons/vpnc/po/el.po delete mode 100755 vpn-daemons/vpnc/po/en_GB.po delete mode 100644 vpn-daemons/vpnc/po/es.po delete mode 100644 vpn-daemons/vpnc/po/et.po delete mode 100644 vpn-daemons/vpnc/po/eu.po delete mode 100644 vpn-daemons/vpnc/po/fi.po delete mode 100644 vpn-daemons/vpnc/po/fr.po delete mode 100644 vpn-daemons/vpnc/po/gl.po delete mode 100644 vpn-daemons/vpnc/po/hu.po delete mode 100644 vpn-daemons/vpnc/po/it.po delete mode 100644 vpn-daemons/vpnc/po/ja.po delete mode 100644 vpn-daemons/vpnc/po/ka.po delete mode 100644 vpn-daemons/vpnc/po/ko.po delete mode 100644 vpn-daemons/vpnc/po/lt.po delete mode 100644 vpn-daemons/vpnc/po/mk.po delete mode 100644 vpn-daemons/vpnc/po/nb.po delete mode 100644 vpn-daemons/vpnc/po/nl.po delete mode 100644 vpn-daemons/vpnc/po/pa.po delete mode 100644 vpn-daemons/vpnc/po/pl.po delete mode 100644 vpn-daemons/vpnc/po/pt.po delete mode 100644 vpn-daemons/vpnc/po/pt_BR.po delete mode 100644 vpn-daemons/vpnc/po/ru.po delete mode 100644 vpn-daemons/vpnc/po/sl.po delete mode 100644 vpn-daemons/vpnc/po/sv.po delete mode 100644 vpn-daemons/vpnc/po/th.po delete mode 100644 vpn-daemons/vpnc/po/uk.po delete mode 100644 vpn-daemons/vpnc/po/vi.po delete mode 100644 vpn-daemons/vpnc/po/zh_CN.po delete mode 100644 vpn-daemons/vpnc/po/zh_HK.po delete mode 100644 vpn-daemons/vpnc/po/zh_TW.po delete mode 100644 vpn-daemons/vpnc/properties/.cvsignore delete mode 100644 vpn-daemons/vpnc/properties/Makefile.am delete mode 100644 vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade delete mode 100644 vpn-daemons/vpnc/properties/nm-vpnc.c delete mode 100644 vpn-daemons/vpnc/properties/nm-vpnc.h delete mode 100644 vpn-daemons/vpnc/properties/pcf-file.c delete mode 100644 vpn-daemons/vpnc/properties/pcf-file.h delete mode 100644 vpn-daemons/vpnc/src/.cvsignore delete mode 100644 vpn-daemons/vpnc/src/Makefile.am delete mode 100644 vpn-daemons/vpnc/src/nm-vpnc-service-vpnc-helper.c delete mode 100644 vpn-daemons/vpnc/src/nm-vpnc-service.c delete mode 100644 vpn-daemons/vpnc/src/nm-vpnc-service.h diff --git a/vpn-daemons/.cvsignore b/vpn-daemons/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/vpn-daemons/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/vpn-daemons/README b/vpn-daemons/README deleted file mode 100644 index e571a1ab79..0000000000 --- a/vpn-daemons/README +++ /dev/null @@ -1,156 +0,0 @@ - -0. Overview ------------ - -NetworkManager features a set of extension points for integrating VPN -software in a seamless way such that it integrates into the network -selection code and the user interface. - -1. Design goals ---------------- - -The goal is to have a vendor-independent interface so an ISV (which -include prominent open source projects too) can easily integrate with -NetworkManager whilst preserving a familiar user interface, behaviour -and while being aware the automatic network switching enforced by -NetworkManager. - -For example, if the user switches from e.g. a wired to a wireless -connection (say, the user pulls out the network cable), routing tables -needs to be reconfigured, DNS lookup services needs to be tweaked, -interfaces may need to be brought or down and, often, the VPN -connection needs to be restarted. - -Another useful feature is that the VPN software should be able to -configure the DNS lookup service of the system to use name servers -behind the VPN concentrator for only certain hostnames; e.g. it should -be possible to say "For domain names of the form *.corp.company.biz -use the DNS servers 10.1.2.3, 10.1.2.4 and 10.1.2.5". - -FIXME: write more stuff here - -2. Interface for configuring VPN connection settings ----------------------------------------------------- - -NetworkManager ships with nm-vpn-properties which is a GNOME -application for adding, removing, importing, exporting and editing VPN -connection details. For each VPN connection type, a shared library -is loaded which must export the method - - NetworkManagerVpnUI* nm_vpn_properties_factory (void) - -which returns a pointer to a structure with function pointers set -by the shared library. Each of these functions are defined and -documented in - - /usr/include/NetworkManager/nm-vpn-ui-interface.h - -Basically, the idea is that the shared library can return a GtkWidget -that is used for editing connection details such as gateway address, -domain for authentication, what addresses to route and so forth. Note -that nm-vpn-properties store this in the GConf2 configuration system -so passwords and other sensitive information should not be stored -here (see section 3.) - -FIXME: actually document the methods in NetworkManagerVpnUI - -3. Interface for retrieving authentication details --------------------------------------------------- - -In order to establish a VPN connection, sometimes one or more secrets -are needed in order successfully connect. The secrets (what secret -(password or one-time key, how many) are very dependent on both the -VPN connection type and how it's configured. - -Each VPN type thus provides a binary that NetworkManager will launch -to retrieve the passwords from the user. The communication protocol is -very simple; if the binary can retrieve the passwords it writes them -on stdout and exits with exit code 0. If the passwords cannot be -retrieved, the auth dialog binary must exit with exit code 1. The -auth-dialog may, at it's own discretion, store the secrets in e.g. the -GNOME keyring (or any other secure location) thus not even needing to -prompt the user for the secrets. - -However, NetworkManager may pass the --reprompt option to the -auth-dialog to signal that the user must be reprompted for the -secrets. This is useful when e.g. the secret needed for establishing -the VPN connection changes on the server and the user needs to put in -a new secret. At this time of writing, NetworkManager will -automatically pass the --reprompt option if the connection was -unsuccessful the last time. - -4. Interface for setting up and tearing down VPN connections ------------------------------------------------------------- - -FIXME: write this - - -5. Summary of files needed for each VPN connection type ---------------------------------------------------------------- - -The following files are needed for registering a new type of VPN -connection. In the following, the notation is used in place -of the actual name, e.g. vpnc, openvpn, openswan and so forth. - - a. /etc/NetworkManager/VPN/nm--service.name - This file describes the locations of the components implemented - the interfaces described in section 2. through 4. Here's the - example for vpnc with annotations - - [VPN Connection] - name=vpnc # name of VPN connection type - service=org.freedesktop.NetworkManager.vpnc # D-BUS service name - program=/usr/bin/nm-vpnc-service # Binary for D-BUS service - - [GNOME] - auth-dialog=/usr/libexec/nm-vpnc-auth-dialog # Binary for auth dialog - properties=/usr/lib/libnm-vpnc-properties # Shared library for conn. prop - - - - /etc/dbus-1/system.d/nm--service.conf - D-BUS policy file to allow ownership of the D-BUS service mentioned in a. - -6. Registering MIME-types for files with VPN connection details ---------------------------------------------------------------- - -If the VPN connection type supports exporting/important connection settings -it should register with the MIME-system. This is a multi-step process - - a. First, make sure that the freedesktop.org shared MIME info knows - about the file-type - (see e.g. https://bugs.freedesktop.org/show_bug.cgi?id=3560) - - b. Create and ship a .desktop file that associates the MIME type with - the nm-vpn-properties program. Here's the example for vpnc - - [Desktop Entry] - Encoding=UTF-8 - Name=VPN Connection Manager (vpnc) - Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.vpnc --import-file %f - Terminal=false - Type=Application - DocPath= - Categories=; - MimeType=application/x-cisco-vpn-settings - - -7. Status of the interfaces ---------------------------- - -As of July 2005 the interfaces are UNSTABLE and can and will change in -the future. At some point the interfaces will be freezed. To -acknowledge that the interfaces are subject to change, developers will -have to define NM_VPN_API_SUBJECT_TO_CHANGE to include the headers - -8. References -------------- - - - Screencast of vpnc integration with NM - http://people.redhat.com/davidz/nm-vpn/nm-vpn.html - - - NetworkManager mailing list - mailto:networkmanager-list@gnome.org - - - vpnc integration in NetworkManager CVS - vpn-daemons/vpnc - diff --git a/vpn-daemons/openvpn/.cvsignore b/vpn-daemons/openvpn/.cvsignore deleted file mode 100644 index c9230f9a5e..0000000000 --- a/vpn-daemons/openvpn/.cvsignore +++ /dev/null @@ -1,30 +0,0 @@ -Makefile -Makefile.in -NetworkManager-vpnc*.tar.gz -aclocal.m4 -autom4te.cache -compile -configure -config.guess -config.h.in -config.h -config.log -config.status -config.sub -depcomp -install-sh -intltool-extract.in -intltool-extract -intltool-merge.in -intltool-merge -intltool-update.in -intltool-update -libtool -ltmain.sh -missing -mkinstalldirs -nm-openvpn-service.name -nm-openvpn.desktop -stamp-h1 -COPYIN -INSTALL diff --git a/vpn-daemons/openvpn/AUTHORS b/vpn-daemons/openvpn/AUTHORS deleted file mode 100644 index 5a486f4ac9..0000000000 --- a/vpn-daemons/openvpn/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -Tim Niemueller -Dan Williams -David Zeuthen - diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog deleted file mode 100644 index 2b38cd57bb..0000000000 --- a/vpn-daemons/openvpn/ChangeLog +++ /dev/null @@ -1,685 +0,0 @@ -2008-10-28 Tambet Ingo - - Patch from Bin Li . - - * properties/import-export.c (handle_path_item): Search for certificates - from the directory where the configuration file is from. - -2008-10-26 Dan Williams - - * properties/auth-helpers.c - properties/import-export.c - properties/nm-openvpn.c - - Update for setting accessor changes - -2008-10-17 Dan Williams - - * properties/auth-helpers.c - - (advanced_dialog_new): The "Certificates (TLS)" tab should also be - present for NM_OPENVPN_CONTYPE_PASSWORD - -2008-10-17 Dan Williams - - * properties/auth-helpers.c - - (tls_default_filter, tls_file_chooser_filter_new): accept ".cer" - extension too - -2008-10-11 Dan Williams - - * src/nm-openvpn-service-openvpn-helper.c - - (main): handle route_vpn_gateway (requires NM svn r4169) (bgo #549196) - -2008-09-30 Dan Williams - - * properties/nm-openvpn-dialog.glade - - Fix the User and CA certificate entries in Password TLS mode, they - were swapped with their labels (rh #464765) - - Move private key password entries below private key chooser - - Rename "Certificate Password" to "Private key password" since that's - what they actually are - - * properties/auth-helpers.c - - (fill_password): s/cert_password/priv_key_password/s - - (fill_vpn_passwords): fix up for corrected widget names; fix mis-filling - of pw_tls secret widgets where passwords were reversed - - (auth_widget_save_secrets): fix up for corrected widget names - - * src/nm-openvpn-service.c - - s/certpass/priv_key_pass/s becuase that's what it is - -2008-09-29 Dan Williams - - Patch from Robert Buchholz - - * src/nm-openvpn-service.c - - (openvpn_watch_cb): don't access socket_channel if it doesn't exist - because openvpn exited before the management socket could be set up - -2008-09-24 Dan Williams - - * common-gnome/* - auth-dialog/Makefile.am - properties/Makefile.am - - Add the keyring helpers that Tambet forgot in the last commit :) - -2008-09-24 Tambet Ingo - - * properties/nm-openvpn-dialog.glade: Add "show passwords" checkbox. - - * properties/nm-openvpn.c (auth_combo_changed_cb): Change the - sensitivity of "show passwords" checkbox depending on whether the - active page has any password entries. - - * properties/auth-helpers.c (fill_password): Add a signal handler for - "show passwords" checkbox to change the password entry's visibility. - -2008-09-24 Tambet Ingo - - * Implement required "save_secrets" and "delete_connection" methods of the - VPN plugin UI interface. - Add the password widgets to the properties UI so that the passwords can be - edited/deleted from the UI. Reorganize the code a bit to avoid duplicate - code (using VPNC plugin as a template). - -2008-09-10 Dan Williams - - * src/nm-openvpn-service.c - - Clean up management socket and connect timer when the plugin stops; - becuase of this openvpn's output needs to be processed from the - child watch callback otherwise it gets lost when the management - socket is cleaned up during the state change to STOPPED. - - Fix parsing of private key auth failure - -2008-09-05 Dan Williams - - * src/nm-openvpn-service.c - - (nm_openvpn_start_openvpn_binary): send --script-security=2 to allow - the plugin's scripts to be run. Requires OpenVPN 2.1-rc9 or later, - distros with older versions should patch this out. - -2008-09-04 Dan Williams - - * src/nm-openvpn-service.c - - (nm_openvpn_start_openvpn_binary, real_connect, real_need_secrets): - handle split VPN secrets - -2008-08-28 Dan Williams - - * auth-dialog/main.c - - (get_secrets): don't gtk_widget_show_all() because that exposes - widgets that were supposed to be hidden - -2008-08-26 Dan Williams - - * auth-dialog/main.c - - Convert to connection UUIDs (requires NM svn 4013 or later) - - General cleanups - - Store secrets in the keyring the same way the pptp and vpnc plugins do - -2008-08-22 Dan Williams - - * src/nm-openvpn-service-openvpn-helper.c - - (main): grab tunnel MTU and push that through to NM - -2008-08-18 Claude Paroz - - * properties/nm-openvpn-dialog.glade: Removed translatable property on non - user-visible strings and stock labels. - -2008-08-14 Tambet Ingo - - * src/nm-openvpn-service.c (nm_openvpn_socket_data_cb): Detect private key - verification errors too. - - * auth-dialog/main.c (pem_is_encrypted): GIOChannel isn't a GObject, use the - correct unreferencing function for it. - -2008-08-12 Dan Williams - - * properties/auth-helpers.c - properties/nm-openvpn-dialog.glade - - Handle shared -> static change - - Hook up the Static Key "Local IP Address" entry - - * properties/import-export.c - - Handle shared -> static change - - * src/nm-openvpn-service.c - src/nm-openvpn-service.h - - (nm_openvpn_start_openvpn_binary): always dup strings when adding to - the argument array so that freeing the array later actually works - - (validate_one_property): validate addresses too - - (nm_openvpn_properties_validate): fix determination of error/success - - (real_connect): fix stray ; causing all connection attempts to fail - -2008-08-11 Dan Williams - - Update to match NM svn3924 vpn setting changes; verify options better; - return more informative errors on VPN launch failures; change some config - options (tap-dev, proto-tcp, connection-type) to better reflect their - usage. - -2008-08-08 Dan Williams - - * src/nm-openvpn-service.c - - (nm_openvpn_socket_data_cb): handle spaces in passwords and usernames - (bgo #482139) - -2008-08-06 Dan Williams - - * src/nm-openvpn-service-openvpn-helper.c - - (get_routes): handle route metrics - -2008-07-28 Dan Williams - - * properties/auth-helpers.c - - (populate_cipher_combo): don't depend on shell and utils which may not - always be there - -2008-07-27 Dan Williams - - Patch from Michael Biebl - - * Move service to $LIBEXECDIR, remove unneeded compilation flags, move - properties plugin to $LIBDIR/NetworkManager - -2008-07-19 Dan Williams - - * properties/nm-openvpn.c - - (advanced_dialog_response_cb): only update if OK was pressed - -2008-07-18 Dan Williams - - * src/nm-openvpn-service.c - - (nm_openvpn_start_openvpn_binary): only add tls-auth direction if - it's non-empty (Nathaniel McCallum) - -2008-07-17 Tambet Ingo - - * properties/nm-openvpn.c (openvpn_plugin_ui_class_init): Don't add empty - private data to the class, it produces a runtime warning. - -2008-07-07 Dan Williams - - * src/nm-openvpn-service-openvpn-helper.c - - Use IPv4 address prefixes rather than netmasks (requires svn3812) - -2008-07-03 Dan Williams - - * nm-openvpn-service.name.in - Makefile.am - - Remove paths from .name file (requires applet r776 or later) to fix - issues with multilib and magic path substitution in glibc - -2008-07-02 Dan Williams - - * properties/auth-helpers.c - - (tls_default_filter): read more of the certificate/key file to look - for the known certificate or key tags, not just 1024 bytes - -2008-06-30 Dan Williams - - * properties/auth-helpers.c - - (tls_default_filter, tls_file_chooser_filter_new): accept .crt and - .key too - -2008-06-30 Dan Williams - - * properties/import-export.c - properties/import-export.h - properties/Makefile.am - - Implement import of OpenVPN config files - - * properties/nm-openvpn.c - properties/nm-openvpn.h - - Add another error for import - - (import): check file extension; get contents; hand off to importer - -2008-06-26 Dan Williams - - Implement the Advanced... dialog - -2008-06-23 Dan Williams - - * Convert to new NM VPN UI plugin format - - Requires a NetworkManager of at least SVN revision r3761. - -2008-06-06 Dan Williams - - Patch from Tambet Ingo - - * src/nm-openvpn-service-openvpn-helper.c - - (main, get_routes): send routes too - -2008-05-30 Dan Williams - - Patch from Casey Harkins - - * src/nm-openvpn-service.c - - (nm_openvpn_start_openvpn_binary): don't send --ns-cert-type, it's - not really supposed to be used anymore since that option isn't - used any more when creating server certificates - -2008-05-22 Tambet Ingo - - * src/nm-openvpn-service.c (real_disconnect): If sending SIGTERM - succeeds, add a timeout to make sure it gets killed. If it fails, - send SIGKILL immediately. - -2008-05-01 Dan Williams - - * src/nm-vpnc-service.c - - (validate_one_property): allow the 'name' property - -2008-04-27 Dan Williams - - * properties/Makefile.am - - Avoid versioning properties plugin (gnome.org #529836) - -2008-04-10 Dan Williams - - * vpn-daemons/openvpn/auth-dialog/main.c - - Fix up for connection ID; but needs more work to actually read the - keyring key from the right place - -2008-04-10 Tambet Ingo - - * auth-dialog/main.c (main): Add the '-i' argument the applet now sends. - -2008-03-13 Dan Williams - - * nm-openvpn-service.name.in - - Fix for 64 bit compat (gnome.org #522231) - -2008-02-06 Dan Williams - - Patch from Ryan Ayers - - * src/nm-openvpn-service-openvpn-helper.c - - (main): respect server-provided DNS search domain - -2008-01-31 Dan Williams - - Patch from Robert Hughes - - * src/nm-openvpn-service.c - properties/nm-openvpn.c - - Make 'port' an integer, not a uint - -2007-12-13 Tim Niemueller - - * nm-openvpn.desktop.in: Updates to make desktop-file-validate happy - - * properties/nm-openvpn.c: Added NULL pointer checks - -2007-12-11 Dan Williams - - Patches from Casey Harkins - - * src/nm-openvpn-service-openvpn-helper.c - - (main): make ifconfig_remote optional - -2007-12-11 Dan Williams - - Patches from Casey Harkins - - * properties/nm-openvpn.c - - (impl_fill_connection): duplicate hash table keys as required - -2007-12-07 Dan Williams - - Patches from Casey Harkins - - * src/nm-openvpn-service-openvpn-helper.c - - (parse_addr_list): fix off-by-one error - - * src/nm-openvpn-service.c - - (nm_openvpn_start_openvpn_binary): don't let openvpn stomp all over - the routing table since NM manages that - - * auth-dialog/main.c - src/nm-openvpn-service.h - src/nm-openvpn-service.c - - Don't require a certificate password - -2007-12-05 Dan Williams - - Patch from Casey Harkins - - * src/nm-openvpn-service-openvpn-helper.c - src/nm-openvpn-service.c - properties/nm-openvpn.c - auth-dialog/main.c - - Fix up so it mostly works - -2007-11-23 Tim Niemueller - - * configure.in: raise version number to 0.7.0 to reflect the - dependency on the new NM and to separate it from the 0.6 branch. - -2007-11-15 Dan Williams - - * properties/nm-vpnc.c - - Fixup for NMSettingConnection 'name' -> 'id' changes - -2007-11-07 Dan Williams - - * properties/nm-openvpn.c - src/nm-openvpn-service.c - - Fix for new NMSetting API changes - -2007-10-28 Tim Niemueller - - * nm-openvpn.desktop.in: Added NoDisplay=true - -2007-10-26 Dan Williams - - * properties/nm-openvpn.c - - (impl_get_object): use a glade root, and ensure widget is referenced - correctly - -2007-10-08 Tambet Ingo - - * Update everything to work with the 0.7 branch NetworkManager. - -2007-08-15 Tambet Ingo - - * nm-openvpn-service.name.in: Use uppercase macros so that they get replaced - by the Makefile. - -2007-08-14 Dan Williams - - * src/nm-openvpn-service.c - - Handle NM_VPN_STATE_* -> NM_VPN_SERVICE_STATE_* and NMVPNState -> - NMVPNServiceState renames - -2007-07-26 Dan Williams - - Patch from Andreas Hanke - - * configure.in - acinclude.m4 - Makefile.am - - remove broken usage of AS_AC_EXPAND (#413323) - -2007-07-26 Dan Williams - - Patch from Robert Buchholz - - * configure.in - - Find & link against libnm-util too (#454739) - -2007-06-21 Christopher Aillon - - * nm-openvpn-service.name.in: - Make the properties library path multilib friendly (#447577) - -2007-04-02 Dan Williams - - Patch from Christian Persch - * properties/nm-openvpn-dialog.glade - - HIGify (gnome.org #423753) - -2007-04-02 Dan Williams - - Patch from Christian Persch - * src/nm-openvpn-service.c - - (nm_openvpn_dbus_process_helper_ip4_config): build fix (gnome.org #423757) - -2007-03-15 Dan Williams - - Patch from Jon Nettleton - - * properties/nm-openvpn-dialog.glade - properties/nm-openvpn.c - - Move advanced properties into a separate dialog - -2007-02-26 Dan Williams - - Patch from Jon Nettleton - - * properties/nm-openvpn-dialog.glade - properties/nm-openvpn.c - - Reduce size of OpenVPN configuration dialog (Gnome.org #410669) - -2007-02-02 Dan Williams - - * src/nm-openvpn-service.c - - (nm_openvpn_dbus_process_helper_ip4_config): convert to dict-based - IP4Config interface - -2006-12-07 Dan Williams - - Patch from Christian Persch - - * auth-dialog/main.c - - Fix memleak by unrefing the GnomeProgram instance (Gnome.org #383110) - -2006-12-07 Dan Williams - - Patch from Christian Persch - - * auth-dialog/main.c - auth-dialog/gnome-two-password-dialog.c - - HIG-ify (Gnome.org #383109) - -2006-11-24 Dan Williams - - Patch from Helmut Schaa - * src/nm-openvpn-service-openvpn-helper.c - - Redirect output to syslog - -2006-10-30 Tambet Ingo - - * properties/Makefile.am: Add NetworkManager to CFLAGS and LDADD. - - * src/Makefile.am: Ditto. - - * properties/nm-openvpn.c: Remove the leading NetworkManager directory - from NM includes since the NM pkg-config file already adds that. - - * src/nm-openvpn-service-openvpn-helper.c: Ditto. - - * src/nm-openvpn-service.c: Ditto. - -2006-10-04 Tambet Ingo - - * properties/nm-openvpn.c (impl_get_widget, impl_get_properties) - (import_from_file): s/tcp/tcp-client. - -2006-07-28 Christophe Merlet - - * properties/nm-openvpn-dialog.glade.h: fixed typo. - * configure.in (ALL_LINGUAS): Added fr (French). - -2006-06-19 Satoru SATOH - - * configure.in (ALL_LINGUAS): Added ja (Japanese). - -2006-06-17 Marcel Telka - - * configure.in (ALL_LINGUAS): Added sk. - -2006-05-11 Robert Love - - Patch to add OpenVPN TLS and Cipher support, by Groug : - * properties/nm-openvpn-dialog.glade: Add UI checkboxes. - * properties/nm-openvpn.c: New UI. - * src/nm-openvpn-service.c: Support "--tls-auth" and "--cipher" - OpenVPN options. - * src/nm-utils.c: Add nm_find_openvpn(), exported function for finding - the location of the OpenVPN binary. - * src/nm-utils.h: Add prototype. - -2006-05-01 Josep Puigdemont Casamajó - - * configure.in: Added "ca" to ALL_LINGUAS. - -2006-04-17 Robert Love - - * properties/nm-openvpn-dialog.glade: If the dialog won't let the user - type in the file entry GtkEntries, then don't mark them editable. - -2006-04-10 Robert Love - - * properties/nm-openvpn.c: Report error if writing out of exported - configuration fails. The silent treatment might work for me and my - wife, but not for failed I/O. - -2006-03-30 Robert Love - - Patch by Crispin Flowerday : - * src/nm-openvpn-service-helper.c: Fix crash when no PtP IP address is - supplied. - -2006-03-29 Robert Love - - * src/nm-openvpn-service.c: New eigth argument to DBUS VPN method, the - per-route MSS. OpenVPN does not care about the MSS, so we send zero. - -2006-03-02 Raphael Higino - - * configure.in: Added pt_BR to ALL_LINGUAS. - -2006-02-28 Ilkka Tuohela - * configure.in: Added fi to ALL_LINGUAS. - -2006-02-16 Francisco Javier F. Serrador - - * configure.in: Added es to ALL_LINGUAS. - -2006-02-08 Clytie Siddall - - * configure.in: Added vi in ALL_LINGUAS line. - -2006-02-04 Funda Wang - - * configure.in: Added zh_CN to ALL_LINGUAS. - -2006-01-05 Tim Niemueller - - * configure.in: Explicitly set AUX_DIR to . to prevent autoconf from - searching (and finding) install-sh in ../.., which lead to - problems. - -2005-12-12 Robert Love - - * auth-dialog/main.c: one more NULL, this time for the ellipses - -2005-12-11 Tim Niemueller - - * auth-dialog/main.c: - - Added support for encrypted key files in X.509 connections - - restructured code, fixed a memleak - - * src/nm-openvpn-service.c: - - Added support for encrypted key files for X.509 connections - - Added support for port parameter in gconf keys. - - * src/gnome-two-password-dialog.[ch]: - - Added support for setting the primary password label - - * configure.in: - - Bumped version to 0.3.2 - -2005-12-07 Tim Niemueller - - * src/nm-openvpn-service.c: - - Removed unused variable, login banner hack not needed any more - -2005-12-07 Tim Niemueller - - * auth-dialog/main.c: - - Only request one password from Gnome keyring, patch by Crispin - Flowerday - - * properties/nm-openvpn-dialog.glade: - - Added check button to use TCP instead of UDP - - * properties/nm-openvpn.c: - - Protocol can now be set, defaults to UDP, TCP maybe selected with - check box - - * src/nm-openvpn-service.c: - - Support proto flag in config, default to UDP if not set for backward - compatibility - - Set a fake login banner for now until we fixed when NM sets - last_attempt_success (provided by Crispin) - - * configure.in: - - Raised versoin to 0.3.1 - -2005-12-05 Tim Niemueller - - * properties/nm-openvpn-dialog.glade: - - Added X.509 + User/Pass to list of available connection - types - - added checkbox for using TAP device to optional info expander - - * properties/nm-openvpn.c: - - Added support for new X.509 + User/Pass connection type - - Added support for using TAP device, device is now written to - config to new field dev - - * auth-dialog/main.c: - - Password is also needed for new connection type - - * src/nm-openvpn-service-openvpn-helper.c: - - Updated header - - * src/nm-openvpn-service.[ch]: - - Added support for new X.509 + User/Pass connection type - - device is now an explicit parameter, if not set it defaults to - "tun" for compatibility with versions < 0.3.0 - - fixed closing of management socket, thanks for this patch goes - to Crispin Flowerday - - Added syslog flag to OpenVPN arguments - - * configure.in: - - Raised version to 0.3.0 - - * openvpn/intltool-extract.in - openvpn/intltool-merge.in - openvpn/intltool-update.in: - - Versions from intltool 0.34 are back, magically work after new - autogen.sh run!? - -2005-11-30 Tim Niemueller - - * auth-dialog/main.c: Only request one password, - still use GnomeTwoPasswordDialog, gives all the functionality we need. - This should be unified between VPN implementations. Also I had to add - GConf support to see if a password is really needed for the connection - type. The configuraton line should be written to the auth-dialog by NM - and maybe even an impl_needs_passwd_dialog or similar should be added. - Patch will follow when healthy again. - - * properties/nm-openvpn-dialog.glade: Updated GUI, - contains now everything needed to configure all three connection types - - * properties/nm-openvpn.c: Added handling of all - three connection types. - - * src/nm-openvpn-service-openvpn-helper.c: Use - different environment variables which are available for all connection - types, fixed the returned VPN gateway address. This was the remote IP - used in the VPN network, not the remote's real address. This prevented - it from working if VPN gateway was not in the same subnet since routes - were wrong. - - * src/nm-openvpn-service.h - src/nm-openvpn-service.c: Added support for - password and shared secret connection types. Reformatted to Gnu style. - - * configure.in: Raised version to 0.2.0 - - * openvpn/intltool-extract.in - openvpn/intltool-merge.in - openvpn/intltool-update.in: - Version from intltool 0.33, 0.34 won't work at the moment. - -2005-10-29 Tim Niemueller - - * started work based on vpnc work - diff --git a/vpn-daemons/openvpn/Makefile.am b/vpn-daemons/openvpn/Makefile.am deleted file mode 100644 index c6ca85c21f..0000000000 --- a/vpn-daemons/openvpn/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -AUTOMAKE_OPTIONS = foreign - -if WITH_GNOME -SUBDIRS = src common-gnome auth-dialog properties po -else -SUBDIRS = src -endif - -dbusservicedir = $(sysconfdir)/dbus-1/system.d -dbusservice_DATA = nm-openvpn-service.conf - -nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN -nmvpnservice_DATA = nm-openvpn-service.name - -if WITH_GNOME -desktopdir = $(datadir)/applications -desktop_in_files = nm-openvpn.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - -icondir = $(datadir)/icons/hicolor/48x48/apps -icon_DATA = gnome-mime-application-x-openvpn-settings.png -endif - -nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in - sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@ - -EXTRA_DIST = nm-openvpn-service.name.in \ - $(dbusservice_DATA) \ - $(desktop_in_files) \ - $(icon_DATA) \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in - -CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~ -DISTCLEANFILES = intltool-extract intltool-merge intltool-update diff --git a/vpn-daemons/openvpn/NEWS b/vpn-daemons/openvpn/NEWS deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/vpn-daemons/openvpn/README b/vpn-daemons/openvpn/README deleted file mode 100644 index 1a5849550b..0000000000 --- a/vpn-daemons/openvpn/README +++ /dev/null @@ -1,15 +0,0 @@ -OpenVPN support for NetworkManager - -Added by Tim Niemueller http://www.niemueller.de - -Assumes that you have a running OpenVPN X.509 setup as mentioned -in the OpenVPN 2.0 HOWOT on the OpenVPN homepage. - -TODO: Support for static keys, support for password authentication, -only present auth-dialog if needed. - -Code released under the GPL. See COPYING file in the NetworkManager -directory. - -Aachen, 2005/11/12 - diff --git a/vpn-daemons/openvpn/auth-dialog/.cvsignore b/vpn-daemons/openvpn/auth-dialog/.cvsignore deleted file mode 100644 index 8db5933547..0000000000 --- a/vpn-daemons/openvpn/auth-dialog/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile.in -Makefile -nm-openvpn-auth-dialog diff --git a/vpn-daemons/openvpn/auth-dialog/Makefile.am b/vpn-daemons/openvpn/auth-dialog/Makefile.am deleted file mode 100644 index ad2d38220e..0000000000 --- a/vpn-daemons/openvpn/auth-dialog/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -libexec_PROGRAMS = nm-openvpn-auth-dialog - -nm_openvpn_auth_dialog_CPPFLAGS = \ - $(GTHREAD_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBGNOMEUI_CFLAGS) \ - $(NETWORK_MANAGER_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ - -I$(top_srcdir)/ - -DICONDIR=\""$(datadir)/pixmaps"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DBINDIR=\""$(bindir)"\" \ - -DDBUS_API_SUBJECT_TO_CHANGE \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" \ - $(NULL) - -nm_openvpn_auth_dialog_SOURCES = \ - main.c \ - gnome-two-password-dialog.c \ - gnome-two-password-dialog.h \ - $(NULL) - -nm_openvpn_auth_dialog_LDADD = \ - $(GTK_LIBS) \ - $(LIBGNOMEUI_LIBS) \ - $(top_builddir)/common-gnome/libnm-openvpn-common-gnome.la \ - $(NULL) - -CLEANFILES = *~ diff --git a/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c b/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c deleted file mode 100644 index b3f3b0ef33..0000000000 --- a/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c +++ /dev/null @@ -1,762 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* gnome-password-dialog.c - A use password prompting dialog widget. - - Copyright (C) 1999, 2000 Eazel, Inc. - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the ree Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Authors: Ramiro Estrugo -*/ - -#include -//#include "gnome-i18nP.h" -#include "gnome-two-password-dialog.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - - -struct GnomeTwoPasswordDialogDetails -{ - /* Attributes */ - gboolean readonly_username; - gboolean readonly_domain; - - gboolean show_username; - gboolean show_domain; - gboolean show_password; - gboolean show_password_secondary; - - /* TODO: */ - gboolean remember; - char *remember_label_text; - - /* Internal widgetry and flags */ - GtkWidget *username_entry; - GtkWidget *password_entry; - GtkWidget *password_entry_secondary; - GtkWidget *domain_entry; - - GtkWidget *table_alignment; - GtkWidget *table; - - GtkWidget *remember_session_button; - GtkWidget *remember_forever_button; - - GtkWidget *radio_vbox; - GtkWidget *connect_with_no_userpass_button; - GtkWidget *connect_with_userpass_button; - - gboolean anon_support_on; - - char *primary_password_label; - char *secondary_password_label; -}; - -/* Caption table rows indices */ -static const guint CAPTION_TABLE_USERNAME_ROW = 0; -static const guint CAPTION_TABLE_PASSWORD_ROW = 1; - -/* GnomeTwoPasswordDialogClass methods */ -static void gnome_two_password_dialog_class_init (GnomeTwoPasswordDialogClass *password_dialog_class); -static void gnome_two_password_dialog_init (GnomeTwoPasswordDialog *password_dialog); - -/* GObjectClass methods */ -static void gnome_two_password_dialog_finalize (GObject *object); - - -/* GtkDialog callbacks */ -static void dialog_show_callback (GtkWidget *widget, - gpointer callback_data); -static void dialog_close_callback (GtkWidget *widget, - gpointer callback_data); - -static gpointer parent_class; - -GType -gnome_two_password_dialog_get_type (void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo info = { - sizeof (GnomeTwoPasswordDialogClass), - NULL, NULL, - (GClassInitFunc) gnome_two_password_dialog_class_init, - NULL, NULL, - sizeof (GnomeTwoPasswordDialog), 0, - (GInstanceInitFunc) gnome_two_password_dialog_init, - NULL - }; - - type = g_type_register_static (gtk_dialog_get_type(), - "GnomeTwoPasswordDialog", - &info, 0); - - parent_class = g_type_class_ref (gtk_dialog_get_type()); - } - - return type; -} - - -static void -gnome_two_password_dialog_class_init (GnomeTwoPasswordDialogClass * klass) -{ - G_OBJECT_CLASS (klass)->finalize = gnome_two_password_dialog_finalize; -} - -static void -gnome_two_password_dialog_init (GnomeTwoPasswordDialog *password_dialog) -{ - password_dialog->details = g_new0 (GnomeTwoPasswordDialogDetails, 1); - password_dialog->details->show_username = TRUE; - password_dialog->details->show_password = TRUE; - password_dialog->details->show_password_secondary = TRUE; - password_dialog->details->anon_support_on = FALSE; - - password_dialog->details->primary_password_label = g_strdup ( _("_Password:") ); - password_dialog->details->secondary_password_label = g_strdup ( _("_Secondary Password:") ); -} - -/* GObjectClass methods */ -static void -gnome_two_password_dialog_finalize (GObject *object) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (object); - - g_object_unref (password_dialog->details->username_entry); - g_object_unref (password_dialog->details->domain_entry); - g_object_unref (password_dialog->details->password_entry); - g_object_unref (password_dialog->details->password_entry_secondary); - - g_free (password_dialog->details->remember_label_text); - - g_free (password_dialog->details->primary_password_label); - g_free (password_dialog->details->secondary_password_label); - - g_free (password_dialog->details); - - if (G_OBJECT_CLASS (parent_class)->finalize != NULL) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); -} - -/* GtkDialog callbacks */ -static void -dialog_show_callback (GtkWidget *widget, gpointer callback_data) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (callback_data); - - if (GTK_WIDGET_VISIBLE (password_dialog->details->username_entry) && - !password_dialog->details->readonly_username) { - gtk_widget_grab_focus (password_dialog->details->username_entry); - } else if (GTK_WIDGET_VISIBLE (password_dialog->details->domain_entry) && - !password_dialog->details->readonly_domain) { - gtk_widget_grab_focus (password_dialog->details->domain_entry); - } else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry)) { - gtk_widget_grab_focus (password_dialog->details->password_entry); - } else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry_secondary)) { - gtk_widget_grab_focus (password_dialog->details->password_entry_secondary); - } -} - -static void -dialog_close_callback (GtkWidget *widget, gpointer callback_data) -{ - gtk_widget_hide (widget); -} - -static void -userpass_radio_button_clicked (GtkWidget *widget, gpointer callback_data) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (callback_data); - - if (widget == password_dialog->details->connect_with_no_userpass_button) { - gtk_widget_set_sensitive ( - password_dialog->details->table, FALSE); - } - else { /* the other button */ - gtk_widget_set_sensitive ( - password_dialog->details->table, TRUE); - } -} - -static void -add_row (GtkWidget *table, int row, const char *label_text, GtkWidget *entry) -{ - GtkWidget *label; - - label = gtk_label_new_with_mnemonic (label_text); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - - gtk_table_attach_defaults (GTK_TABLE (table), label, - 0, 1, row, row + 1); - gtk_table_attach_defaults (GTK_TABLE (table), entry, - 1, 2, row, row + 1); - - gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); -} - -static void -remove_child (GtkWidget *child, GtkWidget *table) -{ - gtk_container_remove (GTK_CONTAINER (table), child); -} - -static void -add_table_rows (GnomeTwoPasswordDialog *password_dialog) -{ - int row; - GtkWidget *table; - int offset; - - if (password_dialog->details->anon_support_on) { - offset = 12; - } - else { - offset = 0; - } - - gtk_alignment_set_padding (GTK_ALIGNMENT (password_dialog->details->table_alignment), - 0, 0, offset, 0); - - table = password_dialog->details->table; - /* This will not kill the entries, since they are ref:ed */ - gtk_container_foreach (GTK_CONTAINER (table), - (GtkCallback)remove_child, table); - - row = 0; - if (password_dialog->details->show_username) - add_row (table, row++, _("_Username:"), password_dialog->details->username_entry); - if (password_dialog->details->show_domain) - add_row (table, row++, _("_Domain:"), password_dialog->details->domain_entry); - if (password_dialog->details->show_password) - add_row (table, row++, password_dialog->details->primary_password_label, - password_dialog->details->password_entry); - if (password_dialog->details->show_password_secondary) - add_row (table, row++, password_dialog->details->secondary_password_label, - password_dialog->details->password_entry_secondary); - - gtk_widget_show_all (table); -} - -static void -username_entry_activate (GtkWidget *widget, GtkWidget *dialog) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (dialog); - - if (GTK_WIDGET_VISIBLE (password_dialog->details->domain_entry) && - GTK_WIDGET_SENSITIVE (password_dialog->details->domain_entry)) - gtk_widget_grab_focus (password_dialog->details->domain_entry); - else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry)) - gtk_widget_grab_focus (password_dialog->details->password_entry); - else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry_secondary) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry_secondary)) - gtk_widget_grab_focus (password_dialog->details->password_entry_secondary); -} - -static void -domain_entry_activate (GtkWidget *widget, GtkWidget *dialog) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (dialog); - - if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry)) - gtk_widget_grab_focus (password_dialog->details->password_entry); - else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry_secondary) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry_secondary)) - gtk_widget_grab_focus (password_dialog->details->password_entry_secondary); -} - - -/* Public GnomeTwoPasswordDialog methods */ -GtkWidget * -gnome_two_password_dialog_new (const char *dialog_title, - const char *message, - const char *username, - const char *password, - gboolean readonly_username) -{ - GnomeTwoPasswordDialog *password_dialog; - GtkDialog *dialog; - GtkWidget *table; - GtkLabel *message_label; - GtkWidget *hbox; - GtkWidget *vbox; - GtkWidget *main_vbox; - GtkWidget *dialog_icon; - GSList *group; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (gtk_widget_new (gnome_two_password_dialog_get_type (), NULL)); - dialog = GTK_DIALOG (password_dialog); - - gtk_window_set_title (GTK_WINDOW (password_dialog), dialog_title); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - - gtk_dialog_add_buttons (dialog, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - gtk_dialog_set_default_response (GTK_DIALOG (password_dialog), GTK_RESPONSE_OK); - - /* Setup the dialog */ - gtk_dialog_set_has_separator (dialog, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 5); - gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6); - - gtk_window_set_position (GTK_WINDOW (password_dialog), GTK_WIN_POS_CENTER); - gtk_window_set_modal (GTK_WINDOW (password_dialog), TRUE); - - g_signal_connect (password_dialog, "show", - G_CALLBACK (dialog_show_callback), password_dialog); - g_signal_connect (password_dialog, "close", - G_CALLBACK (dialog_close_callback), password_dialog); - - /* the radio buttons for anonymous login */ - password_dialog->details->connect_with_no_userpass_button = - gtk_radio_button_new_with_mnemonic (NULL, _("Connect _anonymously")); - group = gtk_radio_button_get_group ( - GTK_RADIO_BUTTON (password_dialog->details->connect_with_no_userpass_button)); - password_dialog->details->connect_with_userpass_button = - gtk_radio_button_new_with_mnemonic ( - group, _("Connect as _user:")); - - if (username != NULL && *username != 0) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->connect_with_userpass_button), TRUE); - } else { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->connect_with_no_userpass_button), TRUE); - } - - password_dialog->details->radio_vbox = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (password_dialog->details->radio_vbox), - password_dialog->details->connect_with_no_userpass_button, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (password_dialog->details->radio_vbox), - password_dialog->details->connect_with_userpass_button, - FALSE, FALSE, 0); - g_signal_connect (password_dialog->details->connect_with_no_userpass_button, "clicked", - G_CALLBACK (userpass_radio_button_clicked), password_dialog); - g_signal_connect (password_dialog->details->connect_with_userpass_button, "clicked", - G_CALLBACK (userpass_radio_button_clicked), password_dialog); - - /* The table that holds the captions */ - password_dialog->details->table_alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); - - password_dialog->details->table = table = gtk_table_new (3, 2, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_container_add (GTK_CONTAINER (password_dialog->details->table_alignment), table); - - password_dialog->details->username_entry = gtk_entry_new (); - password_dialog->details->domain_entry = gtk_entry_new (); - password_dialog->details->password_entry = gtk_entry_new (); - password_dialog->details->password_entry_secondary = gtk_entry_new (); - - /* We want to hold on to these during the table rearrangement */ -#if GLIB_CHECK_VERSION (2, 10, 0) - g_object_ref_sink (password_dialog->details->username_entry); - g_object_ref_sink (password_dialog->details->domain_entry); - g_object_ref_sink (password_dialog->details->password_entry); - g_object_ref_sink (password_dialog->details->password_entry_secondary); -#else - g_object_ref (password_dialog->details->username_entry); - gtk_object_sink (GTK_OBJECT (password_dialog->details->username_entry)); - g_object_ref (password_dialog->details->domain_entry); - gtk_object_sink (GTK_OBJECT (password_dialog->details->domain_entry)); - g_object_ref (password_dialog->details->password_entry); - gtk_object_sink (GTK_OBJECT (password_dialog->details->password_entry)); - g_object_ref (password_dialog->details->password_entry_secondary); - gtk_object_sink (GTK_OBJECT (password_dialog->details->password_entry_secondary)); -#endif - - gtk_entry_set_visibility (GTK_ENTRY (password_dialog->details->password_entry), FALSE); - gtk_entry_set_visibility (GTK_ENTRY (password_dialog->details->password_entry_secondary), FALSE); - - g_signal_connect (password_dialog->details->username_entry, - "activate", - G_CALLBACK (username_entry_activate), - password_dialog); - g_signal_connect (password_dialog->details->domain_entry, - "activate", - G_CALLBACK (domain_entry_activate), - password_dialog); - g_signal_connect_swapped (password_dialog->details->password_entry, - "activate", - G_CALLBACK (gtk_window_activate_default), - password_dialog); - g_signal_connect_swapped (password_dialog->details->password_entry_secondary, - "activate", - G_CALLBACK (gtk_window_activate_default), - password_dialog); - add_table_rows (password_dialog); - - /* Adds some eye-candy to the dialog */ - hbox = gtk_hbox_new (FALSE, 12); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - dialog_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment (GTK_MISC (dialog_icon), 0.5, 0.0); - gtk_box_pack_start (GTK_BOX (hbox), dialog_icon, FALSE, FALSE, 0); - - /* Fills the vbox */ - main_vbox = gtk_vbox_new (FALSE, 18); - - if (message) { - message_label = GTK_LABEL (gtk_label_new (message)); - gtk_label_set_justify (message_label, GTK_JUSTIFY_LEFT); - gtk_label_set_line_wrap (message_label, TRUE); - - gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label), - FALSE, FALSE, 0); - } - - vbox = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->radio_vbox, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->table_alignment, - FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (hbox), main_vbox, FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (password_dialog)->vbox), - hbox, - TRUE, /* expand */ - TRUE, /* fill */ - 0); /* padding */ - - gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox); - - password_dialog->details->remember_session_button = - gtk_check_button_new_with_mnemonic (_("_Remember password for this session")); - password_dialog->details->remember_forever_button = - gtk_check_button_new_with_mnemonic (_("_Save password in keyring")); - - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, - FALSE, FALSE, 0); - - - gnome_two_password_dialog_set_username (password_dialog, username); - gnome_two_password_dialog_set_password (password_dialog, password); - gnome_two_password_dialog_set_readonly_domain (password_dialog, readonly_username); - - return GTK_WIDGET (password_dialog); -} - -gboolean -gnome_two_password_dialog_run_and_block (GnomeTwoPasswordDialog *password_dialog) -{ - gint button_clicked; - - g_return_val_if_fail (password_dialog != NULL, FALSE); - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), FALSE); - - button_clicked = gtk_dialog_run (GTK_DIALOG (password_dialog)); - gtk_widget_hide (GTK_WIDGET (password_dialog)); - - return button_clicked == GTK_RESPONSE_OK; -} - -void -gnome_two_password_dialog_set_username (GnomeTwoPasswordDialog *password_dialog, - const char *username) -{ - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - g_return_if_fail (password_dialog->details->username_entry != NULL); - - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->username_entry), - username?username:""); -} - -void -gnome_two_password_dialog_set_password (GnomeTwoPasswordDialog *password_dialog, - const char *password) -{ - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->password_entry), - password ? password : ""); -} - -void -gnome_two_password_dialog_set_password_secondary (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary) -{ - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->password_entry_secondary), - password_secondary ? password_secondary : ""); -} - -void -gnome_two_password_dialog_set_domain (GnomeTwoPasswordDialog *password_dialog, - const char *domain) -{ - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - g_return_if_fail (password_dialog->details->domain_entry != NULL); - - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->domain_entry), - domain ? domain : ""); -} - - -void -gnome_two_password_dialog_set_show_username (GnomeTwoPasswordDialog *password_dialog, - gboolean show) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - show = !!show; - if (password_dialog->details->show_username != show) { - password_dialog->details->show_username = show; - add_table_rows (password_dialog); - } -} - -void -gnome_two_password_dialog_set_show_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean show) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - show = !!show; - if (password_dialog->details->show_domain != show) { - password_dialog->details->show_domain = show; - add_table_rows (password_dialog); - } -} - -void -gnome_two_password_dialog_set_show_password (GnomeTwoPasswordDialog *password_dialog, - gboolean show) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - show = !!show; - if (password_dialog->details->show_password != show) { - password_dialog->details->show_password = show; - add_table_rows (password_dialog); - } -} - -void -gnome_two_password_dialog_set_show_password_secondary (GnomeTwoPasswordDialog *password_dialog, - gboolean show) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - show = !!show; - if (password_dialog->details->show_password_secondary != show) { - password_dialog->details->show_password_secondary = show; - add_table_rows (password_dialog); - } -} - -void -gnome_two_password_dialog_set_readonly_username (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - password_dialog->details->readonly_username = readonly; - - gtk_widget_set_sensitive (password_dialog->details->username_entry, - !readonly); -} - -void -gnome_two_password_dialog_set_readonly_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - password_dialog->details->readonly_domain = readonly; - - gtk_widget_set_sensitive (password_dialog->details->domain_entry, - !readonly); -} - -char * -gnome_two_password_dialog_get_username (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->username_entry))); -} - -char * -gnome_two_password_dialog_get_domain (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->domain_entry))); -} - -char * -gnome_two_password_dialog_get_password (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->password_entry))); -} - -char * -gnome_two_password_dialog_get_password_secondary (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->password_entry_secondary))); -} - -void -gnome_two_password_dialog_set_show_userpass_buttons (GnomeTwoPasswordDialog *password_dialog, - gboolean show_userpass_buttons) -{ - if (show_userpass_buttons) { - password_dialog->details->anon_support_on = TRUE; - gtk_widget_show (password_dialog->details->radio_vbox); - if (gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON (password_dialog->details->connect_with_no_userpass_button))) { - gtk_widget_set_sensitive (password_dialog->details->table, FALSE); - } - else { - gtk_widget_set_sensitive (password_dialog->details->table, TRUE); - } - } else { - password_dialog->details->anon_support_on = FALSE; - gtk_widget_hide (password_dialog->details->radio_vbox); - gtk_widget_set_sensitive (password_dialog->details->table, TRUE); - } - - add_table_rows (password_dialog); -} - -gboolean -gnome_two_password_dialog_anon_selected (GnomeTwoPasswordDialog *password_dialog) -{ - return password_dialog->details->anon_support_on && - gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON ( - password_dialog->details->connect_with_no_userpass_button)); -} - -void -gnome_two_password_dialog_set_show_remember (GnomeTwoPasswordDialog *password_dialog, - gboolean show_remember) -{ - if (show_remember) { - gtk_widget_show (password_dialog->details->remember_session_button); - gtk_widget_show (password_dialog->details->remember_forever_button); - } else { - gtk_widget_hide (password_dialog->details->remember_session_button); - gtk_widget_hide (password_dialog->details->remember_forever_button); - } -} - -void -gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, - GnomeTwoPasswordDialogRemember remember) -{ - gboolean session, forever; - - session = FALSE; - forever = FALSE; - if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) { - session = TRUE; - } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){ - forever = TRUE; - } - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button), - session); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button), - forever); -} - -GnomeTwoPasswordDialogRemember -gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog) -{ - gboolean session, forever; - - session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button)); - forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button)); - if (forever) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER; - } else if (session) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION; - } - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; -} - -void gnome_two_password_dialog_set_password_primary_label (GnomeTwoPasswordDialog *password_dialog, - const char *password_primary_label) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - g_free (password_dialog->details->primary_password_label); - password_dialog->details->primary_password_label = g_strdup (password_primary_label); - - add_table_rows (password_dialog); -} - -void gnome_two_password_dialog_set_password_secondary_label (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary_label) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - g_free (password_dialog->details->secondary_password_label); - password_dialog->details->secondary_password_label = g_strdup (password_secondary_label); - - if (password_dialog->details->show_password_secondary) { - add_table_rows (password_dialog); - } -} diff --git a/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h b/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h deleted file mode 100644 index 58235da54d..0000000000 --- a/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* gnome-two-password-dialog.h - A use password prompting dialog widget - asking for two passwords. Based of - gnome-password-dialog.[ch] from libgnomeui - - Copyright (C) 1999, 2000 Eazel, Inc. - Copyright (C) 2005, Red Hat, Inc. - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Authors: Ramiro Estrugo -*/ - -#ifndef GNOME_TWO_PASSWORD_DIALOG_H -#define GNOME_TWO_PASSWORD_DIALOG_H - -#include - -G_BEGIN_DECLS - -#define GNOME_TYPE_TWO_PASSWORD_DIALOG (gnome_two_password_dialog_get_type ()) -#define GNOME_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialog)) -#define GNOME_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialogClass)) -#define GNOME_IS_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG)) -#define GNOME_IS_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG)) - -typedef struct GnomeTwoPasswordDialog GnomeTwoPasswordDialog; -typedef struct GnomeTwoPasswordDialogClass GnomeTwoPasswordDialogClass; -typedef struct GnomeTwoPasswordDialogDetails GnomeTwoPasswordDialogDetails; - -struct GnomeTwoPasswordDialog -{ - GtkDialog gtk_dialog; - - GnomeTwoPasswordDialogDetails *details; -}; - -struct GnomeTwoPasswordDialogClass -{ - GtkDialogClass parent_class; -}; - -typedef enum { - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER -} GnomeTwoPasswordDialogRemember; - - -GType gnome_two_password_dialog_get_type (void); -GtkWidget* gnome_two_password_dialog_new (const char *dialog_title, - const char *message, - const char *username, - const char *password, - gboolean readonly_username); - -gboolean gnome_two_password_dialog_run_and_block (GnomeTwoPasswordDialog *password_dialog); - -/* Attribute mutators */ -void gnome_two_password_dialog_set_show_username (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_set_show_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_set_show_password (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_set_show_password_secondary (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_set_username (GnomeTwoPasswordDialog *password_dialog, - const char *username); -void gnome_two_password_dialog_set_domain (GnomeTwoPasswordDialog *password_dialog, - const char *domain); -void gnome_two_password_dialog_set_password (GnomeTwoPasswordDialog *password_dialog, - const char *password); -void gnome_two_password_dialog_set_password_secondary (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary); -void gnome_two_password_dialog_set_readonly_username (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly); -void gnome_two_password_dialog_set_readonly_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly); - -void gnome_two_password_dialog_set_password_primary_label (GnomeTwoPasswordDialog *password_dialog, - const char *password_primary_description); -void gnome_two_password_dialog_set_password_secondary_label (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary_description); - -void gnome_two_password_dialog_set_show_remember (GnomeTwoPasswordDialog *password_dialog, - gboolean show_remember); -void gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, - GnomeTwoPasswordDialogRemember remember); -GnomeTwoPasswordDialogRemember gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog); -void gnome_two_password_dialog_set_show_userpass_buttons (GnomeTwoPasswordDialog *password_dialog, - gboolean show_userpass_buttons); - -/* Attribute accessors */ -char * gnome_two_password_dialog_get_username (GnomeTwoPasswordDialog *password_dialog); -char * gnome_two_password_dialog_get_domain (GnomeTwoPasswordDialog *password_dialog); -char * gnome_two_password_dialog_get_password (GnomeTwoPasswordDialog *password_dialog); -char * gnome_two_password_dialog_get_password_secondary (GnomeTwoPasswordDialog *password_dialog); - -gboolean gnome_two_password_dialog_anon_selected (GnomeTwoPasswordDialog *password_dialog); - -G_END_DECLS - -#endif /* GNOME_TWO_PASSWORD_DIALOG_H */ diff --git a/vpn-daemons/openvpn/auth-dialog/main.c b/vpn-daemons/openvpn/auth-dialog/main.c deleted file mode 100644 index 4c9346b937..0000000000 --- a/vpn-daemons/openvpn/auth-dialog/main.c +++ /dev/null @@ -1,390 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager Wireless Applet -- Display wireless access points and allow user control - * - * Dan Williams - * Tim Niemueller - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2008 Red Hat, Inc. - * 2005 Tim Niemueller [www.niemueller.de] - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "common-gnome/keyring-helpers.h" -#include "src/nm-openvpn-service.h" -#include "gnome-two-password-dialog.h" - -typedef struct { - char *vpn_uuid; - char *vpn_name; - - gboolean need_password; - char *password; - - gboolean need_certpass; - char *certpass; -} PasswordsInfo; - -#define PROC_TYPE_TAG "Proc-Type: 4,ENCRYPTED" - -/** Checks if a key is encrypted - * The key file is read and it is checked if it contains a line reading - * Proc-Type: 4,ENCRYPTED - * This is defined in RFC 1421 (PEM) - * @param filename the path to the file - * @return returns true if the key is encrypted, false otherwise - */ -static gboolean -pem_is_encrypted (const char *filename) -{ - GIOChannel *pem_chan; - char *str = NULL; - gboolean encrypted = FALSE; - - pem_chan = g_io_channel_new_file (filename, "r", NULL); - if (!pem_chan) - return FALSE; - - while (g_io_channel_read_line (pem_chan, &str, NULL, NULL, NULL) != G_IO_STATUS_EOF) { - if (strncmp (str, PROC_TYPE_TAG, strlen (PROC_TYPE_TAG)) == 0) { - encrypted = TRUE; - break; - } - g_free (str); - } - - g_io_channel_shutdown (pem_chan, FALSE, NULL); - g_io_channel_unref (pem_chan); - return encrypted; -} - - -static void -clear_secrets (PasswordsInfo *info) -{ - if (info->password) { - memset (info->password, 0, strlen (info->password)); - g_free (info->password); - } - if (info->certpass) { - memset (info->certpass, 0, strlen (info->certpass)); - g_free (info->certpass); - } -} - -static gboolean -get_secrets (PasswordsInfo *info, gboolean retry) -{ - GnomeTwoPasswordDialog *dialog; - gboolean is_session = TRUE; - char *prompt; - gboolean success = FALSE, need_secret = FALSE; - - g_return_val_if_fail (info->vpn_uuid != NULL, FALSE); - g_return_val_if_fail (info->vpn_name != NULL, FALSE); - - if (info->need_password) { - info->password = keyring_helpers_lookup_secret (info->vpn_uuid, NM_OPENVPN_KEY_PASSWORD, &is_session); - if (!info->password) - need_secret = TRUE; - } - - if (info->need_certpass) { - info->certpass = keyring_helpers_lookup_secret (info->vpn_uuid, NM_OPENVPN_KEY_CERTPASS, &is_session); - if (!info->certpass) - need_secret = TRUE; - } - - /* Have all passwords and we're not supposed to ask the user again */ - if (!need_secret && !retry) - return TRUE; - - prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), info->vpn_name); - dialog = GNOME_TWO_PASSWORD_DIALOG (gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE)); - g_free (prompt); - - gnome_two_password_dialog_set_show_username (dialog, FALSE); - gnome_two_password_dialog_set_show_userpass_buttons (dialog, FALSE); - gnome_two_password_dialog_set_show_domain (dialog, FALSE); - gnome_two_password_dialog_set_show_remember (dialog, TRUE); - - /* If nothing was found in the keyring, default to not remembering any secrets */ - if (info->password || info->certpass) { - /* Otherwise set default remember based on which keyring the secrets were found in */ - if (is_session) - gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION); - else - gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER); - } else - gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING); - - /* pre-fill dialog with the password */ - if (info->need_password && info->need_certpass) { - gnome_two_password_dialog_set_show_password_secondary (dialog, TRUE); - gnome_two_password_dialog_set_password_secondary_label (dialog, _("Certificate pass_word:") ); - - /* if retrying, put in the passwords from the keyring */ - if (info->password) - gnome_two_password_dialog_set_password (dialog, info->password); - if (info->certpass) - gnome_two_password_dialog_set_password_secondary (dialog, info->certpass); - } else { - gnome_two_password_dialog_set_show_password_secondary (dialog, FALSE); - if (info->need_password) { - /* if retrying, put in the passwords from the keyring */ - if (info->password) - gnome_two_password_dialog_set_password (dialog, info->password); - } else if (info->need_certpass) { - gnome_two_password_dialog_set_password_primary_label (dialog, _("Certificate password:")); - /* if retrying, put in the passwords from the keyring */ - if (info->certpass) - gnome_two_password_dialog_set_password (dialog, info->certpass); - } - } - clear_secrets (info); - - gtk_widget_show (GTK_WIDGET (dialog)); - - if (gnome_two_password_dialog_run_and_block (dialog)) { - gboolean save = FALSE; - char *keyring = NULL; - - if (info->need_password) - info->password = g_strdup (gnome_two_password_dialog_get_password (dialog)); - if (info->need_certpass) { - info->certpass = g_strdup (info->need_password ? - gnome_two_password_dialog_get_password_secondary (dialog) : - gnome_two_password_dialog_get_password (dialog)); - } - - switch (gnome_two_password_dialog_get_remember (dialog)) { - case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: - keyring = "session"; - /* Fall through */ - case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER: - save = TRUE; - break; - default: - break; - } - - if (save) { - if (info->password) { - keyring_helpers_save_secret (info->vpn_uuid, info->vpn_name, - keyring, NM_OPENVPN_KEY_PASSWORD, info->password); - } - if (info->certpass) { - keyring_helpers_save_secret (info->vpn_uuid, info->vpn_name, - keyring, NM_OPENVPN_KEY_CERTPASS, info->certpass); - } - } - - success = TRUE; - } - - gtk_widget_destroy (GTK_WIDGET (dialog)); - - return success; -} - -static gboolean -get_password_types (PasswordsInfo *info) -{ - GConfClient *gconf_client = NULL; - GSList *conf_list; - GSList *iter; - char *key; - char *str; - char *connection_path = NULL; - gboolean success = FALSE; - char *connection_type; - - /* FIXME: This whole thing sucks: we should not go around poking gconf - directly, but there's nothing that does it for us right now */ - - gconf_client = gconf_client_get_default (); - - conf_list = gconf_client_all_dirs (gconf_client, "/system/networking/connections", NULL); - if (!conf_list) - return FALSE; - - for (iter = conf_list; iter; iter = iter->next) { - const char *path = (const char *) iter->data; - - key = g_strdup_printf ("%s/%s/%s", - path, - NM_SETTING_CONNECTION_SETTING_NAME, - NM_SETTING_CONNECTION_TYPE); - str = gconf_client_get_string (gconf_client, key, NULL); - g_free (key); - - if (!str || strcmp (str, "vpn")) { - g_free (str); - continue; - } - g_free (str); - - key = g_strdup_printf ("%s/%s/%s", - path, - NM_SETTING_CONNECTION_SETTING_NAME, - NM_SETTING_CONNECTION_UUID); - str = gconf_client_get_string (gconf_client, key, NULL); - g_free (key); - - if (!str || strcmp (str, info->vpn_uuid)) { - g_free (str); - continue; - } - g_free (str); - - /* Woo, found the connection */ - connection_path = g_strdup (path); - break; - } - - g_slist_foreach (conf_list, (GFunc) g_free, NULL); - g_slist_free (conf_list); - - if (!connection_path) - goto out; - - key = g_strdup_printf ("%s/%s/%s", connection_path, - NM_SETTING_VPN_SETTING_NAME, - NM_OPENVPN_KEY_CONNECTION_TYPE); - connection_type = gconf_client_get_string (gconf_client, key, NULL); - g_free (key); - - if ( !strcmp (connection_type, NM_OPENVPN_CONTYPE_TLS) - || !strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - success = TRUE; - - if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) - info->need_password = TRUE; - - key = g_strdup_printf ("%s/%s/%s", connection_path, NM_SETTING_VPN_SETTING_NAME, - NM_OPENVPN_KEY_KEY); - str = gconf_client_get_string (gconf_client, key, NULL); - if (str) - info->need_certpass = pem_is_encrypted (str); - g_free (str); - g_free (key); - } else if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_STATIC_KEY)) { - success = TRUE; - } else if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD)) { - success = TRUE; - info->need_password = TRUE; - } - - g_free (connection_type); - g_free (connection_path); - -out: - g_object_unref (gconf_client); - return success; -} - -int -main (int argc, char *argv[]) -{ - PasswordsInfo info; - gboolean retry = FALSE; - gchar *vpn_name = NULL; - gchar *vpn_uuid = NULL; - gchar *vpn_service = NULL; - char buf[1]; - int ret, exit_status = 1; - GOptionContext *context; - GnomeProgram *program; - GOptionEntry entries[] = { - { "reprompt", 'r', 0, G_OPTION_ARG_NONE, &retry, "Reprompt for passwords", NULL}, - { "uuid", 'u', 0, G_OPTION_ARG_STRING, &vpn_uuid, "UUID of VPN connection", NULL}, - { "name", 'n', 0, G_OPTION_ARG_STRING, &vpn_name, "Name of VPN connection", NULL}, - { "service", 's', 0, G_OPTION_ARG_STRING, &vpn_service, "VPN service type", NULL}, - { NULL } - }; - - bindtextdomain (GETTEXT_PACKAGE, NULL); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - context = g_option_context_new ("- openvpn auth dialog"); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); - - program = gnome_program_init ("nm-openvpn-auth-dialog", VERSION, - LIBGNOMEUI_MODULE, - argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, context, - GNOME_PARAM_NONE); - - if (vpn_uuid == NULL || vpn_name == NULL || vpn_service == NULL) { - fprintf (stderr, "Have to supply ID, name, and service\n"); - goto out; - } - - if (strcmp (vpn_service, NM_DBUS_SERVICE_OPENVPN) != 0) { - fprintf (stderr, "This dialog only works with the '%s' service\n", NM_DBUS_SERVICE_OPENVPN); - goto out; - } - - memset (&info, 0, sizeof (PasswordsInfo)); - info.vpn_uuid = vpn_uuid; - info.vpn_name = vpn_name; - - if (!get_password_types (&info)) { - fprintf (stderr, "Invalid connection"); - goto out; - } - - exit_status = 0; - - if (!info.need_password && !info.need_certpass) { - printf ("%s\n%s\n\n\n", NM_OPENVPN_KEY_NOSECRET, "true"); - goto out; - } - - if (get_secrets (&info, retry)) { - if (info.need_password) - printf ("%s\n%s\n", NM_OPENVPN_KEY_PASSWORD, info.password); - if (info.need_certpass) - printf ("%s\n%s\n", NM_OPENVPN_KEY_CERTPASS, info.certpass); - } - printf ("\n\n"); - - clear_secrets (&info); - - /* for good measure, flush stdout since Kansas is going Bye-Bye */ - fflush (stdout); - - /* wait for data on stdin */ - ret = fread (buf, sizeof (char), sizeof (buf), stdin); - - out: - g_object_unref (program); - - return exit_status; -} diff --git a/vpn-daemons/openvpn/autogen.sh b/vpn-daemons/openvpn/autogen.sh deleted file mode 100755 index 7822d8ed40..0000000000 --- a/vpn-daemons/openvpn/autogen.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. -REQUIRED_AUTOMAKE_VERSION=1.7 -PKG_NAME=NetworkManager-openvpn - -(test -f $srcdir/configure.in \ - && test -f $srcdir/auth-dialog/main.c) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} - - -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} -USE_GNOME2_MACROS=1 . gnome-autogen.sh - - diff --git a/vpn-daemons/openvpn/common-gnome/Makefile.am b/vpn-daemons/openvpn/common-gnome/Makefile.am deleted file mode 100644 index 45154732d6..0000000000 --- a/vpn-daemons/openvpn/common-gnome/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -noinst_LTLIBRARIES=libnm-openvpn-common-gnome.la - -libnm_openvpn_common_gnome_la_CPPFLAGS = \ - $(NETWORK_MANAGER_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ - -DG_DISABLE_DEPRECATED - -libnm_openvpn_common_gnome_la_SOURCES= \ - keyring-helpers.c \ - keyring-helpers.h - -libnm_openvpn_common_gnome_la_LIBADD = \ - $(NETWORK_MANAGER_LIBS) \ - $(GNOMEKEYRING_LIBS) - diff --git a/vpn-daemons/openvpn/common-gnome/keyring-helpers.c b/vpn-daemons/openvpn/common-gnome/keyring-helpers.c deleted file mode 100644 index 720fc2c5e4..0000000000 --- a/vpn-daemons/openvpn/common-gnome/keyring-helpers.c +++ /dev/null @@ -1,156 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager Wireless Applet -- Display wireless access points and allow user control - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2008 Red Hat, Inc. - */ - -#include -#include - -#include - -#include "keyring-helpers.h" -#include "../src/nm-openvpn-service.h" - -#define KEYRING_UUID_TAG "connection-uuid" -#define KEYRING_SN_TAG "setting-name" -#define KEYRING_SK_TAG "setting-key" - -char * -keyring_helpers_lookup_secret (const char *vpn_uuid, - const char *secret_name, - gboolean *is_session) -{ - GList *found_list = NULL; - GnomeKeyringResult ret; - GnomeKeyringFound *found; - char *secret; - - ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET, - &found_list, - KEYRING_UUID_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - vpn_uuid, - KEYRING_SN_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - NM_SETTING_VPN_SETTING_NAME, - KEYRING_SK_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - secret_name, - NULL); - if ((ret != GNOME_KEYRING_RESULT_OK) || (g_list_length (found_list) == 0)) - return NULL; - - found = (GnomeKeyringFound *) found_list->data; - - if (strcmp (found->keyring, "session") == 0) - *is_session = TRUE; - else - *is_session = FALSE; - - secret = found->secret ? g_strdup (found->secret) : NULL; - gnome_keyring_found_list_free (found_list); - - return secret; -} - -GnomeKeyringResult -keyring_helpers_save_secret (const char *vpn_uuid, - const char *vpn_name, - const char *keyring, - const char *secret_name, - const char *secret) -{ - char *display_name; - GnomeKeyringResult ret; - GnomeKeyringAttributeList *attrs = NULL; - guint32 id = 0; - - display_name = g_strdup_printf ("VPN %s secret for %s/%s/" NM_SETTING_VPN_SETTING_NAME, - secret_name, - vpn_name, - NM_DBUS_SERVICE_OPENVPN); - - attrs = gnome_keyring_attribute_list_new (); - gnome_keyring_attribute_list_append_string (attrs, - KEYRING_UUID_TAG, - vpn_uuid); - gnome_keyring_attribute_list_append_string (attrs, - KEYRING_SN_TAG, - NM_SETTING_VPN_SETTING_NAME); - gnome_keyring_attribute_list_append_string (attrs, - KEYRING_SK_TAG, - secret_name); - - ret = gnome_keyring_item_create_sync (keyring, - GNOME_KEYRING_ITEM_GENERIC_SECRET, - display_name, - attrs, - secret, - TRUE, - &id); - gnome_keyring_attribute_list_free (attrs); - g_free (display_name); - return ret; -} - -static void -ignore_callback (GnomeKeyringResult result, gpointer data) -{ -} - -gboolean -keyring_helpers_delete_secret (const char *vpn_uuid, - const char *secret_name) -{ - GList *found = NULL, *iter; - GnomeKeyringResult ret; - - g_return_val_if_fail (vpn_uuid != NULL, FALSE); - g_return_val_if_fail (secret_name != NULL, FALSE); - - ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET, - &found, - KEYRING_UUID_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - vpn_uuid, - KEYRING_SN_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - NM_SETTING_VPN_SETTING_NAME, - KEYRING_SK_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - secret_name, - NULL); - if (ret != GNOME_KEYRING_RESULT_OK && ret != GNOME_KEYRING_RESULT_NO_MATCH) - return FALSE; - if (g_list_length (found) == 0) - return TRUE; - - /* delete them all */ - for (iter = found; iter; iter = g_list_next (iter)) { - GnomeKeyringFound *item = (GnomeKeyringFound *) iter->data; - - gnome_keyring_item_delete (item->keyring, item->item_id, - ignore_callback, NULL, NULL); - } - - gnome_keyring_found_list_free (found); - return TRUE; -} - diff --git a/vpn-daemons/openvpn/common-gnome/keyring-helpers.h b/vpn-daemons/openvpn/common-gnome/keyring-helpers.h deleted file mode 100644 index 44df285c7f..0000000000 --- a/vpn-daemons/openvpn/common-gnome/keyring-helpers.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager Wireless Applet -- Display wireless access points and allow user control - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2008 Red Hat, Inc. - */ - -#ifndef KEYRING_HELPERS_H -#define KEYRING_HELPERS_H - -#include -#include - -char *keyring_helpers_lookup_secret (const char *vpn_uuid, - const char *secret_name, - gboolean *is_session); - -GnomeKeyringResult keyring_helpers_save_secret (const char *vpn_uuid, - const char *vpn_name, - const char *keyring, - const char *secret_name, - const char *secret); - -gboolean keyring_helpers_delete_secret (const char *vpn_uuid, - const char *secret_name); - -#endif /* KEYRING_HELPERS_H */ - diff --git a/vpn-daemons/openvpn/configure.in b/vpn-daemons/openvpn/configure.in deleted file mode 100644 index 62035b14b3..0000000000 --- a/vpn-daemons/openvpn/configure.in +++ /dev/null @@ -1,129 +0,0 @@ -AC_PREREQ(2.52) - -AC_INIT(NetworkManager-openvpn, 0.7.0, tim@niemueller.de, NetworkManager-openvpn) -AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([subdir-objects]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) - -dnl -dnl Require programs -dnl -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_INSTALL -AC_PROG_LIBTOOL - -dnl -dnl Required headers -dnl -AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h syslog.h unistd.h) - -dnl -dnl Checks for typedefs, structures, and compiler characteristics. -dnl -AC_TYPE_MODE_T -AC_TYPE_PID_T -AC_HEADER_TIME - -dnl -dnl Checks for library functions. -dnl -AC_PROG_GCC_TRADITIONAL -AC_FUNC_MEMCMP -AC_CHECK_FUNCS(select socket uname) - -dnl -dnl GNOME support -dnl -AC_ARG_WITH(gnome, AC_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only])) -AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno) - -GETTEXT_PACKAGE=NetworkManager-openvpn -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) - -IT_PROG_INTLTOOL([0.35]) -AM_GLIB_GNU_GETTEXT - -PKG_CHECK_MODULES(GTHREAD, gthread-2.0) -AC_SUBST(GTHREAD_CFLAGS) -AC_SUBST(GTHREAD_LIBS) - -PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.30) -AC_SUBST(DBUS_CFLAGS) -AC_SUBST(DBUS_LIBS) - -PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.7.0 libnm-util >= 0.7.0 libnm_glib libnm_glib_vpn) -AC_SUBST(NETWORK_MANAGER_CFLAGS) -AC_SUBST(NETWORK_MANAGER_LIBS) - -if test x"$with_gnome" != xno; then - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - - PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) - AC_SUBST(GDK_PIXBUF_CFLAGS) - AC_SUBST(GDK_PIXBUF_LIBS) - - PKG_CHECK_MODULES(GLADE, libglade-2.0) - AC_SUBST(GLADE_CFLAGS) - AC_SUBST(GLADE_LIBS) - - PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) - AC_SUBST(LIBGNOMEUI_CFLAGS) - AC_SUBST(LIBGNOMEUI_LIBS) - - PKG_CHECK_MODULES(GCONF, gconf-2.0) - AC_SUBST(GCONF_CFLAGS) - AC_SUBST(GCONF_LIBS) - - PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1) - AC_SUBST(GNOMEKEYRING_CFLAGS) - AC_SUBST(GNOMEKEYRING_LIBS) -fi - -AC_ARG_ENABLE(more-warnings, -AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), -set_more_warnings="$enableval",[ -if test -d "$srcdir/{arch}" || test -d "$srcdir/CVS"; then - set_more_warnings=yes -else - set_more_warnings=no -fi -]) -AC_MSG_CHECKING(for more warnings, including -Werror) -if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT(yes) - CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS" - - for option in -Wno-unused -Wno-strict-aliasing -Wno-sign-compare -Wdeclaration-after-statement -Wno-pointer-sign ; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done - unset option -else - AC_MSG_RESULT(no) -fi - -AC_OUTPUT([ -Makefile -src/Makefile -common-gnome/Makefile -auth-dialog/Makefile -properties/Makefile -po/Makefile.in -]) diff --git a/vpn-daemons/openvpn/doc/example-vpnc-system-wide-connection.sh b/vpn-daemons/openvpn/doc/example-vpnc-system-wide-connection.sh deleted file mode 100755 index 28d8950d62..0000000000 --- a/vpn-daemons/openvpn/doc/example-vpnc-system-wide-connection.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# This is an example of how to install a system-wide connection that -# cannot be edited by unprivileged users using nm-vpn-properties. This -# script needs to be run as root and you may need to restart any -# gconfd daemons after the script has run (logging in and out will -# suffice) - -NAME="openvpn-system-wide" -ESCAPED_NAME="openvpn-system-wide" -REMOTE="1.2.3.4" -CA="/etc/openvpn/CA.crt" -CERT="/etc/openvpn/thisclient.crt" -KEY="/etc/openvpn/thisclient.key" -# must be either yes or no -USELZO="no" - -IPSEC_ROUTES="[172.16.0.0/16,192.168.4.0/24]" - -GCONF_PATH="/system/networking/vpn_connections/$ESCAPED_NAME" - -GCONFTOOL2_OPTS="--direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory" - -gconftool-2 $GCONFTOOL2_OPTS --type string --set $GCONF_PATH/name "$NAME" -gconftool-2 $GCONFTOOL2_OPTS --type string --set $GCONF_PATH/service_name "org.freedesktop.NetworkManager.openvpn" -gconftool-2 $GCONFTOOL2_OPTS --type list --list-type=string --set $GCONF_PATH/vpn_data ["remote","$REMOTE","ca","$CA","cert",$CERT,"key",$KEY,"comp-lzo",$USELZO] -gconftool-2 $GCONFTOOL2_OPTS --type list --list-type=string --set $GCONF_PATH/routes $IPSEC_ROUTES - diff --git a/vpn-daemons/openvpn/gnome-mime-application-x-openvpn-settings.png b/vpn-daemons/openvpn/gnome-mime-application-x-openvpn-settings.png deleted file mode 100644 index d8354ff65551b1db41091b57532368acf26271d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2595 zcmV+;3f%RHP)g+^_g)%r(wSEz|A?gQf{XydxAW?5aE zE+*PEtr~}}iP_dBbd9vhh829k)<;>9hZ00U@WpG8;V}cu?Dsn}-*BY^3=g|&vL}A| z?!DZ(_x#TJoyYfGRd&0bo@PRwjWIKM6q74#3~v-+tr94cBim1BhanMgY3@zXTvPEiJA1 z`0?Y90T}r#3FhL(ix^V^q}17a8a!%9PEKZJ-6<}QSFBjU!+9PkK)iu*;lhO}0h$gE zoGmIUG9)G@x>bBEP|6uV6k|+4(@G)mzpk!s(u$9E4}hFMe_qZ?Kt`c+*K`3$O;1lR z&d<-EkaC{{He{-{f^^-Y8!cLEozN#FV3wk-@S6FFOKT}TIsrfaBz?Y1_qd? zcDs$>U<+UY`txXYhR3dZG$1+q2SOE z_4oIaMx!-bEergjqZcUkQBID4!!v9)280 zxOf5e4-Q|mTCILvU0tNr+9)_Um|p?~F{?o-wR+SXZnp_A!aH64Lv*vgk(!#k$=BDH zX3m_+!yT2}S${$?0Od{n$}3vZ=)7l!K?=t-)n9$Hr^78T;l|CK;P-$lNSp;R8nwo^gh?*Pg>EpaV zu|j(P0D9xCpV6}9RQk5`JRSOAFMWHlgn##J;`8*8@e9iTsMGPj5>Gj++hIo=g;To zmz0!DF8~-6fts=^jo!}uCAGIcq}rNF>M?f<*N3oWm6iwRm%a28M;b*26UxG4e6Dib zqtoel$c(1^{Zu>9;w5;Fso$7{D>aODL=H_I9OFn=?}l4i0hVsjpYNXd|hkOrgR9rqMdou>fq;>-7hh zC(I2DpEH}HqoX;En!92tY3Yw$$`4qrOqJZcPwAV#f5D1FUVe2oJrkcGVq`G~uF|4N zjb7vk*s!oLwz{N_s4sjT85ub)eZ~T?F+M)tc>45d`nsxz-EFa0M79{Bi0Fm1?cKe6 zjvS8{_VxAAGqG_Lx8prm6_%EMckc&0Tf}`_7sRt%Ers}}6CgrDLU=d}q>E}!>rWU! zCAD1{5(_frl+E0TBl` zdu?dIkw&cpq5I41AhI3;b{> z(_`)-bB~#i0Y(O>9ziNCEJk>+FAv;@_hFVYp7loq5QSc(y}g|u(Dk6fNDuy8==@t& ze9Eusg$0f(36Kb2w96y2hdgF5B0xbC3~P7iFc?7_z25h+G^&)z0$`p35 zAvQLa3JMAcUFe!MYiQM~RSW`PWhGUnL#1NMAeCSm8yj8Jae&dgV!=}Y?qc9FYHF&huaVZ4iYb+I*XtvjfjamNj-#TY zT%K^pe@_mo8mO$BrF)Ofd;aDmRv; z-3hF}a^=bbarov~0NkxQj73F7F6ALemk z(%IQbnVFfK0Dh;QG%odHb-L{(K4?_y8Y0|(2>%0~4B zXoP`a=H4C+nxGSu2A47K+_{s}?s)NlXUMstqJqwxIRgVWc)CM9T031L9`bLYbkax= zNQF=yc^rU{fglebK4j`(Al1Ty%a$$UlsTHj*TGQ!$dMzkK3w+IbO5*}C}3E>e!W`| zNUh*M0$M3(H;`(Tzi}rhV)ga)tUTgp-@bj|{z37l%n2>dJ=k7<9x);M9>b|qr(7FN z$oFXMz((&{xpSrzd>goa z{W>cyXkilV0hB9nW)v)L_dJo0#>(M=z!P>s6?<-Ou01_H-Hz5nwBPvgSux&o((Z|V z=yvHl2>=Yjx%FQzMxGe2|B(N^K&h|l|NmR%zbyX|U;rP9vz1Q6+}8jA002ovPDHLk FV1mA;+W7zg diff --git a/vpn-daemons/openvpn/nm-openvpn-service.conf b/vpn-daemons/openvpn/nm-openvpn-service.conf deleted file mode 100644 index 62eaa8c14f..0000000000 --- a/vpn-daemons/openvpn/nm-openvpn-service.conf +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/vpn-daemons/openvpn/nm-openvpn-service.name.in b/vpn-daemons/openvpn/nm-openvpn-service.name.in deleted file mode 100644 index df7eb58a83..0000000000 --- a/vpn-daemons/openvpn/nm-openvpn-service.name.in +++ /dev/null @@ -1,9 +0,0 @@ -[VPN Connection] -name=openvpn -service=org.freedesktop.NetworkManager.openvpn -program=@LIBEXECDIR@/nm-openvpn-service - -[GNOME] -auth-dialog=nm-openvpn-auth-dialog -properties=libnm-openvpn-properties - diff --git a/vpn-daemons/openvpn/nm-openvpn.desktop.in b/vpn-daemons/openvpn/nm-openvpn.desktop.in deleted file mode 100644 index 5d9c380b2a..0000000000 --- a/vpn-daemons/openvpn/nm-openvpn.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=VPN Connection Manager (OpenVPN) -GenericName=VPN Connection Manager (OpenVPN) -Comment=Add, Remove, and Edit VPN Connections -Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.openvpn --import-file %f -Icon=gnome-mime-application-x-openvpn-settings -Terminal=false -Type=Application -Categories=GNOME;Network; -MimeType=application/x-openvpn-settings; -NoDisplay=true diff --git a/vpn-daemons/openvpn/po/.cvsignore b/vpn-daemons/openvpn/po/.cvsignore deleted file mode 100644 index 06d88514e4..0000000000 --- a/vpn-daemons/openvpn/po/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -Makefile.in.in -Makefile -Makefile.in -POTFILES -*.pot -stamp-it -*.gmo diff --git a/vpn-daemons/openvpn/po/ChangeLog b/vpn-daemons/openvpn/po/ChangeLog deleted file mode 100644 index c5898fb8b8..0000000000 --- a/vpn-daemons/openvpn/po/ChangeLog +++ /dev/null @@ -1,707 +0,0 @@ -2008-12-07 Simos Xenitellis - - * el.po: Updated Greek translation by Evgenia Petoumenou. - -2008-11-29 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2008-11-25 Michael Biebl - - * de.po: Updated German translation by Christian Kirbach. -2008-11-22 Mario Blättermann - - * de.po: Updated German translation by Hauke Mehrtens. - -2008-11-19 Tomasz Dominikowski - - * pl.po: Updated Polish translation - -2008-10-22 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-10-21 Og Maciel - - * pt_BR.po: Updated Brazilian Portuguese translation by - Fábio Nogueira and Vladimir Melo. - -2008-10-18 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-10-11 Jorge Gonzalez - - * es.po: Updated Spanish translation. - -2008-10-09 Raivis Dejus - - * fi.po: Added Latvian translation. - * LINGUAS: Added lv line. - -2008-10-04 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2008-10-01 Priit Laes - - * et.po: Translation updated by Mattias Põldaru - -2008-10-01 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-09-26 Jorge Gonzalez - - * es.po: Updated Spanish translation. - -2008-09-25 Claude Paroz - - * fr.po: Updated French translation. - -2008-09-25 Gabor Kelemen - - * hu.po: Translation updated. - -2008-09-25 Žygimantas Beručka - - * LINGUAS: Added "lt". - -2008-09-25 Žygimantas Beručka - - * lt.po: Added Lithuanian translation. - -2008-09-24 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-09-20 Luca Ferretti - - * it.po: Updated Italian translation by Francesco Marletta. - -2008-09-17 Petr Kovar - - * cs.po: Updated Czech translation by Jiri Eischmann. - -2008-09-15 Wouter Bolsterlee - - * nl.po: Updated Dutch translation by Wouter Bolsterlee. - -2008-09-14 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2008-09-09 Inaki Larranaga Murgoitio - - * eu.po: Updated Basque translation. - -2008-08-25 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-08-24 Tomasz Dominikowski - - * pl.po: Updated Polish translation - -2008-08-24 Tomasz Dominikowski - - * pl.po: Updated Polish translation - -2008-08-22 Tomasz Dominikowski - - * pl.po: Updated Polish translation - -2008-08-22 Chao-Hsiung Liao - - * zh_HK.po: Updated Traditional Chinese translation(Hong Kong). - * zh_TW.po: Updated Traditional Chinese translation(Taiwan). - -2008-08-21 Runa Bhattacharjee - - * ps.po: Added Pashto Translations by Zabeeh Khan - * LINGUAS: Added Pashto to the List of Languages - -2008-08-18 Claude Paroz - - * fr.po: Updated French translation by Robert-André Mauchin. - -2008-08-14 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-08-14 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2008-08-08 Leonid Kanter - - ru.po: Updated Russian translation - -2008-08-02 Alexander Shopov - - * bg.po: Updated Bulgarian translation by - Alexander Shopov - -2008-07-31 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2008-07-31 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2008-07-25 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-07-20 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-07-11 Tambet Ingo - - * de.po: Fix typos (From Markus Becker ). - -2008-07-05 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-07-04 Leonardo Ferreira Fontenelle - - * pt_BR.po: Brazilian Portuguese translation updated by Henrique P - Machado. - -2008-06-28 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-06-25 Jonh Wendell - - * pt_BR.po: Updated Brazilian Portuguese translation by Henrique - Machado. - -2008-06-24 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-06-06 Clytie Siddall - - * vi.po: Updated Vietnamese translation. - -2008-03-19 Gabor Kelemen - - * hu.po: Translation updated - -2008-03-10 Vincent van Adrighem - - * nl.po: Translation updated by Tino Meinen. - -2008-03-09 Philip Withnall - - * en_GB.po: Updated British English translation. - -2008-02-28 Gil Forcada - - * ca.po: Updated Catalan translation. - -2008-02-20 Inaki Larranaga Murgoitio - - * LINGUAS: Added 'eu' (Basque) entry. - * eu.po: Added Basque translation. - -2008-01-19 Stéphane Raimbault - - * fr.po: Updated French translation by Robert-André Mauchin. - -2007-12-29 Changwoo Ryu - - * ko.po: Updated Korean translation by Namhyung Kim. - -2007-12-26 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-12-05 Jakub Friedl - - * LINGUAS: Added 'cs'. Bug #501019. - -2007-12-03 Jovan Naumovski - - * mk.po: Updated Macedonian translation. - -2007-12-03 Changwoo Ryu - - * LINGUAS: Added 'ko'. Bug #501020. - -2007-11-02 Priit Laes - - * et.po: Translation updated by Mattias Põldaru. - -2007-11-02 Kjartan Maraas - - * nb.po: Updated Norwegian bokmål translation. - -2007-10-31 Gabor Kelemen - - * hu.po: Translation updated - -2007-10-28 Priit Laes - - * et.po: Translation updated by Priit Laes. - -2007-10-28 Priit Laes - - * et.po: Translation updated by Priit Laes. - -2007-10-26 Jorge Gonzalez - - * es.po: Updated Spanish translation. - -2007-09-23 Gil Forcada - - * ca.po: Updated Catalan translation. - -2007-09-15 Leonardo Ferreira Fontenelle - - * pt_BR.po: Brazilian Portuguese translation updated by Luiz Armesto - . - -2007-08-17 Kjartan Maraas - - * nb.po: Updated Norwegian bokmål translation. - -2007-08-15 Kostas Papadimas - - * el.po: Updated Greek Translation - -2007-08-11 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2007-07-22 Satoru SATOH - - * ja.po: Updated Japanese translation. - -2007-06-19 Leonid Kanter - - * ru.po: Initial Russian translation - -2007-06-11 Artur Flinta - - * pl.po: Updated Polish translation by GNOME PL Team. - -2007-06-07 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2007-04-29 David Lodge - - * en_GB.po: Updated British English translation - -2007-04-24 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2007-04-14 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-03-20 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-03-10 Hendrik Richter - - * de.po: Updated German translation, by - Thomas Gier - -2007-03-07 Vladimer Sichinava - - * ka.po: Updated Georgian translation by - Malkhaz Barkalaya - -2007-03-07 Alexander Shopov - - * bg.po: Updated Bulgarian translation by - Alexander Shopov - -2007-03-06 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2007-03-05 Josep Puigdemont i Casamajó - - * ca.po: Updated Catalan translation by - Gil Forcada . - -2007-03-04 Chao-Hsiung Liao - - * zh_HK.po: Updated Traditional Chinese translation(Hong Kong). - * zh_TW.po: Updated Traditional Chinese translation(Taiwan). - -2007-03-03 Vincent van Adrighem - - * nl.po: Translation updated by Tino Meinen. - -2007-02-28 Stéphane Raimbault - - * fr.po: Updated French translation by Jonathan Ernst and Claude - Paroz. - -2007-02-28 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-02-28 Kjartan Maraas - - * nb.po: Updated Norwegian bokmål translation. - -2007-02-28 Ignacio Casal Quinteiro - - * gl.po: Updated Galician Translation. - -2007-02-28 Leonardo Ferreira Fontenelle - - * pt_BR.po: Updated Brazilian Portuguese translation by Washington - Lins . - -2007-02-28 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2007-02-25 Priit Laes - - * et.po: Fixed header, added some translations. - -2007-02-25 Priit Laes - - * LINGUAS, et.po: Added Estonian translation by Ivar Smolin . - -2007-02-25 Gabor Kelemen - - * hu.po: Translation updated. - -2007-02-25 Changwoo Ryu - - * ko.po: Updated Korean translation by Young-Ho Cha. - -2007-02-21 Raphael Higino - - * pt_BR.po: Updated Brazilian Portuguese translation. - -2007-02-19 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2007-02-18 Artur Flinta - - * pl.po: Updated Polish translation by GNOME PL Team. - -2007-02-16 Maxim Dziumanenko - - * uk.po: Add Ukrainian translation. - * LINGUAS: Add uk to list. - -2007-02-13 Lasse Bang Mikkelsen - - * da.po: Updated Danish translation. - -2007-02-12 Ignacio Casal Quinteiro - - * gl.po: Updated Galician Translation. - -2007-02-11 Stéphane Raimbault - - * fr.po: Updated French translation by Jonathan Ernst and Stéphane - Raimbault. - -2007-02-9 Djihed Afifi - - * ar.po: Updated Arabic Translation by Khaled Hosny. - -2007-02-09 David Lodge - - * en_GB.po: Updated English (British) translation - -2007-02-08 Duarte Loreto - - * pt.po: Added Portuguese translation. - * LINGUAS: Added Portuguese (pt). - -2007-02-8 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-02-08 Josep Puigdemont i Casamajó - - * ca.po: Updated Catalan translation. - -2007-02-04 A S Alam - - * pa.po: Punjabi Translation is added - * LINGUAS: pa is added to list - -2007-02-04 Changwoo Ryu - - * ko.po: Added Korean translation by Young-Ho Cha. - -2007-02-02 Theppitak Karoonboonyanan - - * th.po: Updated Thai translation. - -2007-02-02 Alexander Shopov - - * bg.po: Added Bulgarian translation by - Alexander Shopov - * LINGUAS: Added "bg" (Bulgarian). - -2007-02-01 Chao-Hsiung Liao - - * zh_HK.po: Added Traditional Chinese translation(Hong Kong). - * zh_TW.po: Added Traditional Chinese translation(Taiwan). - -2007-01-31 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2007-01-30 Ignacio Casal Quinteiro - - * gl.po: Added Galician Language. - * LINGUAS: Added 'gl' - -2007-01-30 Theppitak Karoonboonyanan - - * th.po: Updated Thai translation. - -2007-01-29 Theppitak Karoonboonyanan - - * th.po: Updated Thai translation. - -2007-01-23 Theppitak Karoonboonyanan - - * th.po: Added Thai translation by - Supranee Thirawatthanasuk and me. - * LINGUAS: Added 'th'. - -2007-01-21 Josep Puigdemont i Casamajó - - * ca.po: Updated Catalan translation by - Gil Forcada - -2007-01-13 Raphael Higino - - * pt_BR.po: Updated Brazilian Portuguese translation. - -2007-01-13 Kostas Papadimas - - * el.po: Added Greek Translation - * LINGUAS: Added el to the list - -2007-01-13 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-01-12 Jovan Naumovski - - * mk.po: Added Macedonian translaion. - * LINGUAS: Added mk to the list - -2007-01-10 Matic Zgur - - * sl.po: Added Slovenian translation. - * LINGUAS: Added sl to the list of languages - -2007-01-05 Clytie Siddall - - * vi.po: Updated Vietnamese translation. - -2007-01-01 David Lodge - - * en_GB.po: Updated English (British) translation - -2006-12-29 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2006-12-28 David Lodge - - * en_GB.po: Updated English (British) translation - -2006-12-28 Vincent van Adrighem - - * nl.po: Translation updated by Tino Meinen. - -2006-12-10 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2006-12-09 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-11-18 Djihed Afifi - - * ar.po: Added Arabic Translation. - * LINGUAS: Added ar. - -2006-11-02 Pema Geyleg - - * LINGUAS: Added "dz". - * dz.po: Added Dzongkha Translation. - -2006-10-30 Kjartan Maraas - - * LINGUAS: Add nb. - * nb.po: Commit this. - -2006-10-21 Gabor Kelemen - - * hu.po: Translation updated. - -2006-09-30 Alessio Frusciante - - * it.po: Added Italian translation by - Francesco Marletta . - * LINGUAS: Added "it" (Italian). - -2006-09-14 David Lodge - - * en_GB.po: Updated English (British) translation - * LINGUAS: Added en_GB - -2006-09-03 Josep Puigdemont i Casamajó - - * ca.po: Updated Catalan translation by - Gil Forcada . - -2006-09-02 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2006-08-21 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-08-19 Vincent van Adrighem - - * nl.po: Translation updated by Tino Meinen. - -2006-08-16 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2006-08-16 Gabor Kelemen - - * hu.po: Translation updated. - -2006-08-16 Gabor Kelemen - - * hu.po: Translation updated. - -2006-08-03 Jakub Friedl - - * cs.po: Updated Czech translation. - -2006-07-28 Christophe Merlet - - * fr.po: Added French translation from - Haïkel GUÉMAR . - -2006-06-19 Satoru SATOH - - * ja.po: Added Japanese translation. - -2006-06-17 Marcel Telka - - * sk.po: Added Slovak translation. - -2006-06-13 Jakub Friedl - - * cs.po: Added Czech translation. - -2006-06-13 Wouter Bolsterlee - - * nl.po: Translation updated by Tino Meinen. - -2006-06-05 Gabor Kelemen - - * hu.po: Translation added. - -2006-05-26 Clytie Siddall - - * vi.po: Updated Vietnamese translation. - -2006-05-14 Daniel Nylander - - * sv.po Updated Swedish Translation. - -2006-05-12 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-05-06 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2006-04-20 Vincent van Adrighem - - * nl.po: Translation updated by Tino Meinen. - -2006-04-12 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2006-04-11 Clytie Siddall - - * vi.po: Updated Vietnamese translation. - -2006-04-06 Vincent van Adrighem - - * nl.po: Translation added by Tino Meinen. - -2006-03-29 Christian Rose - - * sv.po: Updated Swedish translation. - -2006-03-23 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-03-02 Raphael Higino - - * pt_BR.po: Added Brazilian Portuguese translation. - -2006-02-28 Ilkka Tuohela - - * fi.po: Added Finnish translation. - -2006-02-16 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-02-08 Clytie Siddall - - * vi.po: Added Vietnamese translation. - -2006-02-04 Funda Wang - - * zh_CN.po: Added Simplified Chinese translation. - -2006-01-20 Lasse Bang Mikkelsen - - * da.po: Updated Danish translation. - -2006-01-18 Lasse Bang Mikkelsen - - * da.po: Updated Danish translation. - -2005-06-17 David Zeuthen - - * POTFILES.in: Added nm-vpnc.desktop.in - - * da.po: Updated danish translations - -2005-06-16 David Zeuthen - - * da.po: Updated danish translations - diff --git a/vpn-daemons/openvpn/po/LINGUAS b/vpn-daemons/openvpn/po/LINGUAS deleted file mode 100644 index 0090d0abce..0000000000 --- a/vpn-daemons/openvpn/po/LINGUAS +++ /dev/null @@ -1,42 +0,0 @@ -# please keep this list sorted alphabetically -# -ar -bg -ca -cs -da -de -dz -el -en_GB -es -et -eu -fi -fr -gl -hu -it -ja -ka -ko -lt -lv -mk -nb -nl -pa -pl -ps -pt -pt_BR -ru -sk -sl -sv -th -uk -vi -zh_CN -zh_HK -zh_TW diff --git a/vpn-daemons/openvpn/po/POTFILES.in b/vpn-daemons/openvpn/po/POTFILES.in deleted file mode 100644 index 572edf5e60..0000000000 --- a/vpn-daemons/openvpn/po/POTFILES.in +++ /dev/null @@ -1,11 +0,0 @@ -# List of source files containing translatable strings. -# Please keep this file sorted alphabetically. -auth-dialog/gnome-two-password-dialog.c -auth-dialog/main.c -nm-openvpn.desktop.in -properties/auth-helpers.c -properties/nm-openvpn.c -properties/nm-openvpn-dialog.glade -src/nm-openvpn-service.c -src/nm-openvpn-service-openvpn-helper.c - diff --git a/vpn-daemons/openvpn/po/ar.po b/vpn-daemons/openvpn/po/ar.po deleted file mode 100644 index 5cf7678d56..0000000000 --- a/vpn-daemons/openvpn/po/ar.po +++ /dev/null @@ -1,521 +0,0 @@ -# translation of NetworkManager-openvpn.HEAD.ar.po to Arabic -# Arabic translations for PACKAGE package. -# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Automatically generated, 2006. -# Khaled Hosny , 2007. -msgid "" -msgstr "" -"Project-Id-Version: Project\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-31 10:41+0100\n" -"PO-Revision-Date: 2007-12-26 09:06+0100\n" -"Last-Translator: Djihed Afifi \n" -"Language-Team: Arabic \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && " -"n<=10 ? 2 : 3\n" -"X-Poedit-Language: Arabic\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_كلمة السر:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "كلمة سر _ثانوية:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "ا_سم المستخدم:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "ال_نطاق:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "اتّصل كم_جهول" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "اتصل _كمستخدم:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_تذكّر كلمة السر لهذه الجلسة" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "ا_حفظ كلمة السر في حلقة المفاتيح" - -#: ../auth-dialog/main.c:187 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "تحتاج إلى التوثيق لتَنفُذ إلى الشبكة الخاصة التخيلية '%s'." - -#: ../auth-dialog/main.c:188 -msgid "Authenticate VPN" -msgstr "وثِّق VPN" - -#: ../auth-dialog/main.c:201 -msgid "Certificate pass_word:" -msgstr "كلمة سر ال_شهادة:" - -#: ../auth-dialog/main.c:216 -msgid "Certificate password:" -msgstr "كلمة سر الشهادة:" - -#: ../properties/auth-helpers.c:68 -msgid "Choose a Certificate Authority certificate..." -msgstr "" - -#: ../properties/auth-helpers.c:87 -msgid "Choose your personal certificate..." -msgstr "" - -#: ../properties/auth-helpers.c:105 -msgid "Choose your private key..." -msgstr "" - -#: ../properties/auth-helpers.c:158 -msgid "Choose an OpenVPN static key..." -msgstr "" - -#: ../properties/auth-helpers.c:176 ../properties/auth-helpers.c:886 -#, fuzzy -msgid "None" -msgstr "لا" - -#: ../properties/auth-helpers.c:519 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "" - -#: ../properties/auth-helpers.c:579 -msgid "OpenVPN Static Keys (*.key)" -msgstr "" - -#: ../properties/auth-helpers.c:711 -#, fuzzy -msgid "Default" -msgstr "(افتراضي: 1194)" - -#: ../properties/nm-openvpn.c:53 -#, fuzzy -msgid "OpenVPN" -msgstr "عميل OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "" - -#: ../properties/nm-openvpn.c:308 ../properties/nm-openvpn-dialog.glade.h:7 -#, fuzzy -msgid "Certificates (TLS)" -msgstr "ش_هادة:" - -#: ../properties/nm-openvpn.c:320 -msgid "Password" -msgstr "كلمة السّر" - -#: ../properties/nm-openvpn.c:334 -msgid "Password with Certificates (TLS)" -msgstr "" - -#: ../properties/nm-openvpn.c:346 -msgid "Static Key" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -#, fuzzy -msgid "Authentication" -msgstr "اسم الإتصال" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -#, fuzzy -msgid "General" -msgstr "مطلوب" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -#, fuzzy -msgid "Ad_vanced..." -msgstr "مت_قدم" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -#, fuzzy -msgid "CA Certificate:" -msgstr "ش_هادة:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -#, fuzzy -msgid "Cipher:" -msgstr "شيفرة: %s" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -#, fuzzy -msgid "Key Direction:" -msgstr "الإتجاه:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "OpenVPN Advanced Options" -msgstr "خيارات OpenVPN متقدمة" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -#, fuzzy -msgid "Private Key:" -msgstr "مفتاح مشترَك:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -#, fuzzy -msgid "Static Key:" -msgstr "مفتاح مشترَك:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Type:" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -#, fuzzy -msgid "Use L_ZO data compression" -msgstr "استعمل _ضغط LZO" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -#, fuzzy -msgid "Use a TA_P device" -msgstr "ا_ستخدم جهاز TAP" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -#, fuzzy -msgid "Use a _TCP connection" -msgstr "استخدم ات_صال TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use additional TLS authentication" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -#, fuzzy -msgid "Use custom gateway p_ort:" -msgstr "منفذ ال_بوّابة:" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -#, fuzzy -msgid "User Certificate:" -msgstr "ش_هادة:" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -#, fuzzy -msgid "User name:" -msgstr "ا_سم المستخدم:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -#, fuzzy -msgid "_Gateway:" -msgstr "منفذ ال_بوّابة:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "gtk-cancel" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "gtk-ok" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "page 1" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "page 2" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "page 3" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "page 4" -msgstr "" - -#~ msgid "The following OpenVPN connection will be created:" -#~ msgstr "ستُنشأ اتصالات OpenVPN التالية:" - -#~ msgid "Name: %s" -#~ msgstr "الإسم: %s" - -#~ msgid "Connection Type: X.509 Certificates" -#~ msgstr "نوع الإتصال: X.509 Certificates" - -#~ msgid "CA: %s" -#~ msgstr "CA: %s" - -#~ msgid "Cert: %s" -#~ msgstr "شهادة: %s" - -#~ msgid "Key: %s" -#~ msgstr "مفتاح: %s" - -#~ msgid "Connection Type: Shared Key" -#~ msgstr "نوع الإتصال: مفتاح مشترَك" - -#~ msgid "Shared Key: %s" -#~ msgstr "مفتاح مشترَك: %s" - -#~ msgid "Local IP: %s" -#~ msgstr "IP م_حلّي: %s" - -#~ msgid "Remote IP: %s" -#~ msgstr "IP بعيد: %s" - -#~ msgid "Connection Type: Password" -#~ msgstr "نوع الإتصال: كلمة سّر" - -#~ msgid "Username: %s" -#~ msgstr "اسم المستخدم: %s" - -#~ msgid "Connection Type: X.509 with Password Authentication" -#~ msgstr "نوع الإتصال: X.509 مع توثق عبر كلمة سر" - -#~ msgid "Remote: %s" -#~ msgstr "عن بعد: %s" - -#~ msgid "Port: %s" -#~ msgstr "ميناء: %s" - -#~ msgid "Device: %s" -#~ msgstr "الجهاز: %s" - -#~ msgid "TAP" -#~ msgstr "TAP" - -#~ msgid "TUN" -#~ msgstr "TUN" - -#~ msgid "Protocol: %s" -#~ msgstr "البروتوكول: %s" - -#~ msgid "TCP" -#~ msgstr "TCP" - -#~ msgid "UDP" -#~ msgstr "UDP" - -#~ msgid "Routes: %s" -#~ msgstr "المسارات: %s" - -#~ msgid "Use LZO Compression: %s" -#~ msgstr "ا_ستعمل ضغط LZO: %s" - -#~ msgid "Yes" -#~ msgstr "نعم" - -#~ msgid "TLS auth: %s %s" -#~ msgstr "توثيق TLS: %s %s " - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "يمكن تغيير تفاصيل الإتصال باستخدام زر \"حرِّر\"." - -#~ msgid "Cannot import settings" -#~ msgstr "تعذّر استيراد الإعدادات" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "لا يحتوي ملف اعدادات VPN '%s' على بيانات صالحة." - -#~ msgid "Select file to import" -#~ msgstr "انتقِ ملفّ للإستيراد" - -#~ msgid "Select CA to use" -#~ msgstr "انتقِ CA ليُستخدم" - -#~ msgid "Select certificate to use" -#~ msgstr "انتقِ شهادة لتُستخدم" - -#~ msgid "Select key to use" -#~ msgstr "انتقِ مفتاحا ليُستخدم" - -#~ msgid "Select shared key to use" -#~ msgstr "انتقِ مفتاحا مُشارَكا ليُستخدم" - -#~ msgid "Select TA to use" -#~ msgstr "انتقِ TA ليُستخدم" - -#~ msgid "Save as..." -#~ msgstr "احفظ كـ..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "يوجد ملف بالإسم \"%s\" مسبقاً." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "أتريد استبداله بالملف الذي تقوم بحفظه؟" - -#~ msgid "Failed to export configuration" -#~ msgstr "فشل تصدير الإعدادات" - -#~ msgid "Failed to save file %s" -#~ msgstr "فشل حفظ الملف %s" - -#~ msgid "65536" -#~ msgstr "65536" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "مثال: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "C_A file:" -#~ msgstr "_ملفّ CA:" - -#~ msgid "Co_nnection type:" -#~ msgstr "_نوع الإتصال:" - -#~ msgid "Connection na_me:" -#~ msgstr "ا_سم الإتصال:" - -#~ msgid "Import _Saved Configuration..." -#~ msgstr "ا_ستورد اعدادات محفوظة..." - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "الإ_سم المستخدم لتعريف الإتصال للشبكة الخاصة، مثلا: \"Campus VPN\" أو " -#~ "\"Corporate Network\"" - -#~ msgid "Network" -#~ msgstr "شبكة" - -#~ msgid "Only use _VPN connection for these addresses:" -#~ msgstr "استخدم _فقط اتصالات VPN لهذه العناوين:" - -#~ msgid "OpenVPN Configuration" -#~ msgstr "اعدادات OpenVPN" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "من فضلك أدخل المعلومات التي وفرها مدير نظامك بأسفل. لا تدخل كلمة السر هنا " -#~ "حيث أنك ستسأل عنها عند الإتصال." - -#~ msgid "" -#~ "Please note that the file you import is not an OpenVPN configuration " -#~ "file. Ask your administrator for the file." -#~ msgstr "" -#~ "من فضلك لا حظ أن الملف الذي استوردته ليس ملف إعدادات OpenVPN. اسأل مدير " -#~ "نظامك عن الملف." - -#~ msgid "Shared _key:" -#~ msgstr "مف_تاح مشترَك:" - -#~ msgid "TLS-Auth" -#~ msgstr "TLS-Auth" - -#~ msgid "Use _TLS auth:" -#~ msgstr "اس_تخدم توثيق TLS:" - -#~ msgid "Use cip_her:" -#~ msgstr "استخدم _شيفرة:" - -#~ msgid "" -#~ "X.509 Certificates\n" -#~ "Pre-shared key\n" -#~ "Password Authentication\n" -#~ "X.509 with Password Authentication" -#~ msgstr "" -#~ "شهادات X.509\n" -#~ "مفتاح قبل المُشاركة\n" -#~ "توثيق بكلمة سر\n" -#~ "X.509 مع توثيق بكلمة سر" - -#~ msgid "_0" -#~ msgstr "_0" - -#~ msgid "_1" -#~ msgstr "_1" - -#~ msgid "_Gateway address:" -#~ msgstr "عنوان ال_بوّابة:" - -#~ msgid "_Key:" -#~ msgstr "م_فتاح:" - -#~ msgid "_Local IP:" -#~ msgstr "IP م_حلًي:" - -#~ msgid "_Remote IP:" -#~ msgstr "IP الآخر:" - -#~ msgid "_none" -#~ msgstr "لا _شيء" - -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "أضِف، احذِف، و حرِّر اتصالات VPN" - -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "مدير اتصالت VPN (OpenVPN)" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "فشل ولوج VPN لأن اسم المستخدم أو كلمة السر لم تُقبل أو أن كلمة سر الشهادة " -#~ "كانت خطأ." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "فشل ولوج VPN لأن برنامج VPN لا يمكن بدأه." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "فشل ولوج VPN لأن برنامج VPN لا يمكنه الإتصال بخادم VPN." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "فشل ولوج VPN لأن خيارات اعدادات VPN غير صالحة." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "فشل ولوج VPN لأن برنامج VPN لم يتلقى اعدادات صالحة من خادم VPN." - -#~ msgid "VPN connection failed" -#~ msgstr "فشل اتصال VPN" - -#~ msgid "Connection Information" -#~ msgstr "معلومات الإتصال" - -#~ msgid "Username:" -#~ msgstr "اسم المستخدم:" - -#~ msgid "X.509" -#~ msgstr "X.509" - -#~ msgid "X.509/Pass" -#~ msgstr "X.509/Pass" - -#~ msgid "CA file:" -#~ msgstr "ملفّ CA:" - -#~ msgid "Optional" -#~ msgstr "خياري" diff --git a/vpn-daemons/openvpn/po/bg.po b/vpn-daemons/openvpn/po/bg.po deleted file mode 100644 index a07fb9d38a..0000000000 --- a/vpn-daemons/openvpn/po/bg.po +++ /dev/null @@ -1,490 +0,0 @@ -# Bulgarian translation of NetworkManager-openvpn po-file -# Copyright (C) 2007, 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager-openvpn package. -# Alexander Shopov , 2007, 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn trunk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-02 08:55+0300\n" -"PO-Revision-Date: 2008-08-01 07:31+0300\n" -"Last-Translator: Alexander Shopov \n" -"Language-Team: Bulgarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Парола:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Втора парола:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "Потребителско _име:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Домейн:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "_Анонимно свързване" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Свързване _като потребителя:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Запомняне на паролата за тази сесия" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "Запазване на паролата в клю_чодържателя" - -#: ../auth-dialog/main.c:187 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Трябва да се идентифицирате, за да ползвате ВЧМ „%s“." - -#: ../auth-dialog/main.c:188 -msgid "Authenticate VPN" -msgstr "Идентифициране пред ВЧМ" - -#: ../auth-dialog/main.c:201 -msgid "Certificate pass_word:" -msgstr "Парола за _сертификата:" - -#: ../auth-dialog/main.c:216 -msgid "Certificate password:" -msgstr "Парола за сертификата:" - -#: ../properties/auth-helpers.c:68 -msgid "Choose a Certificate Authority certificate..." -msgstr "Изберете сертификата на сертифициращата организация…" - -#: ../properties/auth-helpers.c:87 -msgid "Choose your personal certificate..." -msgstr "Изберете личния си сертификат…" - -#: ../properties/auth-helpers.c:105 -msgid "Choose your private key..." -msgstr "Изберете личния си ключ…" - -#: ../properties/auth-helpers.c:158 -msgid "Choose an OpenVPN static key..." -msgstr "Изберете статичния ключ на OpenVPN…" - -#: ../properties/auth-helpers.c:176 ../properties/auth-helpers.c:886 -msgid "None" -msgstr "Няма" - -#: ../properties/auth-helpers.c:519 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "Сертификати във формат PEM (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:579 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Статични ключове за OpenVPN (*.key)" - -#: ../properties/auth-helpers.c:711 -msgid "Default" -msgstr "Стандартно" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Съвместим със сървърите за OpenVPN." - -#: ../properties/nm-openvpn.c:308 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Сертификати (TLS)" - -#: ../properties/nm-openvpn.c:320 -msgid "Password" -msgstr "Парола" - -#: ../properties/nm-openvpn.c:334 -msgid "Password with Certificates (TLS)" -msgstr "Парола със сертификати (TLS)" - -#: ../properties/nm-openvpn.c:346 -msgid "Static Key" -msgstr "Статичен ключ" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Идентификация" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Общи" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Ако се използва посока на ключа, тя трябва да е обратната на използваната " -"от отсрещната страна по ВЧМ. Например — ако тя ползва „1“, тази връзка " -"трябва да ползва „0“. Ако не сте сигурни, попитайте системния си " -"администратор." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "_Допълнителни…" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Сертификат на сертифициращата организация:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Шифър:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Общи" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Посока на ключа:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Файл-ключ:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "OpenVPN Advanced Options" -msgstr "Допълнителни настройки на OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Private Key:" -msgstr "Частен ключ:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Static Key:" -msgstr "Статичен ключ:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Type:" -msgstr "Вид:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Use L_ZO data compression" -msgstr "Използване на _компресия LZO" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Use a TA_P device" -msgstr "Използване на _устройство TAP" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Use a _TCP connection" -msgstr "Използване на _връзка по TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use additional TLS authentication" -msgstr "Използване на допълнителна идентификация с TLS" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use custom gateway p_ort:" -msgstr "_Потребителски порт на шлюза:" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "User Certificate:" -msgstr "Потребителски сертификат:" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "User name:" -msgstr "Потребителско име:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "_Gateway:" -msgstr "_Шлюз:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "gtk-cancel" -msgstr "gtk-отмяна" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "gtk-ok" -msgstr "gtk-добре" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "page 1" -msgstr "страница 1" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "page 2" -msgstr "страница 2" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "page 3" -msgstr "страница 3" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "page 4" -msgstr "страница 4" - -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "Добавяне, изтриване и редактиране на връзки към ВЧМ" - -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "Управление на връзките към ВЧМ (за OpenVPN)" - -#~ msgid "The following OpenVPN connection will be created:" -#~ msgstr "Ще бъде създадена следната връзка чрез OpenVPN:" - -#~ msgid "Name: %s" -#~ msgstr "Име: „%s“" - -#~ msgid "Connection Type: X.509 Certificates" -#~ msgstr "Вид на връзката: сертификат по X.509" - -#~ msgid "CA: %s" -#~ msgstr "Серт. орг.: %s" - -#~ msgid "Cert: %s" -#~ msgstr "Серт.: %s" - -#~ msgid "Key: %s" -#~ msgstr "Ключ: %s" - -#~ msgid "Connection Type: Shared Key" -#~ msgstr "Вид на връзката: споделен ключ" - -#~ msgid "Shared Key: %s" -#~ msgstr "Споделен ключ: %s" - -#~ msgid "Local IP: %s" -#~ msgstr "Локален адрес: %s" - -#~ msgid "Remote IP: %s" -#~ msgstr "Отдалечен адрес: %s" - -#~ msgid "Connection Type: Password" -#~ msgstr "Вид на връзката: парола" - -#~ msgid "Username: %s" -#~ msgstr "Потребителско име: %s" - -#~ msgid "Connection Type: X.509 with Password Authentication" -#~ msgstr "Вид на връзката: X.509 с парола" - -#~ msgid "Remote: %s" -#~ msgstr "Отдалечен хост: %s" - -#~ msgid "Port: %s" -#~ msgstr "Порт: %s" - -#~ msgid "Device: %s" -#~ msgstr "Устройство: %s" - -#~ msgid "TAP" -#~ msgstr "TAP" - -#~ msgid "TUN" -#~ msgstr "TUN" - -#~ msgid "Protocol: %s" -#~ msgstr "Протокол: %s" - -#~ msgid "TCP" -#~ msgstr "TCP" - -#~ msgid "UDP" -#~ msgstr "UDP" - -#~ msgid "Routes: %s" -#~ msgstr "Маршрути: %s" - -#~ msgid "Use LZO Compression: %s" -#~ msgstr "Използване на компресия LZO: %s" - -#~ msgid "Yes" -#~ msgstr "да" - -#~ msgid "No" -#~ msgstr "не" - -#~ msgid "TLS auth: %s %s" -#~ msgstr "Ползване на TLS: %s %s" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "" -#~ "Настройките на връзката могат да се редактират с бутона „Редактиране“." - -#~ msgid "Cannot import settings" -#~ msgstr "Настройките не могат да бъдат внесени." - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "Файлът с настройки за ВЧМ „%s“ не съдържа валидни данни." - -#~ msgid "Select file to import" -#~ msgstr "Избор на файл за внасяне" - -#~ msgid "Select CA to use" -#~ msgstr "Избор на сертифицираща организация" - -#~ msgid "Select certificate to use" -#~ msgstr "Избор на сертификат" - -#~ msgid "Select key to use" -#~ msgstr "Избор на ключ" - -#~ msgid "Select shared key to use" -#~ msgstr "Избор на споделен ключ" - -#~ msgid "Select TA to use" -#~ msgstr "Избор на TA" - -#~ msgid "Save as..." -#~ msgstr "Запазване като…" - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Файл с име „%s“ вече съществува." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Искате ли да го презапишете?" - -#~ msgid "Failed to export configuration" -#~ msgstr "Неуспех при изнасяне на настройките" - -#~ msgid "Failed to save file %s" -#~ msgstr "Неуспех при запазването на файла „%s“" - -#~ msgid "0" -#~ msgstr "0" - -#~ msgid "1" -#~ msgstr "1" - -#~ msgid "Connection Information" -#~ msgstr "Информация за връзката" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "например: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "CA file:" -#~ msgstr "Файл за сертифициращите организации:" - -#~ msgid "CA file:" -#~ msgstr "Файл за сертифициращите организации:" - -#~ msgid "Connection Name" -#~ msgstr "Име на връзката" - -#~ msgid "Connection Type:" -#~ msgstr "Вид на връзката:" - -#~ msgid "Local IP:" -#~ msgstr "Локален адрес:" - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Име, което се ползва за различаването на връзката към частната мрежа, " -#~ "напр. „Корпоративна мрежа“." - -#~ msgid "Optional" -#~ msgstr "Незадължителна" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Въведете отдолу информацията предоставена от системния ви администратор. " -#~ "Не въвеждайте паролата си. За нея ще бъдете запитани при свързване." - -#~ msgid "" -#~ "Please note that the file you import is not an OpenVPN configuration " -#~ "file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "Файлът, който се опитахте да внесете, не е конфигурационен файл за " -#~ "OpenVPN. Помолете системния си администратор за такъв файл." - -#~ msgid "Remote IP:" -#~ msgstr "Отдалечен адрес:" - -#~ msgid "Shared key" -#~ msgstr "Споделен ключ" - -#~ msgid "Use TLS auth:" -#~ msgstr "Използване на TLS:" - -#~ msgid "Use cipher:" -#~ msgstr "Ползване на шифриране:" - -#~ msgid "X.509" -#~ msgstr "X.509" - -#~ msgid "" -#~ "X.509 Certificates\n" -#~ "Pre-shared key\n" -#~ "Password Authentication\n" -#~ "X.509 with Password Authentication" -#~ msgstr "" -#~ "Сертификат по X.509\n" -#~ "Споделен ключ\n" -#~ "Парола\n" -#~ "X.509 с парола" - -#~ msgid "X.509/Pass" -#~ msgstr "X.509/Парола" - -#~ msgid "_Gateway Address:" -#~ msgstr "Адрес на _шлюза:" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "_Внасяне на запазени настройки…" - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "Да се използва само връзката през _ВЧМ за тези адреси" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "Неуспешно свързване към ВЧМ — името или паролата са отхвърлени или " -#~ "паролата за сертификата е неправилна." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "Неуспешно свързване към ВЧМ — програмата за ВЧМ не може да бъде " -#~ "стартирана." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "Неуспешно свързване към ВЧМ — програмата за ВЧМ не успя да се свърже със " -#~ "сървъра за ВЧМ." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "Неуспешно свързване към ВЧМ — настройките на ВЧМ са грешни." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "Неуспешно свързване към ВЧМ — програмата за ВЧМ получи грешни настройки " -#~ "от сървъра за ВЧМ." - -#~ msgid "VPN connection failed" -#~ msgstr "Неуспешно свързване към ВЧМ" diff --git a/vpn-daemons/openvpn/po/ca.po b/vpn-daemons/openvpn/po/ca.po deleted file mode 100644 index 15ca2af1e1..0000000000 --- a/vpn-daemons/openvpn/po/ca.po +++ /dev/null @@ -1,485 +0,0 @@ -# Catalan translations for NetworkManager package -# Traduccions al català del paquet «NetworkManager». -# Copyright © 2006 The Free Software Foundaton, Inc. -# This file is distributed under the same license as the -# NetworkManager package. -# Josep Puigdemont Casamajó , 2006. -# Gil Forcada , 2006, 2007, 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-28 16:37+0100\n" -"PO-Revision-Date: 2008-02-28 16:33+0100\n" -"Last-Translator: Gil Forcada \n" -"Language-Team: Catalan \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Contrasenya:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "Contrasenya _secundària:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "Nom d'_usuari:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domini:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Connecta _anònimament" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Connecta com a _usuari:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Recorda la contrasenya per aquesta sessió" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Desa la contrasenya a l'anell de claus" - -#: ../auth-dialog/main.c:181 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Us heu d'autenticar per poder accedir a la xarxa privada virtual «%s»." - -#: ../auth-dialog/main.c:182 -msgid "Authenticate VPN" -msgstr "Autentica la VPN" - -#: ../auth-dialog/main.c:195 -msgid "Certificate pass_word:" -msgstr "Contrasenya del _certificat:" - -#: ../auth-dialog/main.c:210 -msgid "Certificate password:" -msgstr "Contrasenya del certificat:" - -#: ../properties/nm-openvpn.c:150 -msgid "OpenVPN Client" -msgstr "Client OpenVPN" - -#: ../properties/nm-openvpn.c:814 -msgid "The following OpenVPN connection will be created:" -msgstr "Es crearà la següent connexió OpenVPN:" - -#: ../properties/nm-openvpn.c:816 -#, c-format -msgid "Name: %s" -msgstr "Nom: %s" - -#: ../properties/nm-openvpn.c:824 -msgid "Connection Type: X.509 Certificates" -msgstr "Tipus de connexió: Certifcats X.509" - -#: ../properties/nm-openvpn.c:827 ../properties/nm-openvpn.c:854 -#: ../properties/nm-openvpn.c:866 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:830 ../properties/nm-openvpn.c:869 -#, c-format -msgid "Cert: %s" -msgstr "Certificat: %s" - -#: ../properties/nm-openvpn.c:833 ../properties/nm-openvpn.c:872 -#, c-format -msgid "Key: %s" -msgstr "Clau: %s" - -#: ../properties/nm-openvpn.c:837 -msgid "Connection Type: Shared Key" -msgstr "Tipus de connexió: Clau compartida" - -#: ../properties/nm-openvpn.c:840 -#, c-format -msgid "Shared Key: %s" -msgstr "Clau compartida: %s" - -#: ../properties/nm-openvpn.c:843 -#, c-format -msgid "Local IP: %s" -msgstr "IP local: %s" - -#: ../properties/nm-openvpn.c:846 -#, c-format -msgid "Remote IP: %s" -msgstr "IP remota: %s" - -#: ../properties/nm-openvpn.c:851 -msgid "Connection Type: Password" -msgstr "Tipus de connexió: Contrasenya" - -#: ../properties/nm-openvpn.c:857 ../properties/nm-openvpn.c:875 -#, c-format -msgid "Username: %s" -msgstr "Nom d'usuari: %s" - -#: ../properties/nm-openvpn.c:863 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Tipus de connexió: X.509 amb autenticació de contrasenya" - -#: ../properties/nm-openvpn.c:881 -#, c-format -msgid "Remote: %s" -msgstr "Remot: %s" - -#: ../properties/nm-openvpn.c:884 -#, c-format -msgid "Port: %s" -msgstr "Port: %s" - -#: ../properties/nm-openvpn.c:887 -#, c-format -msgid "Device: %s" -msgstr "Dispositiu: %s" - -#: ../properties/nm-openvpn.c:887 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:887 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:890 -#, c-format -msgid "Protocol: %s" -msgstr "Protocol: %s" - -#: ../properties/nm-openvpn.c:890 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:890 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:894 -#, c-format -msgid "Routes: %s" -msgstr "Rutes: %s" - -#: ../properties/nm-openvpn.c:898 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Utilitza compressió LZO: %s" - -#: ../properties/nm-openvpn.c:898 -msgid "Yes" -msgstr "Sí" - -#: ../properties/nm-openvpn.c:898 -msgid "No" -msgstr "No" - -#: ../properties/nm-openvpn.c:902 -#, c-format -msgid "Cipher: %s" -msgstr "Xifratge: %s" - -#: ../properties/nm-openvpn.c:907 -#, c-format -msgid "TLS auth: %s %s" -msgstr "Autenticació TLS: %s %s" - -#: ../properties/nm-openvpn.c:911 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Els detalls de la connexió es poden canviar amb el botó «Edita»." - -#: ../properties/nm-openvpn.c:1141 -msgid "Cannot import settings" -msgstr "No s'han pogut importar els paràmetres" - -#: ../properties/nm-openvpn.c:1143 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "El fitxer de paràmetres VPN «%s», no conté dades vàlides." - -#: ../properties/nm-openvpn.c:1190 -msgid "Select file to import" -msgstr "Seleccioneu el fitxer a importar" - -#: ../properties/nm-openvpn.c:1249 ../properties/nm-openvpn.c:1261 -#: ../properties/nm-openvpn.c:1264 -msgid "Select CA to use" -msgstr "Seleccioneu la CA a utilitzar" - -#: ../properties/nm-openvpn.c:1252 ../properties/nm-openvpn.c:1267 -msgid "Select certificate to use" -msgstr "Seleccioneu el certificat a utilitzar" - -#: ../properties/nm-openvpn.c:1255 ../properties/nm-openvpn.c:1270 -msgid "Select key to use" -msgstr "Seleccioneu la clau a utilitzar" - -#: ../properties/nm-openvpn.c:1258 -msgid "Select shared key to use" -msgstr "Seleccioneu la clau compartida a utilitzar" - -#: ../properties/nm-openvpn.c:1273 -msgid "Select TA to use" -msgstr "Seleccioneu la TA a utilitzar" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1515 -msgid "Save as..." -msgstr "Anomena i desa..." - -#: ../properties/nm-openvpn.c:1544 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Ja existeix un fitxer anomenat «%s»." - -#: ../properties/nm-openvpn.c:1547 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Voleu reemplaçar-lo pel que voleu desar?" - -#: ../properties/nm-openvpn.c:1561 -msgid "Failed to export configuration" -msgstr "No s'ha pogut exportar la configuració" - -#: ../properties/nm-openvpn.c:1563 -#, c-format -msgid "Failed to save file %s" -msgstr "No s'ha pogut desar el fitxer %s" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(Predeterminat: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "65536" -msgstr "65536" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "exemple: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Ad_vanced" -msgstr "A_vançat" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "C_A file:" -msgstr "Fitxer C_A:" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "C_ertificate:" -msgstr "C_ertificat:" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Co_nnection type:" -msgstr "Tipus de co_nnexió:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Connection na_me:" -msgstr "No_m de la connexió:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Direction:" -msgstr "Direcció:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Import _Saved Configuration..." -msgstr "Importa una configuració de_sada..." - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"_Nom utilitzat per identificar la connexió a la xarxa privada, per exemple " -"«VPN del Campus» o «Xarxa Corporativa»" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Network" -msgstr "Xarxa" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Only use _VPN connection for these addresses:" -msgstr "_Fes servir només la connexió VPN per a aquestes adreces:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "Opcions avançades de l'OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "OpenVPN Configuration" -msgstr "Configuració de l'OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Entreu la informació proporcionada pel vostre administrador de sistema. No " -"hi entreu la vostra contrasenya, ja es demanarà en connectar." - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" -"El fitxer que heu importat no és un fitxer de configuració OpenVPN. Demaneu-" -"li el fitxer a l'administrador." - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared _key:" -msgstr "_Clau compartida:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "TLS-Auth" -msgstr "Autenticació TLS" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO compression" -msgstr "Utilitza la compressió L_ZO" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TA_P device" -msgstr "Utilitza un dispositiu TA_P" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use _TCP connection" -msgstr "Utilitza una connexió _TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use _TLS auth:" -msgstr "Utilitza autenticació _TLS:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cip_her:" -msgstr "Utilitza _xifratge:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"Certificats X.509\n" -"Clau pre-compartida\n" -"Autenticació de contrasenya\n" -"X.509 amb autenticació de contrasenya" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "_0" -msgstr "_0" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "_1" -msgstr "_1" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway address:" -msgstr "A_dreça de la passarel·la:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Gateway port:" -msgstr "_Port de la passarel·la:" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Key:" -msgstr "_Clau:" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Local IP:" -msgstr "IP _local:" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "_Remote IP:" -msgstr "IP _remota:" - -#: ../properties/nm-openvpn-dialog.glade.h:36 -msgid "_User name:" -msgstr "Nom d'_usuari:" - -#: ../properties/nm-openvpn-dialog.glade.h:37 -msgid "_none" -msgstr "_cap" - -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "Afegiu, suprimiu, i editeu connexions VPN" - -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "Gestor de connexions VPN (OpenVPN)" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "No s'ha pogut connectar a la VPN perquè no s'han acceptat el nom " -#~ "d'usuari, o la contrasenya o la contrasenya certificada és errònia.\"" - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "No s'ha pogut connectar a la VPN perquè no s'ha pogut iniciar l'aplicació " -#~ "VPN." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "No s'ha pogut connectar a la VPN perquè l'aplicació VPN no s'ha pogut " -#~ "connectar al servidor VPN." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "No s'ha pogut connectar a la VPN perquè les opcions de configuració de la " -#~ "VPN eren erronis." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "No s'ha pogut connectar a la VPN perquè l'aplicació VPN ha rebut una " -#~ "configuració errònia del servidor VPN." - -#~ msgid "VPN connection failed" -#~ msgstr "Ha fallat la connexió VPN" - -#~ msgid "Connection Information" -#~ msgstr "Informació de la connexió" - -#~ msgid "Connection Name" -#~ msgstr "Nom de la connexió" - -#~ msgid "Password" -#~ msgstr "Contrasenya" - -#~ msgid "Shared Key:" -#~ msgstr "Clau compartida:" - -#~ msgid "Username:" -#~ msgstr "Nom d'usuari:" - -#~ msgid "X.509" -#~ msgstr "X.509" - -#~ msgid "X.509/Pass" -#~ msgstr "X.509/Contrasenya" - -#~ msgid "Required" -#~ msgstr "Necessari" - -#~ msgid "CA file:" -#~ msgstr "Fitxer CA:" - -#~ msgid "Optional" -#~ msgstr "Opcional" diff --git a/vpn-daemons/openvpn/po/cs.po b/vpn-daemons/openvpn/po/cs.po deleted file mode 100644 index 7e75c40edf..0000000000 --- a/vpn-daemons/openvpn/po/cs.po +++ /dev/null @@ -1,221 +0,0 @@ -# Czech translation of NetworkManager-openvpn. -# Copyright (C) 2008 the author(s) of NetworkManager-openvpn. -# This file is distributed under the same license as the NetworkManager-openvpn package. -# Jakub Friedl , 2006. -# Jiří Eischmann , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-17 22:14+0200\n" -"PO-Revision-Date: 2008-09-16 13:07+0100\n" -"Last-Translator: Jiří Eischmann \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Heslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Sekundární heslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Uživ. jméno:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Doména:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Připojit _anonymně" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Připojit jako _uživatel:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Zapamatovat heslo pro toto sezení" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Uložit heslo do svazku klíčů" - -#: ../auth-dialog/main.c:210 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Pro přístup do VPN '%s' se musíte autentizovat." - -#: ../auth-dialog/main.c:211 -msgid "Authenticate VPN" -msgstr "Ověřování VPN" - -#: ../auth-dialog/main.c:232 -msgid "Certificate pass_word:" -msgstr "Heslo _certifikátu:" - -#: ../auth-dialog/main.c:246 -msgid "Certificate password:" -msgstr "Heslo certifikátu:" - -#: ../properties/auth-helpers.c:69 -msgid "Choose a Certificate Authority certificate..." -msgstr "Zvolit certifikát certifikační autority..." - -#: ../properties/auth-helpers.c:88 -msgid "Choose your personal certificate..." -msgstr "Zvolit váš osobní certifikát..." - -#: ../properties/auth-helpers.c:106 -msgid "Choose your private key..." -msgstr "Zvolit váš osobní klíč..." - -#: ../properties/auth-helpers.c:159 -msgid "Choose an OpenVPN static key..." -msgstr "Zvolit statický klíč OpenVPN..." - -#: ../properties/auth-helpers.c:183 ../properties/auth-helpers.c:862 -msgid "None" -msgstr "Žádný" - -#: ../properties/auth-helpers.c:518 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "Certifikáty PEM (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:578 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Statické klíče OpenVPN (*.key)" - -#: ../properties/auth-helpers.c:689 -msgid "Default" -msgstr "Výchozí" - -#: ../properties/nm-openvpn.c:52 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:53 -msgid "Compatible with the OpenVPN server." -msgstr "Kompatibilní s OpenVPN serverem." - -#: ../properties/nm-openvpn.c:310 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Certifikáty (TLS)" - -#: ../properties/nm-openvpn.c:322 -msgid "Password" -msgstr "Heslo" - -#: ../properties/nm-openvpn.c:336 -msgid "Password with Certificates (TLS)" -msgstr "Heslo s certifikáty (TLS)" - -#: ../properties/nm-openvpn.c:348 -msgid "Static Key" -msgstr "Statický klíč" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Autentizace" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Obecné" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Pokud se používá směr klíče, musí být opačný k VPN protějšku. Například, " -"když protějšek používá '1', toto připojení musí použít '0'. Pokud si nejste " -"jisti, jakou hodnotu použít, kontaktujte administrátora svého systému." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "P_okročilé..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Certifikát CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Šifra:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Obecné" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Směr klíče:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Soubor klíče:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "Lokální IP adresa:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "Pokročilé volby OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Private Key:" -msgstr "Soukromý klíč:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Static Key:" -msgstr "Statický klíč:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Type:" -msgstr "Typ:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Use L_ZO data compression" -msgstr "Použít kompresi L_ZO" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Use a TA_P device" -msgstr "Použít TA_P zařízení" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use a _TCP connection" -msgstr "Použít _TCP spojení" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use additional TLS authentication" -msgstr "Použít dodatečnou autentizaci TLS" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use custom gateway p_ort:" -msgstr "P_oužít vlastní port brány:" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "User Certificate:" -msgstr "Uživatelský certifikát:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "User name:" -msgstr "Uživatelské jméno:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "_Gateway:" -msgstr "_Brána:" diff --git a/vpn-daemons/openvpn/po/da.po b/vpn-daemons/openvpn/po/da.po deleted file mode 100644 index 0c18c8fa90..0000000000 --- a/vpn-daemons/openvpn/po/da.po +++ /dev/null @@ -1,427 +0,0 @@ -# Danish translation of NetworkManager-openvpn -# Copyright (C) 2005-2007 -# This file is distributed under the same license as the NetworkManager-openvpn package. -# David Zeuthen , 2005. -# Lasse Bang Mikkelsen , 2006, 07. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-13 20:58+0100\n" -"PO-Revision-Date: 2007-02-13 21:04+0100\n" -"Last-Translator: Lasse Bang Mikkelsen \n" -"Language-Team: Danish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Adgangskode:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Sekundær adgangskode:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Brugernavn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domæne:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Tilslut _anonymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Tilslut som _bruger:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Husk adgangskode for denne session" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Gem adgangskode i nøglering" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Brugerverifikation er påkrævet for at tilslutte til det virtuelle private netværk '%s'." - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "VPN-brugerverifikation" - -#: ../auth-dialog/main.c:227 -msgid "Certificate pass_word:" -msgstr "Certifikat-adgangskode:" - -#: ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "Certifikat-adgangskode:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Tilføj, fjern og redigér VPN-forbindelser" - -# -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "VPN-forbindelser (OpenVPN)" - -#: ../properties/nm-openvpn.c:130 -msgid "OpenVPN Client" -msgstr "OpenVPN-klient" - -#: ../properties/nm-openvpn.c:729 -msgid "The following OpenVPN connection will be created:" -msgstr "Følgende OpenVPN-forbindelse vil blive oprettet:" - -#: ../properties/nm-openvpn.c:731 -#, c-format -msgid "Name: %s" -msgstr "Navn: %s" - -#: ../properties/nm-openvpn.c:739 -msgid "Connection Type: X.509 Certificates" -msgstr "Forbindelsestype: X.509-certifikater" - -#: ../properties/nm-openvpn.c:742 -#: ../properties/nm-openvpn.c:769 -#: ../properties/nm-openvpn.c:781 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:745 -#: ../properties/nm-openvpn.c:784 -#, c-format -msgid "Cert: %s" -msgstr "Cert: %s" - -#: ../properties/nm-openvpn.c:748 -#: ../properties/nm-openvpn.c:787 -#, c-format -msgid "Key: %s" -msgstr "Nøgle: %s" - -#: ../properties/nm-openvpn.c:752 -msgid "Connection Type: Shared Key" -msgstr "Forbindelsestype: Delt nøgle" - -#: ../properties/nm-openvpn.c:755 -#, c-format -msgid "Shared Key: %s" -msgstr "Delt nøgle: %s" - -#: ../properties/nm-openvpn.c:758 -#, c-format -msgid "Local IP: %s" -msgstr "Lokal IP: %s" - -#: ../properties/nm-openvpn.c:761 -#, c-format -msgid "Remote IP: %s" -msgstr "Fjern IP: %s" - -#: ../properties/nm-openvpn.c:766 -msgid "Connection Type: Password" -msgstr "Forbindelsestype: Adgangskode" - -#: ../properties/nm-openvpn.c:772 -#: ../properties/nm-openvpn.c:790 -#, c-format -msgid "Username: %s" -msgstr "Brugernavn: %s" - -#: ../properties/nm-openvpn.c:778 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Forbindelsestype: X.509 med adgangskode-godkendelse" - -#: ../properties/nm-openvpn.c:796 -#, c-format -msgid "Remote: %s" -msgstr "Fjern: %s" - -#: ../properties/nm-openvpn.c:799 -#, c-format -msgid "Device: %s" -msgstr "Enhed: %s" - -#: ../properties/nm-openvpn.c:799 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:799 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:802 -#, c-format -msgid "Protocol: %s" -msgstr "Protokol: %s" - -#: ../properties/nm-openvpn.c:802 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:802 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:806 -#, c-format -msgid "Routes: %s" -msgstr "Ruter: %s" - -#: ../properties/nm-openvpn.c:810 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Brug LZO-komprimering: %s" - -#: ../properties/nm-openvpn.c:810 -msgid "Yes" -msgstr "Ja" - -#: ../properties/nm-openvpn.c:810 -msgid "No" -msgstr "Nej" - -#: ../properties/nm-openvpn.c:814 -#, c-format -msgid "Cipher: %s" -msgstr "Kode: %s" - -#: ../properties/nm-openvpn.c:819 -#, c-format -msgid "TLS auth: %s %s" -msgstr "TLS-godkendelse: %s %s" - -#: ../properties/nm-openvpn.c:823 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Forbindelsens detaljer kan ændres ved at bruge knappen \"Redigér\"." - -#: ../properties/nm-openvpn.c:1003 -msgid "Cannot import settings" -msgstr "Kan ikke importere opsætning" - -#: ../properties/nm-openvpn.c:1005 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "VPN-opsætningsfilen '%s' indeholder ikke gyldige data." - -#: ../properties/nm-openvpn.c:1042 -msgid "Select file to import" -msgstr "Vælg fil der skal importeres" - -#: ../properties/nm-openvpn.c:1122 -#: ../properties/nm-openvpn.c:1134 -msgid "Select CA to use" -msgstr "Vælg CA der skal bruges" - -#: ../properties/nm-openvpn.c:1125 -msgid "Select certificate to use" -msgstr "Vælg certifikat der skal bruges" - -#: ../properties/nm-openvpn.c:1128 -msgid "Select key to use" -msgstr "Vælg nøgle der skal bruges" - -#: ../properties/nm-openvpn.c:1131 -msgid "Select shared key to use" -msgstr "Vælg delt nøgle der skal bruges" - -#: ../properties/nm-openvpn.c:1137 -msgid "Select TA to use" -msgstr "Vælg TA der skal bruges" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1326 -msgid "Save as..." -msgstr "Gem som..." - -#: ../properties/nm-openvpn.c:1356 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "En fil med navnet \"%s\" eksisterer allerede." - -#: ../properties/nm-openvpn.c:1359 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Vil du erstatte den med den du gemmer?" - -#: ../properties/nm-openvpn.c:1373 -msgid "Failed to export configuration" -msgstr "Kunne ikke eksportere konfiguration" - -#: ../properties/nm-openvpn.c:1375 -#, c-format -msgid "Failed to save file %s" -msgstr "Kunne ikke gemme filen %s" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "0" -msgstr "0" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "1" -msgstr "1" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "Connection Name" -msgstr "Navn på forbindelse" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Optional Information" -msgstr "Valgfrie oplysninger" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Required Information" -msgstr "Påkrævede oplysninger" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "eksempel: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "CA file:" -msgstr "CA-fil:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "CA file:" -msgstr "CA-fil:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Certificate:" -msgstr "Certifikat:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Connection Type:" -msgstr "Forbindelsestype:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Direction:" -msgstr "Retning:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Key:" -msgstr "Nøgle:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Local IP:" -msgstr "Lokal IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password" -msgstr "Adgangskode:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting." -msgstr "Indtast oplysninger fra din systemadministrator nedenfor. Du skal ikke indtaste din adgangskode her, da du bliver spurgt om den ved tilslutning." - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Please note that the file you import is not an OpenVPN configuration file. Ask your administrator for the file." -msgstr "Bemærk venligst at filen du importerer ikke er en OpenVPN-konfigurationsfil. Spørg din administrator efter filen." - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Remote IP:" -msgstr "Fjern IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared Key:" -msgstr "Delt nøgle:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Shared key" -msgstr "Delt nøgle" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use LZO compression" -msgstr "Brug LZO-komprimering" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TAP device" -msgstr "Brug TAP-enhed" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use TCP connection" -msgstr "Brug TCP-forbindelse" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use TLS auth:" -msgstr "Brug TLS-godkendelse:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cipher:" -msgstr "Brug kode:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Username:" -msgstr "Brugernavn:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "X.509" -msgstr "X.509" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"X.509-certifikater\n" -"Forhåndsdelt nøgle\n" -"Adgangskode-godkendelse\n" -"X.509 med adgangskode-godkendelse" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway:" -msgstr "Ad_gangspunkt:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Import Saved Configuration..." -msgstr "_Importér gemt konfiguration..." - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "_Navn brugt til at identificere forbindelsen til det private netværk, f.eks. \"Universitetets VPN\" eller \"Virksomhedens netværk\"" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Only use VPN connection for these addresses" -msgstr "_Brug kun VPN-forbindelse til flg. adresser" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "none" -msgstr "ingen" - -#: ../src/nm-openvpn-service.c:127 -msgid "The VPN login failed because the user name and password were not accepted or the certificate password was wrong." -msgstr "VPN-tjenesten fejlede fordi brugernavn og adgangskode blev afvist eller certifikat-adgangskoden var forkert." - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "VPN-tjenesten fejlede fordi VPN-programmet ikke kunne startes." - -#: ../src/nm-openvpn-service.c:131 -msgid "The VPN login failed because the VPN program could not connect to the VPN server." -msgstr "VPN-tjenesten fejlede fordi VPN-programmet ikke kunne forbinde til VPN-serveren." - -#: ../src/nm-openvpn-service.c:133 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "VPN-tjenesten fejlede fordi VPN-konfigurationen var ugyldig." - -#: ../src/nm-openvpn-service.c:135 -msgid "The VPN login failed because the VPN program received an invalid configuration from the VPN server." -msgstr "VPN-tjenesten fejlede fordi VPN-programmet modtog en ugyldig konfiguration fra VPN-serveren." - -# -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "VPN-forbindelsen fejlede" - diff --git a/vpn-daemons/openvpn/po/de.po b/vpn-daemons/openvpn/po/de.po deleted file mode 100644 index 28d4c189d5..0000000000 --- a/vpn-daemons/openvpn/po/de.po +++ /dev/null @@ -1,243 +0,0 @@ -# German translation of NetworkManager-OpenVPN. -# Copyright (C) 2005 Dan Williams -# This file is distributed under the same license as the NetworkManager package. -# Thomas Gier , 2007. -# Hauke Mehrtens , 2008. -# Christian Kirbach , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-25 21:55+0100\n" -"PO-Revision-Date: 2008-10-24 00:11+0200\n" -"Last-Translator: Christian Kirbach \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Passwort:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Sekundäres Passwort:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Benutzername:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domäne:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "_Anonym verbinden" - -# CHECK ACCELERATOR -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Als _Benutzer verbinden:" - -# CHECK ACCELERATOR -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Passwort für dieser Sitzung behalten" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "Passwort im _Schlüsselbund speichern" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Sie müssen sich authentifizieren, um auf das Virtuelle Private Netz »%s« " -"zuzugreifen." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "VPN authentifizieren" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "Zertifikatspass_wort:" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Zertifikatspasswort:" - -#: ../properties/auth-helpers.c:160 -msgid "Choose a Certificate Authority certificate..." -msgstr "Zertifikat einer Zertifizierungsstelle auswählen..." - -#: ../properties/auth-helpers.c:179 -msgid "Choose your personal certificate..." -msgstr "Persönliches Zertifikat auswählen..." - -#: ../properties/auth-helpers.c:197 -msgid "Choose your private key..." -msgstr "Privaten Schlüssel auswählen..." - -#: ../properties/auth-helpers.c:250 -msgid "Choose an OpenVPN static key..." -msgstr "Statischen OpenVPN-Schlüssel auswählen..." - -# CHECK keine/keiner -#: ../properties/auth-helpers.c:274 ../properties/auth-helpers.c:992 -msgid "None" -msgstr "keine" - -#: ../properties/auth-helpers.c:654 -msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)" -msgstr "PEM-Zertifikate (*.pem, *.crt, *.key, *.cer)" - -#: ../properties/auth-helpers.c:714 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Statische OpenVPN-Schlüssel (*.key)" - -#: ../properties/auth-helpers.c:822 -msgid "Default" -msgstr "Vorgabe" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Kompatibel zum OpenVPN-Server" - -#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Zertifikate (TLS):" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Passwort" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Passwort und Zertifikate (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Statischer Schlüssel" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Authentifizierung" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Allgemein" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Falls eine Schlüsselrichtung verwendet wird, muss sie dem Gegenteil der " -"Gegenstelle entsprechen. Falls die Gegenstelle zum Beispiel »1« benutzt, muss " -"hier »0« gewählt werden. Sollten Sie sich nicht sicher sein, setzen Sie sich " -"mit Ihrem Systemadministrator in Verbindung." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "Er_weitert..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Zertifikat der Zertifizierungsstelle:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Chiffre:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Allgemein" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Schlüsselrichtung:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Schlüsseldatei:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "Lokale IP-Adresse:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "Erweiterte OpenVPN-Einstellungen" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password:" -msgstr "Passwort:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Private Key Password:" -msgstr "Passwort für prrivater Schlüssel:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Privater Schlüssel:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Show passwords" -msgstr "Passwort anzeigen" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Static Key:" -msgstr "Statischer Schlüssel:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Type:" -msgstr "Art:" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO data compression" -msgstr "L_ZO-Komprimierung verwenden" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use a TA_P device" -msgstr "TA_P-Gerät verwenden" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a _TCP connection" -msgstr "_TCP-Verbindung verwenden" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use additional TLS authentication" -msgstr "Zusätzliche TLS-Authentifizierung verwenden" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use custom gateway p_ort:" -msgstr "_Gateway-Port:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "User Certificate:" -msgstr "Zertifikat des Benutzers:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User name:" -msgstr "Benutzername:" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "_Gateway:" -msgstr "_Gateway:" - -#~ msgid "Ca Certificate:" -#~ msgstr "Zertifikat der Zertifizierungsstelle:" diff --git a/vpn-daemons/openvpn/po/dz.po b/vpn-daemons/openvpn/po/dz.po deleted file mode 100644 index c5612ab008..0000000000 --- a/vpn-daemons/openvpn/po/dz.po +++ /dev/null @@ -1,464 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: networkmanager-openvpn.networkmamager-0-6-0=release.pot\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-19 03:35+0000\n" -"PO-Revision-Date: 2007-03-19 15:41+0530\n" -"Last-Translator: sonam pelden \n" -"Language-Team: Dzongkha \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Poedit-Language: Dzongkha\n" -"X-Poedit-Country: Bhutan\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:148 -msgid "_Password:" -msgstr "ཆོག་ཡིག: (_P)" - -#: ../auth-dialog/gnome-two-password-dialog.c:149 -msgid "_Secondary Password:" -msgstr "གལ་ནད་ཆུང་བའི་ཆོག་ཡིག: (_S)" - -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Username:" -msgstr "ལག་ལེན་པའི་མིང་: (_U)" - -#: ../auth-dialog/gnome-two-password-dialog.c:274 -msgid "_Domain:" -msgstr "ཌོ་མེན་: (_D)" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect _anonymously" -msgstr "མིང་མེད་ཐོག་ལས་མཐུད།(_a)" - -#: ../auth-dialog/gnome-two-password-dialog.c:365 -msgid "Connect as _user:" -msgstr "ལག་ལེན་པ་བཟུམ་སྦེ་མཐུད:(_u)" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "ལཱ་ཡུན་འདི་གི་དོན་ལུ་ ཆོག་ཡིག་སེམས་ཁར་བཞག(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "ལྡེ་འཁོར་ནང་ ཆོག་ཡིག་སྲུངས་(_S)" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "བར་ཅུ་ཡལ་སྒེར་སྡེ་ཡོངས་འབྲེལ་'%s'འཛུལ་སྤྱོད་འབད་ནི་ལུ་ ཁྱོད་ཀྱིས་བདེན་བཤད་འབད་དགོ།" - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "ཝི་པི་ཨེན་བདེན་བཤད་འབད་" - -#: ../auth-dialog/main.c:227 -#: ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "ལག་ཁྱེལ་ཆོག་ཡིག:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ་ཁ་སྐོང་བརྐྱབ་ནི་རྩ་བསྐྲད་གཏང་ནི་དང་ཞུན་དག་འབད" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཛིན་སྐྱོང་པ(ཝི་པི་ཨེན་ཁ་ཕྱེ)" - -#: ../properties/nm-openvpn.c:146 -msgid "OpenVPN Client" -msgstr "ཝི་པི་ཨེན་ཁྱེ་བའི་ཞབས་ཏོག་" - -#: ../properties/nm-openvpn.c:803 -msgid "The following OpenVPN connection will be created:" -msgstr "འོག་གི་ཝི་པི་ཨེན་ཁ་ཕྱེ་བའི་མཐུད་ལམ་འདི་གསར་བསྐྲུན་འབད་ནི་ཨིན:" - -#: ../properties/nm-openvpn.c:805 -#, c-format -msgid "Name: %s" -msgstr "མིང་:%s" - -#: ../properties/nm-openvpn.c:813 -msgid "Connection Type: X.509 Certificates" -msgstr "མཐུད་ལམ་དབྱེ་བ: X.509 ལག་ཁྱེར་" - -#: ../properties/nm-openvpn.c:816 -#: ../properties/nm-openvpn.c:843 -#: ../properties/nm-openvpn.c:855 -#, c-format -msgid "CA: %s" -msgstr "སི་ཨེ: %s" - -#: ../properties/nm-openvpn.c:819 -#: ../properties/nm-openvpn.c:858 -#, c-format -msgid "Cert: %s" -msgstr "ངེས་ཅན: %s" - -#: ../properties/nm-openvpn.c:822 -#: ../properties/nm-openvpn.c:861 -#, c-format -msgid "Key: %s" -msgstr "ལྡེ་མིག: %s" - -#: ../properties/nm-openvpn.c:826 -msgid "Connection Type: Shared Key" -msgstr "མཐུད་ལམ་དབྱེ་བ: རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག་" - -#: ../properties/nm-openvpn.c:829 -#, c-format -msgid "Shared Key: %s" -msgstr "རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག་: %s" - -#: ../properties/nm-openvpn.c:832 -#, c-format -msgid "Local IP: %s" -msgstr "ཉེ་གནས་ཨའི་པི: %s" - -#: ../properties/nm-openvpn.c:835 -#, c-format -msgid "Remote IP: %s" -msgstr "ཐག་རིང་གི་ཨའི་པི: %s" - -#: ../properties/nm-openvpn.c:840 -msgid "Connection Type: Password" -msgstr "མཐུད་ལམ་དབྱེ་བ: ཆོག་ཡིག་" - -#: ../properties/nm-openvpn.c:846 -#: ../properties/nm-openvpn.c:864 -#, c-format -msgid "Username: %s" -msgstr "ལག་ལེན་པའི་མིང་: %s" - -#: ../properties/nm-openvpn.c:852 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "མཐུད་ལམ་དབྱེ་བ: X.509འདི་ཆོག་ཡིག་བདེན་བཤད་དང་ཅིག་ཁར་" - -#: ../properties/nm-openvpn.c:870 -#, c-format -msgid "Remote: %s" -msgstr "ཐག་རིང་གི: %s" - -#: ../properties/nm-openvpn.c:873 -#, c-format -msgid "Port: %s" -msgstr "འདྲེན་ལམ: %s" - -#: ../properties/nm-openvpn.c:876 -#, c-format -msgid "Device: %s" -msgstr "ཐབས་འཕྲུལ: %s" - -#: ../properties/nm-openvpn.c:876 -msgid "TAP" -msgstr "ཊི་ཨེ་པི་" - -#: ../properties/nm-openvpn.c:876 -msgid "TUN" -msgstr "ཊི་ཡུ་ཨེན་" - -#: ../properties/nm-openvpn.c:879 -#, c-format -msgid "Protocol: %s" -msgstr "གནད་སྤེལ་ལམ་ལུགས: %s" - -#: ../properties/nm-openvpn.c:879 -msgid "TCP" -msgstr "ཊི་སི་པི་" - -#: ../properties/nm-openvpn.c:879 -msgid "UDP" -msgstr "ཡུ་ཌི་པི་" - -#: ../properties/nm-openvpn.c:883 -#, c-format -msgid "Routes: %s" -msgstr "འགྲུལ་ལམ: %s" - -#: ../properties/nm-openvpn.c:887 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "ཨེལ་ཛེརཌི་ཨོ་ཨེབ་བཙུགས་ལག་ལེན་འཐབ: %s" - -#: ../properties/nm-openvpn.c:887 -msgid "Yes" -msgstr "ཨིན་" - -#: ../properties/nm-openvpn.c:887 -msgid "No" -msgstr "མེན་" - -#: ../properties/nm-openvpn.c:891 -#, c-format -msgid "Cipher: %s" -msgstr "གསང་ཡིག: %s" - -#: ../properties/nm-openvpn.c:896 -#, c-format -msgid "TLS auth: %s %s" -msgstr "ཊི་ཨེལ་ཨེསི་བདེན་བཤད: %s %s" - -#: ../properties/nm-openvpn.c:900 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "མཐུད་ལམ་རྒྱས་བཤད་ཚུ་ \"Edit\" ཨེབ་རྟ་ལག་ལེན་འཐབ་སྟེ་བསྒྱུར་བཅོས་འབད་ཚུགས།" - -#: ../properties/nm-openvpn.c:1124 -msgid "Cannot import settings" -msgstr "སྒྲིག་སྟངས་ཚུ་ནང་འདྲེན་འབད་མི་ཚུགས་" - -#: ../properties/nm-openvpn.c:1126 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "ཝི་པི་ཨེན་སྒྲིག་སྟངས་ཚུའི་ཡིག་སྣོད་'%s' དེ་གིས་ནུས་ཅན་གནས་སྡུད་གནས་ཏེ་མེདཔ་ཨིན།" - -#: ../properties/nm-openvpn.c:1173 -msgid "Select file to import" -msgstr "ནང་འདྲེན་འབད་ནི་ལུ་ཡིག་སྣོད་སེལ་འཐུ་འབད་" - -#: ../properties/nm-openvpn.c:1232 -#: ../properties/nm-openvpn.c:1244 -#: ../properties/nm-openvpn.c:1247 -msgid "Select CA to use" -msgstr "ལག་ལེན་འཐབ་ནི་ལུ་སི་ཨེ་སེལ་འཐུ་འབད་" - -#: ../properties/nm-openvpn.c:1235 -#: ../properties/nm-openvpn.c:1250 -msgid "Select certificate to use" -msgstr "ལག་ལེན་འཐབ་ནི་ལུ་ལག་ཁྱེར་སེལ་འཐུ་འབད་" - -#: ../properties/nm-openvpn.c:1238 -#: ../properties/nm-openvpn.c:1253 -msgid "Select key to use" -msgstr "ལག་ལེན་འཐབ་ནི་ལུ་ལྡེ་མིག་སེལ་འཐུ་འབད་" - -#: ../properties/nm-openvpn.c:1241 -msgid "Select shared key to use" -msgstr "ལག་ལེན་འཐབ་ནི་ལུ་རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག་སེལ་འཐུ་འབད་" - -#: ../properties/nm-openvpn.c:1256 -msgid "Select TA to use" -msgstr "ལག་ལེན་འཐབ་ནི་ལུ་ཊི་ཨེ་སེལ་འཐུ་འབད་" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1450 -msgid "Save as..." -msgstr "དེ་སྦེ་སྲུང་..." - -#: ../properties/nm-openvpn.c:1480 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "ཡིག་སྣོད་མིང་ \"%s\" ཧེ་མ་ལས་རང་འདུག།" - -#: ../properties/nm-openvpn.c:1483 -msgid "Do you want to replace it with the one you are saving?" -msgstr "ཁྱོད་ཀྱིས་སྲུང་མི་དང་ཅིག་ཁར་ཁྱོད་ཀྱིས་ཚབ་བཙུགས་ནི་ཨིན་ན?" - -#: ../properties/nm-openvpn.c:1497 -msgid "Failed to export configuration" -msgstr "རིམ་སྒྲིག་ཕྱིར་འདྲེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་" - -#: ../properties/nm-openvpn.c:1499 -#, c-format -msgid "Failed to save file %s" -msgstr "ཡིག་སྣོད་%sསྲུང་མ་ཚུགས་" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(སྔོན་སྒྲིག: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "0" -msgstr "༠" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "1" -msgstr "༡" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "65536" -msgstr "65536" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Connection Information" -msgstr "མཐུད་ལམ་བརྡ་དོན" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "Connection Name" -msgstr "མཐུད་ལམ་མིང་" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "དཔེར་ན: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Advanced" -msgstr "སྔ་གཡར་" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "CA file:" -msgstr "སི་ཨེ་ཡིག་སྣོད:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Certificate:" -msgstr "ལག་ཁྱེར:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Connection Name" -msgstr "མཐུད་ལམ་མིང་" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Connection Type:" -msgstr "མཐུད་ལམ་དབྱེ་བ་" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Direction:" -msgstr "ཕྱོགས:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Gateway _Port:" -msgstr "འཛུལ་སྒོའི་འདྲེན་ལམ: (_P)" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Key:" -msgstr "ལྡེ་མིག:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Local IP:" -msgstr "ཉེ་གནས་ཨའི་པི:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "སྒེར་སྡེ་ཡོངས་འབྲེལ་ལུ་མཐུད་ལམ་ངོས་འཛིན་འབད་ནི་ལུ་ལག་ལེན་འཐབ་ཡོད་པའི་མིང་ e.g. \"Campus VPN\" or \"Corporate Network\"" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Network" -msgstr "ཡོངས་འབྲེལ་" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "OpenVPN Advanced Options" -msgstr "ཝི་པི་ཨེན་ཁ་ཕྱེ་སྔ་གཡར་གདམ་ཁ་ཚུ་" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "OpenVPN Configuration" -msgstr "ཝི་པི་ཨེན་ཁ་ཕྱེ་བའི་རིམ་སྒྲིག་" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Password" -msgstr "ཆོག་ཡིག་" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting." -msgstr "འོག་ལུ་ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་གིས་བྱིན་ཡོད་པའི་བརྡ་དོན་ཐོ་བཀོད་འབད་གནང་། མཐུད་པའི་བསྒང་ཁྱོད་ཡར་བསྐྱེད་འབདཝ་ལས་ ནཱ་ལུ་ཁྱོད་རའི་ཆོག་ཡིག་མ་བཙུགས། " - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Please note that the file you import is not an OpenVPN configuration file. Ask your administrator for the file." -msgstr "ཁྱོད་ཀྱིས་ནང་འདྲེན་འབད་མི་ཡིག་སྣོད་འདི་ ཝི་པི་ཨེན་ཁ་ཕྱེ་རིམ་སྒྲིག་ཡིག་སྣོད་མེན་ཟེར་དྲན་འཛིན་འབད། ཁྱོད་རའི་བདག་སྐྱོང་པ་ལུ་ཡིག་སྣོད་དོན་ལུ་དྲི།" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Remote IP:" -msgstr "ཐག་རིང་གི་ཨའི་པི:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Shared Key:" -msgstr "རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "Shared key" -msgstr "རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག་" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "TLS-Auth" -msgstr "ཊི་ཨེལ་ཨེསི་-བདེན་བཤད་" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "Use LZO compression" -msgstr "ཨེལ་ཛེརཌི་ཨེབ་བཙུགས་ལག་ལེན་འཐབ་" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "Use TAP device" -msgstr "ཊི་ཨེ་པི་ཐབས་འཕྲུལ་ལག་ལེན་འཐབ་" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "Use TCP connection" -msgstr "ཊི་སི་པི་མཐུད་ལམ་ལག་ལེན་འཐབ་" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "Use TLS auth:" -msgstr "ཊི་ཨེལ་ཨེསི་བདེན་བཤད་ལག་ལེན་འཐབ:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "Use cipher:" -msgstr "གསང་ཡིག་ལག་ལེན་འཐབ:" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "Username:" -msgstr "ལག་ལེན་པའི་མིང་:" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "X.509" -msgstr "X.509" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"X.509 ལག་ཁྱེར་ཚུ་\n" -"སྔོན་-རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག\n" -"ཆོག་ཡིག་བདེན་བཤད\n" -"X.509 ཆོག་ཡིག་བདེན་བཤད་དང་ཅིག་ཁར་" - -#: ../properties/nm-openvpn-dialog.glade.h:39 -msgid "X.509/Pass" -msgstr "X.509/རྩིས་སྤྲོད་" - -#: ../properties/nm-openvpn-dialog.glade.h:40 -msgid "_Gateway Address:" -msgstr "འཛུལ་སྒོའི་ཁ་བྱང་: (_G)" - -#: ../properties/nm-openvpn-dialog.glade.h:41 -msgid "_Import Saved Configuration..." -msgstr "སྲུང་བཞག་པའི་རིམ་སྒྲིག་ནང་འདྲེན་འབད... (_I)" - -#: ../properties/nm-openvpn-dialog.glade.h:42 -msgid "_Only use VPN connection for these addresses" -msgstr "ཁ་བྱང་འདི་གི་དོན་ལུ་ ཝི་པི་ཨེན་མཐུད་ལམ་རྐྱངམ་ཅིག་ལག་ལེན་འཐབ། (_O)" - -#: ../properties/nm-openvpn-dialog.glade.h:43 -msgid "none" -msgstr "ཅི་མེད་" - -#: ../src/nm-openvpn-service.c:127 -msgid "The VPN login failed because the user name and password were not accepted or the certificate password was wrong." -msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོདཔ་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ལག་ལེན་པ་དང་ཆོག་ཡིག་དང་ལེན་མ་འབད་བས་ ཡང་ན་ ལག་ཁྱེར་ཆོག་ཡིག་འདི་འཛོལ་བ་འདུག།" - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོདཔ་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཝི་པི་ཨེན་འགོ་བཙུགས་མ་ཚུགས།" - -#: ../src/nm-openvpn-service.c:131 -msgid "The VPN login failed because the VPN program could not connect to the VPN server." -msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོདཔ་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཝི་པི་ཨེན་ལས་རིམ་ཝི་པི་ཨེན་སར་བར་ལུ་མཐུད་མ་ཚུགས།" - -#: ../src/nm-openvpn-service.c:133 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོདཔ་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཝི་པི་ཨེན་རིམ་སྒྲིག་གདམ་ཁ་ཚུ་ནུས་ཅན་མེད།" - -#: ../src/nm-openvpn-service.c:135 -msgid "The VPN login failed because the VPN program received an invalid configuration from the VPN server." -msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོདཔ་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཝི་པི་ཨེན་ལས་རིམ་གྱིས་ ཝི་པི་ཨེན་སར་བར་ལས་ནུས་ཅན་མེད་པའི་རིམ་སྒྲིག་ཐོབ་ཡོད།" - -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" - diff --git a/vpn-daemons/openvpn/po/el.po b/vpn-daemons/openvpn/po/el.po deleted file mode 100644 index 592e5a75c5..0000000000 --- a/vpn-daemons/openvpn/po/el.po +++ /dev/null @@ -1,238 +0,0 @@ -# translation of NetworkManager-openvpn.HEAD.po to -# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Kostas Papadimas , 2007. -# Jennie Petoumenou , 2008. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-07 16:00+0000\n" -"PO-Revision-Date: 2008-12-07 01:32+0200\n" -"Last-Translator: Jennie Petoumenou \n" -"Language-Team: Greek \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Συνθηματικό:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Δευτερεύον συνθηματικό:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "Ό_νομα χρήστη:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Τομέας:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "_Ανώνυμη σύνδεση" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Σύνδεση ως _χρήστης:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "Απομνη_μόνευση συνθηματικού για αυτή τη συνεδρία" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "Απο_θήκευση συνθηματικού στην κλειδοθήκη" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Χρειάζεστε πιστοποίηση για να αποκτήσετε πρόσβαση στο Ιδιωτικό Εικονικό " -"Δίκτυο (VPN) '%s'." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "Πιστοποίηση VPN" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "Σ_υνθηματικό πιστοποιητικού:" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Συνθηματικό πιστοποιητικού:" - -#: ../properties/auth-helpers.c:160 -msgid "Choose a Certificate Authority certificate..." -msgstr "Επιλέξτε πιστοποιητικό Αρχής Πιστοποίησης..." - -#: ../properties/auth-helpers.c:179 -msgid "Choose your personal certificate..." -msgstr "Επιλέξτε το προσωπικό σας πιστοποιητικό..." - -#: ../properties/auth-helpers.c:197 -msgid "Choose your private key..." -msgstr "Επιλέξτε το ιδιωτικό σας κλειδί..." - -#: ../properties/auth-helpers.c:250 -msgid "Choose an OpenVPN static key..." -msgstr "Επιλέξτε στατικό κλειδί OpenVPN..." - -#: ../properties/auth-helpers.c:274 ../properties/auth-helpers.c:992 -msgid "None" -msgstr "Χωρίς" - -#: ../properties/auth-helpers.c:654 -msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)" -msgstr "Πιστοποιητικά PEM (*.pem, *.crt, *.key, *.cer)" - -#: ../properties/auth-helpers.c:714 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Στατικά κλειδιά OpenVPN (*.key)" - -#: ../properties/auth-helpers.c:822 -msgid "Default" -msgstr "Προεπιλεγμένο" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Συμβατό με τον εξυπηρετητή OpenVPN." - -#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Πιστοποιητικά (TLS)" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Συνθηματικό" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Συνθηματικό με πιστοποιητικά (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Στατικό Κλειδί" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Πιστοποίηση" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Γενικά" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Αν χρησιμοποιηθεί η κατεύθυνση του κλειδιού, θα πρέπει να είναι αντίθετη " -"από την κατεύθυνση του άλλου υπολογιστή. Για παράδειγμα, αν ο άλλος " -"υπολογιστής χρησιμοποιεί '1', αυτή η σύνδεση θα πρέπει να χρησιμοποιεί '0'. " -"Αν δεν είστε βέβαιοι για το ποια τιμή πρέπει να χρησιμοποιήσετε, " -"επικοινωνήστε με το διαχειριστή του συστήματος." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "Για προ_χωρημένους..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Πι_στοποιητικό CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Αλγόριθμος κρυπτογράφησης:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Γενικά" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Κατεύθυνση κλειδιού:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Αρχείο κλειδιού:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "Τοπική διεύθυνση IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "Προχωρημένες επιλογές OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password:" -msgstr "Συνθηματικό:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Private Key Password:" -msgstr "Συνθηματικό ιδιωτικού κλειδιού:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Ιδιωτικό κλειδί:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Show passwords" -msgstr "Εμφάνιση συνθηματικών" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Static Key:" -msgstr "Στατικό Κλειδί:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Type:" -msgstr "Τύπος:" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO data compression" -msgstr "Χρήση συμπίεσης L_ZO" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use a TA_P device" -msgstr "Χρήση συσκευής TA_P" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a _TCP connection" -msgstr "Χρήση σύνδεσης _TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use additional TLS authentication" -msgstr "Χρήση επιπλέον πιστοποίησης TLS" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use custom gateway p_ort:" -msgstr "Χρήση προσαρμοσμένης _θύρας πύλης:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "User Certificate:" -msgstr "Πιστοποιητικό χρήστη:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User name:" -msgstr "Όνομα χρήστη:" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "_Gateway:" -msgstr "Πύ_λη:" diff --git a/vpn-daemons/openvpn/po/en_GB.po b/vpn-daemons/openvpn/po/en_GB.po deleted file mode 100644 index aa2c8226d1..0000000000 --- a/vpn-daemons/openvpn/po/en_GB.po +++ /dev/null @@ -1,474 +0,0 @@ -# English (British) translation for NetworkManager-openvpn -# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager-openvpn package. -# David Lodge , 2006 -# -msgid "" -msgstr "" -"Project-Id-Version: gnome-torrent\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-09 15:20+0000\n" -"PO-Revision-Date: 2007-04-29 08:43-0000\n" -"Last-Translator: David Lodge \n" -"Language-Team: en_GB \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Password:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Secondary Password:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Username:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domain:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Connect _anonymously" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Connect as _user:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Remember password for this session" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Save password in keyring" - -#: ../auth-dialog/main.c:181 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "You need to authenticate to access the Virtual Private Network '%s'." - -#: ../auth-dialog/main.c:182 -msgid "Authenticate VPN" -msgstr "Authenticate VPN" - -#: ../auth-dialog/main.c:195 -msgid "Certificate pass_word:" -msgstr "Certificate pass_word:" - -#: ../auth-dialog/main.c:210 -msgid "Certificate password:" -msgstr "Certificate password:" - -#: ../properties/nm-openvpn.c:150 -msgid "OpenVPN Client" -msgstr "OpenVPN Client" - -#: ../properties/nm-openvpn.c:814 -msgid "The following OpenVPN connection will be created:" -msgstr "The following OpenVPN connection will be created:" - -#: ../properties/nm-openvpn.c:816 -#, c-format -msgid "Name: %s" -msgstr "Name: %s" - -#: ../properties/nm-openvpn.c:824 -msgid "Connection Type: X.509 Certificates" -msgstr "Connection Type: X.509 Certificates" - -#: ../properties/nm-openvpn.c:827 ../properties/nm-openvpn.c:854 -#: ../properties/nm-openvpn.c:866 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:830 ../properties/nm-openvpn.c:869 -#, c-format -msgid "Cert: %s" -msgstr "Cert: %s" - -#: ../properties/nm-openvpn.c:833 ../properties/nm-openvpn.c:872 -#, c-format -msgid "Key: %s" -msgstr "Key: %s" - -#: ../properties/nm-openvpn.c:837 -msgid "Connection Type: Shared Key" -msgstr "Connection Type: Shared Key" - -#: ../properties/nm-openvpn.c:840 -#, c-format -msgid "Shared Key: %s" -msgstr "Shared Key: %s" - -#: ../properties/nm-openvpn.c:843 -#, c-format -msgid "Local IP: %s" -msgstr "Local IP: %s" - -#: ../properties/nm-openvpn.c:846 -#, c-format -msgid "Remote IP: %s" -msgstr "Remote IP: %s" - -#: ../properties/nm-openvpn.c:851 -msgid "Connection Type: Password" -msgstr "Connection Type: Password" - -#: ../properties/nm-openvpn.c:857 ../properties/nm-openvpn.c:875 -#, c-format -msgid "Username: %s" -msgstr "Username: %s" - -#: ../properties/nm-openvpn.c:863 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Connection Type: X.509 with Password Authentication" - -#: ../properties/nm-openvpn.c:881 -#, c-format -msgid "Remote: %s" -msgstr "Remote: %s" - -#: ../properties/nm-openvpn.c:884 -#, c-format -msgid "Port: %s" -msgstr "Port: %s" - -#: ../properties/nm-openvpn.c:887 -#, c-format -msgid "Device: %s" -msgstr "Device: %s" - -#: ../properties/nm-openvpn.c:887 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:887 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:890 -#, c-format -msgid "Protocol: %s" -msgstr "Protocol: %s" - -#: ../properties/nm-openvpn.c:890 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:890 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:894 -#, c-format -msgid "Routes: %s" -msgstr "Routes: %s" - -#: ../properties/nm-openvpn.c:898 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Use LZO Compression: %s" - -#: ../properties/nm-openvpn.c:898 -msgid "Yes" -msgstr "Yes" - -#: ../properties/nm-openvpn.c:898 -msgid "No" -msgstr "No" - -#: ../properties/nm-openvpn.c:902 -#, c-format -msgid "Cipher: %s" -msgstr "Cipher: %s" - -#: ../properties/nm-openvpn.c:907 -#, c-format -msgid "TLS auth: %s %s" -msgstr "TLS auth: %s %s" - -#: ../properties/nm-openvpn.c:911 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "The connection details can be changed using the \"Edit\" button." - -#: ../properties/nm-openvpn.c:1141 -msgid "Cannot import settings" -msgstr "Cannot import settings" - -#: ../properties/nm-openvpn.c:1143 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "The VPN settings file '%s' does not contain valid data." - -#: ../properties/nm-openvpn.c:1190 -msgid "Select file to import" -msgstr "Select file to import" - -#: ../properties/nm-openvpn.c:1249 ../properties/nm-openvpn.c:1261 -#: ../properties/nm-openvpn.c:1264 -msgid "Select CA to use" -msgstr "Select CA to use" - -#: ../properties/nm-openvpn.c:1252 ../properties/nm-openvpn.c:1267 -msgid "Select certificate to use" -msgstr "Select certificate to use" - -#: ../properties/nm-openvpn.c:1255 ../properties/nm-openvpn.c:1270 -msgid "Select key to use" -msgstr "Select key to use" - -#: ../properties/nm-openvpn.c:1258 -msgid "Select shared key to use" -msgstr "Select shared key to use" - -#: ../properties/nm-openvpn.c:1273 -msgid "Select TA to use" -msgstr "Select TA to use" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1515 -msgid "Save as..." -msgstr "Save as..." - -#: ../properties/nm-openvpn.c:1544 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "A file named \"%s\" already exists." - -#: ../properties/nm-openvpn.c:1547 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Do you want to replace it with the one you are saving?" - -#: ../properties/nm-openvpn.c:1561 -msgid "Failed to export configuration" -msgstr "Failed to export configuration" - -#: ../properties/nm-openvpn.c:1563 -#, c-format -msgid "Failed to save file %s" -msgstr "Failed to save file %s" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(Default: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "65536" -msgstr "65536" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "example: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Ad_vanced" -msgstr "Ad_vanced" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "C_A file:" -msgstr "C_A file:" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "C_ertificate:" -msgstr "C_ertificate:" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Co_nnection type:" -msgstr "Co_nnection type:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Connection na_me:" -msgstr "Connection na_me:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Direction:" -msgstr "Direction:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Import _Saved Configuration..." -msgstr "Import _Saved Configuration..." - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Network" -msgstr "Network" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Only use _VPN connection for these addresses:" -msgstr "Only use _VPN connection for these addresses:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "OpenVPN Advanced Options" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "OpenVPN Configuration" -msgstr "OpenVPN Configuration" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared _key:" -msgstr "Shared _key:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "TLS-Auth" -msgstr "TLS-Auth" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO compression" -msgstr "Use L_ZO compression" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TA_P device" -msgstr "Use TA_P device" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use _TCP connection" -msgstr "Use _TCP connection" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use _TLS auth:" -msgstr "Use _TLS auth:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cip_her:" -msgstr "Use cip_her:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "_0" -msgstr "_0" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "_1" -msgstr "_1" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway address:" -msgstr "_Gateway address:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Gateway port:" -msgstr "_Gateway port:" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Key:" -msgstr "_Key:" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Local IP:" -msgstr "_Local IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "_Remote IP:" -msgstr "_Remote IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:36 -msgid "_User name:" -msgstr "_User name:" - -#: ../properties/nm-openvpn-dialog.glade.h:37 -msgid "_none" -msgstr "_none" - -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "Add, Remove, and Edit VPN Connections" - -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "VPN Connection Manager (OpenVPN)" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "The VPN login failed because the VPN program could not be started." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "The VPN login failed because the VPN configuration options were invalid." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." - -#~ msgid "VPN connection failed" -#~ msgstr "VPN connection failed" - -#~ msgid "Connection Name" -#~ msgstr "Connection Name" - -#~ msgid "Optional Information" -#~ msgstr "Optional Information" - -#~ msgid "Required Information" -#~ msgstr "Required Information" - -#~ msgid "CA file:" -#~ msgstr "CA file:" - -#~ msgid "Password" -#~ msgstr "Password" - -#~ msgid "Shared Key:" -#~ msgstr "Shared Key:" - -#~ msgid "Username:" -#~ msgstr "Username:" - -#~ msgid "X.509" -#~ msgstr "X.509" diff --git a/vpn-daemons/openvpn/po/es.po b/vpn-daemons/openvpn/po/es.po deleted file mode 100644 index 7ff5ca2cf5..0000000000 --- a/vpn-daemons/openvpn/po/es.po +++ /dev/null @@ -1,278 +0,0 @@ -# translation of NetworkManager-openvpn.HEAD.po to Español -# Spanish message file for YaST2 (@memory@). -# Copyright (C) 2005 SUSE Linux Products GmbH. -# Copyright (C) 2002, 2003 SuSE Linux AG. -# Copyright (C) 1999, 2000, 2001 SuSE GmbH. -# -# Ibán josé García Castillo , 2000. -# Javier Moreno , 2000. -# Jordi Jaen Pallares , 1999, 2000, 2001. -# Pablo Iranzo Gómez , 2000. -# Jorge González , 2007, 2008. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-17 11:06+0000\n" -"PO-Revision-Date: 2008-10-18 12:39+0200\n" -"Last-Translator: Jorge González \n" -"Language-Team: Español \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Contraseña:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "Contraseña _secundaria:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "Nombre de _usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Dominio:" - -# include/printconf/dialogs.ycp:150 -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Conectar _anónimamente" - -# include/scanner/scanner_overview.ycp:85 -# include/scanner/scanner_overview.ycp:85 -# include/scanner/scanner_overview.ycp:85 -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Conectar como _usuario:" - -# include/partitioning/custom_part_dialogs.ycp:67 -# include/partitioning/custom_part_dialogs.ycp:67 -# include/partitioning/custom_part_dialogs.ycp:67 include/partitioning/custom_part_dialogs.ycp:197 -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Recordar la contraseña para esta sesión" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Guardar la contraseña en el depósito de claves" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Debe autenticarse para acceder a la red privada virtual «%s»." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "Autenticación VPN" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "_Contraseña del certificado:" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Contraseña del certificado:" - -#: ../properties/auth-helpers.c:161 -msgid "Choose a Certificate Authority certificate..." -msgstr "Elija un certificado de una autoridad de certificados…" - -#: ../properties/auth-helpers.c:180 -msgid "Choose your personal certificate..." -msgstr "Elija su certificado personal…" - -#: ../properties/auth-helpers.c:198 -msgid "Choose your private key..." -msgstr "Elija su clave privada…" - -#: ../properties/auth-helpers.c:251 -msgid "Choose an OpenVPN static key..." -msgstr "Elija una clave estática OpenVPN…" - -#: ../properties/auth-helpers.c:275 ../properties/auth-helpers.c:1002 -msgid "None" -msgstr "Ninguno" - -#: ../properties/auth-helpers.c:660 -msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)" -msgstr "Certificados PEM (*.pem, *.crt, *.key, *.cer)" - -#: ../properties/auth-helpers.c:720 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Claves estáticas OpenVPN (*.key)" - -#: ../properties/auth-helpers.c:831 -msgid "Default" -msgstr "Predeterminado" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Compatible con el servidor OpenVPN." - -#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Certificados (TLS)" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Contraseña" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Contraseñas con certificados (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Clave estática" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Autenticación" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "General" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Si se usa la dirección de la clave, debe ser la opuesta a la usada en el " -"par VPN. Por ejemplo, si el par usa «1», esta conexión debe usar «0». Si no " -"está seguro de qué valor usar, contacte con el administrador de su sistema." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "A_vanzado…" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Certificado CA:" - -# clients/inst_custom_part.ycp:2337 -# clients/inst_custom_part.ycp:2336 -# clients/inst_custom_part.ycp:2350 -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Cifrado:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "General" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Dirección de la clave:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Archivo de clave:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "Dirección IP local:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "Opciones avanzadas de OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password:" -msgstr "Contraseña:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Private Key Password:" -msgstr "Contraseña de la clave privada:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Clave privada:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Show passwords" -msgstr "Mostrar contraseñas" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Static Key:" -msgstr "Clave estática:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Type:" -msgstr "Tipo:" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO data compression" -msgstr "Usar compresión L_ZO" - -# include/scanner/scanner_usb.ycp:47 -# include/scanner/scanner_usb.ycp:47 -# include/scanner/scanner_usb.ycp:47 -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use a TA_P device" -msgstr "Usar dispositivo TA_P" - -# include/printconf/dialogs.ycp:150 -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a _TCP connection" -msgstr "Usar conexión _TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use additional TLS authentication" -msgstr "Usar autenticación TLS adicional" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use custom gateway p_ort:" -msgstr "Usar un p_uerto de pasarela personalizado:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "User Certificate:" -msgstr "Certificado de usuario:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User name:" -msgstr "Nombre de usuario:" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "_Gateway:" -msgstr "_Pasarela:" - -#~ msgid "Certificate Password:" -#~ msgstr "Contraseña del certificado:" - -#~ msgid "Select A File" -#~ msgstr "Seleccione un archivo" - -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" - -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" - -#~ msgid "page 1" -#~ msgstr "página 1" - -#~ msgid "page 2" -#~ msgstr "página 2" - -#~ msgid "page 3" -#~ msgstr "página 3" - -#~ msgid "page 4" -#~ msgstr "página 4" diff --git a/vpn-daemons/openvpn/po/et.po b/vpn-daemons/openvpn/po/et.po deleted file mode 100644 index 0709239191..0000000000 --- a/vpn-daemons/openvpn/po/et.po +++ /dev/null @@ -1,381 +0,0 @@ -# GNOME NetworkManager - OpenVPN klient -# -# Copyright (C) 2007 The GNOME Project. -# This file is distributed under the same license as the NetworkManager-openvpn package. -# -# Priit Laes , 2007. -# Ivar Smolin , 2007. -# Mattias Põldaru , 2007-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 08:00+0000\n" -"PO-Revision-Date: 2008-09-28 21:19+0300\n" -"Last-Translator: Mattias Põldaru \n" -"Language-Team: Estonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Parool:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "Parool _uuesti:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Kasutajanimi:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domeen:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Ühendu _anonüümselt" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Ühendu ka_sutajana:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Jäta parool selle sessiooni ajaks meelde" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "Parooli salvestamine _võtmerõngasse" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "VPN-võrgule '%s' ligipääsuks pead end autentima." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "VPN autentimine" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "Sertifikaadi _parool:" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Sertifikaadi parool:" - -#: ../properties/auth-helpers.c:161 -msgid "Choose a Certificate Authority certificate..." -msgstr "Vali sertifitseerimiskeskuse sertifikaadifail..." - -#: ../properties/auth-helpers.c:180 -msgid "Choose your personal certificate..." -msgstr "Vali isiklik sertifikaat..." - -#: ../properties/auth-helpers.c:198 -msgid "Choose your private key..." -msgstr "Vali eravõti..." - -#: ../properties/auth-helpers.c:251 -msgid "Choose an OpenVPN static key..." -msgstr "Vali OpenVPN püsivõti..." - -#: ../properties/auth-helpers.c:275 -#: ../properties/auth-helpers.c:1002 -msgid "None" -msgstr "Pole" - -#: ../properties/auth-helpers.c:660 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "PEM sertifikaadid (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:720 -msgid "OpenVPN Static Keys (*.key)" -msgstr "OpenVPN püsivõtmed (*.key)" - -#: ../properties/auth-helpers.c:831 -msgid "Default" -msgstr "Vaikimisi" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Ühildub OpenVPN serveriga." - -#: ../properties/nm-openvpn.c:322 -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Certificates (TLS)" -msgstr "Sertifikaadid (TLS)" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Parool" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Parool koos sertifikaatidega (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Püsivõti" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Autentimine" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Üldine" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator." -msgstr "Kui kasutatakse võtme suunda, peab see olema vastupidine teise VPN'i võtme suunale. Näitaks, kui teine masina kasutab '1', peab siin olema '0'. Kui sa ei tea millist väärtust kasutada, küsi süsteemiadministraatorilt." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "_Laiendatud..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Sertifitseerimiskeskuse fertifikaadifail:" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificate Password:" -msgstr "Sertifikaadi parool:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Cipher:" -msgstr "Šiffer:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "General" -msgstr "Üldine" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key Direction:" -msgstr "Võtme suund:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Key File:" -msgstr "Võtmefail:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Local IP Address:" -msgstr "Kohalik IP-aadress:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "OpenVPN laiendatud sätted" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Password:" -msgstr "Parool:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Eravõti:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Select A File" -msgstr "Vali fail" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Show passwords" -msgstr "Näita paroole" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Static Key:" -msgstr "Püsivõti:" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Type:" -msgstr "Tüüp:" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use L_ZO data compression" -msgstr "L_ZO-pakkimise kasutamine" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a TA_P device" -msgstr "TA_P-seadme kasutamine" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use a _TCP connection" -msgstr "_TCP-ühenduse kasutamine" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use additional TLS authentication" -msgstr "Lisaks TLS-autentimise kasutamine" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Use custom gateway p_ort:" -msgstr "Kasuta muud gateway _porti:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User Certificate:" -msgstr "Kasutaja sertifikaat:" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "User name:" -msgstr "Kasutajanimi:" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "_Gateway:" -msgstr "_Gateway:" - -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "VPN-ühenduste lisamine, muutmine ja eemaldamine" -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "VPN ühenduse haldaja (OpenVPN)" -#~ msgid "The following OpenVPN connection will be created:" -#~ msgstr "Luuakse järgnev OpenVPN ühendus:" -#~ msgid "Name: %s" -#~ msgstr "Nimi: %s" -#~ msgid "Connection Type: X.509 Certificates" -#~ msgstr "Ühenduse tüüp: X.509 Sertifikaadid" -#~ msgid "CA: %s" -#~ msgstr "CA: %s" -#~ msgid "Cert: %s" -#~ msgstr "Sertif.: %s" -#~ msgid "Key: %s" -#~ msgstr "Võti: %s" -#~ msgid "Connection Type: Shared Key" -#~ msgstr "Ühenduse tüüp: Jagatud võti" -#~ msgid "Shared Key: %s" -#~ msgstr "Jagatud võti: %s" -#~ msgid "Remote IP: %s" -#~ msgstr "Kaug-IP: %s" -#~ msgid "Connection Type: Password" -#~ msgstr "Ühenduse tüüp: parooliga" -#~ msgid "Username: %s" -#~ msgstr "Kasutajanimi: %s" -#~ msgid "Connection Type: X.509 with Password Authentication" -#~ msgstr "Ühenduse tüüp: X.509 parooliga autentimisega" -#~ msgid "Remote: %s" -#~ msgstr "Kauglogimine: %s" -#~ msgid "Port: %s" -#~ msgstr "Port: %s" -#~ msgid "Device: %s" -#~ msgstr "Seade: %s" -#~ msgid "TAP" -#~ msgstr "TAP" -#~ msgid "TUN" -#~ msgstr "TUN" -#~ msgid "Protocol: %s" -#~ msgstr "Protokoll: %s" -#~ msgid "TCP" -#~ msgstr "TCP" -#~ msgid "UDP" -#~ msgstr "UDP" -#~ msgid "Routes: %s" -#~ msgstr "Marsruudid: %s" -#~ msgid "Use LZO Compression: %s" -#~ msgstr "LZO pakkimise kasutamine: %s" -#~ msgid "Yes" -#~ msgstr "Jah" -#~ msgid "TLS auth: %s %s" -#~ msgstr "TLS autentimine: %s %s" -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "Ühenduse üksikasju saab muuta kasutades \"Muuda\" nuppu." -#~ msgid "Cannot import settings" -#~ msgstr "Sätteid ei saa importida" -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN-seadete fail '%s' ei sisalda sobivat teavet." -#~ msgid "Select file to import" -#~ msgstr "Vali imporditav fail" -#~ msgid "Select certificate to use" -#~ msgstr "Vali kasutatav sertifikaat" -#~ msgid "Select key to use" -#~ msgstr "Vali võti" -#~ msgid "Select shared key to use" -#~ msgstr "Vali jagatud võti" -#~ msgid "Select TA to use" -#~ msgstr "Vali TA" -#~ msgid "Save as..." -#~ msgstr "Salvesta kui..." -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Fail nimega \"%s\" on juba olemas." -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Kas soovid seda salvestatava failiga asendada?" -#~ msgid "Failed to export configuration" -#~ msgstr "Tõrge seadistuste eksportimisel" -#~ msgid "Failed to save file %s" -#~ msgstr "Faili %s salvestamine nurjus" -#~ msgid "65536" -#~ msgstr "65536" -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "näide: 172.16.0.0/16 10.11.12.0/24" -#~ msgid "C_A file:" -#~ msgstr "C_A fail:" -#~ msgid "Co_nnection type:" -#~ msgstr "Ühe_nduse tüüp:" -#~ msgid "Connection na_me:" -#~ msgstr "Üh_enduse nimi:" -#~ msgid "Import _Saved Configuration..." -#~ msgstr "_Impordi salvestatud seaded..." -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "VPN-võrgu nimi, näiteks \"Kool\" või \"Ametivõrk\"." -#~ msgid "Network" -#~ msgstr "Võrk" -#~ msgid "Only use _VPN connection for these addresses:" -#~ msgstr "_Kasuta VPN-ühendust ainult nende aadresside jaoks:" -#~ msgid "OpenVPN Configuration" -#~ msgstr "OpenVPN sätted" -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Palun sisesta süsteemi administraatorilt saadud teave. Ära siia parooli " -#~ "sisesta, seda küsitakse ühendumisel." -#~ msgid "" -#~ "Please note that the file you import is not an OpenVPN configuration " -#~ "file. Ask your administrator for the file." -#~ msgstr "" -#~ "Imporditav fail ei ole OpenVPN-i seadete fail. Küsi administraatorilt " -#~ "õiget faili." -#~ msgid "Shared _key:" -#~ msgstr "Jagatud _võti:" -#~ msgid "TLS-Auth" -#~ msgstr "TLS-Auth" -#~ msgid "Use _TLS auth:" -#~ msgstr "_TLS autentimise kasutamine:" -#~ msgid "Use cip_her:" -#~ msgstr "_Kasutatav šiffer:" -#~ msgid "" -#~ "X.509 Certificates\n" -#~ "Pre-shared key\n" -#~ "Password Authentication\n" -#~ "X.509 with Password Authentication" -#~ msgstr "" -#~ "X.509 Sertifikaadid\n" -#~ "Eeljagatud võti\n" -#~ "Parooliga autentimine\n" -#~ "X.509 parooliga autentimisega" -#~ msgid "_0" -#~ msgstr "_0" -#~ msgid "_1" -#~ msgstr "_1" -#~ msgid "_Gateway address:" -#~ msgstr "_Gateway aadress:" -#~ msgid "_Key:" -#~ msgstr "_Võti:" -#~ msgid "_Local IP:" -#~ msgstr "_Kohalik IP:" -#~ msgid "_Remote IP:" -#~ msgstr "_Kaug-IP:" -#~ msgid "_none" -#~ msgstr "_puudub" - diff --git a/vpn-daemons/openvpn/po/eu.po b/vpn-daemons/openvpn/po/eu.po deleted file mode 100644 index dc28bcc0fa..0000000000 --- a/vpn-daemons/openvpn/po/eu.po +++ /dev/null @@ -1,225 +0,0 @@ -# translation of eu.po to Basque -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Iñaki Larrañaga Murgoitio , 2008. -msgid "" -msgstr "" -"Project-Id-Version: eu\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-09 16:27+0200\n" -"PO-Revision-Date: 2008-09-09 16:43+0200\n" -"Last-Translator: Iñaki Larrañaga Murgoitio \n" -"Language-Team: Basque \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Pasahitza:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Bigarren pasahitza:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Erabiltzaile-izena:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domeinua:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Konektatu _anonimo gisa" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Konektatu _erabiltzaile gisa:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Gogoratu pasahitza saio honetan" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Gorde pasahitza gako-sortan" - -#: ../auth-dialog/main.c:210 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Autentifikatu egin behar zara '%s' VPN-ra (Sare Birtual Pribatua) " -"sarbidetzeko." - -#: ../auth-dialog/main.c:211 -msgid "Authenticate VPN" -msgstr "Autentifikatu VPN" - -#: ../auth-dialog/main.c:232 -msgid "Certificate pass_word:" -msgstr "_Ziurtagiriaren pasahitza:" - -#: ../auth-dialog/main.c:246 -msgid "Certificate password:" -msgstr "Ziurtagiriaren pasahitza:" - -#: ../properties/auth-helpers.c:69 -msgid "Choose a Certificate Authority certificate..." -msgstr "Aukeratu Ziurtagiri-Emailearen ziurtagiria..." - -#: ../properties/auth-helpers.c:88 -msgid "Choose your personal certificate..." -msgstr "Aukeratu ziurtagiri pertsonala..." - -#: ../properties/auth-helpers.c:106 -msgid "Choose your private key..." -msgstr "Aukeratu gako pribatua..." - -#: ../properties/auth-helpers.c:159 -msgid "Choose an OpenVPN static key..." -msgstr "Aukeratu OpenVPN gako estatikoa..." - -#: ../properties/auth-helpers.c:183 ../properties/auth-helpers.c:862 -msgid "None" -msgstr "Bat ere ez" - -#: ../properties/auth-helpers.c:518 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "PEM ziurtagiriak (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:578 -msgid "OpenVPN Static Keys (*.key)" -msgstr "OpenVPN gako estatikoak (*.key)" - -#: ../properties/auth-helpers.c:689 -msgid "Default" -msgstr "Lehenetsia" - -#: ../properties/nm-openvpn.c:52 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:53 -msgid "Compatible with the OpenVPN server." -msgstr "OpenVPN zerbitzariarekin bateragarria." - -#: ../properties/nm-openvpn.c:310 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Ziurtagiriak (TLS)" - -#: ../properties/nm-openvpn.c:322 -msgid "Password" -msgstr "Pasahitza" - -#: ../properties/nm-openvpn.c:336 -msgid "Password with Certificates (TLS)" -msgstr "Pasahitza ziurtagiriekin (TLS)" - -#: ../properties/nm-openvpn.c:348 -msgid "Static Key" -msgstr "Gako estatikoa" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Autentifikazioa" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Orokorra" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Gakoaren helbidea erabiltzen bada, VPN parekoarenaren aurkakoa izan behar du. " -"Esate baterako, parekoak '1' erabiltzen badu, konexio honek '0' erabili behar du. " -"Zein balio erabili behar duzun ez badakizu, jar zaitez sistemako administratzailearekin " -"harremanetan." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "_Aurreratua..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "ZE ziurtagiria:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Zifratua:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Orokorra" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Gakoaren helbidea:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Gakoaren fitxategia:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "IP helbide lokala:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "OpenVPN-ren aukera aurreratuak" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Private Key:" -msgstr "Gako pribatua:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Static Key:" -msgstr "Gako estatikoa:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Type:" -msgstr "Mota:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Use L_ZO data compression" -msgstr "Erabili _LZO datu-konpresioa" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Use a TA_P device" -msgstr "Erabili TA_P gailua" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use a _TCP connection" -msgstr "Erabili _TCP konexioa" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use additional TLS authentication" -msgstr "Erabili TLS autentifikazio gehigarria" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use custom gateway p_ort:" -msgstr "Erabili atebidearen _ataka pertsonalizatua:" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "User Certificate:" -msgstr "Erabiltzailearen ziurtagiria:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "User name:" -msgstr "Erabiltzaile-izena:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "_Gateway:" -msgstr "_Atebidea:" - diff --git a/vpn-daemons/openvpn/po/fi.po b/vpn-daemons/openvpn/po/fi.po deleted file mode 100644 index e1a0668152..0000000000 --- a/vpn-daemons/openvpn/po/fi.po +++ /dev/null @@ -1,519 +0,0 @@ -# Finnish messages for NetworkManager-openvpn. -# Copyright (C) 2006-2008 Free Software Foundation. -# Ilkka Tuohela , 2006-2008. -# -# Suomennos: http://gnome.fi/ -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-29 20:22+0300\n" -"PO-Revision-Date: 2008-11-29 20:00+0300\n" -"Last-Translator: Ilkka Tuohela \n" -"Language-Team: Finnish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Salasana:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Toissijainen salasana:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Käyttäjätunnus:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Toimialue:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Yhdistä _anonyymisti" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Yhdistä _käyttäjänä:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Muista salasana istunnon ajan" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Tallenna salasana avainrenkaaseen" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Yhteydenotto VPN-verkkoon \"%s\" vaatii kirjautumista." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "Todenna VPN-yhteyden avaus" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "Varmenteen _salasana:" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Varmennettu salasana:" - -#: ../properties/auth-helpers.c:160 -msgid "Choose a Certificate Authority certificate..." -msgstr "Valitse CA-varmenne..." - -#: ../properties/auth-helpers.c:179 -msgid "Choose your personal certificate..." -msgstr "Valitse oma varmenteesi..." - -#: ../properties/auth-helpers.c:197 -msgid "Choose your private key..." -msgstr "Valitse salainen avaimesi..." - -#: ../properties/auth-helpers.c:250 -msgid "Choose an OpenVPN static key..." -msgstr "Valitse OpenPVN:n staattinen avain..." - -#: ../properties/auth-helpers.c:274 ../properties/auth-helpers.c:992 -msgid "None" -msgstr "Ei mitään" - -#: ../properties/auth-helpers.c:654 -msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)" -msgstr "PEM-varmenteet (*.pem, *.crt, *.key tai *.cer)" - -#: ../properties/auth-helpers.c:714 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Pysyvät OpenVPN-avaimet (*.key)" - -#: ../properties/auth-helpers.c:822 -msgid "Default" -msgstr "Oletus" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Yhteensopiva OpenVPN-palvelimen kanssa." - -#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Varmenteet (TLS)" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Salasana" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Salasana varmenteiden kanssa (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Staattinen avain" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Tunnistautuminen" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Yleisasetukset" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Jos avaimen suuntaa käytetään, täytyy annetun arvon olla vastkkainen kuin " -"VPN-yhteyden toisessa päässä. Jos esimerkiksi vastapäässä on arvo 1, tämän " -"täytyy olla 0. Jos et tiedä mitä tässä pitäisi olla, kysy VPN-yhteytesi " -"ylläpitäjältä lisätietoja." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "_Lisäasetukset..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "CA-varmenne:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Salausmenetelmä:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Yleisasetukset" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Avaimen suunta:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Avaintiedosto:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "Oma IP-osoite:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "OpenVPN-lisäasetukset" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password:" -msgstr "Salasana:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Private Key Password:" -msgstr "Salaisen avaimen salasana:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Salainen avain:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Show passwords" -msgstr "Näytä salasanat" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Static Key:" -msgstr "Kiinteä avain:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Type:" -msgstr "Tyyppi:" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO data compression" -msgstr "Käytä L_ZO-pakkausta" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use a TA_P device" -msgstr "Käytä TA_P-laitetta" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a _TCP connection" -msgstr "Käytä _TCP-yhteyttä" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use additional TLS authentication" -msgstr "Käytä lisäksi TLS-tunnistatumista" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use custom gateway p_ort:" -msgstr "Käytä _muuta yhdyskäytävän porttia:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "User Certificate:" -msgstr "Käyttäjän varmenne:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User name:" -msgstr "Käyttäjätunnus:" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "_Gateway:" -msgstr "_Yhdyskäytävä:" - -#~ msgid "Certificate Password:" -#~ msgstr "Varmenteen salasana:" - -#~ msgid "Select A File" -#~ msgstr "Valitse tiedosto" - -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" - -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" - -#~ msgid "page 1" -#~ msgstr "sivu 1" - -#~ msgid "page 2" -#~ msgstr "sivu 2" - -#~ msgid "page 3" -#~ msgstr "sivu 3" - -#~ msgid "page 4" -#~ msgstr "sivu 4" - -#~ msgid "The following OpenVPN connection will be created:" -#~ msgstr "Seuraava OpenVPN-yhteys luodaan:" - -#~ msgid "Name: %s" -#~ msgstr "Nimi: %s" - -#~ msgid "Connection Type: X.509 Certificates" -#~ msgstr "Yhteyden tyyppi: X.509-varmenteet" - -#~ msgid "CA: %s" -#~ msgstr "CA: %s" - -#~ msgid "Cert: %s" -#~ msgstr "Varmenne: %s" - -#~ msgid "Key: %s" -#~ msgstr "Avain: %s" - -#~ msgid "Connection Type: Shared Key" -#~ msgstr "Yhteyden tyyppi: jaettu avain" - -#~ msgid "Shared Key: %s" -#~ msgstr "Jaettu avain: %s" - -#~ msgid "Remote IP: %s" -#~ msgstr "Palvelimen IP-osoite: %s" - -#~ msgid "Connection Type: Password" -#~ msgstr "Yhteyden tyyppi: Salasana" - -#~ msgid "Username: %s" -#~ msgstr "Käyttäjätunnus: %s" - -#~ msgid "Connection Type: X.509 with Password Authentication" -#~ msgstr "Yhteyden tyyppi: X.509 salasanalla todennuksella" - -#~ msgid "Remote: %s" -#~ msgstr "Palvelin: %s" - -#~ msgid "Port: %s" -#~ msgstr "Portti: %s" - -#~ msgid "Device: %s" -#~ msgstr "Laite: %s" - -#~ msgid "TAP" -#~ msgstr "TAP" - -#~ msgid "TUN" -#~ msgstr "TUN" - -#~ msgid "Protocol: %s" -#~ msgstr "Protokolla: %s" - -#~ msgid "TCP" -#~ msgstr "TCP" - -#~ msgid "UDP" -#~ msgstr "UDP" - -#~ msgid "Routes: %s" -#~ msgstr "Reitit: %s" - -#~ msgid "Use LZO Compression: %s" -#~ msgstr "Käytä LZO-pakkausta: %s" - -#~ msgid "Yes" -#~ msgstr "Kyllä" - -#~ msgid "TLS auth: %s %s" -#~ msgstr "TLS-todentaminen: %s %s" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "Yhteyden yksityiskohtia voi muuttaa valitsemalla \"Muokkaa\"." - -#~ msgid "Cannot import settings" -#~ msgstr "Asetuksia ei voi tuoda" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN-asetustiedosto \"%s\" ei sisällä kelvollisia tietoja." - -#~ msgid "Select file to import" -#~ msgstr "Valitse tuotava tiedosto" - -#~ msgid "Select certificate to use" -#~ msgstr "Valitse käytettävä varmenne" - -#~ msgid "Select key to use" -#~ msgstr "Valitse käytettävä avain" - -#~ msgid "Select shared key to use" -#~ msgstr "Valitse käytettävä jaettu avain" - -#~ msgid "Select TA to use" -#~ msgstr "Valitse käytettävä TA" - -#~ msgid "Save as..." -#~ msgstr "Tallenna nimellä..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Tiedosto \"%s\" on jo olemassa." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Haluatko korvata sen tiedostolla jota olet tallentamassa?" - -#~ msgid "Failed to export configuration" -#~ msgstr "Asetuksia ei voitu viedä" - -#~ msgid "Failed to save file %s" -#~ msgstr "Tiedostoa \"%s\" ei voitu tallentaa" - -#~ msgid "65536" -#~ msgstr "65536" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "esimerkki: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "C_A file:" -#~ msgstr "C_A-tiedosto:" - -#~ msgid "Co_nnection type:" -#~ msgstr "_Yhteyden tyyppi:" - -#~ msgid "Connection na_me:" -#~ msgstr "Yhteyden _nimi:" - -#~ msgid "Import _Saved Configuration..." -#~ msgstr "Tuo _tallennettu määrittely..." - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Yksilöllinen VPN-verkon nimi, esimerkiksi \"Kampusverkko\" tai " -#~ "\"Työpaikan verkko\"." - -#~ msgid "Network" -#~ msgstr "Verkko" - -#~ msgid "Only use _VPN connection for these addresses:" -#~ msgstr "_Käytä VPN-yhteyttä seuraaville osoitteille" - -#~ msgid "OpenVPN Configuration" -#~ msgstr "OpenVPN-määrittely" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Syötä järjestelmän ylläpitäjältä saamasi tiedot alla oleviin kohtiin. Älä " -#~ "syötä tähän salasanaasi, sillä se kysytään vasta otettaessa yhteyttä." - -#~ msgid "" -#~ "Please note that the file you import is not an OpenVPN configuration " -#~ "file. Ask your administrator for the file." -#~ msgstr "" -#~ "Huomaa, että tuotava tiedosto ei ole OpenVPN-asetustiedosto. Kysy " -#~ "ylläpitäjältäsi oikeaa tiedostoa." - -#~ msgid "Shared _key:" -#~ msgstr "_Jaettu avain:" - -#~ msgid "TLS-Auth" -#~ msgstr "TLS-todentaminen" - -#~ msgid "Use _TLS auth:" -#~ msgstr "Käytä _TLS-todentamista:" - -#~ msgid "Use cip_her:" -#~ msgstr "Salaus_menetelmä:" - -#~ msgid "" -#~ "X.509 Certificates\n" -#~ "Pre-shared key\n" -#~ "Password Authentication\n" -#~ "X.509 with Password Authentication" -#~ msgstr "" -#~ "X.509-varmenteet\n" -#~ "Jaettu avain\n" -#~ "Salasanalla todentaminen\n" -#~ "X.509 salasanatodennuksella" - -#~ msgid "_0" -#~ msgstr "_0" - -#~ msgid "_1" -#~ msgstr "_1" - -#~ msgid "_Gateway address:" -#~ msgstr "_Yhdyskäytävän osoite:" - -#~ msgid "_Key:" -#~ msgstr "_Avain:" - -#~ msgid "_Local IP:" -#~ msgstr "_Paikallinen IP-osoite:" - -#~ msgid "_Remote IP:" -#~ msgstr "_Palvelimen IP-osoite:" - -#~ msgid "_none" -#~ msgstr "_ei mitään" - -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "Lisää, poista tai muokkaa VPN-yhteyksiä" - -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "VPN-yhteyksien hallinta (OpenVPN)" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "VPN-kirjautuminen epäonnistui, koska käyttäjätunnusta ja salasanaa ei " -#~ "hyväsytty, tai varmenteen salasana oli väärin." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "VPN-kirjautuminen epäonnistui, koska VPN-ohjelmaa ei voitu käynnistää." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "VPN-kirjatuminen epäonnistui, koska VPN-ohjelma ei saanut yhteyttä VPN-" -#~ "palvelimeen." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "VPN-kirjautuminen epäonnistui, koska VPN-asetuksten valinnat olivat " -#~ "virheelliset." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "VPN-kirjautuminen epäonnistui, koska VPN-ohjelma sai epäyhteensopivat " -#~ "asetukset VPN-palvelimelta." - -#~ msgid "VPN connection failed" -#~ msgstr "VPN-yhteyden avaus epäonnistui" - -#~ msgid "Connection Information" -#~ msgstr "Tietoja yhteydestä" - -#~ msgid "CA file:" -#~ msgstr "CA-tiedosto:" - -#~ msgid "Optional" -#~ msgstr "Valinnaiset tiedot" - -#~ msgid "Username:" -#~ msgstr "Käyttäjätunnus:" - -#~ msgid "X.509" -#~ msgstr "X.509" - -#~ msgid "X.509/Pass" -#~ msgstr "X.509/salasana" diff --git a/vpn-daemons/openvpn/po/fr.po b/vpn-daemons/openvpn/po/fr.po deleted file mode 100644 index 5a03fec93d..0000000000 --- a/vpn-daemons/openvpn/po/fr.po +++ /dev/null @@ -1,240 +0,0 @@ -# French translation of NetworkManager-OpenVPN. -# Copyright (C) 2006-2008 The GNOME Foundation. -# This file is distributed under the same license as the NetworkManager-OpenVPN package -# -# Haïkel Guémar , 2006. -# Jonathan Ernst , 2007. -# Stéphane Raimbault , 2007-2008. -# Robert-André Mauchin , 2007-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 22:52+0200\n" -"PO-Revision-Date: 2008-09-25 22:55+0200\n" -"Last-Translator: Claude Paroz \n" -"Language-Team: GNOME French Team \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Mot de passe :" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "Mot de passe _secondaire :" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "Nom d'_utilisateur :" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domaine :" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Se connecter _anonymement" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Se _connecter en tant que :" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Conserver le mot de passe pour cette session" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Enregistrer le mot de passe dans le trousseau de clés" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Authentifiez-vous pour accéder au réseau privé virtuel « %s »." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "Authentifier le VPN" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "_Mot de passe du certificat :" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Mot de passe du certificat :" - -#: ../properties/auth-helpers.c:161 -msgid "Choose a Certificate Authority certificate..." -msgstr "Choisissez un certificat d'une autorité de certification..." - -#: ../properties/auth-helpers.c:180 -msgid "Choose your personal certificate..." -msgstr "Choisissez votre certificat personnel..." - -#: ../properties/auth-helpers.c:198 -msgid "Choose your private key..." -msgstr "Choisissez votre clé privée..." - -#: ../properties/auth-helpers.c:251 -msgid "Choose an OpenVPN static key..." -msgstr "Choisissez une clé statique OpenVPN..." - -#: ../properties/auth-helpers.c:275 ../properties/auth-helpers.c:1002 -msgid "None" -msgstr "Aucun" - -#: ../properties/auth-helpers.c:660 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "Certificats PEM (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:720 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Clés statiques OpenVPN (*.key)" - -#: ../properties/auth-helpers.c:831 -msgid "Default" -msgstr "Par défaut" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Compatible avec le serveur OpenVPN." - -#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Certificates (TLS)" -msgstr "Certificats (TLS)" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Mot de passe" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Mot de passe avec certificats (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Clé statique" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Authentification" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Général" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Si une direction de clé est utilisée, elle doit être l'opposé de celle " -"utilisée sur le pair VPN. Par exemple, si le pair utilise « 1 », cette " -"connexion doit être « 0 ». Si vous n'êtes pas certain de la valeur à " -"utiliser, contactez votre administrateur système." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "A_vancé..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Certificat du CA :" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificate Password:" -msgstr "Mot de passe du certificat :" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Cipher:" -msgstr "Chiffrement :" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "General" -msgstr "Général" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key Direction:" -msgstr "Direction de la clé :" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Key File:" -msgstr "Fichier de clé :" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Local IP Address:" -msgstr "Adresse IP locale :" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "Options avancées OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Password:" -msgstr "Mot de passe :" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Clé privée :" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Select A File" -msgstr "Sélectionnez un fichier" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Show passwords" -msgstr "Afficher les mots de passe" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Static Key:" -msgstr "Clé statique :" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Type:" -msgstr "Type :" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use L_ZO data compression" -msgstr "Utiliser la compression de données L_ZO" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a TA_P device" -msgstr "Utiliser un périphérique TA_P" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use a _TCP connection" -msgstr "Utiliser une connexion _TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use additional TLS authentication" -msgstr "Utiliser une authentification TLS supplémentaire" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Use custom gateway p_ort:" -msgstr "Utiliser un p_ort de passerelle personnalisé :" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User Certificate:" -msgstr "Certificat de l'utilisateur :" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "User name:" -msgstr "Nom d'utilisateur :" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "_Gateway:" -msgstr "_Passerelle :" diff --git a/vpn-daemons/openvpn/po/gl.po b/vpn-daemons/openvpn/po/gl.po deleted file mode 100644 index c5353bd667..0000000000 --- a/vpn-daemons/openvpn/po/gl.po +++ /dev/null @@ -1,468 +0,0 @@ -# translation of gl.po to Galego -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Ignacio Casal Quinteiro , 2007. -msgid "" -msgstr "" -"Project-Id-Version: gl\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-28 13:28+0100\n" -"PO-Revision-Date: 2007-02-28 13:30+0100\n" -"Last-Translator: Ignacio Casal Quinteiro \n" -"Language-Team: Galego \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Contrasinal:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "Contrasinal _secundario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Nome de usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Conectar como _anónimo" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Conectar como _usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Lembrar contrasinal durante esta sesión" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Gardar o contrasinal no anel" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Necesita autenticarse para acceder á rede privada virtual (VPN) '%s'." - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "Autenticar VPN" - -#: ../auth-dialog/main.c:227 -msgid "Certificate pass_word:" -msgstr "_Contrasinal do certificado:" - -#: ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "Contrasinal do certificado:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Engadir, eliminar, e editar conexións VPN" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "Xestor de conexións VPN (OpenVPN)" - -#: ../properties/nm-openvpn.c:143 -msgid "OpenVPN Client" -msgstr "Cliente OpenVPN" - -#: ../properties/nm-openvpn.c:799 -msgid "The following OpenVPN connection will be created:" -msgstr "Crearase a seguinte conexión OpenVPN:" - -#: ../properties/nm-openvpn.c:801 -#, c-format -msgid "Name: %s" -msgstr "Nome: %s" - -#: ../properties/nm-openvpn.c:809 -msgid "Connection Type: X.509 Certificates" -msgstr "Tipo de conexión: Certificados X.509" - -#: ../properties/nm-openvpn.c:812 ../properties/nm-openvpn.c:839 -#: ../properties/nm-openvpn.c:851 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:815 ../properties/nm-openvpn.c:854 -#, c-format -msgid "Cert: %s" -msgstr "Cert: %s" - -#: ../properties/nm-openvpn.c:818 ../properties/nm-openvpn.c:857 -#, c-format -msgid "Key: %s" -msgstr "Clave: %s" - -#: ../properties/nm-openvpn.c:822 -msgid "Connection Type: Shared Key" -msgstr "Tipo de conexión: Clave compartida" - -#: ../properties/nm-openvpn.c:825 -#, c-format -msgid "Shared Key: %s" -msgstr "Clave compartida: %s" - -#: ../properties/nm-openvpn.c:828 -#, c-format -msgid "Local IP: %s" -msgstr "IP local: %s" - -#: ../properties/nm-openvpn.c:831 -#, c-format -msgid "Remote IP: %s" -msgstr "IP remota: %s" - -#: ../properties/nm-openvpn.c:836 -msgid "Connection Type: Password" -msgstr "Tipo de conexión: Contrasinal" - -#: ../properties/nm-openvpn.c:842 ../properties/nm-openvpn.c:860 -#, c-format -msgid "Username: %s" -msgstr "Nome de usuario: %s" - -#: ../properties/nm-openvpn.c:848 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Tipo de conexión: X.509 con autenticación por contrasinal" - -#: ../properties/nm-openvpn.c:866 -#, c-format -msgid "Remote: %s" -msgstr "Remoto: %s" - -#: ../properties/nm-openvpn.c:869 -#, c-format -msgid "Port: %s" -msgstr "Porto: %s" - -#: ../properties/nm-openvpn.c:872 -#, c-format -msgid "Device: %s" -msgstr "Dispositivo: %s" - -#: ../properties/nm-openvpn.c:872 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:872 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:875 -#, c-format -msgid "Protocol: %s" -msgstr "Protocolo: %s" - -#: ../properties/nm-openvpn.c:875 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:875 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:879 -#, c-format -msgid "Routes: %s" -msgstr "Rutas: %s" - -#: ../properties/nm-openvpn.c:883 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Usar compresión LZO: %s" - -#: ../properties/nm-openvpn.c:883 -msgid "Yes" -msgstr "Si" - -#: ../properties/nm-openvpn.c:883 -msgid "No" -msgstr "Non" - -#: ../properties/nm-openvpn.c:887 -#, c-format -msgid "Cipher: %s" -msgstr "Cifra: %s" - -#: ../properties/nm-openvpn.c:892 -#, c-format -msgid "TLS auth: %s %s" -msgstr "TLS auth: %s %s" - -#: ../properties/nm-openvpn.c:896 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Os detalles da conexión pódense modificar mediante o botón \"Editar\"." - -#: ../properties/nm-openvpn.c:1121 -msgid "Cannot import settings" -msgstr "Non se poden importar os axustes" - -#: ../properties/nm-openvpn.c:1123 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "O ficheiro de configuración '%s' non contén datos válidos." - -#: ../properties/nm-openvpn.c:1161 -msgid "Select file to import" -msgstr "Seleccione un ficheiro para importar" - -#: ../properties/nm-openvpn.c:1220 ../properties/nm-openvpn.c:1232 -#: ../properties/nm-openvpn.c:1235 -msgid "Select CA to use" -msgstr "Seleccione a CA a usar" - -#: ../properties/nm-openvpn.c:1223 ../properties/nm-openvpn.c:1238 -msgid "Select certificate to use" -msgstr "Seleccione o certificado a usar" - -#: ../properties/nm-openvpn.c:1226 ../properties/nm-openvpn.c:1241 -msgid "Select key to use" -msgstr "Seleccione a clave a usar" - -#: ../properties/nm-openvpn.c:1229 -msgid "Select shared key to use" -msgstr "Seleccione a clave compartida a usar" - -#: ../properties/nm-openvpn.c:1244 -msgid "Select TA to use" -msgstr "Seleccione a TA a usar" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1438 -msgid "Save as..." -msgstr "Gardar como..." - -#: ../properties/nm-openvpn.c:1468 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Xa existe un ficheiro co nome \"%s\"." - -#: ../properties/nm-openvpn.c:1471 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Desexa reemprazalo co ficheiro que está gardando?" - -#: ../properties/nm-openvpn.c:1485 -msgid "Failed to export configuration" -msgstr "Fallou a exportación da configuración" - -#: ../properties/nm-openvpn.c:1487 -#, c-format -msgid "Failed to save file %s" -msgstr "Ocorreu un erro ao gardar o ficheiro %s" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(Predeterminado: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "0" -msgstr "0" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "1" -msgstr "1" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Connection Information" -msgstr "Información da conexión" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Connection Name" -msgstr "Nome da conexión" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "Required" -msgstr "Obrigatoria" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "exemplo: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "CA file:" -msgstr "Ficheiro CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "CA file:" -msgstr "Ficheiro CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Certificate:" -msgstr "Certificado:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Connection Name" -msgstr "Nome da conexión" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Connection Type:" -msgstr "Tipo de conexión:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Direction:" -msgstr "Enderezo:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Gateway _Port:" -msgstr "_Pasarela:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Key:" -msgstr "Clave:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Local IP:" -msgstr "IP local:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"O _nome empregado para identificar a conexión á rede privada, por exemplo: " -"\"VPN do campus\" ou \"Rede corporativa\"" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Optional" -msgstr "Opcional" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Password" -msgstr "Contrasinal" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Introduza a información proporcionada polo seu administrador de sistemas " -"aquí embaixo. Non introduza o seu contrasinal, posto que se lle pedirá cando " -"conecte." - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your adminstrator for the file." -msgstr "" -"Observe que o ficheiro que está importando non é un ficheiro de " -"configuración OpenVPN. Pregúntelle ao seu administrador polo ficheiro." - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Remote IP:" -msgstr "IP remota:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Shared Key:" -msgstr "Clave compartida:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Shared key" -msgstr "Clave compartida" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Use LZO compression" -msgstr "Usar compresión LZO" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "Use TAP device" -msgstr "Usar dispositivo TAP" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "Use TCP connection" -msgstr "Usar conexión TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "Use TLS auth:" -msgstr "Usar auth TLS:" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "Use cipher:" -msgstr "Usar cifrado:" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "Username:" -msgstr "Nome de usuario:" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "X.509" -msgstr "X.509" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"Certificados X.509\n" -"Clave precompartida\n" -"Autenticación por contrasinal\n" -"X.509 con autenticación por contrasinal" - -#: ../properties/nm-openvpn-dialog.glade.h:36 -msgid "X.509/Pass" -msgstr "X.509/Pass" - -#: ../properties/nm-openvpn-dialog.glade.h:37 -msgid "_Gateway Address:" -msgstr "Enderezo da _pasarela:" - -#: ../properties/nm-openvpn-dialog.glade.h:38 -msgid "_Import Saved Configuration..." -msgstr "_Importar a configuración gardada...." - -#: ../properties/nm-openvpn-dialog.glade.h:39 -msgid "_Only use VPN connection for these addresses" -msgstr "Usar _só a conexión VPN para estes enderezos" - -#: ../properties/nm-openvpn-dialog.glade.h:40 -msgid "none" -msgstr "ningún" - -#: ../src/nm-openvpn-service.c:127 -msgid "" -"The VPN login failed because the user name and password were not accepted or " -"the certificate password was wrong." -msgstr "" -"O acceso VPN fallou porque o nome de usuario e o contrasinal non foron " -"aceptados ou o contrasinal do certificado é erróneo." - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "O acceso VPN fallou porque non se puido iniciar o programa VPN." - -#: ../src/nm-openvpn-service.c:131 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "O acceso VPN fallou porque o programa VPN non puido conectar co servidor VPN." - -#: ../src/nm-openvpn-service.c:133 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "O acceso VPN fallou porque as opcións de configuración de VPN eran inválidas." - -#: ../src/nm-openvpn-service.c:135 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"O acceso VPN fallou porque o programa VPN recibiu unha configuración " -"incorrecta do servidor VPN." - -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "Fallou a conexión VPN" - diff --git a/vpn-daemons/openvpn/po/hu.po b/vpn-daemons/openvpn/po/hu.po deleted file mode 100644 index 832396a487..0000000000 --- a/vpn-daemons/openvpn/po/hu.po +++ /dev/null @@ -1,240 +0,0 @@ -# Hungarian translation of NetworkManager-openvpn. -# Copyright (C) 2006, 2007, 2008 The Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager-openvpn package. -# -# Gabor Halaszvari , 2006. -# Gabor Kelemen , 2006, 2007, 2008. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 23:18+0200\n" -"PO-Revision-Date: 2008-09-25 23:19+0200\n" -"Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Jelszó:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "Jelszó _még egyszer:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Felhasználói név:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Tartomány:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Csatlakozás _névtelenül" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Csatlakozás _mint:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "Je_lszó megjegyzése a munkamenetre" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "Jelszó mentése a _kulcstartóra" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Azonosítania kell magát a(z) „%s” virtuális magánhálózat eléréséhez." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "VPN azonosítás" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "Tanúsítvány _jelszava:" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Tanúsítvány jelszava:" - -#: ../properties/auth-helpers.c:161 -msgid "Choose a Certificate Authority certificate..." -msgstr "Válasszon hitelesítésszolgáltatói tanúsítványt…" - -#: ../properties/auth-helpers.c:180 -msgid "Choose your personal certificate..." -msgstr "Válassza ki a személyes tanúsítványát…" - -#: ../properties/auth-helpers.c:198 -msgid "Choose your private key..." -msgstr "Válassza ki a személyes kulcsát…" - -#: ../properties/auth-helpers.c:251 -msgid "Choose an OpenVPN static key..." -msgstr "Válassza ki az OpenVPN statikus kulcsát…" - -#: ../properties/auth-helpers.c:275 ../properties/auth-helpers.c:1002 -msgid "None" -msgstr "Nincs" - -#: ../properties/auth-helpers.c:660 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "PEM tanúsítványok (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:720 -msgid "OpenVPN Static Keys (*.key)" -msgstr "OpenVPN statikus kulcsok (*.key)" - -#: ../properties/auth-helpers.c:831 -msgid "Default" -msgstr "Alapértelmezett" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Kompatibilis az OpenVPN kiszolgálóval." - -#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Certificates (TLS)" -msgstr "Tanúsítványok (TLS)" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Jelszó" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Jelszó tanúsítványokkal (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Statikus kulcs" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Hitelesítés" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Általános" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"A kulcsirány használatakor a VPN partneren használttal ellentétesnek kell " -"lennie. Ha például a partner 1-et használ, akkor a kapcsolatnak 0-t kell. Ha " -"nem biztos benne, hogy melyik értéket kell használnia, keresse meg a " -"rendszergazdát." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "S_peciális…" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "CA tanúsítvány:" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificate Password:" -msgstr "Tanúsítvány jelszava:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Cipher:" -msgstr "Rejtjelzés:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "General" -msgstr "Általános" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key Direction:" -msgstr "Kulcsirány:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Key File:" -msgstr "Kulcsfájl:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Local IP Address:" -msgstr "Helyi IP cím:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "OpenVPN speciális beállításai" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Password:" -msgstr "Jelszó:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Személyes kulcs:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Select A File" -msgstr "Válasszon fájlt" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Show passwords" -msgstr "Jelszavak megjelenítése" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Static Key:" -msgstr "Statikus kulcs:" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Type:" -msgstr "Típus:" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use L_ZO data compression" -msgstr "L_ZO tömörítés használata" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a TA_P device" -msgstr "TA_P eszköz használata" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use a _TCP connection" -msgstr "T_CP kapcsolat használata" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use additional TLS authentication" -msgstr "Kiegészítő TLS hitelesítés használata" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Use custom gateway p_ort:" -msgstr "Egyéni átjáró_port használata:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User Certificate:" -msgstr "Felhasználói tanúsítvány:" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "User name:" -msgstr "Felhasználónév:" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "_Gateway:" -msgstr "Á_tjáró:" - diff --git a/vpn-daemons/openvpn/po/it.po b/vpn-daemons/openvpn/po/it.po deleted file mode 100644 index b18ec45c7d..0000000000 --- a/vpn-daemons/openvpn/po/it.po +++ /dev/null @@ -1,223 +0,0 @@ -# Italian translation of NetworkManager-OpenVPN. -# Copyright (C) 2008 THE NetworkManager-OpenVPN'S COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager-OpenVPN package. -# Francesco Marletta , 2006-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-OpenVPN 0.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-17 04:41+0000\n" -"PO-Revision-Date: 2008-09-17 12:28-0400\n" -"Last-Translator: Francesco Marletta \n" -"Language-Team: italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Password:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "Password _secondaria:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "Nome _utente:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Connessione _anonima" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Connessione come _utente:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Ricorda la password per questa sessione" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Salva la password nel portachiavi" - -#: ../auth-dialog/main.c:210 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"È necessario autenticarsi per accedere alla Rete Privata Virtuale (VPN) '%s'." - -#: ../auth-dialog/main.c:211 -msgid "Authenticate VPN" -msgstr "Autenticazione VPN" - -#: ../auth-dialog/main.c:232 -msgid "Certificate pass_word:" -msgstr "Pass_word del certificato:" - -#: ../auth-dialog/main.c:246 -msgid "Certificate password:" -msgstr "Password del certificato:" - -#: ../properties/auth-helpers.c:69 -msgid "Choose a Certificate Authority certificate..." -msgstr "Scegliere il certificato di un'Autorità di Certificazione..." - -#: ../properties/auth-helpers.c:88 -msgid "Choose your personal certificate..." -msgstr "Scegliere il certificato personale..." - -#: ../properties/auth-helpers.c:106 -msgid "Choose your private key..." -msgstr "Scegliere la propria chiave privata..." - -#: ../properties/auth-helpers.c:159 -msgid "Choose an OpenVPN static key..." -msgstr "Scegliere una chiave statica OpenVPN..." - -#: ../properties/auth-helpers.c:183 ../properties/auth-helpers.c:862 -msgid "None" -msgstr "Nessuno" - -#: ../properties/auth-helpers.c:518 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "Certificati PEM (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:578 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Chiavi statiche OpenVPN (*.key)" - -#: ../properties/auth-helpers.c:689 -msgid "Default" -msgstr "Predefinito" - -#: ../properties/nm-openvpn.c:52 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:53 -msgid "Compatible with the OpenVPN server." -msgstr "Compatibile con il server OpenVPN." - -#: ../properties/nm-openvpn.c:310 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Certificati (TLS)" - -#: ../properties/nm-openvpn.c:322 -msgid "Password" -msgstr "Password" - -#: ../properties/nm-openvpn.c:336 -msgid "Password with Certificates (TLS)" -msgstr "Password con Certificati (TLS)" - -#: ../properties/nm-openvpn.c:348 -msgid "Static Key" -msgstr "Chiave statica" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Autenticazione" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Generale" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Se la direzione della chiave è usata, deve essere opposta a quella usata " -"sul peer della VPN. Per esempio, se il peer usa \"1\", questa connessione " -"deve usare \"0\". Se si è incerti sul valore da usare, contattare " -"l'amministratore di sistema." - -# NdT: sono le preferenze avanzate -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "A_vanzate..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Certificato CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Cifrario:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Generale" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Direzione chiave:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "File chiave:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "Indirizzo IP locale:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "Opzioni OpenVPN avanzate" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Private Key:" -msgstr "Chiave privata:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Static Key:" -msgstr "Chiave statica:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Type:" -msgstr "Tipo:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Use L_ZO data compression" -msgstr "Usare compressione L_ZO" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Use a TA_P device" -msgstr "Usare device TA_P" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use a _TCP connection" -msgstr "Usare connessione _TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use additional TLS authentication" -msgstr "Usare autenticazione TLS aggiuntiva" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use custom gateway p_ort:" -msgstr "Usare p_orta gateway personalizzata:" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "User Certificate:" -msgstr "Certificato utente:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "User name:" -msgstr "Nome utente:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "_Gateway:" -msgstr "_Gateway:" diff --git a/vpn-daemons/openvpn/po/ja.po b/vpn-daemons/openvpn/po/ja.po deleted file mode 100644 index 10a74b1d37..0000000000 --- a/vpn-daemons/openvpn/po/ja.po +++ /dev/null @@ -1,476 +0,0 @@ -# Japanese message catalog for NetworkManager-openvpn -# Copyright (C) 2006 THE NetworkManager-openvpn's COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager-openvpn package. -# Satoru SATOH , 2006, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-23 00:35+0900\n" -"PO-Revision-Date: 2007-07-23 00:56+0900\n" -"Last-Translator: Satoru SATOH \n" -"Language-Team: Japanese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "パスワード(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "第二パスワード(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "ユーザ名(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "ドメイン(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "匿名で接続(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "ユーザで接続(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "このセッションのパスワードを記憶する(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "パスワードをキーリングに保存する(_S)" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "仮想プライベートネットワーク '%s' にアクセスするには認証が必要です。" - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "VPN 認証" - -#: ../auth-dialog/main.c:227 -msgid "Certificate pass_word:" -msgstr "証明パスワード(_W):" - -#: ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "証明パスワード:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN 接続を追加、削除または編集" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "VPN 接続マネージャ (OpenVPN)" - -#: ../properties/nm-openvpn.c:146 -msgid "OpenVPN Client" -msgstr "OpenVPN クライアント" - -#: ../properties/nm-openvpn.c:803 -msgid "The following OpenVPN connection will be created:" -msgstr "次の OpenVPN 接続を作成します:" - -#: ../properties/nm-openvpn.c:805 -#, c-format -msgid "Name: %s" -msgstr "名前: %s" - -#: ../properties/nm-openvpn.c:813 -msgid "Connection Type: X.509 Certificates" -msgstr "接続タイプ: X.509 証明" - -#: ../properties/nm-openvpn.c:816 ../properties/nm-openvpn.c:843 -#: ../properties/nm-openvpn.c:855 -#, c-format -msgid "CA: %s" -msgstr "認証局: %s" - -#: ../properties/nm-openvpn.c:819 ../properties/nm-openvpn.c:858 -#, c-format -msgid "Cert: %s" -msgstr "証明: %s" - -#: ../properties/nm-openvpn.c:822 ../properties/nm-openvpn.c:861 -#, c-format -msgid "Key: %s" -msgstr "鍵: %s" - -#: ../properties/nm-openvpn.c:826 -msgid "Connection Type: Shared Key" -msgstr "接続タイプ: 共有鍵" - -#: ../properties/nm-openvpn.c:829 -#, c-format -msgid "Shared Key: %s" -msgstr "共有鍵: %s" - -#: ../properties/nm-openvpn.c:832 -#, c-format -msgid "Local IP: %s" -msgstr "ローカル IP: %s" - -#: ../properties/nm-openvpn.c:835 -#, c-format -msgid "Remote IP: %s" -msgstr "リモート IP: %s" - -#: ../properties/nm-openvpn.c:840 -msgid "Connection Type: Password" -msgstr "接続タイプ: パスワード" - -#: ../properties/nm-openvpn.c:846 ../properties/nm-openvpn.c:864 -#, c-format -msgid "Username: %s" -msgstr "ユーザ名: %s" - -#: ../properties/nm-openvpn.c:852 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "接続タイプ: X.509 + パスワード認証" - -#: ../properties/nm-openvpn.c:870 -#, c-format -msgid "Remote: %s" -msgstr "リモート: %s" - -#: ../properties/nm-openvpn.c:873 -#, c-format -msgid "Port: %s" -msgstr "ポート: %s" - -#: ../properties/nm-openvpn.c:876 -#, c-format -msgid "Device: %s" -msgstr "デバイス: %s" - -#: ../properties/nm-openvpn.c:876 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:876 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:879 -#, c-format -msgid "Protocol: %s" -msgstr "プロトコル: %s" - -#: ../properties/nm-openvpn.c:879 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:879 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:883 -#, c-format -msgid "Routes: %s" -msgstr "ルート: %s" - -#: ../properties/nm-openvpn.c:887 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "LZO 圧縮の使用: %s" - -#: ../properties/nm-openvpn.c:887 -msgid "Yes" -msgstr "はい" - -#: ../properties/nm-openvpn.c:887 -msgid "No" -msgstr "いいえ" - -#: ../properties/nm-openvpn.c:891 -#, c-format -msgid "Cipher: %s" -msgstr "暗号: %s" - -#: ../properties/nm-openvpn.c:896 -#, c-format -msgid "TLS auth: %s %s" -msgstr "TLS 認証: %s %s" - -#: ../properties/nm-openvpn.c:900 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "接続の詳細は\"編集\"ボタンで変更できます。" - -#: ../properties/nm-openvpn.c:1124 -msgid "Cannot import settings" -msgstr "設定をインポートできません" - -#: ../properties/nm-openvpn.c:1126 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "VPN 設定ファイル '%s' には適切なデータが含まれていません。" - -#: ../properties/nm-openvpn.c:1173 -msgid "Select file to import" -msgstr "インポートするファイルを選択" - -#: ../properties/nm-openvpn.c:1232 ../properties/nm-openvpn.c:1244 -#: ../properties/nm-openvpn.c:1247 -msgid "Select CA to use" -msgstr "利用する認証局を選択" - -#: ../properties/nm-openvpn.c:1235 ../properties/nm-openvpn.c:1250 -msgid "Select certificate to use" -msgstr "利用する証明を選択" - -#: ../properties/nm-openvpn.c:1238 ../properties/nm-openvpn.c:1253 -msgid "Select key to use" -msgstr "利用する鍵を選択" - -#: ../properties/nm-openvpn.c:1241 -msgid "Select shared key to use" -msgstr "利用する共有鍵を選択" - -#: ../properties/nm-openvpn.c:1256 -msgid "Select TA to use" -msgstr "利用する TA を選択" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1450 -msgid "Save as..." -msgstr "別名で保存..." - -#: ../properties/nm-openvpn.c:1480 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "ファイル \"%s\" は既にあります。" - -#: ../properties/nm-openvpn.c:1483 -msgid "Do you want to replace it with the one you are saving?" -msgstr "保存しようとしているファイルで上書きしますか?" - -#: ../properties/nm-openvpn.c:1497 -msgid "Failed to export configuration" -msgstr "設定のエクスポートに失敗" - -#: ../properties/nm-openvpn.c:1499 -#, c-format -msgid "Failed to save file %s" -msgstr "ファイル %s の保存に失敗" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(デフォルト: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "65536" -msgstr "65536" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "例: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Ad_vanced" -msgstr "詳細(_V)" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "C_A file:" -msgstr "認証局ファイル(_A):" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "C_ertificate:" -msgstr "証明書(_E):" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Co_nnection type:" -msgstr "接続タイプ(_N):" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Connection na_me:" -msgstr "接続名(_M):" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Direction:" -msgstr "方向:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Import _Saved Configuration..." -msgstr "保存した設定をインポート(_S)..." - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"プライベートネットワークへの接続を識別する名前。例えば\"キャンパス VPN\" や" -" \"社内ネットワーク\" など。" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Network" -msgstr "ネットワーク" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Only use _VPN connection for these addresses:" -msgstr "これらのアドレスについてのみ VPN 接続を利用(_V)" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "Options の詳細オプション" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "OpenVPN Configuration" -msgstr "OpenVPN 設定" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"システム管理者が提供した情報を下に入力してください。接続時にきかれるまではパ" -"スワードは入力しないでください。" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" -"インポートしたファイルは OpenVPN の設定ファイルではありません。" -"システム管理者にファイルについて尋ねてください。" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared _key:" -msgstr "共有鍵(_K):" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "TLS-Auth" -msgstr "TLS 認証" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO compression" -msgstr "LZO 圧縮を使用(_Z)" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TA_P device" -msgstr "TAP デバイスを使用 (_P)" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use _TCP connection" -msgstr "TCP 接続を使用 (_T)" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use _TLS auth:" -msgstr "TLS 認証を使用 (_T):" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cip_her:" -msgstr "暗号を使用 (_H):" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"X.509 証明\n" -"事前共有鍵\n" -"パスワード認証\n" -"X.509 + パスワード認証" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "_0" -msgstr "0(_0)" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "_1" -msgstr "1(_1)" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway address:" -msgstr "ゲートウェイアドレス (_G):" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Gateway port:" -msgstr "ゲートウェイポート (_G):" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Key:" -msgstr "鍵(_K):" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Local IP:" -msgstr "ローカル IP (_L):" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "_Remote IP:" -msgstr "リモート IP (_R):" - -#: ../properties/nm-openvpn-dialog.glade.h:36 -msgid "_User name:" -msgstr "ユーザ名 (_U):" - -#: ../properties/nm-openvpn-dialog.glade.h:37 -msgid "_none" -msgstr "なし (_N)" - -#: ../src/nm-openvpn-service.c:127 -msgid "" -"The VPN login failed because the user name and password were not accepted or " -"the certificate password was wrong." -msgstr "" -"VPN ログインに失敗。ユーザ名、パスワードあるいは証明パスワードが間違っていま" -"す。" - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "VPN ログインに失敗。VPN プログラムを起動できませんでした。" - -#: ../src/nm-openvpn-service.c:131 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"VPN ログインに失敗。VPN プログラムは VPN サーバに接続できませんでした。" - -#: ../src/nm-openvpn-service.c:133 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "VPN ログインに失敗。VPN 設定オプションが間違っています。" - -#: ../src/nm-openvpn-service.c:135 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"VPN ログインに失敗。VPN プログラムが VPN サーバから受け取った設定は適切なもの" -"ではありません。" - -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "VPN 接続に失敗" - -#~ msgid "Connection Name" -#~ msgstr "接続名" - -#~ msgid "Optional Information" -#~ msgstr "オプション情報" - -#~ msgid "Required Information" -#~ msgstr "必須情報" - -#~ msgid "Password" -#~ msgstr "パスワード" - -#~ msgid "Shared Key:" -#~ msgstr "共有鍵:" - -#~ msgid "Username:" -#~ msgstr "ユーザ名:" - -#~ msgid "X.509" -#~ msgstr "X.509" diff --git a/vpn-daemons/openvpn/po/ka.po b/vpn-daemons/openvpn/po/ka.po deleted file mode 100644 index bbbc4da3cc..0000000000 --- a/vpn-daemons/openvpn/po/ka.po +++ /dev/null @@ -1,515 +0,0 @@ -# translation of NetworkManager-openvpn.HEAD.po to Georgian -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2007. -# Malkhaz Barkalaya მალზახ ბარკალაია -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-02 03:30+0000\n" -"PO-Revision-Date: 2007-03-07 01:02+0100\n" -"Last-Translator: Vladimer Sichinava ვლადიმერ სიჭინავა \n" -"Language-Team: Georgian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=1; plural=0\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_პაროლი:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_მეორადი პაროლი:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_მომხმარებელი:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_დომენი:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "_ანონიმური დაკავშირება" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "" -"_სახელი, რომლითაც " -"ვუკავშირდებით:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "" -"_მიმდინარე სესიის პაროლის " -"დამახსოვრება" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_გასაღების შენახვა აცმაში" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "VPN '%s' ითხოვს ავტორიზაციას." - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "VPN-ავტორიზაცია" - -#: ../auth-dialog/main.c:227 -msgid "Certificate pass_word:" -msgstr "_სერტიფიკატის პაროლი:" - -#: ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "სერტიფიკატის პაროლი:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "" -"VPN-შეერთების დამატება, მოხსნა " -"და რედაქტირება" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "VPN-შეერთებების მენეჯერი (OpenVPN)" - -#: ../properties/nm-openvpn.c:143 -msgid "OpenVPN Client" -msgstr "OpenVPN-კლიენტი" - -#: ../properties/nm-openvpn.c:799 -msgid "The following OpenVPN connection will be created:" -msgstr "იხსნება OpenVPN-შეერთება:" - -#: ../properties/nm-openvpn.c:801 -#, c-format -msgid "Name: %s" -msgstr "სახელი: %s" - -#: ../properties/nm-openvpn.c:809 -msgid "Connection Type: X.509 Certificates" -msgstr "" -"შეერთების ტიპი: X.509 " -"სერტიფიკატები" - -#: ../properties/nm-openvpn.c:812 ../properties/nm-openvpn.c:839 -#: ../properties/nm-openvpn.c:851 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:815 ../properties/nm-openvpn.c:854 -#, c-format -msgid "Cert: %s" -msgstr "სერტ: %s" - -#: ../properties/nm-openvpn.c:818 ../properties/nm-openvpn.c:857 -#, c-format -msgid "Key: %s" -msgstr "გასაღები: %s" - -#: ../properties/nm-openvpn.c:822 -msgid "Connection Type: Shared Key" -msgstr "" -"შეერთების ტიპი:ზიარი " -"გასაღები" - -#: ../properties/nm-openvpn.c:825 -#, c-format -msgid "Shared Key: %s" -msgstr "ზიარი გასაღები: %s" - -#: ../properties/nm-openvpn.c:828 -#, c-format -msgid "Local IP: %s" -msgstr "ლოკალური IP: %s" - -#: ../properties/nm-openvpn.c:831 -#, c-format -msgid "Remote IP: %s" -msgstr "დისტანციური IP: %s" - -#: ../properties/nm-openvpn.c:836 -msgid "Connection Type: Password" -msgstr "შეერთების ტიპი: პაროლი" - -#: ../properties/nm-openvpn.c:842 ../properties/nm-openvpn.c:860 -#, c-format -msgid "Username: %s" -msgstr "მომხმარებელი: %s" - -#: ../properties/nm-openvpn.c:848 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "" -"შეერთების ტიპი: X.509 პაროლის " -"ავტორიზაციით" - -#: ../properties/nm-openvpn.c:866 -#, c-format -msgid "Remote: %s" -msgstr "დისტანციური: %s" - -#: ../properties/nm-openvpn.c:869 -#, c-format -msgid "Port: %s" -msgstr "პორტი: %s" - -#: ../properties/nm-openvpn.c:872 -#, c-format -msgid "Device: %s" -msgstr "მოწყობილობა: %s" - -#: ../properties/nm-openvpn.c:872 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:872 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:875 -#, c-format -msgid "Protocol: %s" -msgstr "პროტოკოლი: %s" - -#: ../properties/nm-openvpn.c:875 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:875 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:879 -#, c-format -msgid "Routes: %s" -msgstr "მარშრუტები: %s" - -#: ../properties/nm-openvpn.c:883 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "LZO კუმშვის მეთოდი: %s" - -#: ../properties/nm-openvpn.c:883 -msgid "Yes" -msgstr "დიახ" - -#: ../properties/nm-openvpn.c:883 -msgid "No" -msgstr "არა" - -#: ../properties/nm-openvpn.c:887 -#, c-format -msgid "Cipher: %s" -msgstr "ციფრი: %s" - -#: ../properties/nm-openvpn.c:892 -#, c-format -msgid "TLS auth: %s %s" -msgstr "TLS ავტ: %s %s" - -#: ../properties/nm-openvpn.c:896 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" -"შეერთების დეტალების შეცვლა " -"შეიძლება \"Edit\" ღილაკით." - -#: ../properties/nm-openvpn.c:1121 -msgid "Cannot import settings" -msgstr "" -"ვერ ხერხდება პარამეტრების " -"იმპორტი" - -#: ../properties/nm-openvpn.c:1123 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "" -"VPN პარამეტრების ფაილი '%s' არ " -"შეიცავს საჭირო მონაცემებს." - -#: ../properties/nm-openvpn.c:1161 -msgid "Select file to import" -msgstr "" -"მიუთითეთ ფაილი " -"იმპორტისათვის" - -#: ../properties/nm-openvpn.c:1220 ../properties/nm-openvpn.c:1232 -#: ../properties/nm-openvpn.c:1235 -msgid "Select CA to use" -msgstr "მიუთითეთ CA" - -#: ../properties/nm-openvpn.c:1223 ../properties/nm-openvpn.c:1238 -msgid "Select certificate to use" -msgstr "მიუთითეთ სერტიფიკატი" - -#: ../properties/nm-openvpn.c:1226 ../properties/nm-openvpn.c:1241 -msgid "Select key to use" -msgstr "მიუთითეთ გასაღები" - -#: ../properties/nm-openvpn.c:1229 -msgid "Select shared key to use" -msgstr "მიუთითეთ ზიარი გასაღები" - -#: ../properties/nm-openvpn.c:1244 -msgid "Select TA to use" -msgstr "მიუთითეთ TA" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1438 -msgid "Save as..." -msgstr "შეინახე როგორც..." - -#: ../properties/nm-openvpn.c:1468 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "ფაილი \"%s\" უკვე არსებობს." - -#: ../properties/nm-openvpn.c:1471 -msgid "Do you want to replace it with the one you are saving?" -msgstr "შევცვალოთ თქვენი ფაილით?" - -#: ../properties/nm-openvpn.c:1485 -msgid "Failed to export configuration" -msgstr "" -"კონფიგურაციის ექსპორტი ვერ " -"მოხერხდა" - -#: ../properties/nm-openvpn.c:1487 -#, c-format -msgid "Failed to save file %s" -msgstr "" -"ვერ მოხერხდა %s ფაილის " -"შენახვა" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(ნაგულისხმევი: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "0" -msgstr "0" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "1" -msgstr "1" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Connection Information" -msgstr "" -"ინფორმაცია შეერთების " -"შესახებ" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Connection Name" -msgstr "შეერთების სახელი" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "Required" -msgstr "საჭიროა" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "მაგალითი: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "CA file:" -msgstr "CA ფაილი:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "CA file:" -msgstr "CA ფაილი:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Certificate:" -msgstr "სერტიფიკატი:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Connection Name" -msgstr "შეერთების სახელი" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Connection Type:" -msgstr "შეერთების ტიპი:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Direction:" -msgstr "მიმართულება:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Gateway _Port:" -msgstr "_რაბის პორტი:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Key:" -msgstr "გასაღები:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Local IP:" -msgstr "ლოკალური IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"VPN-იდენტიფიკატორი, მაგ.: \"Campus VPN\" " -"ან \"Corporate Network\"" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Optional" -msgstr "არ არის სავალდებულო" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Password" -msgstr "პაროლი" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"შეიყვანეთ სისტემური " -"ადმინისტრატორისაგან " -"მიღებული ინფორმაცია. " -"შეერთებისას აქ ნუ შეიყვანთ " -"თქვენს პაროლს." - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your adminstrator for the file." -msgstr "" -"თქვენს მიერ იმპორტირებული " -"ფაილი არ არის OpenVPN " -"კონფიგურაციის ფაილი. " -"მოსთხოვეთ ფაილი თქვენს " -"ადმინისტრატორს." - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Remote IP:" -msgstr "დისტანციური IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Shared Key:" -msgstr "ზიარი გასაღები:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Shared key" -msgstr "ზიარი გასაღები" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Use LZO compression" -msgstr "LZO-კუმშვის გამოყენება" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "Use TAP device" -msgstr "TAP მოწყობილობის გამოყენება" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "Use TCP connection" -msgstr "TCP შეერთების გამოყენება" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "Use TLS auth:" -msgstr "TLS ავტ:" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "Use cipher:" -msgstr "ციფრი:" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "Username:" -msgstr "მომხმარებლის სახელი:" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "X.509" -msgstr "X.509" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"X.509 სერტიფიკატები\n" -"წინასწარგაზიარებული " -"გასაღები\n" -"პაროლით ავტორიზება\n" -"X.509 პაროლით ავტორიზებით" - -#: ../properties/nm-openvpn-dialog.glade.h:36 -msgid "X.509/Pass" -msgstr "X.509/პარ" - -#: ../properties/nm-openvpn-dialog.glade.h:37 -msgid "_Gateway Address:" -msgstr "_რაბის მისამართი" - -#: ../properties/nm-openvpn-dialog.glade.h:38 -msgid "_Import Saved Configuration..." -msgstr "" -"_შენახული კონფიგურაციის " -"იმპორტი..." - -#: ../properties/nm-openvpn-dialog.glade.h:39 -msgid "_Only use VPN connection for these addresses" -msgstr "" -"_ამ მისამართებისათვის " -"მხოლოდ VPN-შეერთება" - -#: ../properties/nm-openvpn-dialog.glade.h:40 -msgid "none" -msgstr "არა" - -#: ../src/nm-openvpn-service.c:127 -msgid "" -"The VPN login failed because the user name and password were not accepted or " -"the certificate password was wrong." -msgstr "" -"VPN-ში შესვლა ვერ მოხერხდა - " -"არასწორია მომხმარებლის " -"სახელი/პაროლი ან " -"სერტიფიკატის პაროლი." - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" -"VPN-ში შესვლა ვერ მოხერხდა - " -"პროგრამა ვერ გაიშვა." - -#: ../src/nm-openvpn-service.c:131 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"VPN-ში შესვლა ვერ მოხერხდა - " -"VPN-პროგრამა ვერ დაუკავშირდა " -"VPN-სერვერს." - -#: ../src/nm-openvpn-service.c:133 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "" -"VPN-ში შესვლა ვერ მოხერხდა - " -"არასწორია VPN-კონფიგურაციის " -"პარამეტრები." - -#: ../src/nm-openvpn-service.c:135 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"VPN-ში შესვლა ვერ მოხერხდა - " -"VPN-პროგრამამ ვერ მიიღო სწორი " -"კონფიგურაცია " -"VPN-სერვერისაგან." - -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "VPN-თან შეერთება ვერ მოხერხდა" - diff --git a/vpn-daemons/openvpn/po/ko.po b/vpn-daemons/openvpn/po/ko.po deleted file mode 100644 index 50b6d86ae4..0000000000 --- a/vpn-daemons/openvpn/po/ko.po +++ /dev/null @@ -1,467 +0,0 @@ -# GNOME Korea translation of nm-openvpn. -# Copyright (C) 2007 THE nm-openvpn'S COPYRIGHT HOLDER -# This file is distributed under the same license as the nm-openvpn package. -# Young-Ho Cha , 2007. -# Namhyung Kim , 2007. -# -# -msgid "" -msgstr "" -"Project-Id-Version: nm-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-13 14:35+0000\n" -"PO-Revision-Date: 2007-12-24 18:33+0900\n" -"Last-Translator: Namhyung@gmail.com \n" -"Language-Team: GNOME Korea \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "암호(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "보조 암호(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "사용자 이름(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "도메인(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "익명으로 연결(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "사용자로 연결(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "이 세션에서 암호 기억(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "키링에 암호 저장(_S)" - -#: ../auth-dialog/main.c:181 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "가상 사설 네트워크 '%s'에 접근할 때 인증이 필요합니다." - -#: ../auth-dialog/main.c:182 -msgid "Authenticate VPN" -msgstr "VPN 인증" - -#: ../auth-dialog/main.c:195 -msgid "Certificate pass_word:" -msgstr "인증서 암호(_W):" - -#: ../auth-dialog/main.c:210 -msgid "Certificate password:" -msgstr "인증서 암호:" - -#: ../properties/nm-openvpn.c:150 -msgid "OpenVPN Client" -msgstr "OpenVPN 클라이언트" - -#: ../properties/nm-openvpn.c:824 -msgid "The following OpenVPN connection will be created:" -msgstr "다음 OpenVPN 연결이 만들어집니다:" - -#: ../properties/nm-openvpn.c:826 -#, c-format -msgid "Name: %s" -msgstr "이름: %s" - -#: ../properties/nm-openvpn.c:834 -msgid "Connection Type: X.509 Certificates" -msgstr "연결 형식: X.509 인증서" - -#: ../properties/nm-openvpn.c:837 ../properties/nm-openvpn.c:864 -#: ../properties/nm-openvpn.c:876 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:840 ../properties/nm-openvpn.c:879 -#, c-format -msgid "Cert: %s" -msgstr "인증서: %s" - -#: ../properties/nm-openvpn.c:843 ../properties/nm-openvpn.c:882 -#, c-format -msgid "Key: %s" -msgstr "키: %s" - -#: ../properties/nm-openvpn.c:847 -msgid "Connection Type: Shared Key" -msgstr "연결 형식: 공유키" - -#: ../properties/nm-openvpn.c:850 -#, c-format -msgid "Shared Key: %s" -msgstr "공유키: %s" - -#: ../properties/nm-openvpn.c:853 -#, c-format -msgid "Local IP: %s" -msgstr "로컬 IP: %s" - -#: ../properties/nm-openvpn.c:856 -#, c-format -msgid "Remote IP: %s" -msgstr "원격 IP: %s" - -#: ../properties/nm-openvpn.c:861 -msgid "Connection Type: Password" -msgstr "연결 형식: 암호" - -#: ../properties/nm-openvpn.c:867 ../properties/nm-openvpn.c:885 -#, c-format -msgid "Username: %s" -msgstr "사용자이름: %s" - -#: ../properties/nm-openvpn.c:873 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "연결 형식: X.509 및 암호 인증" - -#: ../properties/nm-openvpn.c:891 -#, c-format -msgid "Remote: %s" -msgstr "원격: %s" - -#: ../properties/nm-openvpn.c:894 -#, c-format -msgid "Port: %s" -msgstr "포트: %s" - -#: ../properties/nm-openvpn.c:897 -#, c-format -msgid "Device: %s" -msgstr "장치: %s" - -#: ../properties/nm-openvpn.c:897 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:897 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:900 -#, c-format -msgid "Protocol: %s" -msgstr "프로토콜: %s" - -#: ../properties/nm-openvpn.c:900 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:900 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:904 -#, c-format -msgid "Routes: %s" -msgstr "경로: %s" - -#: ../properties/nm-openvpn.c:908 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "LZO 압축 사용: %s" - -#: ../properties/nm-openvpn.c:908 -msgid "Yes" -msgstr "예" - -#: ../properties/nm-openvpn.c:908 -msgid "No" -msgstr "아니오" - -#: ../properties/nm-openvpn.c:912 -#, c-format -msgid "Cipher: %s" -msgstr "암호화: %s" - -#: ../properties/nm-openvpn.c:917 -#, c-format -msgid "TLS auth: %s %s" -msgstr "TLS 인증: %s %s" - -#: ../properties/nm-openvpn.c:921 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "\"편집\" 단추를 눌러서 연결 설정을 바꿀 수 있습니다." - -#: ../properties/nm-openvpn.c:1151 -msgid "Cannot import settings" -msgstr "설정을 가져올 수 없음" - -#: ../properties/nm-openvpn.c:1153 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "VPN 설정 파일 '%s'에 올바른 데이터가 들어있지 않습니다." - -#: ../properties/nm-openvpn.c:1200 -msgid "Select file to import" -msgstr "가져올 파일 선택" - -#: ../properties/nm-openvpn.c:1259 ../properties/nm-openvpn.c:1271 -#: ../properties/nm-openvpn.c:1274 -msgid "Select CA to use" -msgstr "사용할 CA 선택" - -#: ../properties/nm-openvpn.c:1262 ../properties/nm-openvpn.c:1277 -msgid "Select certificate to use" -msgstr "사용할 인증서 선택" - -#: ../properties/nm-openvpn.c:1265 ../properties/nm-openvpn.c:1280 -msgid "Select key to use" -msgstr "사용할 키 선택" - -#: ../properties/nm-openvpn.c:1268 -msgid "Select shared key to use" -msgstr "사용할 공유키 선택" - -#: ../properties/nm-openvpn.c:1283 -msgid "Select TA to use" -msgstr "사용할 TA 선택" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1525 -msgid "Save as..." -msgstr "다른 이름으로 저장..." - -#: ../properties/nm-openvpn.c:1554 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "\"%s\" 파일이 이미 있습니다." - -#: ../properties/nm-openvpn.c:1557 -msgid "Do you want to replace it with the one you are saving?" -msgstr "이를 저장할 파일로 바꾸겠습니까?" - -#: ../properties/nm-openvpn.c:1571 -msgid "Failed to export configuration" -msgstr "설정 내보내기 실패" - -#: ../properties/nm-openvpn.c:1573 -#, c-format -msgid "Failed to save file %s" -msgstr "파일 %s(으)로 저장 실패" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(기본값: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "65536" -msgstr "65536" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "예: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Ad_vanced" -msgstr "고급(_V)" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "C_A file:" -msgstr "CA 파일(_A):" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "C_ertificate:" -msgstr "인증서(_E):" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Co_nnection type:" -msgstr "연결 형식(_N):" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Connection na_me:" -msgstr "연결 이름(_M):" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Direction:" -msgstr "방향:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Import _Saved Configuration..." -msgstr "저장된 설정 가져오기(_S)..." - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "사설 네트워크 연결에 붙일 이름. (예: \"학교 VPN\", \"회사 네트워크\")" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Network" -msgstr "네트워크" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Only use _VPN connection for these addresses:" -msgstr "이 주소에는 VPN 연결 만 사용(_V):" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "OpenVPN 고급 옵션" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "OpenVPN Configuration" -msgstr "OpenVPN 설정" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"시스템 관리자에게 받은 정보를 입력하십시오. 연결될 때 나타나는 화면에 암호를 " -"입력하지 마십시오." - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" -"가져올 파일은 OpenVPN 설정파일이 아닙니다. 관리자에게 파일에 대해 문의하시" -"기 바랍니다." - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared _key:" -msgstr "공유키(_K):" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "TLS-Auth" -msgstr "TLS 인증" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO compression" -msgstr "LZO 압축 사용(_Z)" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TA_P device" -msgstr "TAP 장치 사용(_P)" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use _TCP connection" -msgstr "TCP 연결 사용(_T)" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use _TLS auth:" -msgstr "TLS 인증 사용(_T):" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cip_her:" -msgstr "암호화 사용(_H):" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"X.509 인증서\n" -"미리 공유된 키\n" -"암호 인증\n" -"X.509 및 암호 인증" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "_0" -msgstr "0(_0)" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "_1" -msgstr "1(_1)" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway address:" -msgstr "게이트웨이 주소(_G):" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Gateway port:" -msgstr "게이트웨이 포트(_G):" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Key:" -msgstr "키(_K):" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Local IP:" -msgstr "로컬 IP(_L):" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "_Remote IP:" -msgstr "원격 IP(_R):" - -#: ../properties/nm-openvpn-dialog.glade.h:36 -msgid "_User name:" -msgstr "사용자 이름(_U):" - -#: ../properties/nm-openvpn-dialog.glade.h:37 -msgid "_none" -msgstr "없음(_N)" - -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN 연결 더하기, 지우기, 편집" - -msgid "VPN Connection Manager (OpenVPN)" -msgstr "VPN 연결 관리자 (OpenVPN)" - -msgid "Connection Name" -msgstr "연결 이름" - -msgid "Optional Information" -msgstr "기타 정보" - -msgid "Required Information" -msgstr "필수 정보" - -msgid "CA file:" -msgstr "CA 파일:" - -msgid "Password" -msgstr "열쇠글" - -msgid "Shared Key:" -msgstr "공유키:" - -msgid "Username:" -msgstr "사용자이름:" - -msgid "X.509" -msgstr "X.509" - -msgid "" -"The VPN login failed because the user name and password were not accepted or " -"the certificate password was wrong." -msgstr "사용자 이름과 열쇠글 또는 인증서 열쇠글이 틀려서 로그인 실패했습니다." - -msgid "The VPN login failed because the VPN program could not be started." -msgstr "VPN 프로그램을 시작할 수 없어서 로그인 실패했습니다." - -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "VPN 프로그램이 VPN 서버에 연결하지 못해서 로그인 실패했습니다." - -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "VPN 설정 옵션이 잘못되어서 로그인 실패했습니다." - -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"VPN 프로그램이 VPN 서버에서 잘못된 설정값을 받아서 로그인 실패했습니다." - -msgid "VPN connection failed" -msgstr "VPN 연결 실패" diff --git a/vpn-daemons/openvpn/po/lt.po b/vpn-daemons/openvpn/po/lt.po deleted file mode 100644 index d9f0d16b8a..0000000000 --- a/vpn-daemons/openvpn/po/lt.po +++ /dev/null @@ -1,241 +0,0 @@ -# Lithuanian translation of NetworkManager-openvpn. -# Copyright (C) 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager package. -# Žygimantas Beručka , 2008. -# -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-24 23:44+0300\n" -"PO-Revision-Date: 2008-09-25 00:02+0300\n" -"Last-Translator: Žygimantas Beručka \n" -"Language-Team: Lithuanian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Slaptažodis:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Antrinis slaptažodis:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Naudotojo vardas:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "S_ritis:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Jungtis an_onimiškai" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Prisijungti kaip na_udotojas:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Atsiminti slaptažodį šiam seansui" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "Iš_saugoti slaptažodį raktinėje" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Norint gauti prieigą prie Virtualiojo Privačiojo Tinklo „%s“, reikia " -"nustatyti jūsų tapatybę." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "Nustatyti tapatybę VPN" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "Liudijimo slaptažo_dis:" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Liudijimo slaptažodis:" - -#: ../properties/auth-helpers.c:161 -msgid "Choose a Certificate Authority certificate..." -msgstr "Pasirinkite liudijimų įstaigos liudijimą..." - -#: ../properties/auth-helpers.c:180 -msgid "Choose your personal certificate..." -msgstr "Pasirinkite savo asmeninį liudijimą..." - -#: ../properties/auth-helpers.c:198 -msgid "Choose your private key..." -msgstr "Pasirinkite savo asmeninį raktą..." - -#: ../properties/auth-helpers.c:251 -msgid "Choose an OpenVPN static key..." -msgstr "Pasirinkite OpenVPN statinį raktą..." - -#: ../properties/auth-helpers.c:275 ../properties/auth-helpers.c:1002 -msgid "None" -msgstr "Nėra" - -#: ../properties/auth-helpers.c:660 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "PEM liudijimai (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:720 -msgid "OpenVPN Static Keys (*.key)" -msgstr "OpenVPN statiniai raktai (*.key)" - -#: ../properties/auth-helpers.c:831 -msgid "Default" -msgstr "Numatytasis" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Suderinamas su OpenVPN serveriu." - -#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Certificates (TLS)" -msgstr "Liudijimai (TLS)" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Slaptažodis" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Slaptažodis su liudijimais (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Statinis raktas" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Tapatybės nustatymas" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Bendra" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Jeigu naudojama rakto kryptis, ji turi būti priešinga naudojamai VPN " -"lygiarangyje. Pavyzdžiui, jeigu lygiarangyje naudojama „1“, šiam " -"prisijungimui turi būti naudojama „0“. Jeigu nežinote, kokią reikšmę naudoti, " -"susisiekite su savo sistemos administratoriumi." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "Išsa_miau..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "LĮ liudijimas:" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificate Password:" -msgstr "Liudijimo slaptažodis:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Cipher:" -msgstr "Šifras:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "General" -msgstr "Bendra" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key Direction:" -msgstr "Rakto kryptis:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Key File:" -msgstr "Rakto failas:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Local IP Address:" -msgstr "Vietinis IP adresas:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "Išsamesnės OpenVPN parinktys" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Password:" -msgstr "Slaptažodis:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Asmeninis raktas:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Select A File" -msgstr "Pasirinkite failą" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Show passwords" -msgstr "Rodyti slaptažodžius" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Static Key:" -msgstr "Statinis raktas:" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Type:" -msgstr "Tipas:" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use L_ZO data compression" -msgstr "Naudoti L_ZO duomenų glaudinimą" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a TA_P device" -msgstr "Naudoti TA_P įrenginį" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use a _TCP connection" -msgstr "Naudoti _TCP prisijungimą" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use additional TLS authentication" -msgstr "Naudoti papildomą TLS tapatybės nustatymą" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Use custom gateway p_ort:" -msgstr "Naudoti pasirinktinį šliuzo _prievadą:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User Certificate:" -msgstr "Naudotojo sertifikatas:" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "User name:" -msgstr "Naudotojo vardas:" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "_Gateway:" -msgstr "Š_liuzas:" diff --git a/vpn-daemons/openvpn/po/lv.po b/vpn-daemons/openvpn/po/lv.po deleted file mode 100644 index dc6cdb7975..0000000000 --- a/vpn-daemons/openvpn/po/lv.po +++ /dev/null @@ -1,457 +0,0 @@ -# English (British) translation for NetworkManager-openvpn -# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager-openvpn package. -# David Lodge , 2006 -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager OpenVPN plugin\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-09 15:20+0000\n" -"PO-Revision-Date: 2008-10-07 20:22+0300\n" -"Last-Translator: Ivars Strazdiņš \n" -"Language-Team: lv_LV \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Latvian\n" -"X-Poedit-Country: LATVIA\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Parole:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Sekundārā parole:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Lietotājvārds:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domēns:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Pievienoties _anonīmi" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Pievienoties kā _lietotājam:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "Atce_rēties paroli šai sesijai" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Saglabāt paroli saišķī" - -#: ../auth-dialog/main.c:181 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Jums jāpiesakās, lai lietotu virtuālo privāto tīklu '%s'." - -#: ../auth-dialog/main.c:182 -msgid "Authenticate VPN" -msgstr "Pieteikties VPN" - -#: ../auth-dialog/main.c:195 -msgid "Certificate pass_word:" -msgstr "Sertifikāta _parole:" - -#: ../auth-dialog/main.c:210 -msgid "Certificate password:" -msgstr "Sertifikāta parole:" - -#: ../properties/nm-openvpn.c:150 -msgid "OpenVPN Client" -msgstr "OpenVPN klients" - -#: ../properties/nm-openvpn.c:814 -msgid "The following OpenVPN connection will be created:" -msgstr "Tiks izveidots OpenVPN savienojums:" - -#: ../properties/nm-openvpn.c:816 -#, c-format -msgid "Name: %s" -msgstr "Vārds: %s" - -#: ../properties/nm-openvpn.c:824 -msgid "Connection Type: X.509 Certificates" -msgstr "Savienojuma tips: X.509 sertifikāti" - -#: ../properties/nm-openvpn.c:827 -#: ../properties/nm-openvpn.c:854 -#: ../properties/nm-openvpn.c:866 -#, c-format -msgid "CA: %s" -msgstr "Sertificēšanas institūcija (CA): %s" - -#: ../properties/nm-openvpn.c:830 -#: ../properties/nm-openvpn.c:869 -#, c-format -msgid "Cert: %s" -msgstr "Sertif.: %s" - -#: ../properties/nm-openvpn.c:833 -#: ../properties/nm-openvpn.c:872 -#, c-format -msgid "Key: %s" -msgstr "Atslēga: %s" - -#: ../properties/nm-openvpn.c:837 -msgid "Connection Type: Shared Key" -msgstr "Savienojuma tips: kopīgā atslēga" - -#: ../properties/nm-openvpn.c:840 -#, c-format -msgid "Shared Key: %s" -msgstr "Kopīgā atslēga: %s" - -#: ../properties/nm-openvpn.c:843 -#, c-format -msgid "Local IP: %s" -msgstr "Lokālā IP adrese: %s" - -#: ../properties/nm-openvpn.c:846 -#, c-format -msgid "Remote IP: %s" -msgstr "Attālinātā IP adrese: %s" - -#: ../properties/nm-openvpn.c:851 -msgid "Connection Type: Password" -msgstr "Savienojuma tips: parole" - -#: ../properties/nm-openvpn.c:857 -#: ../properties/nm-openvpn.c:875 -#, c-format -msgid "Username: %s" -msgstr "Lietotājvārds: %s" - -#: ../properties/nm-openvpn.c:863 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Savienojuma tips: X.509 ar paroles autentificēšanu" - -#: ../properties/nm-openvpn.c:881 -#, c-format -msgid "Remote: %s" -msgstr "Attālinātais: %s" - -#: ../properties/nm-openvpn.c:884 -#, c-format -msgid "Port: %s" -msgstr "Ports: %s" - -#: ../properties/nm-openvpn.c:887 -#, c-format -msgid "Device: %s" -msgstr "Iekārta: %s" - -#: ../properties/nm-openvpn.c:887 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:887 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:890 -#, c-format -msgid "Protocol: %s" -msgstr "Protokols: %s" - -#: ../properties/nm-openvpn.c:890 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:890 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:894 -#, c-format -msgid "Routes: %s" -msgstr "Maršruti: %s" - -#: ../properties/nm-openvpn.c:898 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Lietot LZO kompresiju: %s" - -#: ../properties/nm-openvpn.c:898 -msgid "Yes" -msgstr "Jā" - -#: ../properties/nm-openvpn.c:898 -msgid "No" -msgstr "Nē" - -#: ../properties/nm-openvpn.c:902 -#, c-format -msgid "Cipher: %s" -msgstr "Šifrs: %s" - -#: ../properties/nm-openvpn.c:907 -#, c-format -msgid "TLS auth: %s %s" -msgstr "TLS autentificēšana: %s %s" - -#: ../properties/nm-openvpn.c:911 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Savienojuma īpašības var mainīt, lietojot \"Labot\" pogu." - -#: ../properties/nm-openvpn.c:1141 -msgid "Cannot import settings" -msgstr "Nav iespējams importēt iestatījumus" - -#: ../properties/nm-openvpn.c:1143 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "VPN iestatījumu datne '%s' nesatur derīgus datus." - -#: ../properties/nm-openvpn.c:1190 -msgid "Select file to import" -msgstr "Izvēlieties datni importam" - -#: ../properties/nm-openvpn.c:1249 -#: ../properties/nm-openvpn.c:1261 -#: ../properties/nm-openvpn.c:1264 -msgid "Select CA to use" -msgstr "Izvēlieties savienojuma CA" - -#: ../properties/nm-openvpn.c:1252 -#: ../properties/nm-openvpn.c:1267 -msgid "Select certificate to use" -msgstr "Izvēlieties savienojuma sertifikātu" - -#: ../properties/nm-openvpn.c:1255 -#: ../properties/nm-openvpn.c:1270 -msgid "Select key to use" -msgstr "Izvēlieties savienojuma atslēgu" - -#: ../properties/nm-openvpn.c:1258 -msgid "Select shared key to use" -msgstr "Izvēlieties savienojuma kopīgo atslēgu" - -#: ../properties/nm-openvpn.c:1273 -msgid "Select TA to use" -msgstr "Izvēlieties savienojuma TA atslēgu" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1515 -msgid "Save as..." -msgstr "Saglabāt kā..." - -#: ../properties/nm-openvpn.c:1544 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Datne \"%s\" jau eksistē." - -#: ../properties/nm-openvpn.c:1547 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Vai vēlaties aizvietot to ar pašreiz saglabājamo?" - -#: ../properties/nm-openvpn.c:1561 -msgid "Failed to export configuration" -msgstr "Neizdevās eksportēt konfigurāciju" - -#: ../properties/nm-openvpn.c:1563 -#, c-format -msgid "Failed to save file %s" -msgstr "Neizdevās saglabāt datni %s" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(Noklusētais: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "65536" -msgstr "65536" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "piemērs: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Ad_vanced" -msgstr "_Paplašināts" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "C_A file:" -msgstr "C_A datne:" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "C_ertificate:" -msgstr "S_ertifikāts:" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Co_nnection type:" -msgstr "Savie_nojuma tips:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Connection na_me:" -msgstr "Savienoju_ma nosaukums:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Direction:" -msgstr "Virziens:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Import _Saved Configuration..." -msgstr "Importēt _saglabāto konfigurāciju..." - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "Nosaukums savienojumam ar privāto tīklu, piem. \"Universitātes VPN\" or \"Korporatīvais tīkls\"" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Network" -msgstr "Tīkls" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Only use _VPN connection for these addresses:" -msgstr "Lietot VPN savienojumu tikai šīm adresēm:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "OpenVPN paplašinātie parametri" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "OpenVPN Configuration" -msgstr "OpenVPN konfigurācija" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting." -msgstr "Lūdzu, zemāk ievadiet no jūsu sistēmas administratora saņemto informāciju. Paroli šeit neievadiet, tā tiks pieprasīta savienojoties." - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Please note that the file you import is not an OpenVPN configuration file. Ask your administrator for the file." -msgstr "Ņemiet vērā, ka importējamā datne nav OpenVPN konfigurācijas datne. Konfigurācijas datni jautājiet sistēmas administratoram." - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared _key:" -msgstr "_Kopējā atslēga:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "TLS-Auth" -msgstr "TLS-autentifikācija" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO compression" -msgstr "Lietot L_ZO kompresiju" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TA_P device" -msgstr "Lietot TA_P iekārtu" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use _TCP connection" -msgstr "Lietot _TCP savienojumu" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use _TLS auth:" -msgstr "Lietot _TLS autentifikāciju:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cip_her:" -msgstr "Lietot ši_fru:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"X.509 sertifikāts\n" -"Koplietojamā atslēga\n" -"Paroles autentifikācija\n" -"X.509 ar paroles autentifikāciju" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "_0" -msgstr "_0" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "_1" -msgstr "_1" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway address:" -msgstr "_Vārtejas adrese:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Gateway port:" -msgstr "Vā_rtejas ports:" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Key:" -msgstr "_Atslēga:" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Local IP:" -msgstr "_Lokālā IP adrese:" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "_Remote IP:" -msgstr "Attālinātā IP ad_rese:" - -#: ../properties/nm-openvpn-dialog.glade.h:36 -msgid "_User name:" -msgstr "_Lietotājvārds:" - -#: ../properties/nm-openvpn-dialog.glade.h:37 -msgid "_none" -msgstr "_nekas" - -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "Add, Remove, and Edit VPN Connections" -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "VPN Connection Manager (OpenVPN)" -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "The VPN login failed because the VPN program could not be started." -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgid "VPN connection failed" -#~ msgstr "VPN connection failed" -#~ msgid "Connection Name" -#~ msgstr "Connection Name" -#~ msgid "Optional Information" -#~ msgstr "Optional Information" -#~ msgid "Required Information" -#~ msgstr "Required Information" -#~ msgid "CA file:" -#~ msgstr "CA file:" -#~ msgid "Password" -#~ msgstr "Password" -#~ msgid "Shared Key:" -#~ msgstr "Shared Key:" -#~ msgid "Username:" -#~ msgstr "Username:" -#~ msgid "X.509" -#~ msgstr "X.509" - diff --git a/vpn-daemons/openvpn/po/mk.po b/vpn-daemons/openvpn/po/mk.po deleted file mode 100644 index 28016a7e9c..0000000000 --- a/vpn-daemons/openvpn/po/mk.po +++ /dev/null @@ -1,425 +0,0 @@ -# translation of NetworkManager-openvpn.HEAD.po to Macedonian -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Jovan Naumovski , 2007. -# Arangel Angov , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-08 15:46+0100\n" -"PO-Revision-Date: 2007-12-02 18:53+0100\n" -"Last-Translator: Arangel Angov \n" -"Language-Team: Macedonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Лозинка:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Втора лозинка:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Корисничко име:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Домен:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Поврзи се _анонимно" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Поврзи се како _корисник:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Запамети ја лозинката за оваа сесија" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Зачувај ја лозинката во приврзок" - -#: ../auth-dialog/main.c:181 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Треба да ја потврдите автентичноста за да пристапите кон виртуелната " -"приватна мрежа „%s“." - -#: ../auth-dialog/main.c:182 -msgid "Authenticate VPN" -msgstr "Потврди автентичност за виртуелна приватна мрежа" - -#: ../auth-dialog/main.c:195 -msgid "Certificate pass_word:" -msgstr "Лозин_ка на сертификат:" - -#: ../auth-dialog/main.c:210 -msgid "Certificate password:" -msgstr "Лозинка на сертификат:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Додавајте, отстранувајте и уредувајте VPN врски" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "Менаџер за VPN врски (OpenVPN)" - -#: ../properties/nm-openvpn.c:147 -msgid "OpenVPN Client" -msgstr "OpenVPN клиент" - -#: ../properties/nm-openvpn.c:821 -msgid "The following OpenVPN connection will be created:" -msgstr "Следната OpenVPN врска ќе биде креирана:" - -#: ../properties/nm-openvpn.c:823 -#, c-format -msgid "Name: %s" -msgstr "Име: %s" - -#: ../properties/nm-openvpn.c:831 -msgid "Connection Type: X.509 Certificates" -msgstr "Тип на врска: X.509 сертификати" - -#: ../properties/nm-openvpn.c:834 ../properties/nm-openvpn.c:861 -#: ../properties/nm-openvpn.c:873 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:837 ../properties/nm-openvpn.c:876 -#, c-format -msgid "Cert: %s" -msgstr "Серт.: %s" - -#: ../properties/nm-openvpn.c:840 ../properties/nm-openvpn.c:879 -#, c-format -msgid "Key: %s" -msgstr "Клуч: %s" - -#: ../properties/nm-openvpn.c:844 -msgid "Connection Type: Shared Key" -msgstr "Тип на врска: Споделен клуч" - -#: ../properties/nm-openvpn.c:847 -#, c-format -msgid "Shared Key: %s" -msgstr "Споделен клуч: %s" - -#: ../properties/nm-openvpn.c:850 -#, c-format -msgid "Local IP: %s" -msgstr "Локална IP: %s" - -#: ../properties/nm-openvpn.c:853 -#, c-format -msgid "Remote IP: %s" -msgstr "Оддалечена IP: %s" - -#: ../properties/nm-openvpn.c:858 -msgid "Connection Type: Password" -msgstr "Тип на врска: лозинка" - -#: ../properties/nm-openvpn.c:864 ../properties/nm-openvpn.c:882 -#, c-format -msgid "Username: %s" -msgstr "Корисничко име: %s" - -#: ../properties/nm-openvpn.c:870 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Тип на врска: X.509 со автентикација на лозинка" - -#: ../properties/nm-openvpn.c:888 -#, c-format -msgid "Remote: %s" -msgstr "Оддалечено: %s" - -#: ../properties/nm-openvpn.c:891 -#, c-format -msgid "Port: %s" -msgstr "Порта: %s" - -#: ../properties/nm-openvpn.c:894 -#, c-format -msgid "Device: %s" -msgstr "Уред: %s" - -#: ../properties/nm-openvpn.c:894 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:894 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:897 -#, c-format -msgid "Protocol: %s" -msgstr "Протокол: %s" - -#: ../properties/nm-openvpn.c:897 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:897 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:901 -#, c-format -msgid "Routes: %s" -msgstr "Рутирања: %s" - -#: ../properties/nm-openvpn.c:905 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Користи LZO компресија: %s" - -#: ../properties/nm-openvpn.c:905 -msgid "Yes" -msgstr "Да" - -#: ../properties/nm-openvpn.c:905 -msgid "No" -msgstr "Не" - -#: ../properties/nm-openvpn.c:909 -#, c-format -msgid "Cipher: %s" -msgstr "Шифра: %s" - -#: ../properties/nm-openvpn.c:914 -#, c-format -msgid "TLS auth: %s %s" -msgstr "TLS авт.: %s %s" - -#: ../properties/nm-openvpn.c:918 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Деталите за врската можат да се променат со користење на копчето \"Уреди\"." - -#: ../properties/nm-openvpn.c:1148 -msgid "Cannot import settings" -msgstr "Не можам да ги увезам поставувањата" - -#: ../properties/nm-openvpn.c:1150 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "Датотеката со VPN поставувања '%s' не содржи валидни податоци." - -#: ../properties/nm-openvpn.c:1197 -msgid "Select file to import" -msgstr "Изберете датотека за увоз" - -#: ../properties/nm-openvpn.c:1256 ../properties/nm-openvpn.c:1268 -#: ../properties/nm-openvpn.c:1271 -msgid "Select CA to use" -msgstr "Одберете сертификат кој ќе се употребува" - -#: ../properties/nm-openvpn.c:1259 ../properties/nm-openvpn.c:1274 -msgid "Select certificate to use" -msgstr "Одберете сертификат кој ќе се употребува" - -#: ../properties/nm-openvpn.c:1262 ../properties/nm-openvpn.c:1277 -msgid "Select key to use" -msgstr "Одберете клуч кој ќе се употребува" - -#: ../properties/nm-openvpn.c:1265 -msgid "Select shared key to use" -msgstr "Одберете споделен клуч кој ќе се употребува" - -#: ../properties/nm-openvpn.c:1280 -msgid "Select TA to use" -msgstr "Одберте TA кое ќе се употребува" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1522 -msgid "Save as..." -msgstr "Зачувај како..." - -#: ../properties/nm-openvpn.c:1551 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Датотеката со името \"%s\" веќе постои." - -#: ../properties/nm-openvpn.c:1554 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Дали сакате да ја замените со онаа која ја зачувувате?" - -#: ../properties/nm-openvpn.c:1568 -msgid "Failed to export configuration" -msgstr "Не успеав да ја извезам конфигурацијата" - -#: ../properties/nm-openvpn.c:1570 -#, c-format -msgid "Failed to save file %s" -msgstr "Не можам да ја зачувам датотеката %s" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(Стандардна: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "65536" -msgstr "65536" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "пример: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Ad_vanced" -msgstr "На_предно" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "C_A file:" -msgstr "C_A датотека:" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "C_ertificate:" -msgstr "С_ертификат:" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Co_nnection type:" -msgstr "Ти_п на врска:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Connection na_me:" -msgstr "Тип на вр_ска:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Direction:" -msgstr "Насока:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Import _Saved Configuration..." -msgstr "Увези _зачувана конфигурација..." - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Име кое ќе се користи за идентификација на врската до приватната мрежа, на " -"пр. \"VPN на универзитетот\" или \"Мрежа на здружението\"" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Network" -msgstr "Мрежа" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Only use _VPN connection for these addresses:" -msgstr "Користи _VPN врски само за овие адреси:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "Напредни опции за OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "OpenVPN Configuration" -msgstr "Конфигурација на OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Ве молам, внесете ги информациите добиени од Вашиот администратор на " -"системот. Не ја внесувајте Вашата лозинка овде, бидејќи ќе Ви биде побарана " -"при поврзување." - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" -"Забележете дека датотеката која ја увезувате не е OpenVPN конфигурациска " -"датотека. Датотеката побарајте ја кај Вашиот администратор на системот." - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared _key:" -msgstr "Споделен _клуч:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "TLS-Auth" -msgstr "TLS проверка" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO compression" -msgstr "Користи L_ZO компресија" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TA_P device" -msgstr "Користи TA_P уред" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use _TCP connection" -msgstr "Користи _TCP врска" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use _TLS auth:" -msgstr "Користи _TLS авторизација:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cip_her:" -msgstr "Користи cip_her:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"X.509 сертификати\n" -"Однапред споделен клуч\n" -"Автентикација на лозинка\n" -"X.509 со автентикација на лозинка" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "_0" -msgstr "_0" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "_1" -msgstr "_1" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway address:" -msgstr "_Адреса за премин:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Gateway port:" -msgstr "_Порта на премин:" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Key:" -msgstr "_Клуч:" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Local IP:" -msgstr "_Локална IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "_Remote IP:" -msgstr "_Оддалечена IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:36 -msgid "_User name:" -msgstr "_Корисничко име:" - -#: ../properties/nm-openvpn-dialog.glade.h:37 -msgid "_none" -msgstr "_ништо" - diff --git a/vpn-daemons/openvpn/po/nb.po b/vpn-daemons/openvpn/po/nb.po deleted file mode 100644 index a857e2aea3..0000000000 --- a/vpn-daemons/openvpn/po/nb.po +++ /dev/null @@ -1,420 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Kjartan Maraas , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: OpenVPN xx\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-02 14:45+0100\n" -"PO-Revision-Date: 2007-11-02 14:45+0100\n" -"Last-Translator: Kjartan Maraas \n" -"Language-Team: Norwegian Bokmål \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Passord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Sekundært passord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "Br_ukernavn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domene:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Koble til _anonymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Koble til som br_uker:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Husk passordet for denne sesjonen" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Lagre passord i nøkkelring" - -#: ../auth-dialog/main.c:181 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Du må autentisere deg for å få tilgang til virtuelt privat nettverk «%s»." - -#: ../auth-dialog/main.c:182 -msgid "Authenticate VPN" -msgstr "Autentiser VPN" - -#: ../auth-dialog/main.c:195 -msgid "Certificate pass_word:" -msgstr "Pass_ord for sertifikat:" - -#: ../auth-dialog/main.c:210 -msgid "Certificate password:" -msgstr "Passord for sertifikat:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Legg til, fjern og regiger VPN-tilkoblinger" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "Håndtering av VPN-tilkobling (OpenVPN)" - -#: ../properties/nm-openvpn.c:147 -msgid "OpenVPN Client" -msgstr "OpenVPN-klient" - -#: ../properties/nm-openvpn.c:821 -msgid "The following OpenVPN connection will be created:" -msgstr "Følgende OpenVPN-tilkobling vil bli opprettet:" - -#: ../properties/nm-openvpn.c:823 -#, c-format -msgid "Name: %s" -msgstr "Navn: %s" - -#: ../properties/nm-openvpn.c:831 -msgid "Connection Type: X.509 Certificates" -msgstr "Tilkoblingstype: X.509-sertifikater" - -#: ../properties/nm-openvpn.c:834 ../properties/nm-openvpn.c:861 -#: ../properties/nm-openvpn.c:873 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:837 ../properties/nm-openvpn.c:876 -#, c-format -msgid "Cert: %s" -msgstr "Sert: %s" - -#: ../properties/nm-openvpn.c:840 ../properties/nm-openvpn.c:879 -#, c-format -msgid "Key: %s" -msgstr "Nøkkel: %s" - -#: ../properties/nm-openvpn.c:844 -msgid "Connection Type: Shared Key" -msgstr "Tilkoblingstype: Delt nøkkel" - -#: ../properties/nm-openvpn.c:847 -#, c-format -msgid "Shared Key: %s" -msgstr "Delt nøkkel: %s" - -#: ../properties/nm-openvpn.c:850 -#, c-format -msgid "Local IP: %s" -msgstr "Lokal IP: %s" - -#: ../properties/nm-openvpn.c:853 -#, c-format -msgid "Remote IP: %s" -msgstr "Ekstern IP: %s" - -#: ../properties/nm-openvpn.c:858 -msgid "Connection Type: Password" -msgstr "Tilkoblingstype: Passord" - -#: ../properties/nm-openvpn.c:864 ../properties/nm-openvpn.c:882 -#, c-format -msgid "Username: %s" -msgstr "Brukernavn: %s" - -#: ../properties/nm-openvpn.c:870 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Tilkoblingstype: X.509 med passordautentisering" - -#: ../properties/nm-openvpn.c:888 -#, c-format -msgid "Remote: %s" -msgstr "Ekstern: %s" - -#: ../properties/nm-openvpn.c:891 -#, c-format -msgid "Port: %s" -msgstr "Port: %s" - -#: ../properties/nm-openvpn.c:894 -#, c-format -msgid "Device: %s" -msgstr "Enhet: %s" - -#: ../properties/nm-openvpn.c:894 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:894 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:897 -#, c-format -msgid "Protocol: %s" -msgstr "Protokoll: %s" - -#: ../properties/nm-openvpn.c:897 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:897 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:901 -#, c-format -msgid "Routes: %s" -msgstr "Ruter: %s" - -#: ../properties/nm-openvpn.c:905 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Bruk LZO-komprimering: %s" - -#: ../properties/nm-openvpn.c:905 -msgid "Yes" -msgstr "Ja" - -#: ../properties/nm-openvpn.c:905 -msgid "No" -msgstr "Nei" - -#: ../properties/nm-openvpn.c:909 -#, c-format -msgid "Cipher: %s" -msgstr "Cipher: %s" - -#: ../properties/nm-openvpn.c:914 -#, c-format -msgid "TLS auth: %s %s" -msgstr "TLS: aut: %s %s" - -#: ../properties/nm-openvpn.c:918 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Tilkoblingsdetaljene kan endres med «Rediger»-knappen." - -#: ../properties/nm-openvpn.c:1148 -msgid "Cannot import settings" -msgstr "Kan ikke importere innstillinger" - -#: ../properties/nm-openvpn.c:1150 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "Filen «%s», med innstillinger for VPN inneholder ikke gyldige data." - -#: ../properties/nm-openvpn.c:1197 -msgid "Select file to import" -msgstr "Velg fil som skal importeres" - -#: ../properties/nm-openvpn.c:1256 ../properties/nm-openvpn.c:1268 -#: ../properties/nm-openvpn.c:1271 -msgid "Select CA to use" -msgstr "Velg CA som skal brukes" - -#: ../properties/nm-openvpn.c:1259 ../properties/nm-openvpn.c:1274 -msgid "Select certificate to use" -msgstr "Velg sertifikat som skal brukes" - -#: ../properties/nm-openvpn.c:1262 ../properties/nm-openvpn.c:1277 -msgid "Select key to use" -msgstr "Velg nøkkel som skal brukes" - -#: ../properties/nm-openvpn.c:1265 -msgid "Select shared key to use" -msgstr "Velg delt nøkkel som skal brukes" - -#: ../properties/nm-openvpn.c:1280 -msgid "Select TA to use" -msgstr "Velg TA som skal brukes" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1522 -msgid "Save as..." -msgstr "Lagre som..." - -#: ../properties/nm-openvpn.c:1551 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "En fil med navn «%s» eksisterer allerede." - -#: ../properties/nm-openvpn.c:1554 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Vil du erstatte den med filen du lagrer nå?" - -#: ../properties/nm-openvpn.c:1568 -msgid "Failed to export configuration" -msgstr "Klarte ikke å eksportere konfigurasjonen" - -#: ../properties/nm-openvpn.c:1570 -#, c-format -msgid "Failed to save file %s" -msgstr "Klarte ikke å lagre fil %s" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(Forvalg: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "65536" -msgstr "65536" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "eksempel: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Ad_vanced" -msgstr "A_vansert" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "C_A file:" -msgstr "C_A-fil:" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "C_ertificate:" -msgstr "S_ertifikat:" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Co_nnection type:" -msgstr "Tilkobli_ngstype:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Connection na_me:" -msgstr "_Navn på tilkobling:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Direction:" -msgstr "Retning:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Import _Saved Configuration..." -msgstr "Importer lagret konfigura_sjon..." - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Navn som brukes til å identifisere tilkoblingen til det private nettverket. " -"F.eks. «Mitt VPN» eller «Jobbnettverk»" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Network" -msgstr "Nettverk" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Only use _VPN connection for these addresses:" -msgstr "Kun bruk _VPN-tilkoblingen for disse adressene:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "Avanserte alternativer for OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "OpenVPN Configuration" -msgstr "Konfigurasjon av OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Vennligst oppgi informasjonen du har fått av din systemadministrator under. " -"Ikke oppgi passordet her da du vil bli spurt om dette når du kobler til." - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" -"Vennligst merk at filen du importerer ikke er en konfigurasjonsfil for " -"OpenVPN. Spør din administrator etter filen." - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared _key:" -msgstr "Delt nøkkel:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "TLS-Auth" -msgstr "TLS-autentisering" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO compression" -msgstr "Bruk L_ZO-komprimering" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TA_P device" -msgstr "Bruk TA_P-enhet" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use _TCP connection" -msgstr "Bruk _TCP-tilkobling" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use _TLS auth:" -msgstr "Bruk _TLS-autentisering:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cip_her:" -msgstr "Bruk cip_her:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"X.509-sertifikat\n" -"Forhåndsdelt nøkkel\n" -"Passordautentisering\n" -"X.509 med passordautentisering" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "_0" -msgstr "_0" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "_1" -msgstr "_1" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway address:" -msgstr "_Gateway-adresse:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Gateway port:" -msgstr "_Port på gateway:" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Key:" -msgstr "Nø_kkel:" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Local IP:" -msgstr "_Lokal IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "_Remote IP:" -msgstr "Ekste_rn IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:36 -msgid "_User name:" -msgstr "Br_ukernavn:" - -#: ../properties/nm-openvpn-dialog.glade.h:37 -msgid "_none" -msgstr "i_ngen" diff --git a/vpn-daemons/openvpn/po/nl.po b/vpn-daemons/openvpn/po/nl.po deleted file mode 100644 index ca6bf14d33..0000000000 --- a/vpn-daemons/openvpn/po/nl.po +++ /dev/null @@ -1,229 +0,0 @@ -# Dutch translation of NetworkManager-openvpn -# -# This file is distributed under the same license as the NetworkManager-openvpn -# package. -# -# Tino Meinen , 2006, 2007, 2008. -# Wouter Bolsterlee , 2008. -# -# -# Static key Vaste sleutel -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-15 10:58+0200\n" -"PO-Revision-Date: 2008-09-15 10:58+0200\n" -"Last-Translator: Wouter Bolsterlee \n" -"Language-Team: Dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Wachtwoord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Tweede wachtwoord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Gebruikersnaam:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domein:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "_Anoniem verbinden" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Verbinden als _gebruiker:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "Wa_chtwoord voor deze sessie onthouden" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "Wachtwoord op_slaan in sleutelbos" - -# dient zich aan te melden/moet zich aanmelden -#: ../auth-dialog/main.c:210 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"U moet zich aanmelden om toegang te krijgen tot het Virtual Private Netwerk " -"'%s'." - -#: ../auth-dialog/main.c:211 -msgid "Authenticate VPN" -msgstr "Aanmeldingscontrole VPN" - -#: ../auth-dialog/main.c:232 -msgid "Certificate pass_word:" -msgstr "Certificaat-_wachtwoord:" - -#: ../auth-dialog/main.c:246 -msgid "Certificate password:" -msgstr "Certificaat-wachtwoord:" - -#: ../properties/auth-helpers.c:69 -msgid "Choose a Certificate Authority certificate..." -msgstr "Kies certificaat van certificaatauthoriteit (CA)…" - -#: ../properties/auth-helpers.c:88 -msgid "Choose your personal certificate..." -msgstr "Kies uw persoonlijke certificate…" - -#: ../properties/auth-helpers.c:106 -msgid "Choose your private key..." -msgstr "Kies uw privé-sleutel…" - -#: ../properties/auth-helpers.c:159 -msgid "Choose an OpenVPN static key..." -msgstr "Kies een vaste OpenVPN-sleutel…" - -#: ../properties/auth-helpers.c:183 ../properties/auth-helpers.c:862 -msgid "None" -msgstr "Geen" - -#: ../properties/auth-helpers.c:518 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "PEM-certificaten (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:578 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Vaste OpenVPN-sleutels (*.key)" - -#: ../properties/auth-helpers.c:689 -msgid "Default" -msgstr "Standaard" - -#: ../properties/nm-openvpn.c:52 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:53 -msgid "Compatible with the OpenVPN server." -msgstr "Geschikt voor OpenVPN-servers." - -#: ../properties/nm-openvpn.c:310 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Certificaten (TLS)" - -#: ../properties/nm-openvpn.c:322 -msgid "Password" -msgstr "Wachtwoord" - -#: ../properties/nm-openvpn.c:336 -msgid "Password with Certificates (TLS)" -msgstr "Wachtwoord met certificaten (TLS)" - -#: ../properties/nm-openvpn.c:348 -msgid "Static Key" -msgstr "Vaste sleutel" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Authenticatie" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Algemeen" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Als een sleutelrichting wordt gebruikt, moet deze tegenovergesteld zijn " -"dan die van de VPN-peer. Bijvoorbeeld: als de andere machine ‘1’ gebruikt, " -"moet deze verbinding ‘0’ gebruiken. Neem contact op met uw systeembeheerder " -"als u niet weet welke waarde te gebruiken." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "_Geavanceerd…" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "CA-certificaat:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Codering:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Algemeen" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Sleutelrichting:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Sleutelbestand:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "Lokaal IP-adres:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "OpenVPN geavanceerde opties" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Private Key:" -msgstr "Privé-sleutel:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Static Key:" -msgstr "Vaste sleutel:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Type:" -msgstr "Type:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Use L_ZO data compression" -msgstr "_LZO-datacompressie gebruiken" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Use a TA_P device" -msgstr "T_AP-apparaat gebruiken" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use a _TCP connection" -msgstr "_TCP-verbinding gebruiken" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use additional TLS authentication" -msgstr "Aanvullende TLS-authenticatie gebruiken" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use custom gateway p_ort:" -msgstr "Aangepaste gateway-_poort:" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "User Certificate:" -msgstr "Gebruikerscertificaat:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "User name:" -msgstr "Gebruikersnaam:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "_Gateway:" -msgstr "_Gateway:" diff --git a/vpn-daemons/openvpn/po/pa.po b/vpn-daemons/openvpn/po/pa.po deleted file mode 100644 index badc4cd177..0000000000 --- a/vpn-daemons/openvpn/po/pa.po +++ /dev/null @@ -1,432 +0,0 @@ -# translation of NetworkManager-openvpn.HEAD.po to Punjabi -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# A S Alam , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-03 18:38+0000\n" -"PO-Revision-Date: 2007-02-04 09:00+0530\n" -"Last-Translator: A S Alam \n" -"Language-Team: Punjabi \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "ਗੁਪਤ-ਕੋਡ(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "ਸੈਕੰਡਰੀ ਗੁਪਤ-ਕੋਡ(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "ਉਪਭੋਗੀ ਨਾਂ(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "ਡੋਮੇਨ(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "ਅਗਿਆਤ ਵਾਂਗ ਜੁੜੋ(_a)" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "ਉਪਭੋਗੀ ਵਾਂਗ ਜੁੜੋ(_u):" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "ਇਹ ਸ਼ੈਸ਼ਨ ਲਈ ਗੁਪਤ-ਕੋਡ ਸੰਭਾਲੋ(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "ਛੱਲੇ 'ਚ ਗੁਪਤ-ਕੋਡ ਸੰਭਾਲੋ(_S)" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"ਤੁਹਾਨੂੰ ਵੁਰਚੁਅਲ ਪ੍ਰਾਈਵੇਟ ਨੈੱਟਵਰਕ (VPN) '%s' ਦੀ ਵਰਤੋਂ ਵਾਸਤੇ " -"ਪਰਮਾਣਿਤ ਹੋਣ ਦੀ ਲੋੜ ਹੈ।" - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "ਪਰਮਾਣਿਤ VPN" - -#: ../auth-dialog/main.c:227 -msgid "Certificate pass_word:" -msgstr "ਸਰਟੀਫਿਕੇਟ ਗੁਪਤ-ਕੋਡ(_w):" - -#: ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "ਸਰਟੀਫਿਕੇਟ ਗੁਪਤ-ਕੋਡ:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਿਲ, ਹਟਾਓ ਜਾਂ ਸੋਧ" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ(OpenVPN)" - -#: ../properties/nm-openvpn.c:130 -msgid "OpenVPN Client" -msgstr "OpenVPN ਕਲਾਂਇਟ" - -#: ../properties/nm-openvpn.c:729 -msgid "The following OpenVPN connection will be created:" -msgstr "ਹੇਠ ਦਿੱਤਾ OpenVPN ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾਵੇਗਾ:" - -#: ../properties/nm-openvpn.c:731 -#, c-format -msgid "Name: %s" -msgstr "ਨਾਂ: %s" - -#: ../properties/nm-openvpn.c:739 -msgid "Connection Type: X.509 Certificates" -msgstr "ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ: X.509 ਸਰਟੀਫਿਕੇਟ" - -#: ../properties/nm-openvpn.c:742 ../properties/nm-openvpn.c:769 -#: ../properties/nm-openvpn.c:781 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:745 ../properties/nm-openvpn.c:784 -#, c-format -msgid "Cert: %s" -msgstr "ਸਰਟੀ: %s" - -#: ../properties/nm-openvpn.c:748 ../properties/nm-openvpn.c:787 -#, c-format -msgid "Key: %s" -msgstr "ਕੁੰਜੀ: %s" - -#: ../properties/nm-openvpn.c:752 -msgid "Connection Type: Shared Key" -msgstr "ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ: ਸਾਂਝੀ ਕੁੰਜੀ" - -#: ../properties/nm-openvpn.c:755 -#, c-format -msgid "Shared Key: %s" -msgstr "ਸਾਂਝੀ ਕੁੰਜੀ: %s" - -#: ../properties/nm-openvpn.c:758 -#, c-format -msgid "Local IP: %s" -msgstr "ਲੋਕਲ IP: %s" - -#: ../properties/nm-openvpn.c:761 -#, c-format -msgid "Remote IP: %s" -msgstr "ਰਿਮੋਟ IP: %s" - -#: ../properties/nm-openvpn.c:766 -msgid "Connection Type: Password" -msgstr "ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ: ਗੁਪਤ-ਕੋਡ" - -#: ../properties/nm-openvpn.c:772 ../properties/nm-openvpn.c:790 -#, c-format -msgid "Username: %s" -msgstr "ਉਪਭੋਗੀ ਨਾਂ: %s" - -#: ../properties/nm-openvpn.c:778 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ: ਗੁਪਤ-ਕੋਡ ਪਰਮਾਣਕਿਤਾ ਨਾਲ X.509" - -#: ../properties/nm-openvpn.c:796 -#, c-format -msgid "Remote: %s" -msgstr "ਰਿਮੋਟ: %s" - -#: ../properties/nm-openvpn.c:799 -#, c-format -msgid "Device: %s" -msgstr "ਜੰਤਰ: %s" - -#: ../properties/nm-openvpn.c:799 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:799 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:802 -#, c-format -msgid "Protocol: %s" -msgstr "ਪ੍ਰੋਟੋਕਾਲ: %s" - -#: ../properties/nm-openvpn.c:802 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:802 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:806 -#, c-format -msgid "Routes: %s" -msgstr "ਰੂਟ: %s" - -#: ../properties/nm-openvpn.c:810 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "LZO ਨਪੀੜਨ ਵਰਤੋਂ: %s" - -#: ../properties/nm-openvpn.c:810 -msgid "Yes" -msgstr "ਹਾਂ" - -#: ../properties/nm-openvpn.c:810 -msgid "No" -msgstr "ਨਹੀਂ" - -#: ../properties/nm-openvpn.c:814 -#, c-format -msgid "Cipher: %s" -msgstr "ਕੀਪਰ: %s" - -#: ../properties/nm-openvpn.c:819 -#, c-format -msgid "TLS auth: %s %s" -msgstr "TLS ਪਰਮਾਣ: %s %s" - -#: ../properties/nm-openvpn.c:823 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "ਕੁਨੈਕਸ਼ਨ ਵੇਰਵੇ ਨੂੰ \"ਸੋਧ\" ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਬਦਲਿਆ ਜਾ ਸਕਦਾ ਹੈ।" - -#: ../properties/nm-openvpn.c:1003 -msgid "Cannot import settings" -msgstr "ਸੈਟਿੰਗ ਆਯਾਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ" - -#: ../properties/nm-openvpn.c:1005 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "VPN ਸੈਟਿੰਗ ਫਾਇਲ '%s' ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਸੀ।" - -#: ../properties/nm-openvpn.c:1042 -msgid "Select file to import" -msgstr "ਆਯਾਤ ਕਰਨ ਲਈ ਫਾਇਲ ਚੁਣੋ" - -#: ../properties/nm-openvpn.c:1122 ../properties/nm-openvpn.c:1134 -msgid "Select CA to use" -msgstr "ਵਰਤਣ ਵਾਸਤੇ CA ਚੁਣੋ" - -#: ../properties/nm-openvpn.c:1125 -msgid "Select certificate to use" -msgstr "ਵਰਤਣ ਵਾਸਤੇ ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ" - -#: ../properties/nm-openvpn.c:1128 -msgid "Select key to use" -msgstr "ਵਰਤਣ ਵਾਸਤੇ ਕੁੰਜੀ" - -#: ../properties/nm-openvpn.c:1131 -msgid "Select shared key to use" -msgstr "ਵਰਤਣ ਵਾਸਤੇ ਸਾਂਝੀ ਕੁੰਜੀ ਵਰਤੋਂ" - -#: ../properties/nm-openvpn.c:1137 -msgid "Select TA to use" -msgstr "ਵਰਤਣ ਵਾਸਤੇ TA ਵਰਤੋਂ" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1326 -msgid "Save as..." -msgstr "ਇੰਝ ਸੰਭਾਲੋ..." - -#: ../properties/nm-openvpn.c:1356 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "\"%s\" ਨਾਂ ਨਾਲ ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।" - -#: ../properties/nm-openvpn.c:1359 -msgid "Do you want to replace it with the one you are saving?" -msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਆਪਣੇ ਵਲੋਂ ਸੰਭਾਲੀ ਜਾਣ ਵਾਲੀ ਨਾਲ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?" - -#: ../properties/nm-openvpn.c:1373 -msgid "Failed to export configuration" -msgstr "ਸੰਰਚਨਾ ਨਿਰਯਾਤ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" - -#: ../properties/nm-openvpn.c:1375 -#, c-format -msgid "Failed to save file %s" -msgstr "ਫਾਇਲ %s ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "0" -msgstr "0" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "1" -msgstr "1" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "Connection Name" -msgstr "ਕੁਨੈਕਸ਼ਨ ਨਾਂ" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Optional Information" -msgstr "ਚੋਣਵੀਂ ਜਾਣਕਾਰੀ" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Required Information" -msgstr "ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "ਜਿਵੇਂ: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "CA file:" -msgstr "CA ਫਾਇਲ:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "CA file:" -msgstr "CA ਫਾਇਲ:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Certificate:" -msgstr "ਸਰਟੀਫਕੇਟ:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Connection Type:" -msgstr "ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Direction:" -msgstr "ਦਿਸ਼ਾ:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Key:" -msgstr "ਕੁੰਜੀ:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Local IP:" -msgstr "ਲੋਕਲ IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password" -msgstr "ਗੁਪਤ-ਕੋਡ" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Remote IP:" -msgstr "ਰਿਮੋਟ IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared Key:" -msgstr "ਸਾਂਝੀ ਕੁੰਜੀ:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Shared key" -msgstr "ਸਾਂਝੀ ਕੁੰਜੀ" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use LZO compression" -msgstr "LZO ਨਪੀੜਨ ਵਰਤੋਂ" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TAP device" -msgstr "TAP ਜੰਤਰ ਵਰਤੋਂ" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use TCP connection" -msgstr "TCP ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use TLS auth:" -msgstr "TLS ਪਰਾਮਣਿਤ ਵਰਤੋਂ:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cipher:" -msgstr "ਕੀਪਰ ਵਰਤੋਂ:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Username:" -msgstr "ਉਪਭੋਗੀ ਨਾਂ:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "X.509" -msgstr "X.509" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway:" -msgstr "ਗੇਟਵੇ(_G):" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Import Saved Configuration..." -msgstr "ਸੰਭਾਲੀ ਸੰਰਚਨਾ ਆਯਾਤ(_I)..." - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Only use VPN connection for these addresses" -msgstr "ਇਹ ਸਿਰਨਾਵਿਆਂ ਲਈ ਸਿਰਫ਼ VPN ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_O)" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "none" -msgstr "ਕੋਈ ਨਹੀਂ" - -#: ../src/nm-openvpn-service.c:127 -msgid "" -"The VPN login failed because the user name and password were not accepted or " -"the certificate password was wrong." -msgstr "" - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "VPN ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੋ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ VPN ਪ੍ਰੋਗਰਾਮ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।" - -#: ../src/nm-openvpn-service.c:131 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"VPN ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੋ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ VPN ਪ੍ਰੋਗਰਾਮ VPN ਸਰਵਰ ਨਾਲ " -"ਜੁੜ ਨਹੀਂ ਸਕਿਆ।" - -#: ../src/nm-openvpn-service.c:133 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "VPN ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੋ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ VPN ਸੰਰਚਨਾ ਚੋਣਾਂ ਗਲਤ ਹਨ।" - -#: ../src/nm-openvpn-service.c:135 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "VPN ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੋ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ VPN ਪ੍ਰੋਗਰਾਮ ਨੇ VPN ਸਰਵਰ ਤੋਂ ਗਲਤ ਸੰਰਚਨਾ ਮਿਲੀ ਹੈ।" - -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ" - diff --git a/vpn-daemons/openvpn/po/pl.po b/vpn-daemons/openvpn/po/pl.po deleted file mode 100644 index f8854979d6..0000000000 --- a/vpn-daemons/openvpn/po/pl.po +++ /dev/null @@ -1,434 +0,0 @@ -# translation of networkmanager-openvpn to Polish -# Copyright (C) 2001-2008 Free Software Foundation, Inc. -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -msgid "" -msgstr "" -"Project-Id-Version: networkmanager-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-19 20:18+0100\n" -"PO-Revision-Date: 2008-11-19 20:19+0100\n" -"Last-Translator: Tomasz Dominikowski \n" -"Language-Team: Aviary.pl \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Hasło:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "Hasło _dodatkowe:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "Nazwa _użytkownika:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domena:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Połączenie _anonimowe" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Połączenie jako _użytkownik:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "Zapamiętanie _hasła na czas tej sesji" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Zapamiętanie hasła w bazie kluczy" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Aby uzyskać dostęp do wirtualnej sieci prywatnej \"%s\", należy dokonać uwierzytelnienia." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "Uwierzytelnianie VPN" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "Hasło _certyfikatu:" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Hasło certyfikatu:" - -#: ../properties/auth-helpers.c:160 -msgid "Choose a Certificate Authority certificate..." -msgstr "Wybierz certyfikat CA..." - -#: ../properties/auth-helpers.c:179 -msgid "Choose your personal certificate..." -msgstr "Wybierz certyfikat prywatny..." - -#: ../properties/auth-helpers.c:197 -msgid "Choose your private key..." -msgstr "Wybierz klucz prywatny..." - -#: ../properties/auth-helpers.c:250 -msgid "Choose an OpenVPN static key..." -msgstr "Wybierz klucz statyczny OpenVPN..." - -#: ../properties/auth-helpers.c:274 -#: ../properties/auth-helpers.c:992 -msgid "None" -msgstr "Brak" - -#: ../properties/auth-helpers.c:654 -msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)" -msgstr "Certyfikaty PEM (*.pem, *.crt, *.key, *.cer)" - -#: ../properties/auth-helpers.c:714 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Klucze statyczne OpenVPN (*.key)" - -#: ../properties/auth-helpers.c:822 -msgid "Default" -msgstr "Domyślny" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Kompatybilny z serwerem OpenVPN." - -#: ../properties/nm-openvpn.c:322 -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Certyfikaty (TLS)" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Hasło" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Hasło z certyfikatami (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Klucz statyczny" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Uwierzytelnianie" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Ogólne" - -# FIXME - ktoś zna się na VPN na tyle, żeby określić czym jest ten VPN peer? Wywnioskowałem, że to po prostu serwer VPN (w przeciwieństwie do VPN Passthrough), please confirm (td) -# jm: no idea.. -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator." -msgstr "Jeśli zostanie użyty kierunek klucza, to musi być przeciwny kierunkowi użytemu na serwerze VPN. Przykładowo, jeśli serwer używa \"1\", te połączenie musi użyć \"0\". W wypadku braku pewności jakiej wartości użyć, proszę skontaktować się z administratorem systemu." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "Zaa_wansowane..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Certyfikat CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Szyfr:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Ogólne" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Kierunek klucza:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Plik klucza:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "Lokalny adres IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "Zaawansowane opcje OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password:" -msgstr "Hasło:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Private Key Password:" -msgstr "Hasło klucza prywatnego:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Klucz prywatny:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Show passwords" -msgstr "Wyświetlanie haseł" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Static Key:" -msgstr "Klucz statyczny:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Type:" -msgstr "Typ:" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO data compression" -msgstr "Użycie kompresji L_ZO" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use a TA_P device" -msgstr "Użycie urządzenia TA_P" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a _TCP connection" -msgstr "Użycie połączenia _TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use additional TLS authentication" -msgstr "Użycie dodatkowego uwierzytelniania TLS" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use custom gateway p_ort:" -msgstr "Własny port bra_my:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "User Certificate:" -msgstr "Certyfikat użytkownika:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User name:" -msgstr "Nazwa użytkownika:" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "_Gateway:" -msgstr "_Brama:" - -#~ msgid "page 1" -#~ msgstr "strona 1" -#~ msgid "page 2" -#~ msgstr "strona 2" -#~ msgid "page 3" -#~ msgstr "strona 3" -#~ msgid "page 4" -#~ msgstr "strona 4" -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "Dodawanie, usuwanie i edycja połączeń VPN" -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "Połączenia VPN (OpenVPN)" -#~ msgid "The following OpenVPN connection will be created:" -#~ msgstr "Utworzone zostanie poniższe połączenie OpenVPN:" -#~ msgid "Name: %s" -#~ msgstr "Nazwa: %s" -#~ msgid "Connection Type: X.509 Certificates" -#~ msgstr "Typ połączenia: Certyfikaty X.509" -#~ msgid "CA: %s" -#~ msgstr "CA: %s" -#~ msgid "Cert: %s" -#~ msgstr "Certyfikat: %s" -#~ msgid "Key: %s" -#~ msgstr "Klucz: %s" -#~ msgid "Connection Type: Shared Key" -#~ msgstr "Typ połączenia: klucz współdzielony" -#~ msgid "Shared Key: %s" -#~ msgstr "Klucz współdzielony: %s" -#~ msgid "Remote IP: %s" -#~ msgstr "Zdalny adres IP: %s" -#~ msgid "Connection Type: Password" -#~ msgstr "Typ połączenia: Hasło" -#~ msgid "Username: %s" -#~ msgstr "Nazwa użytkownika: %s" -#~ msgid "Connection Type: X.509 with Password Authentication" -#~ msgstr "Typ połączenia: X.509 z uwierzytelnianiem hasłem" -#~ msgid "Remote: %s" -#~ msgstr "Zdalny: %s" -#~ msgid "Port: %s" -#~ msgstr "Port: %s" -#~ msgid "Device: %s" -#~ msgstr "Urządzenie: %s" -#~ msgid "TAP" -#~ msgstr "TAP" -#~ msgid "TUN" -#~ msgstr "TUN" -#~ msgid "Protocol: %s" -#~ msgstr "Protokół: %s" -#~ msgid "TCP" -#~ msgstr "TCP" -#~ msgid "UDP" -#~ msgstr "UDP" -#~ msgid "Routes: %s" -#~ msgstr "Trasy: %s" -#~ msgid "Use LZO Compression: %s" -#~ msgstr "Użyj kompresji LZO: %s" -#~ msgid "Yes" -#~ msgstr "Tak" -#~ msgid "TLS auth: %s %s" -#~ msgstr "TLS auth: %s %s" -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "Szczegóły połączenia można zmienić za pomocą przycisku \"Edytuj\"." -#~ msgid "Cannot import settings" -#~ msgstr "Nie można zaimportować ustawień" -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "Plik ustawień VPN '%s' nie zawiera poprawnych danych." -#~ msgid "Select file to import" -#~ msgstr "Plik do zaimportowania" -#~ msgid "Select CA to use" -#~ msgstr "Używany CA" -#~ msgid "Select certificate to use" -#~ msgstr "Używany certyfikat" -#~ msgid "Select key to use" -#~ msgstr "Używany klucz" -#~ msgid "Select shared key to use" -#~ msgstr "Używany klucz współdzielony" -#~ msgid "Select TA to use" -#~ msgstr "Używany TA" -#~ msgid "Save as..." -#~ msgstr "Zapisz jako..." -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Plik \"%s\" już istnieje." -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Czy nadpisać go zapisywanym plikiem?" -#~ msgid "Failed to export configuration" -#~ msgstr "Nie można wyeksportować konfiguracji" -#~ msgid "Failed to save file %s" -#~ msgstr "Nie można zapisać pliku %s" -#~ msgid "65536" -#~ msgstr "65536" -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "przykład: 172.16.0.0/16 10.11.12.0/24" -#~ msgid "C_A file:" -#~ msgstr "Plik C_A:" -#~ msgid "Co_nnection type:" -#~ msgstr "Typ połącze_nia:" -#~ msgid "Connection na_me:" -#~ msgstr "Nazwa _połączenia" -#~ msgid "Import _Saved Configuration..." -#~ msgstr "Importuj zapi_saną konfigurację..." -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Nazwa identyfikująca połączenie do sieci prywatnej. Np. \"VPN kampusu\" " -#~ "lub \"Sieć firmowa\"" -#~ msgid "Network" -#~ msgstr "Sieć" -#~ msgid "Only use _VPN connection for these addresses:" -#~ msgstr "_Używaj połączeń VPN tylko dla tych adresów:" -#~ msgid "OpenVPN Configuration" -#~ msgstr "Konfiguracja OpenVPN" -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Proszę podać poniżej informacje dostarczone przez administratora. Hasło " -#~ "należy podać później, podczas łączenia." -#~ msgid "" -#~ "Please note that the file you import is not an OpenVPN configuration " -#~ "file. Ask your administrator for the file." -#~ msgstr "" -#~ "Uwaga: importowany plik nie jest plikiem konfiguracyjnym OpenVPN. Proszę " -#~ "poprosić administratora o poprawny plik." -#~ msgid "Shared _key:" -#~ msgstr "_Klucz współdzielony:" -#~ msgid "TLS-Auth" -#~ msgstr "TLS-Auth" -#~ msgid "Use _TLS auth:" -#~ msgstr "Użyj _TLS auth:" -#~ msgid "Use cip_her:" -#~ msgstr "Użyj szy_fru:" -#~ msgid "" -#~ "X.509 Certificates\n" -#~ "Pre-shared key\n" -#~ "Password Authentication\n" -#~ "X.509 with Password Authentication" -#~ msgstr "" -#~ "Certyfikaty X.509\n" -#~ "Klucz współdzielony\n" -#~ "Uwierzytelnianie za pomocą hasła\n" -#~ "X.509 z uwierzytelnianiem hasłem" -#~ msgid "_0" -#~ msgstr "_0" -#~ msgid "_1" -#~ msgstr "_1" -#~ msgid "_Gateway address:" -#~ msgstr "Adres _bramy:" -#~ msgid "_Key:" -#~ msgstr "_Klucz:" -#~ msgid "_Local IP:" -#~ msgstr "_Lokalny adres IP:" -#~ msgid "_Remote IP:" -#~ msgstr "Zdalny ad_res IP:" -#~ msgid "_none" -#~ msgstr "_brak" -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu błędnego użytkownika i " -#~ "hasła lub błędnego hasła certyfikatu." -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu niemożności uruchomienia " -#~ "programu VPN." -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu braku połączenia z " -#~ "serwerem VPN." -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu błędnych opcji " -#~ "konfiguracyjnych." -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu otrzymania od serwera " -#~ "błędnej konfiguracji." -#~ msgid "VPN connection failed" -#~ msgstr "Połączenie VPN zakończone niepowodzeniem" -#~ msgid "Connection Information" -#~ msgstr "Informacje o połączeniu " -#~ msgid "CA file:" -#~ msgstr "Plik CA:" -#~ msgid "Optional" -#~ msgstr "Opcjonalnie" -#~ msgid "Username:" -#~ msgstr "Nazwa użytkownika:" -#~ msgid "X.509" -#~ msgstr "X.509" -#~ msgid "X.509/Pass" -#~ msgstr "X.509/Pass" - diff --git a/vpn-daemons/openvpn/po/ps.po b/vpn-daemons/openvpn/po/ps.po deleted file mode 100644 index 6b9d42e7b5..0000000000 --- a/vpn-daemons/openvpn/po/ps.po +++ /dev/null @@ -1,234 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn.head\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-05 03:53+0000\n" -"PO-Revision-Date: 2008-08-19 09:14-0800\n" -"Last-Translator: Zabeeh Khan \n" -"Language-Team: Pashto \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Pashto, Pushto\n" -"X-Poedit-Country: AFGHANISTAN\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr ":تېرنويې_" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr ":دويمه تېرنويې_" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr ":کارننوم_" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr ":شپول_" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "بېنومه نښلېدل_" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr ":لکه _کارن نښلېدل" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "دې ناستې لپاره تېرنويې په ياد ساتل_" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "تېرونویي په کيلۍ رېنګ کې ساتل_" - -#: ../auth-dialog/main.c:187 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr ".اوڅاریز ځانی ځال ته د لاسرسي لپاره ځان کره کړﺉ '%s' تاسو ته اړينه ده چې د" - -#: ../auth-dialog/main.c:188 -msgid "Authenticate VPN" -msgstr "اوڅاریز ځاني ځال کرول" - -#: ../auth-dialog/main.c:201 -msgid "Certificate pass_word:" -msgstr "د بريليک تېر_نويې:" - -#: ../auth-dialog/main.c:216 -msgid "Certificate password:" -msgstr "د بريليک تېرنويې:" - -#: ../properties/auth-helpers.c:68 -msgid "Choose a Certificate Authority certificate..." -msgstr "د بريليک واک يو برېليک وټاکئ..." - -#: ../properties/auth-helpers.c:87 -msgid "Choose your personal certificate..." -msgstr "خپل وګړيز برېليک وټاکئ..." - -#: ../properties/auth-helpers.c:105 -msgid "Choose your private key..." -msgstr "خپله وګړيزه کيلۍ وټاکئ..." - -#: ../properties/auth-helpers.c:158 -msgid "Choose an OpenVPN static key..." -msgstr "ولاړ کيلۍ وټاکئ... OpenVPN يوه" - -#: ../properties/auth-helpers.c:176 -#: ../properties/auth-helpers.c:864 -msgid "None" -msgstr "هېڅ" - -#: ../properties/auth-helpers.c:519 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "(*.pem, *.crt, *.key) بريليکونه PEM" - -#: ../properties/auth-helpers.c:579 -msgid "OpenVPN Static Keys (*.key)" -msgstr "(*.key) ولاړ کيلۍ OpenVPN" - -#: ../properties/auth-helpers.c:703 -msgid "Default" -msgstr "تلواله" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr ".پالنګر سره جوړ OpenVPN" - -#: ../properties/nm-openvpn.c:311 -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "(TLS) برېليک" - -#: ../properties/nm-openvpn.c:323 -msgid "Password" -msgstr "تېرنويې" - -#: ../properties/nm-openvpn.c:337 -msgid "Password with Certificates (TLS)" -msgstr "(TLS) بريليکونو سره تېرنویې " - -#: ../properties/nm-openvpn.c:349 -msgid "Static Key" -msgstr "ولاړه کيلۍ" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "کرونه" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "ټوليز" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator." -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "...بر_یونلې" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr ":برېليک CA" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "ټکی:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "ټوليز" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr ":کيلۍ لور" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr ":کيلي دوتنه" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Private Key:" -msgstr "وګړيزه کيلۍ:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Static Key:" -msgstr ":ولاړه کيلۍ" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Type:" -msgstr ":ډول" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Use L_ZO data compression" -msgstr "اومتوک زېرنه کارول L_ZO" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Use a TA_P device" -msgstr "وزله کارول TA_P" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Use a _TCP connection" -msgstr "نښلېدنه کارول _TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Use additional TLS authentication" -msgstr "کرونه کارول TLS زياتي " - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use custom gateway p_ort:" -msgstr ":دوديزې ورلارې در_شل کارول" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "User Certificate:" -msgstr ":کارن برېليک" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "User name:" -msgstr ":کارن نوم" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "_Gateway:" -msgstr ":_ورلار" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "gtk-cancel" -msgstr "بندول-gtk" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "gtk-ok" -msgstr "هوکې-gtk" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "page 1" -msgstr "۱ پاڼه" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "page 2" -msgstr "۲مه پاڼه" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "page 3" -msgstr "۳مه پاڼه" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "page 4" -msgstr "۴مه پاڼه" - diff --git a/vpn-daemons/openvpn/po/pt.po b/vpn-daemons/openvpn/po/pt.po deleted file mode 100644 index cd2c3f77f3..0000000000 --- a/vpn-daemons/openvpn/po/pt.po +++ /dev/null @@ -1,447 +0,0 @@ -# NetworkManager-openvpn's Portuguese translation. -# Copyright © 2007 NetworkManager-openvpn -# This file is distributed under the same license as the NetworkManager-openvpn package. -# Duarte Loreto , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: 2.18\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-08 20:39+0000\n" -"PO-Revision-Date: 2007-02-08 18:50+0000\n" -"Last-Translator: Duarte Loreto \n" -"Language-Team: Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Senha:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "S_enha Secundária:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Utilizador:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domínio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Ligar-se _anonimamente" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Ligar-se como o _utilizador:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Recordar a senha durante esta sessão" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Gravar a senha no chaveiro" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Tem de se autenticar para aceder à Rede Privada Virtual (VPN) '%s'." - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "Autenticar na VPN" - -#: ../auth-dialog/main.c:227 -msgid "Certificate pass_word:" -msgstr "Sen_ha do Certificado:" - -#: ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "Senha do certificado:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Adicionar, Remover e Editar Ligações VPN" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "Gestor de Ligações VPN (OpenVPN)" - -#: ../properties/nm-openvpn.c:130 -msgid "OpenVPN Client" -msgstr "Cliente OpenVPN" - -#: ../properties/nm-openvpn.c:729 -msgid "The following OpenVPN connection will be created:" -msgstr "Serão criadas as seguintes ligações OpenVPN:" - -#: ../properties/nm-openvpn.c:731 -#, c-format -msgid "Name: %s" -msgstr "Nome: %s" - -#: ../properties/nm-openvpn.c:739 -msgid "Connection Type: X.509 Certificates" -msgstr "Tipo de Ligação: Certificados X.509" - -#: ../properties/nm-openvpn.c:742 ../properties/nm-openvpn.c:769 -#: ../properties/nm-openvpn.c:781 -#, c-format -msgid "CA: %s" -msgstr "AC: %s" - -#: ../properties/nm-openvpn.c:745 ../properties/nm-openvpn.c:784 -#, c-format -msgid "Cert: %s" -msgstr "Cert: %s" - -#: ../properties/nm-openvpn.c:748 ../properties/nm-openvpn.c:787 -#, c-format -msgid "Key: %s" -msgstr "Chave: %s" - -#: ../properties/nm-openvpn.c:752 -msgid "Connection Type: Shared Key" -msgstr "Tipo de Ligação: Chave Partilhada" - -#: ../properties/nm-openvpn.c:755 -#, c-format -msgid "Shared Key: %s" -msgstr "Chave Partilhada: %s" - -#: ../properties/nm-openvpn.c:758 -#, c-format -msgid "Local IP: %s" -msgstr "IP Local: %s" - -#: ../properties/nm-openvpn.c:761 -#, c-format -msgid "Remote IP: %s" -msgstr "IP Remoto: %s" - -#: ../properties/nm-openvpn.c:766 -msgid "Connection Type: Password" -msgstr "Tipo de Ligação: Senha" - -#: ../properties/nm-openvpn.c:772 ../properties/nm-openvpn.c:790 -#, c-format -msgid "Username: %s" -msgstr "Utilizador: %s" - -#: ../properties/nm-openvpn.c:778 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Tipo de Ligação: X.509 com Autenticação por Senha" - -#: ../properties/nm-openvpn.c:796 -#, c-format -msgid "Remote: %s" -msgstr "Remoto: %s" - -#: ../properties/nm-openvpn.c:799 -#, c-format -msgid "Device: %s" -msgstr "Dispositivo: %s" - -#: ../properties/nm-openvpn.c:799 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:799 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:802 -#, c-format -msgid "Protocol: %s" -msgstr "Protocolo: %s" - -#: ../properties/nm-openvpn.c:802 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:802 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:806 -#, c-format -msgid "Routes: %s" -msgstr "Rotas: %s" - -#: ../properties/nm-openvpn.c:810 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Utilizar Compressão LZO: %s" - -#: ../properties/nm-openvpn.c:810 -msgid "Yes" -msgstr "Sim" - -#: ../properties/nm-openvpn.c:810 -msgid "No" -msgstr "Não" - -#: ../properties/nm-openvpn.c:814 -#, c-format -msgid "Cipher: %s" -msgstr "Cifra: %s" - -#: ../properties/nm-openvpn.c:819 -#, c-format -msgid "TLS auth: %s %s" -msgstr "Autenticação TLS: %s %s" - -#: ../properties/nm-openvpn.c:823 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" -"Os detalhes da ligação podem ser alterados utilizando o botão \"Editar\"." - -#: ../properties/nm-openvpn.c:1003 -msgid "Cannot import settings" -msgstr "Incapaz de importar as definições" - -#: ../properties/nm-openvpn.c:1005 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "O ficheiro de definições da VPN '%s' não contém dados válidos." - -#: ../properties/nm-openvpn.c:1042 -msgid "Select file to import" -msgstr "Seleccionar o ficheiro a importar" - -#: ../properties/nm-openvpn.c:1122 ../properties/nm-openvpn.c:1134 -msgid "Select CA to use" -msgstr "Seleccionar a AC a utilizar" - -#: ../properties/nm-openvpn.c:1125 -msgid "Select certificate to use" -msgstr "Seleccionar o certificado a utilizar" - -#: ../properties/nm-openvpn.c:1128 -msgid "Select key to use" -msgstr "Seleccionar a chave a utilizar" - -#: ../properties/nm-openvpn.c:1131 -msgid "Select shared key to use" -msgstr "Seleccionar a chave partilhada a utilizar" - -#: ../properties/nm-openvpn.c:1137 -msgid "Select TA to use" -msgstr "Seleccionar a TA a utilizar" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1326 -msgid "Save as..." -msgstr "Gravar como..." - -#: ../properties/nm-openvpn.c:1356 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Já existe um ficheiro denominado \"%s\"." - -#: ../properties/nm-openvpn.c:1359 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Deseja substituí-lo pelo que está a gravar?" - -#: ../properties/nm-openvpn.c:1373 -msgid "Failed to export configuration" -msgstr "Falha ao exportar a configuração" - -#: ../properties/nm-openvpn.c:1375 -#, c-format -msgid "Failed to save file %s" -msgstr "Falha ao gravar o ficheiro %s" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "0" -msgstr "0" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "1" -msgstr "1" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "Connection Name" -msgstr "Nome da Ligação" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Optional Information" -msgstr "Informação Opcional" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Required Information" -msgstr "Informação Necessária" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "exemplo: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "CA file:" -msgstr "Ficheiro AC:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "CA file:" -msgstr "Ficheiro AC:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Certificate:" -msgstr "Certificado:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Connection Type:" -msgstr "Tipo de Ligação:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Direction:" -msgstr "Direcção:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Key:" -msgstr "Chave:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Local IP:" -msgstr "IP Local:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password" -msgstr "Senha" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Introduza abaixo a informação disponibilizada pelo administrador do seu " -"sistema. Não introduza aqui a sua senha pois essa ser-lhe-á pedida quando se " -"ligar." - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" -"Note que o ficheiro que importou não é um ficheiro de configuração OpenVPN. " -"Peça o ficheiro ao administrador do seu sistema." - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Remote IP:" -msgstr "IP Remoto:" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared Key:" -msgstr "Chave Partilhada:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Shared key" -msgstr "Chave partilhada" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use LZO compression" -msgstr "Utilizar compressão LZO" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TAP device" -msgstr "Utilizar o dispositivo TAP" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use TCP connection" -msgstr "Utilizar uma ligação TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use TLS auth:" -msgstr "Utilizar autenticação TLS:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cipher:" -msgstr "Utilizar cifra:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Username:" -msgstr "Utilizador:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "X.509" -msgstr "X.509" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"Certificados X.509\n" -"Chave pré-partilhada\n" -"Autenticação por Senha\n" -"X.509 com Autenticação por Senha" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Import Saved Configuration..." -msgstr "_Importar Configuração Gravada..." - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"_Nome utilizado para identificar a ligação à rede privada, por. ex. \"VPN da " -"Universidade\" ou \"Rede da Empresa\"" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Only use VPN connection for these addresses" -msgstr "_Apenas utilizar ligação VPN para estes endereços" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "none" -msgstr "nenhuma" - -#: ../src/nm-openvpn-service.c:127 -msgid "" -"The VPN login failed because the user name and password were not accepted or " -"the certificate password was wrong." -msgstr "" -"O início de sessão VPN falhou porque o utilizador e senha não foram aceites " -"ou a senha de certificado estava incorrecta." - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" -"O início de sessão VPN falhou porque não foi possível iniciar a aplicação de " -"VPN." - -#: ../src/nm-openvpn-service.c:131 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"O início de sessão VPN falhou porque a aplicação de VPN foi incapaz de se " -"ligar ao servidor de VPN." - -#: ../src/nm-openvpn-service.c:133 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "" -"O início de sessão VPN falhou porque as opções de configuração são inválidas." - -#: ../src/nm-openvpn-service.c:135 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"O início de sessão VPN falhou porque a aplicação de VPN recebeu uma " -"configuração inválida do servidor de VPN." - -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "Falhou a ligação VPN" diff --git a/vpn-daemons/openvpn/po/pt_BR.po b/vpn-daemons/openvpn/po/pt_BR.po deleted file mode 100644 index ef3d9c1d14..0000000000 --- a/vpn-daemons/openvpn/po/pt_BR.po +++ /dev/null @@ -1,503 +0,0 @@ -# Brazilian Portuguese translation of NetworkManager. -# Copyright (C) 2004-2007 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager package. -# Raphael Higino , 2004-2007. -# Washington Lins , 2007. -# Luiz Armesto , 2007. -# Henrique P Machado , 2008. -# Fábio Nogueira , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-21 15:02-0400\n" -"PO-Revision-Date: 2008-10-01 13:51-0300\n" -"Last-Translator: Fábio Nogueira \n" -"Language-Team: Brazilian Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: BRAZIL\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Senha:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Senha secundária:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "Nome do _usuário:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domínio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Conectar _anonimamente" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Conectar como _usuário:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Lembrar senha para esta sessão" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Salvar senha no chaveiro" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Você precisa se autenticar para acessar a Rede Privada Virtual \"%s\"." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "Autenticar VPN" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "Sen_ha do certificado:" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Senha do certificado:" - -#: ../properties/auth-helpers.c:161 -msgid "Choose a Certificate Authority certificate..." -msgstr "Escolha um certificado de Autoridade Certificadora..." - -#: ../properties/auth-helpers.c:180 -msgid "Choose your personal certificate..." -msgstr "Escolha seu certificado pessoal..." - -#: ../properties/auth-helpers.c:198 -msgid "Choose your private key..." -msgstr "Escolha sua chave privada..." - -#: ../properties/auth-helpers.c:251 -msgid "Choose an OpenVPN static key..." -msgstr "Escolha uma chave estática do OpenVPN..." - -#: ../properties/auth-helpers.c:275 ../properties/auth-helpers.c:1001 -msgid "None" -msgstr "Nenhum" - -#: ../properties/auth-helpers.c:660 -msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)" -msgstr "Certificados PEM (*.pem, *.crt, *.key, *.cer)" - -#: ../properties/auth-helpers.c:720 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Chaves estáticas do OpenVPN (*.key)" - -#: ../properties/auth-helpers.c:831 -msgid "Default" -msgstr "Padrão" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Compatível com o servidor OpenVPN." - -#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Certificados (TLS)" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Senha" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Senha com certificados (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Chave estática" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Autenticação" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Geral" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Se a chave de direção é utilizada, ela tem que ser o oposto da utilizada " -"no par da VPN. Por exemplo: se o par utiliza '1', esta conexão tem que " -"utilizar '0'. Se você não tem certeza de qual valor utilizar, entre em " -"contato com seu administrador de sistema." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "A_vançado..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Certificado CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Cifragem:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Geral" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Direção da chave:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Arquivo de chave:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "Endereço IP local:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "Opções avançadas do OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password:" -msgstr "Senha:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Private Key Password:" -msgstr "Senha da chave privada:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Chave privada:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Show passwords" -msgstr "Mostrar senhas" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Static Key:" -msgstr "Chave estática:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Type:" -msgstr "Tipo:" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO data compression" -msgstr "Utilizar compressão de dados L_ZO" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use a TA_P device" -msgstr "Utilizar um dispositivo TA_P" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a _TCP connection" -msgstr "Utilizar uma conexão _TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use additional TLS authentication" -msgstr "Utilizar autenticação TLS adicional" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use custom gateway p_ort:" -msgstr "Utilizar p_orta de gateway personalizada:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "User Certificate:" -msgstr "Certificado de usuário:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User name:" -msgstr "Nome do usuário:" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "_Gateway:" -msgstr "_Gateway:" - -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" - -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" - -#~ msgid "page 1" -#~ msgstr "página 1" - -#~ msgid "page 2" -#~ msgstr "página 2" - -#~ msgid "page 3" -#~ msgstr "página 3" - -#~ msgid "page 4" -#~ msgstr "página 4" - -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "Adicione, remova e edite conexões VPN" - -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "Gerenciador de Conexões VPN (OpenVPN)" - -#~ msgid "The following OpenVPN connection will be created:" -#~ msgstr "As seguintes conexões OpenVPN serão criadas:" - -#~ msgid "Name: %s" -#~ msgstr "Nome: %s" - -#~ msgid "Connection Type: X.509 Certificates" -#~ msgstr "Tipo de Conexão: Certificados X.509" - -#~ msgid "CA: %s" -#~ msgstr "CA: %s" - -#~ msgid "Cert: %s" -#~ msgstr "Cert: %s" - -#~ msgid "Key: %s" -#~ msgstr "Chave: %s" - -#~ msgid "Connection Type: Shared Key" -#~ msgstr "Tipo de Conexão: Chave Compartilhada" - -#~ msgid "Shared Key: %s" -#~ msgstr "Chave Compartilhada: %s" - -#~ msgid "Remote IP: %s" -#~ msgstr "IP Remoto: %s" - -#~ msgid "Connection Type: Password" -#~ msgstr "Tipo de Conexão: Senha" - -#~ msgid "Username: %s" -#~ msgstr "Nome do usuário: %s" - -#~ msgid "Connection Type: X.509 with Password Authentication" -#~ msgstr "Tipo de Conexão: X.509 com Autenticação de Senha" - -#~ msgid "Remote: %s" -#~ msgstr "Remoto: %s" - -#~ msgid "Port: %s" -#~ msgstr "Porta: %s" - -#~ msgid "Device: %s" -#~ msgstr "Dispositivo: %s" - -#~ msgid "TAP" -#~ msgstr "TAP" - -#~ msgid "TUN" -#~ msgstr "TUN" - -#~ msgid "Protocol: %s" -#~ msgstr "Protocolo: %s" - -#~ msgid "TCP" -#~ msgstr "TCP" - -#~ msgid "UDP" -#~ msgstr "UDP" - -#~ msgid "Routes: %s" -#~ msgstr "Rotas: %s" - -#~ msgid "Use LZO Compression: %s" -#~ msgstr "Usar Compressão LZO: %s" - -#~ msgid "Yes" -#~ msgstr "Sim" - -#~ msgid "TLS auth: %s %s" -#~ msgstr "Autenticação TLS: %s %s" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "" -#~ "Os detalhes da conexão podem ser alterados usando o botão \"Editar\"." - -#~ msgid "Cannot import settings" -#~ msgstr "Não é possível importar configurações" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "O arquivo de configurações de VPN \"%s\" não contém dados válidos." - -#~ msgid "Select file to import" -#~ msgstr "Selecione o arquivo a importar" - -#~ msgid "Select CA to use" -#~ msgstr "Selecione o CA a usar" - -#~ msgid "Select certificate to use" -#~ msgstr "Selecione o certificado a usar" - -#~ msgid "Select key to use" -#~ msgstr "Selecione a chave a usar" - -#~ msgid "Select shared key to use" -#~ msgstr "Selecione a chave compartilhada a usar" - -#~ msgid "Select TA to use" -#~ msgstr "Selecione TA para usar" - -#~ msgid "Save as..." -#~ msgstr "Salvar como..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Um arquivo chamado \"%s\" já existe." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Você deseja substituí-la com aquela que você está salvando?" - -#~ msgid "Failed to export configuration" -#~ msgstr "Falha ao exportar configuração" - -#~ msgid "Failed to save file %s" -#~ msgstr "Falha ao salvar o arquivo %s" - -#~ msgid "65536" -#~ msgstr "65536" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "exemplo: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "C_A file:" -#~ msgstr "Arquivo C_A:" - -#~ msgid "Co_nnection type:" -#~ msgstr "Tipo de Co_nexão:" - -#~ msgid "Connection na_me:" -#~ msgstr "No_me da Conexão" - -#~ msgid "Import _Saved Configuration..." -#~ msgstr "Importar Configurações _Salvas..." - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Nome usado para identificar a conexão à rede privada, por ex. \"VPN do " -#~ "Campus\" ou \"Rede Corporativa\"" - -#~ msgid "Network" -#~ msgstr "Rede" - -#~ msgid "Only use _VPN connection for these addresses:" -#~ msgstr "Usar conexões _VPN apenas para estes endereços:" - -#~ msgid "OpenVPN Configuration" -#~ msgstr "Configurações do OpenVPN" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Por favor, digite abaixo as informações fornecidas pelo seu administrador " -#~ "de sistema. Não digite sua senha aqui, já que ela será solicitada ao " -#~ "conectar." - -#~ msgid "" -#~ "Please note that the file you import is not an OpenVPN configuration " -#~ "file. Ask your administrator for the file." -#~ msgstr "" -#~ "Por favor, observe que o arquivo que você importou não é um arquivo de " -#~ "configuração OpenVPN. Pergunte ao seu administrador pelo arquivo." - -#~ msgid "Shared _key:" -#~ msgstr "C_have compartilhada:" - -#~ msgid "TLS-Auth" -#~ msgstr "Autenticação-TSL" - -#~ msgid "Use _TLS auth:" -#~ msgstr "Usar autenticação _TLS:" - -#~ msgid "Use cip_her:" -#~ msgstr "Usar ci_fragem:" - -#~ msgid "" -#~ "X.509 Certificates\n" -#~ "Pre-shared key\n" -#~ "Password Authentication\n" -#~ "X.509 with Password Authentication" -#~ msgstr "" -#~ "Certificados X.509\n" -#~ "Chave pré-compartilhada\n" -#~ "Autenticação de Senha\n" -#~ "X.509 com Autenticação de Senha" - -#~ msgid "_0" -#~ msgstr "_0" - -#~ msgid "_1" -#~ msgstr "_1" - -#~ msgid "_Gateway address:" -#~ msgstr "Endereço do _Gateway:" - -#~ msgid "_Key:" -#~ msgstr "C_have:" - -#~ msgid "_Local IP:" -#~ msgstr "IP _Local:" - -#~ msgid "_Remote IP:" -#~ msgstr "IP _Remoto:" - -#~ msgid "_none" -#~ msgstr "_nenhum" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "A autenticação VPN falhou porque o nome do usuário e a senha não foram " -#~ "aceitas ou a senha do certificado estava errada." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "A autenticação VPN falhou porque o programa não pôde ser iniciado." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "A autenticação VPN falhou porque o programa VPN não pôde se conectar ao " -#~ "servidor VPN." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "A autenticação VPN falhou porque as opções de configuração VPN eram " -#~ "inválidas." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "A autenticação VPN falhou porque o programa VPN recebeu uma configuração " -#~ "inválida do servidor VPN." - -#~ msgid "VPN connection failed" -#~ msgstr "Falha na conexão VPN" diff --git a/vpn-daemons/openvpn/po/ru.po b/vpn-daemons/openvpn/po/ru.po deleted file mode 100644 index 9d588bb528..0000000000 --- a/vpn-daemons/openvpn/po/ru.po +++ /dev/null @@ -1,243 +0,0 @@ -# translation of ru.po to Russian -# Ukrainian translation of NetworkManager openvpn -# Copyright (C) Free Software Foundation, 2005 -# This file is distributed under the same license as the NetworkManager package. -# -# Maxim Dziumanenko , 2005-2007. -# Leonid Kanter , 2007, 2008. -msgid "" -msgstr "" -"Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-08 14:53+0300\n" -"PO-Revision-Date: 2008-08-08 15:13+0300\n" -"Last-Translator: Leonid Kanter \n" -"Language-Team: Russian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Вторичный пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Имя пользователя:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Домен:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Подключаться _анонимно" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "_Подключаться как пользователь:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Запомнить пароль для этого сеанса" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Сохранить пароль на брелоке" - -#: ../auth-dialog/main.c:187 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Для доступа к виртуальной частной сети '%s' требуется аутентификация." - -#: ../auth-dialog/main.c:188 -msgid "Authenticate VPN" -msgstr "Аутентификация VPN" - -#: ../auth-dialog/main.c:201 -msgid "Certificate pass_word:" -msgstr "Па_роль сертификата:" - -#: ../auth-dialog/main.c:216 -msgid "Certificate password:" -msgstr "Пароль сертификата:" - -#: ../properties/auth-helpers.c:68 -msgid "Choose a Certificate Authority certificate..." -msgstr "Выберите сертификат Центра сертификации..." - -#: ../properties/auth-helpers.c:87 -msgid "Choose your personal certificate..." -msgstr "Выберите ваш персональный сертификат..." - -#: ../properties/auth-helpers.c:105 -msgid "Choose your private key..." -msgstr "Выберите ваш личный ключ..." - -#: ../properties/auth-helpers.c:158 -msgid "Choose an OpenVPN static key..." -msgstr "Выберите статический ключ OpenVPN..." - -#: ../properties/auth-helpers.c:176 ../properties/auth-helpers.c:886 -msgid "None" -msgstr "Нет" - -#: ../properties/auth-helpers.c:519 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "Сертификаты PEM (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:579 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Статические ключи OpenVPN (*.key)" - -#: ../properties/auth-helpers.c:711 -msgid "Default" -msgstr "По умолчанию" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Совместим с сервером OpenVPN." - -#: ../properties/nm-openvpn.c:308 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Сертификаты (TLS)" - -#: ../properties/nm-openvpn.c:320 -msgid "Password" -msgstr "Пароль" - -#: ../properties/nm-openvpn.c:334 -msgid "Password with Certificates (TLS)" -msgstr "Пароль с сертификатами (TLS)" - -#: ../properties/nm-openvpn.c:346 -msgid "Static Key" -msgstr "Статический ключ" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Аутентификация" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Общие" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"Если используется направление ключа, оно должно быть противоположно направлению, которое " -"использует вторая сторона. Например, если вторая сторона использует \"1\", это соединение должно использовать \"0\". Если вы не уверены, какое значение использовать, свяжитесь с системным администратором." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "_Дополнительно..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "Сертификат CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Шифр:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Общие" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Направление ключа:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Направление ключа:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "OpenVPN Advanced Options" -msgstr "Дополнительные параметры OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Private Key:" -msgstr "Личный ключ:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Static Key:" -msgstr "Статический ключ:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Type:" -msgstr "Тип:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Use L_ZO data compression" -msgstr "Использовать сжатие L_ZO" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Use a TA_P device" -msgstr "Использовать устройство TA_P" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Use a _TCP connection" -msgstr "Использовать соединение _TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use additional TLS authentication" -msgstr "Дополнительная аутентификация TLS" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use custom gateway p_ort:" -msgstr "Использовать другой _порт шлюза:" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "User Certificate:" -msgstr "Сертификат пользователя:" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "User name:" -msgstr "Имя пользователя:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "_Gateway:" -msgstr "_Шлюз:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "gtk-cancel" -msgstr "gtk-cancel" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "gtk-ok" -msgstr "gtk-ok" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "page 1" -msgstr "страница 1" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "page 2" -msgstr "страница 2" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "page 3" -msgstr "страница 3" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "page 4" -msgstr "страница 4" - diff --git a/vpn-daemons/openvpn/po/sk.po b/vpn-daemons/openvpn/po/sk.po deleted file mode 100644 index a1e05b1a04..0000000000 --- a/vpn-daemons/openvpn/po/sk.po +++ /dev/null @@ -1,429 +0,0 @@ -# Slovak translations for NetworkManager package. -# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager package. -# Marcel Telka , 2004, 2005, 2006. -# -# $Id: sk.po,v 1.1 2006/06/17 20:55:49 marcel Exp $ -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-17 08:52+0200\n" -"PO-Revision-Date: 2006-06-17 22:54+0200\n" -"Last-Translator: Marcel Telka \n" -"Language-Team: Slovak \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:148 -msgid "_Password:" -msgstr "_Heslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:149 -msgid "_Secondary Password:" -msgstr "_Sekundárne heslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Username:" -msgstr "Meno po_užívateľa:" - -#: ../auth-dialog/gnome-two-password-dialog.c:274 -msgid "_Domain:" -msgstr "_Doména:" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect _anonymously" -msgstr "Pripojiť sa _anonymne" - -#: ../auth-dialog/gnome-two-password-dialog.c:365 -msgid "Connect as _user:" -msgstr "Pripojiť sa ako po_užívateľ:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Zapamätať si heslo pre toto sedenie" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Uložiť heslo na zväzok kľúčov" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" - -#: ../auth-dialog/main.c:215 -#, fuzzy -msgid "Authenticate VPN" -msgstr "Overenie totožnosti:" - -#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "Heslo certifikátu:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Pridať, odstrániť a upraviť VPN spojenia" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "Manažér spojenia VPN (OpenVPN)" - -#: ../properties/nm-openvpn.c:130 -msgid "OpenVPN Client" -msgstr "OpenVPN klient" - -#: ../properties/nm-openvpn.c:729 -#, fuzzy -msgid "The following OpenVPN connection will be created:" -msgstr "Vyberte si, ktorý typ VPN spojenia chcete vytvoriť." - -#: ../properties/nm-openvpn.c:731 -#, c-format -msgid "Name: %s" -msgstr "Meno: %s" - -#: ../properties/nm-openvpn.c:739 -msgid "Connection Type: X.509 Certificates" -msgstr "Typ spojenia: X.509 certifikáty" - -#: ../properties/nm-openvpn.c:742 ../properties/nm-openvpn.c:769 -#: ../properties/nm-openvpn.c:781 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:745 ../properties/nm-openvpn.c:784 -#, c-format -msgid "Cert: %s" -msgstr "Cert: %s" - -#: ../properties/nm-openvpn.c:748 ../properties/nm-openvpn.c:787 -#, c-format -msgid "Key: %s" -msgstr "Kľúč: %s" - -#: ../properties/nm-openvpn.c:752 -msgid "Connection Type: Shared Key" -msgstr "Typ spojenia: Zdieľaný kľúč" - -#: ../properties/nm-openvpn.c:755 -#, c-format -msgid "Shared Key: %s" -msgstr "Zdieľaný kľúč: %s" - -#: ../properties/nm-openvpn.c:758 -#, c-format -msgid "Local IP: %s" -msgstr "Miestne IP: %s" - -#: ../properties/nm-openvpn.c:761 -#, c-format -msgid "Remote IP: %s" -msgstr "Vzdialené IP: %s" - -#: ../properties/nm-openvpn.c:766 -msgid "Connection Type: Password" -msgstr "Typ spojenia: Heslo" - -#: ../properties/nm-openvpn.c:772 ../properties/nm-openvpn.c:790 -#, c-format -msgid "Username: %s" -msgstr "Meno používateľa: %s" - -#: ../properties/nm-openvpn.c:778 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Typ spojenia: X.509 s overením totožnosti heslom" - -#: ../properties/nm-openvpn.c:796 -#, c-format -msgid "Remote: %s" -msgstr "Vzdialené: %s" - -#: ../properties/nm-openvpn.c:799 -#, c-format -msgid "Device: %s" -msgstr "Zariadenie: %s" - -#: ../properties/nm-openvpn.c:799 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:799 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:802 -#, c-format -msgid "Protocol: %s" -msgstr "Protokol: %s" - -#: ../properties/nm-openvpn.c:802 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:802 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:806 -#, c-format -msgid "Routes: %s" -msgstr "" - -#: ../properties/nm-openvpn.c:810 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Použiť kompresiu LZO: %s" - -#: ../properties/nm-openvpn.c:810 -msgid "Yes" -msgstr "Áno" - -#: ../properties/nm-openvpn.c:810 -msgid "No" -msgstr "Nie" - -#: ../properties/nm-openvpn.c:814 -#, c-format -msgid "Cipher: %s" -msgstr "Šifra: %s" - -#: ../properties/nm-openvpn.c:819 -#, c-format -msgid "TLS auth: %s %s" -msgstr "" - -#: ../properties/nm-openvpn.c:823 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Podrobnosti spojenia je možné zmeniť pomocou tlačidla \"Upraviť\"." - -#: ../properties/nm-openvpn.c:1003 -msgid "Cannot import settings" -msgstr "Nepodarilo sa naimportovať nastavenia" - -#: ../properties/nm-openvpn.c:1005 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "" - -#: ../properties/nm-openvpn.c:1042 -msgid "Select file to import" -msgstr "" - -#: ../properties/nm-openvpn.c:1122 ../properties/nm-openvpn.c:1134 -msgid "Select CA to use" -msgstr "" - -#: ../properties/nm-openvpn.c:1125 -msgid "Select certificate to use" -msgstr "" - -#: ../properties/nm-openvpn.c:1128 -msgid "Select key to use" -msgstr "" - -#: ../properties/nm-openvpn.c:1131 -msgid "Select shared key to use" -msgstr "" - -#: ../properties/nm-openvpn.c:1137 -msgid "Select TA to use" -msgstr "" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1326 -msgid "Save as..." -msgstr "" - -#: ../properties/nm-openvpn.c:1356 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "" - -#: ../properties/nm-openvpn.c:1359 -msgid "Do you want to replace it with the one you are saving?" -msgstr "" - -#: ../properties/nm-openvpn.c:1373 -msgid "Failed to export configuration" -msgstr "" - -#: ../properties/nm-openvpn.c:1375 -#, c-format -msgid "Failed to save file %s" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "0" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "1" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "Connection Name" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -#, fuzzy -msgid "Optional Information" -msgstr "Informácie o spojení" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Required Information" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "CA file:" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Certificate:" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -#, fuzzy -msgid "Connection Type:" -msgstr "Pripojiť k:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Direction:" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key:" -msgstr "Kľúč:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP:" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -#, fuzzy -msgid "Password" -msgstr "Heslo:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your adminstrator for the file." -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Remote IP:" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -#, fuzzy -msgid "Shared Key:" -msgstr "Zdieľaný kľúč" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -#, fuzzy -msgid "Shared key" -msgstr "Zdieľaný kľúč" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use LZO compression" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use TAP device" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -#, fuzzy -msgid "Use TCP connection" -msgstr "VPN spojenia" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use TLS auth:" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use cipher:" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -#, fuzzy -msgid "Username:" -msgstr "Meno používateľa:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "X.509" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "_Gateway:" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Import Saved Configuration..." -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Only use VPN connection for these addresses" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "none" -msgstr "nič" - -#: ../src/nm-openvpn-service.c:127 -msgid "" -"The VPN login failed because the user name and password were not accepted or " -"the certificate password was wrong." -msgstr "" - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" - -#: ../src/nm-openvpn-service.c:131 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" - -#: ../src/nm-openvpn-service.c:133 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "" - -#: ../src/nm-openvpn-service.c:135 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" - -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "VPN spojenie zlyhalo" diff --git a/vpn-daemons/openvpn/po/sl.po b/vpn-daemons/openvpn/po/sl.po deleted file mode 100644 index bc0f84b230..0000000000 --- a/vpn-daemons/openvpn/po/sl.po +++ /dev/null @@ -1,422 +0,0 @@ -# Slovenian translation of NetworkManager-openvpn. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager-openvpn package. -# -# Matic Žgur , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-10 03:26+0000\n" -"PO-Revision-Date: 2007-01-10 15:25+0100\n" -"Last-Translator: Matic Žgur \n" -"Language-Team: Slovenian GNOME Translation Team \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Slovenian\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Geslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Sekundarno geslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Uporabniško ime:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domena:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Poveži _anonimno" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Poveži se kot _uporabnik:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Zapomni si geslo za to sejo" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "Shrani geslo v _zbirko ključev" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Morate se overoviti za dostop do navideznega zasebnega omrežja '%s'." - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "Overovi VPN" - -#: ../auth-dialog/main.c:227 -msgid "Certificate pass_word:" -msgstr "G_eslo za certifikat:" - -#: ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "Geslo za certifikat:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Dodajte, odstranite ali uredite povezave VPN" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "Upravitelj povezav VPN (OpenVPN)" - -#: ../properties/nm-openvpn.c:130 -msgid "OpenVPN Client" -msgstr "Odjemalec OpenVPN" - -#: ../properties/nm-openvpn.c:729 -msgid "The following OpenVPN connection will be created:" -msgstr "Naslednje povezave OpenVPN bodo ustvarjene:" - -#: ../properties/nm-openvpn.c:731 -#, c-format -msgid "Name: %s" -msgstr "Ime: %s" - -#: ../properties/nm-openvpn.c:739 -msgid "Connection Type: X.509 Certificates" -msgstr "Vrsta povezave: Certifikati X.509" - -#: ../properties/nm-openvpn.c:742 -#: ../properties/nm-openvpn.c:769 -#: ../properties/nm-openvpn.c:781 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:745 -#: ../properties/nm-openvpn.c:784 -#, c-format -msgid "Cert: %s" -msgstr "Cert: %s" - -#: ../properties/nm-openvpn.c:748 -#: ../properties/nm-openvpn.c:787 -#, c-format -msgid "Key: %s" -msgstr "Ključ: %s" - -#: ../properties/nm-openvpn.c:752 -msgid "Connection Type: Shared Key" -msgstr "Vrsta povezave: Deljeni ključ" - -#: ../properties/nm-openvpn.c:755 -#, c-format -msgid "Shared Key: %s" -msgstr "Deljeni ključ: %s" - -#: ../properties/nm-openvpn.c:758 -#, c-format -msgid "Local IP: %s" -msgstr "Lokalni IP: %s" - -#: ../properties/nm-openvpn.c:761 -#, c-format -msgid "Remote IP: %s" -msgstr "Oddaljeni IP: %s" - -#: ../properties/nm-openvpn.c:766 -msgid "Connection Type: Password" -msgstr "Vrsta povezave: Geslo" - -#: ../properties/nm-openvpn.c:772 -#: ../properties/nm-openvpn.c:790 -#, c-format -msgid "Username: %s" -msgstr "Uporabniško ime: %s" - -#: ../properties/nm-openvpn.c:778 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Vrsta povezave: X.509 z overovitvijo z geslom" - -#: ../properties/nm-openvpn.c:796 -#, c-format -msgid "Remote: %s" -msgstr "Oddaljeno: %s" - -#: ../properties/nm-openvpn.c:799 -#, c-format -msgid "Device: %s" -msgstr "Naprava: %s" - -#: ../properties/nm-openvpn.c:799 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:799 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:802 -#, c-format -msgid "Protocol: %s" -msgstr "Protokol: %s" - -#: ../properties/nm-openvpn.c:802 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:802 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:806 -#, c-format -msgid "Routes: %s" -msgstr "Smeri: %s" - -#: ../properties/nm-openvpn.c:810 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Uporabi kompresijo LZO: %s" - -#: ../properties/nm-openvpn.c:810 -msgid "Yes" -msgstr "Da" - -#: ../properties/nm-openvpn.c:810 -msgid "No" -msgstr "Ne" - -#: ../properties/nm-openvpn.c:814 -#, c-format -msgid "Cipher: %s" -msgstr "Šifra: %s" - -#: ../properties/nm-openvpn.c:819 -#, c-format -msgid "TLS auth: %s %s" -msgstr "Overovitev TLS: %s %s" - -#: ../properties/nm-openvpn.c:823 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Podrobnosti o povezavi so lahko spremenjene z uporabo gumba \"Uredi\"." - -#: ../properties/nm-openvpn.c:1003 -msgid "Cannot import settings" -msgstr "Ni mogoče uvoziti nastavitev" - -#: ../properties/nm-openvpn.c:1005 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "Datoteka z nastavitvami za VPN '%s' ne vsebuje veljavnih podatkov." - -#: ../properties/nm-openvpn.c:1042 -msgid "Select file to import" -msgstr "Izberite datoteko za uvoz" - -#: ../properties/nm-openvpn.c:1122 -#: ../properties/nm-openvpn.c:1134 -msgid "Select CA to use" -msgstr "Izberite CA za uporabo" - -#: ../properties/nm-openvpn.c:1125 -msgid "Select certificate to use" -msgstr "Izberite certifikat za uporabo" - -#: ../properties/nm-openvpn.c:1128 -msgid "Select key to use" -msgstr "Izberite ključ za uporabo" - -#: ../properties/nm-openvpn.c:1131 -msgid "Select shared key to use" -msgstr "Izberite deljeni ključ za uporabo" - -#: ../properties/nm-openvpn.c:1137 -msgid "Select TA to use" -msgstr "Izberite TA za uporabo" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1326 -msgid "Save as..." -msgstr "Shrani kot ..." - -#: ../properties/nm-openvpn.c:1356 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Datoteka z imenom \"%s\" že obstaja." - -#: ../properties/nm-openvpn.c:1359 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Ali jo želite zamenjati s to, ki jo shranjujete?" - -#: ../properties/nm-openvpn.c:1373 -msgid "Failed to export configuration" -msgstr "Izvoz nastavitev ni uspel" - -#: ../properties/nm-openvpn.c:1375 -#, c-format -msgid "Failed to save file %s" -msgstr "Shranjevanje datoteke %s ni uspelo" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "0" -msgstr "0" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "1" -msgstr "1" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "Connection Name" -msgstr "Ime povezave" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Optional Information" -msgstr "Dodatne informacije" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Required Information" -msgstr "Zahtevane informacije" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "primer: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "CA file:" -msgstr "Datoteka z CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Certificate:" -msgstr "Certifikat:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Connection Type:" -msgstr "Vrsta povezave:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Direction:" -msgstr "Smer:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key:" -msgstr "Ključ:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP:" -msgstr "Lokalni IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Password" -msgstr "Geslo" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting." -msgstr "Prosim, spodaj vnesite informacije, ki vam jih je priskrbel sistemski administrator. Ne vnesite svojega gesla tukaj, saj boste ponovno vprašani zanj med povezovanjem." - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Please note that the file you import is not an OpenVPN configuration file. Ask your administrator for the file." -msgstr "Prosim, pomnite, da datoteka, ki ste jo uvozili, ni datoteka z nastavitvami za OpenVPN. Vprašajte administratorja za datoteko." - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Remote IP:" -msgstr "Oddaljeni IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Shared Key:" -msgstr "Deljeni ključ:" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared key" -msgstr "Deljeni ključ" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use LZO compression" -msgstr "Uporabi kompresijo LZO" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use TAP device" -msgstr "Uporabi napravo TAP" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TCP connection" -msgstr "Uporabi povezavo TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use TLS auth:" -msgstr "Uporabi overovitev TLS:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use cipher:" -msgstr "Uporabi šifro:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Username:" -msgstr "Uporabniško ime:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "X.509" -msgstr "X.509" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"Certifikati X.509\n" -"Vnaprej deljeni ključ\n" -"Overovitev z geslom\n" -"X.509 z overovitvijo z geslom" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "_Gateway:" -msgstr "_Prehod:" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Import Saved Configuration..." -msgstr "_Uvozi shranjene nastavitve ..." - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "_Ime, uporabljeno za identificiranje povezave na zasebno omrežje, npr. \"Campus VPN\" ali \"Corporate Network\"" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Only use VPN connection for these addresses" -msgstr "Uporabi povezavo VPN _samo za te naslove" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "none" -msgstr "noben" - -#: ../src/nm-openvpn-service.c:127 -msgid "The VPN login failed because the user name and password were not accepted or the certificate password was wrong." -msgstr "Prijava v VPN ni uspela, ker uporabniško ime in geslo nista bila sprejeta ali pa je bilo geslo certifikata napačno." - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "Prijava v VPN ni uspela, ker ni mogoče zagnati programa VPN." - -#: ../src/nm-openvpn-service.c:131 -msgid "The VPN login failed because the VPN program could not connect to the VPN server." -msgstr "Prijava v VPN ni uspela, ker se program VPN ne more povezati s strežnikom VPN." - -#: ../src/nm-openvpn-service.c:133 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "Prijava v VPN ni uspela, ker so nastavitve VPN neveljavne." - -#: ../src/nm-openvpn-service.c:135 -msgid "The VPN login failed because the VPN program received an invalid configuration from the VPN server." -msgstr "Prijava v VPN ni uspela, ker je program VPN prejel neveljavne nastavitve iz strežnika VPN." - -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "Povezava VPN ni uspela" - diff --git a/vpn-daemons/openvpn/po/sv.po b/vpn-daemons/openvpn/po/sv.po deleted file mode 100644 index 9809123ae7..0000000000 --- a/vpn-daemons/openvpn/po/sv.po +++ /dev/null @@ -1,543 +0,0 @@ -# Swedish messages for NetworkManager openvpn. -# Copyright (C) 2004, 2005, 2006, 2008 Free Software Foundation, Inc. -# Daniel Nylander , 2006, 2007, 2008. -# Christian Rose , 2004, 2005, 2006. -# -# $Id: sv.po,v 1.6 2006/12/10 18:35:50 dnylande Exp $ -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-22 16:44+0200\n" -"PO-Revision-Date: 2008-10-22 16:45+0100\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Lösenord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Sekundärt lösenord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Användarnamn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Domän:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Anslut anon_ymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Anslut som _användare:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_Kom ihåg lösenordet för denna session" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Spara lösenordet i nyckelring" - -#: ../auth-dialog/main.c:127 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Du måsta autentisera för att komma åt VPN-nätverket \"%s\"." - -#: ../auth-dialog/main.c:128 -msgid "Authenticate VPN" -msgstr "Autentisera VPN" - -#: ../auth-dialog/main.c:149 -msgid "Certificate pass_word:" -msgstr "Certifikatlöse_nord:" - -#: ../auth-dialog/main.c:163 -msgid "Certificate password:" -msgstr "Certifikatlösenord:" - -#: ../properties/auth-helpers.c:161 -msgid "Choose a Certificate Authority certificate..." -msgstr "Välj ett CA-certifikat (Certifikatutfärdare)..." - -#: ../properties/auth-helpers.c:180 -msgid "Choose your personal certificate..." -msgstr "Välj ditt personliga certifikat..." - -#: ../properties/auth-helpers.c:198 -msgid "Choose your private key..." -msgstr "Välj din privata nyckel..." - -#: ../properties/auth-helpers.c:251 -msgid "Choose an OpenVPN static key..." -msgstr "Välj en statisk OpenVPN-nyckel..." - -#: ../properties/auth-helpers.c:275 -#: ../properties/auth-helpers.c:1001 -msgid "None" -msgstr "Ingen" - -#: ../properties/auth-helpers.c:660 -msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)" -msgstr "PEM-certifikat (*.pem, *.crt, *.key, *.cer)" - -#: ../properties/auth-helpers.c:720 -msgid "OpenVPN Static Keys (*.key)" -msgstr "Statiska OpenVPN-nycklar (*.key)" - -#: ../properties/auth-helpers.c:831 -msgid "Default" -msgstr "Standard" - -#: ../properties/nm-openvpn.c:53 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:54 -msgid "Compatible with the OpenVPN server." -msgstr "Kompatibel med OpenVPN-servern." - -#: ../properties/nm-openvpn.c:322 -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "Certifikat (TLS)" - -#: ../properties/nm-openvpn.c:336 -msgid "Password" -msgstr "Lösenord" - -#: ../properties/nm-openvpn.c:353 -msgid "Password with Certificates (TLS)" -msgstr "Lösenord med certifikat (TLS)" - -#: ../properties/nm-openvpn.c:365 -msgid "Static Key" -msgstr "Statisk nyckel" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "Autentisering" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "Allmänt" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator." -msgstr "Om nyckelriktning används så måste den vara motsatsen till den som används på VPN-parten. Till exempel om parten använder \"1\" måste denna anslutning vara \"0\". Om du är osäker vilket värde du ska använda kan du kontakta din systemadministratör." - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "A_vancerat..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "CA-certifikat:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "Skiffer:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "Allmänt" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "Nyckelriktning:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "Nyckelfil:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "Lokal IP-adress:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "Avancerade alternativ för OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password:" -msgstr "Lösenord:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Private Key Password:" -msgstr "Lösenord för privat nyckel:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Private Key:" -msgstr "Privat nyckel:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Show passwords" -msgstr "Visa lösenord" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Static Key:" -msgstr "Statisk nyckel:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Type:" -msgstr "Typ:" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO data compression" -msgstr "Använd L_ZO-datakomprimering" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use a TA_P device" -msgstr "Använd en TA_P-enhet" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use a _TCP connection" -msgstr "Använd en _TCP-anslutning" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use additional TLS authentication" -msgstr "Använd ytterligare TLS-autentisering" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use custom gateway p_ort:" -msgstr "Använd anpassad gatewayp_ort:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "User Certificate:" -msgstr "Användarcertifikat:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "User name:" -msgstr "Användarnamn:" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "_Gateway:" -msgstr "_Gateway:" - -#~ msgid "Certificate Password:" -#~ msgstr "Certifikatlösenord:" -#~ msgid "Select A File" -#~ msgstr "Välj en fil" -#~ msgid "gtk-cancel" -#~ msgstr "Avbryt" -#~ msgid "gtk-ok" -#~ msgstr "OK" -#~ msgid "page 1" -#~ msgstr "sida 1" -#~ msgid "page 2" -#~ msgstr "sida 2" -#~ msgid "page 3" -#~ msgstr "sida 3" -#~ msgid "page 4" -#~ msgstr "sida 4" -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "Lägg till, ta bort och redigera VPN-anslutningar" -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "VPN-anslutningshanterare (OpenVPN)" -#~ msgid "The following OpenVPN connection will be created:" -#~ msgstr "Följande OpenVPN-anslutning kommer att skapas:" -#~ msgid "Name: %s" -#~ msgstr "Namn: %s" -#~ msgid "Connection Type: X.509 Certificates" -#~ msgstr "Anslutningstyp: X.509-certifikat" -#~ msgid "CA: %s" -#~ msgstr "CA: %s" -#~ msgid "Cert: %s" -#~ msgstr "Cert: %s" -#~ msgid "Key: %s" -#~ msgstr "Nyckel: %s" -#~ msgid "Connection Type: Shared Key" -#~ msgstr "Anslutningstyp: Delad nyckel" -#~ msgid "Shared Key: %s" -#~ msgstr "Delad nyckel: %s" -#~ msgid "Remote IP: %s" -#~ msgstr "Fjärr-IP: %s" -#~ msgid "Connection Type: Password" -#~ msgstr "Anslutningstyp: Lösenord" -#~ msgid "Username: %s" -#~ msgstr "Användarnamn: %s" -#~ msgid "Connection Type: X.509 with Password Authentication" -#~ msgstr "Anslutningstyp: X.509 med lösenordsautentisering" -#~ msgid "Remote: %s" -#~ msgstr "Fjärr: %s" -#~ msgid "Port: %s" -#~ msgstr "Port: %s" -#~ msgid "Device: %s" -#~ msgstr "Enhet: %s" -#~ msgid "TAP" -#~ msgstr "TAP" -#~ msgid "TUN" -#~ msgstr "TUN" -#~ msgid "Protocol: %s" -#~ msgstr "Protokoll: %s" -#~ msgid "TCP" -#~ msgstr "TCP" -#~ msgid "UDP" -#~ msgstr "UDP" -#~ msgid "Routes: %s" -#~ msgstr "Vägar: %s" -#~ msgid "Use LZO Compression: %s" -#~ msgstr "Använd LZO-komprimering: %s" -#~ msgid "Yes" -#~ msgstr "Ja" -#~ msgid "TLS auth: %s %s" -#~ msgstr "TLS-autentisering: %s %s" -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "" -#~ "Anslutningsdetaljerna kan ändras genom att knappen \"Redigera\" används." -#~ msgid "Cannot import settings" -#~ msgstr "Kan inte importera inställningar" -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN-inställningsfilen \"%s\" innehåller inte giltiga data." -#~ msgid "Select file to import" -#~ msgstr "Välj fil att importera" -#~ msgid "Select certificate to use" -#~ msgstr "Välj certifikat att använda" -#~ msgid "Select key to use" -#~ msgstr "Välj nyckel att använda" -#~ msgid "Select shared key to use" -#~ msgstr "Välj delad nyckel att använda" -#~ msgid "Select TA to use" -#~ msgstr "Välj TA att använda" -#~ msgid "Save as..." -#~ msgstr "Spara som..." -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "En fil med namnet \"%s\" finns redan." -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Vill du ersätta den med den du håller på att spara?" -#~ msgid "Failed to export configuration" -#~ msgstr "Misslyckades med att exportera konfiguration" -#~ msgid "Failed to save file %s" -#~ msgstr "Misslyckades med att spara filen %s" -#~ msgid "65536" -#~ msgstr "65536" -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "exempel: 172.16.0.0/16 10.11.12.0/24" -#~ msgid "C_A file:" -#~ msgstr "C_A-fil:" -#~ msgid "Co_nnection type:" -#~ msgstr "A_nslutningstyp:" -#~ msgid "Connection na_me:" -#~ msgstr "Anslutningsna_mn:" -#~ msgid "Import _Saved Configuration..." -#~ msgstr "Importera _sparad konfiguration..." -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Namn som används för att identifiera anslutningen till det privata " -#~ "nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\"" -#~ msgid "Network" -#~ msgstr "Nätverk" -#~ msgid "Only use _VPN connection for these addresses:" -#~ msgstr "Använd endast _VPN-anslutning för dessa adresser:" -#~ msgid "OpenVPN Configuration" -#~ msgstr "Konfiguration för OpenVPN" -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Ange den information som har tillhandahållits av din systemadministratör " -#~ "nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det " -#~ "när du ansluter." -#~ msgid "" -#~ "Please note that the file you import is not an OpenVPN configuration " -#~ "file. Ask your administrator for the file." -#~ msgstr "" -#~ "Observera att filen som du importerar inte är en konfigurationsfil för " -#~ "OpenVPN. Fråga din administratör efter filen." -#~ msgid "Shared _key:" -#~ msgstr "Delad _nyckel:" -#~ msgid "TLS-Auth" -#~ msgstr "TLS-Auth" -#~ msgid "Use _TLS auth:" -#~ msgstr "Använd _TLS-autentisering:" -#~ msgid "Use cip_her:" -#~ msgstr "Använd s_kiffer:" -#~ msgid "" -#~ "X.509 Certificates\n" -#~ "Pre-shared key\n" -#~ "Password Authentication\n" -#~ "X.509 with Password Authentication" -#~ msgstr "" -#~ "X.509-ertifikat\n" -#~ "Delad nyckel\n" -#~ "Lösenordsautentisering\n" -#~ "X.509 med lösenordsautentisering" -#~ msgid "_0" -#~ msgstr "_0" -#~ msgid "_1" -#~ msgstr "_1" -#~ msgid "_Gateway address:" -#~ msgstr "_Gatewayadress:" -#~ msgid "_Key:" -#~ msgstr "_Nyckel:" -#~ msgid "_Local IP:" -#~ msgstr "_Lokal IP:" -#~ msgid "_Remote IP:" -#~ msgstr "_Fjärr-IP:" -#~ msgid "_User name:" -#~ msgstr "An_vändarnamn:" -#~ msgid "_none" -#~ msgstr "_inget" -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom användarnamnet och lösenordet inte " -#~ "accepterades eller att certifikatlösenordet var felaktigt." -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde startas." -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde ansluta " -#~ "till VPN-servern." -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-konfigurationsalternativen var " -#~ "ogiltiga." -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-programmet mottog en ogiltig " -#~ "konfiguration från VPN-servern." -#~ msgid "VPN connection failed" -#~ msgstr "VPN-anslutningen misslyckades" -#~ msgid "Connection Information" -#~ msgstr "Anslutningsinformation" -#~ msgid "CA file:" -#~ msgstr "CA-fil:" -#~ msgid "Optional" -#~ msgstr "Valfritt" -#~ msgid "Username:" -#~ msgstr "Användarnamn:" -#~ msgid "X.509" -#~ msgstr "X.509" -#~ msgid "X.509/Pass" -#~ msgstr "X.509/Lösenord" -#~ msgid "_Import Saved Configuration..." -#~ msgstr "_Importera sparad konfiguration..." -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "Använd _endast VPN-anslutning för dessa adresser" -#~ msgid "" -#~ "_Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "_Namn som används för att identifiera anslutningen till det privata " -#~ "nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\"" -#~ msgid "Remember password for this session" -#~ msgstr "Kom ihåg lösenordet för denna session" -#~ msgid "Save password in keyring" -#~ msgstr "Spara lösenordet i nyckelring" -#~ msgid "VPN Connection Manager" -#~ msgstr "VPN-anslutningshanterare" -#~ msgid "VPN Connection Manager (vpnc)" -#~ msgstr "VPN-anslutningshanterare (vpnc)" -#~ msgid "Name:" -#~ msgstr "Namn:" -#~ msgid "Username: %s" -#~ msgstr "Användarnamn: %s" -#~ msgid "User Name:" -#~ msgstr "Användarnamn:" -#~ msgid "CA:" -#~ msgstr "CA:" -#~ msgid "Cert:" -#~ msgstr "Cert:" -#~ msgid "Key" -#~ msgstr "Nyckel" -#~ msgid "Connection Type" -#~ msgstr "Anslutningstyp" -#~ msgid "Local IP" -#~ msgstr "Lokalt IP" -#~ msgid "Remote IP" -#~ msgstr "Fjärr-IP" -#~ msgid "Remote: %s" -#~ msgstr "Fjärr: %s" -#~ msgid "Remote:" -#~ msgstr "Fjärr:" -#~ msgid "Device:" -#~ msgstr "Enhet:" -#~ msgid "Device" -#~ msgstr "Enhet" -#~ msgid "Protocol:" -#~ msgstr "Protokoll:" -#~ msgid "Protocol" -#~ msgstr "Protokoll" -#~ msgid "Routes:" -#~ msgstr "Vägar:" -#~ msgid "Routes" -#~ msgstr "Vägar" -#~ msgid "Use LZO Compression:" -#~ msgstr "Använd LZO-komprimering:" -#~ msgid "Use LZO Compression" -#~ msgstr "Använd LZO-komprimering" -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom användarnamnet och lösenordet inte " -#~ "accepterades." -#~ msgid "_Group Password:" -#~ msgstr "_Grupplösenord:" -#~ msgid "Group Name:" -#~ msgstr "Gruppnamn:" -#~ msgid "Override user name" -#~ msgstr "Åsidosätt användarnamn" -#~ msgid "_Import..." -#~ msgstr "_Importera..." -#~ msgid "Compatible Cisco VPN client (vpnc)" -#~ msgstr "Kompatibel Cisco VPN-klient (vpnc)" -#~ msgid "\tDomain: %s\n" -#~ msgstr "\tDomän: %s\n" -#~ msgid "" -#~ "The following vpnc VPN connection will be created:\n" -#~ "\n" -#~ "\tName: %s\n" -#~ "\n" -#~ "\tGateway: %s\n" -#~ "\tGroup Name: %s\n" -#~ "%s%s%s\n" -#~ "The connection details can be changed using the \"Edit\" button.\n" -#~ msgstr "" -#~ "Följande vpnc-VPN-anslutning kommer att skapas:\n" -#~ "\n" -#~ "\tNamn: %s\n" -#~ "\n" -#~ "\tGateway: %s\n" -#~ "\tGruppnamn: %s\n" -#~ "%s%s%s\n" -#~ "Anslutningsdetaljerna kan ändras genom att använda knappen \"Redigera\".\n" -#~ msgid "TCP tunneling not supported" -#~ msgstr "TCP-tunnling stöds inte" -#~ msgid "" -#~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled " -#~ "through TCP which is currently not supported in the vpnc software.\n" -#~ "\n" -#~ "The connection can still be created, with TCP tunneling disabled, however " -#~ "it may not work as expected." -#~ msgstr "" -#~ "VPN-inställningsfilen \"%s\" anger att VPN-trafiken ska tunnlas genom TCP " -#~ "vilket för tillfället inte stöds i vpnc-programvaran.\n" -#~ "\n" -#~ "Anslutningen kan fortfarande skapas, med inaktiverad TCP-tunnling, men " -#~ "det kanske inte fungerar som väntat." - diff --git a/vpn-daemons/openvpn/po/th.po b/vpn-daemons/openvpn/po/th.po deleted file mode 100644 index 12dbe70e17..0000000000 --- a/vpn-daemons/openvpn/po/th.po +++ /dev/null @@ -1,438 +0,0 @@ -# Thai translation of NetworkManager-openvpn -# Copyright (C) 2007 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager package. -# -# Supranee Thirawatthanasuk , 2007. -# Theppitak Karoonboonyanan , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-02 20:52+0700\n" -"PO-Revision-Date: 2007-02-02 20:53+0700\n" -"Last-Translator: Theppitak Karoonboonyanan \n" -"Language-Team: Thai \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_รหัสผ่าน:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "รหัสผ่านที่_สอง:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_ชื่อผู้ใช้:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "โ_ดเมน:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "เชื่อมต่อแบบ_นิรนาม" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "เชื่อมต่อในนาม_ผู้ใช้:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "_จำรหัสผ่านสำหรับใช้ในวาระนี้" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_บันทึกรหัสผ่านลงในพวงกุญแจ" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "คุณจะต้องยืนยันตัวบุคคลเพื่อเข้าใช้ Virtual Private Network '%s'" - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "ยืนยันตัวบุคคลกับ VPN" - -#: ../auth-dialog/main.c:227 -msgid "Certificate pass_word:" -msgstr "_รหัสผ่านใบรับรอง:" - -#: ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "รหัสผ่านใบรับรอง:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "เพิ่ม, ลบ และแก้ไข การเชื่อมต่อ VPN" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "เครื่องมือจัดการการเชื่อมต่อ VPN (OpenVPN)" - -#: ../properties/nm-openvpn.c:130 -msgid "OpenVPN Client" -msgstr "ไคลเอนต์ OpenVPN" - -#: ../properties/nm-openvpn.c:729 -msgid "The following OpenVPN connection will be created:" -msgstr "จะสร้างการเชื่อมต่อ OpenVPN ต่อไปนี้:" - -#: ../properties/nm-openvpn.c:731 -#, c-format -msgid "Name: %s" -msgstr "ชื่อ: %s" - -#: ../properties/nm-openvpn.c:739 -msgid "Connection Type: X.509 Certificates" -msgstr "ชนิดการเชื่อมต่อ: ใบรับรอง X.509" - -#: ../properties/nm-openvpn.c:742 ../properties/nm-openvpn.c:769 -#: ../properties/nm-openvpn.c:781 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:745 ../properties/nm-openvpn.c:784 -#, c-format -msgid "Cert: %s" -msgstr "ใบรับรอง: %s" - -#: ../properties/nm-openvpn.c:748 ../properties/nm-openvpn.c:787 -#, c-format -msgid "Key: %s" -msgstr "กุญแจ: %s" - -#: ../properties/nm-openvpn.c:752 -msgid "Connection Type: Shared Key" -msgstr "ชนิดการเชื่อมต่อ: กุญแจร่วม" - -#: ../properties/nm-openvpn.c:755 -#, c-format -msgid "Shared Key: %s" -msgstr "กุญแจร่วม: %s" - -#: ../properties/nm-openvpn.c:758 -#, c-format -msgid "Local IP: %s" -msgstr "IP ฝั่งนี้: %s" - -#: ../properties/nm-openvpn.c:761 -#, c-format -msgid "Remote IP: %s" -msgstr "IP ฝั่งโน้น: %s" - -#: ../properties/nm-openvpn.c:766 -msgid "Connection Type: Password" -msgstr "ชนิดการเชื่อมต่อ: รหัสผ่าน" - -#: ../properties/nm-openvpn.c:772 ../properties/nm-openvpn.c:790 -#, c-format -msgid "Username: %s" -msgstr "ชื่อผู้ใช้: %s" - -#: ../properties/nm-openvpn.c:778 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "ชนิดการเชื่อมต่อ: X.509 พร้อมการยืนยันตัวบุคคลด้วยรหัสผ่าน" - -#: ../properties/nm-openvpn.c:796 -#, c-format -msgid "Remote: %s" -msgstr "ฝั่งโน้น: %s" - -#: ../properties/nm-openvpn.c:799 -#, c-format -msgid "Device: %s" -msgstr "อุปกรณ์: %s" - -#: ../properties/nm-openvpn.c:799 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:799 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:802 -#, c-format -msgid "Protocol: %s" -msgstr "โพรโทคอล: %s" - -#: ../properties/nm-openvpn.c:802 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:802 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:806 -#, c-format -msgid "Routes: %s" -msgstr "เส้นทาง: %s" - -#: ../properties/nm-openvpn.c:810 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "ใช้การบีบอัด LZO: %s" - -#: ../properties/nm-openvpn.c:810 -msgid "Yes" -msgstr "ใช้" - -#: ../properties/nm-openvpn.c:810 -msgid "No" -msgstr "ไม่ใช้" - -#: ../properties/nm-openvpn.c:814 -#, c-format -msgid "Cipher: %s" -msgstr "รหัสลับ: %s" - -#: ../properties/nm-openvpn.c:819 -#, c-format -msgid "TLS auth: %s %s" -msgstr "การยืนยันตัวบุคคลของ TLS: %s %s" - -#: ../properties/nm-openvpn.c:823 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "รายละเอียดการเชื่อมต่อสามารถเปลี่ยนแปลงได้ โดยใช้ปุ่ม \"แก้ไข\"" - -#: ../properties/nm-openvpn.c:1003 -msgid "Cannot import settings" -msgstr "ไม่สามารถนำเข้าค่าตั้ง" - -#: ../properties/nm-openvpn.c:1005 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "แฟ้มค่าตั้ง VPN '%s' มีข้อมูลไม่ถูกต้อง" - -#: ../properties/nm-openvpn.c:1042 -msgid "Select file to import" -msgstr "เลือกแฟ้มที่จะนำเข้า" - -#: ../properties/nm-openvpn.c:1122 ../properties/nm-openvpn.c:1134 -msgid "Select CA to use" -msgstr "เลือก CA ที่จะใช้" - -#: ../properties/nm-openvpn.c:1125 -msgid "Select certificate to use" -msgstr "เลือกใบรับรองที่จะใช้" - -#: ../properties/nm-openvpn.c:1128 -msgid "Select key to use" -msgstr "เลือกกุญแจที่จะใช้" - -#: ../properties/nm-openvpn.c:1131 -msgid "Select shared key to use" -msgstr "เลือกกุญแจร่วมที่จะใช้" - -#: ../properties/nm-openvpn.c:1137 -msgid "Select TA to use" -msgstr "เลือก TA ที่จะใช้" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1326 -msgid "Save as..." -msgstr "บันทึกเป็น..." - -#: ../properties/nm-openvpn.c:1356 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "มีแฟ้มชื่อ \"%s\" อยู่ก่อนแล้ว" - -#: ../properties/nm-openvpn.c:1359 -msgid "Do you want to replace it with the one you are saving?" -msgstr "คุณต้องการเขียนทับแฟ้มนี้ด้วยข้อมูลที่กำลังจะบันทึกหรือไม่?" - -#: ../properties/nm-openvpn.c:1373 -msgid "Failed to export configuration" -msgstr "ส่งออกค่าตั้งไม่สำเร็จ" - -#: ../properties/nm-openvpn.c:1375 -#, c-format -msgid "Failed to save file %s" -msgstr "บันทึกแฟ้ม %s ไม่สำเร็จ" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "0" -msgstr "0" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "1" -msgstr "1" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "Connection Name" -msgstr "ชื่อการเชื่อมต่อ" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Optional Information" -msgstr "ข้อมูลเสริม" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Required Information" -msgstr "ข้อมูลจำเป็น" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "ตัวอย่าง: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "CA file:" -msgstr "แฟ้ม CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "CA file:" -msgstr "แฟ้ม CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Certificate:" -msgstr "ใบรับรอง:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Connection Type:" -msgstr "ชนิดการเชื่อมต่อ:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Direction:" -msgstr "ทิศทาง:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Key:" -msgstr "กุญแจ:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Local IP:" -msgstr "IP ฝั่งนี้:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password" -msgstr "รหัสผ่าน" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"กรุณาป้อนข้อมูลที่คุณได้มาจากผู้ดูแลระบบของคุณในแบบฟอร์มข้างล่างนี้ ไม่ต้องป้อนรหัสผ่านที่นี่ " -"เพราะคุณจะถูกถามเมื่อเชื่อมต่อ" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" -"โปรดสังเกตว่าแฟ้มที่คุณนำเข้าไม่ใช่แฟ้มค่าตั้ง OpenVPN กรุณาขอแฟ้มค่าตั้งนี้จากผู้ดูแลระบบของคุณ" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Remote IP:" -msgstr "IP ฝั่งโน้น:" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared Key:" -msgstr "กุญแจร่วม:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Shared key" -msgstr "กุญแจร่วม" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use LZO compression" -msgstr "ใช้การบีบบอัด LZO" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TAP device" -msgstr "ใช้อุปกรณ์ TAP" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use TCP connection" -msgstr "ใช้การเชื่อมต่อ TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use TLS auth:" -msgstr "ใช้การยืนยันตัวบุคคลของ TLS:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cipher:" -msgstr "ใช้วิธีเข้ารหัสลับ:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Username:" -msgstr "ชื่อผู้ใช้:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "X.509" -msgstr "X.509" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"ใบรับรอง X.509\n" -"กุญแจร่วมกำหนดล่วงหน้า\n" -"การยืนยันตัวบุคคลด้วยรหัสผ่าน\n" -"X.509 พร้อมการยืนยันตัวบุคคลด้วยรหัสผ่าน" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway:" -msgstr "เ_กตเวย์:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Import Saved Configuration..." -msgstr "_นำเข้าค่าตั้งที่บันทึกไว้..." - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"_ชื่อที่ใช้แทนการเชื่อมต่อไปยังเครือข่ายส่วนบุคคล เช่น \"VPN มหาวิทยาลัย\" หรือ \"เครือข่ายบริษัท" -"\"" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Only use VPN connection for these addresses" -msgstr "ใ_ช้การเชื่อมต่อ VPN กับที่อยู่เหล่านี้เท่านั้น" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "none" -msgstr "ไม่มี" - -#: ../src/nm-openvpn-service.c:127 -msgid "" -"The VPN login failed because the user name and password were not accepted or " -"the certificate password was wrong." -msgstr "" -"การเข้าระบบ VPN ล้มเหลว เพราะชื่อผู้ใช้และรหัสผ่านไม่ผ่านการยอมรับ " -"หรือรหัสผ่านใบรับรองไม่ถูกต้อง" - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "การเข้าระบบ VPN ล้มเหลว เพราะโปรแกรม VPN ไม่สามารถเริ่มทำงานได้" - -#: ../src/nm-openvpn-service.c:131 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "การเข้าระบบ VPN ล้มเหลว เพราะโปรแกรม VPN ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์ VPN" - -#: ../src/nm-openvpn-service.c:133 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "การเข้าระบบ VPN ล้มเหลว เพราะตัวเลือกของค่าตั้ง VPN ไม่ถูกต้อง" - -#: ../src/nm-openvpn-service.c:135 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "การเข้าระบบ VPN ล้มเหลว เพราะโปรแกรม VPN ได้รับค่าตั้งที่ไม่ถูกต้องจากเซิร์ฟเวอร์ VPN" - -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "การเชื่อมต่อ VPN ล้มเหลว" diff --git a/vpn-daemons/openvpn/po/uk.po b/vpn-daemons/openvpn/po/uk.po deleted file mode 100644 index c93be0f12b..0000000000 --- a/vpn-daemons/openvpn/po/uk.po +++ /dev/null @@ -1,444 +0,0 @@ -# Ukrainian translation of NetworkManager openvpn -# Copyright (C) Free Software Foundation, 2005 -# This file is distributed under the same license as the NetworkManager package. -# Maxim Dziumanenko , 2005-2007 -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager openvpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-16 17:14+0200\n" -"PO-Revision-Date: 2007-02-16 03:32+0200\n" -"Last-Translator: Maxim Dziumanenko \n" -"Language-Team: Ukrainian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "_Вторинний пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Ім'я:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Домен" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "З'єднуватись _анонімно" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "З'єднуватись як _користувач" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "Па_м'ятати пароль для цього сеансу" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "З_берегти пароль у в'язці паролів" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Для доступу до віртуальної приватної мережі '%s' потрібна автентифікація." - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "Автентифікація VPN" - -#: ../auth-dialog/main.c:227 -msgid "Certificate pass_word:" -msgstr "Па_роль сертифікату:" - -#: ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "Пароль сертифікату:" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Додавання, видалення та редагування з'єднань типу VPN" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "Менеджер з'єднань VPN (OpenVPN)" - -#: ../properties/nm-openvpn.c:130 -msgid "OpenVPN Client" -msgstr "Клієнт OpenVPN" - -#: ../properties/nm-openvpn.c:729 -msgid "The following OpenVPN connection will be created:" -msgstr "Буде створене наступне з'єднання OpenVPN:" - -#: ../properties/nm-openvpn.c:731 -#, c-format -msgid "Name: %s" -msgstr "Назва: %s" - -#: ../properties/nm-openvpn.c:739 -msgid "Connection Type: X.509 Certificates" -msgstr "Тип з'єднання: сертифікати X.509" - -#: ../properties/nm-openvpn.c:742 ../properties/nm-openvpn.c:769 -#: ../properties/nm-openvpn.c:781 -#, c-format -msgid "CA: %s" -msgstr "CA: %s" - -#: ../properties/nm-openvpn.c:745 ../properties/nm-openvpn.c:784 -#, c-format -msgid "Cert: %s" -msgstr "Сертифікат: %s" - -#: ../properties/nm-openvpn.c:748 ../properties/nm-openvpn.c:787 -#, c-format -msgid "Key: %s" -msgstr "Ключ: %s" - -#: ../properties/nm-openvpn.c:752 -msgid "Connection Type: Shared Key" -msgstr "Тип з'єднання: спільний ключ" - -#: ../properties/nm-openvpn.c:755 -#, c-format -msgid "Shared Key: %s" -msgstr "Спільний ключ: %s" - -#: ../properties/nm-openvpn.c:758 -#, c-format -msgid "Local IP: %s" -msgstr "Локальна адреса IP: %s" - -#: ../properties/nm-openvpn.c:761 -#, c-format -msgid "Remote IP: %s" -msgstr "Віддалена адреса IP: %s" - -#: ../properties/nm-openvpn.c:766 -msgid "Connection Type: Password" -msgstr "Тип з'єднання: пароль" - -#: ../properties/nm-openvpn.c:772 ../properties/nm-openvpn.c:790 -#, c-format -msgid "Username: %s" -msgstr "Ім'я користувача: %s" - -#: ../properties/nm-openvpn.c:778 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Тип з'єднання: автентифікація X.509 з паролем" - -#: ../properties/nm-openvpn.c:796 -#, c-format -msgid "Remote: %s" -msgstr "Віддалений вузол: %s" - -#: ../properties/nm-openvpn.c:799 -#, c-format -msgid "Device: %s" -msgstr "Пристрій: %s" - -#: ../properties/nm-openvpn.c:799 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:799 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:802 -#, c-format -msgid "Protocol: %s" -msgstr "Протокол: %s" - -#: ../properties/nm-openvpn.c:802 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:802 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:806 -#, c-format -msgid "Routes: %s" -msgstr "Маршрутизатор: %s" - -#: ../properties/nm-openvpn.c:810 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Використовується стиснення LZO: %s" - -#: ../properties/nm-openvpn.c:810 -msgid "Yes" -msgstr "Так" - -#: ../properties/nm-openvpn.c:810 -msgid "No" -msgstr "Ні" - -#: ../properties/nm-openvpn.c:814 -#, c-format -msgid "Cipher: %s" -msgstr "Шифтр: %s" - -#: ../properties/nm-openvpn.c:819 -#, c-format -msgid "TLS auth: %s %s" -msgstr "Аутентифікація TLS: %s %s" - -#: ../properties/nm-openvpn.c:823 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Подробиці про з'єднання можна змінити кнопкою \"Правка\"." - -#: ../properties/nm-openvpn.c:1003 -msgid "Cannot import settings" -msgstr "Не вдається імпортувати параметри" - -#: ../properties/nm-openvpn.c:1005 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "Файл параметрів VPN '%s' містить некоректні дані." - -#: ../properties/nm-openvpn.c:1042 -msgid "Select file to import" -msgstr "Виберіть файл для імпорту" - -#: ../properties/nm-openvpn.c:1122 ../properties/nm-openvpn.c:1134 -msgid "Select CA to use" -msgstr "Виберіть CA" - -#: ../properties/nm-openvpn.c:1125 -msgid "Select certificate to use" -msgstr "Виберіть сертифікат" - -#: ../properties/nm-openvpn.c:1128 -msgid "Select key to use" -msgstr "Виберіть ключ" - -#: ../properties/nm-openvpn.c:1131 -msgid "Select shared key to use" -msgstr "Виберіть спільний ключ" - -#: ../properties/nm-openvpn.c:1137 -msgid "Select TA to use" -msgstr "Виберіть TA" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1326 -msgid "Save as..." -msgstr "Зберегти як..." - -#: ../properties/nm-openvpn.c:1356 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Файл з назвою \"%s\" вже існує." - -#: ../properties/nm-openvpn.c:1359 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Замінити його?" - -#: ../properties/nm-openvpn.c:1373 -msgid "Failed to export configuration" -msgstr "Помилка при експорті конфігурації" - -#: ../properties/nm-openvpn.c:1375 -#, c-format -msgid "Failed to save file %s" -msgstr "Помилка при збереженні файлу %s" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "0" -msgstr "0" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "1" -msgstr "1" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "Connection Name" -msgstr "Назва з'єднання" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Optional Information" -msgstr "Необов'язкова інформація" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Required Information" -msgstr "Обов'язкова інформація" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "приклад: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "CA file:" -msgstr "Файл CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "CA file:" -msgstr "Файл CA:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Certificate:" -msgstr "Сертифікат:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Connection Type:" -msgstr "Тип з'єднання:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Direction:" -msgstr "Напрямок:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Key:" -msgstr "Ключ:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Local IP:" -msgstr "Локальна адреса IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Password" -msgstr "Пароль" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Нижче введіть інформацію, що надана системним адміністратором. Не вводьте " -"тут ваш пароль, пароль буде запитаний на етапі встановлення з'єднання." - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" -"Зауважте, файл, що імпортується, не є файлом конфігурації OpenVPN. Попросіть " -"системного адміністратора надати вам файл." - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Remote IP:" -msgstr "Віддалена адреса IP:" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared Key:" -msgstr "Спільний ключ:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Shared key" -msgstr "Спільний ключ" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use LZO compression" -msgstr "Використовувати стиснення LZO" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TAP device" -msgstr "Використовувати пристрій TAP" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use TCP connection" -msgstr "Використовувати з'єднання TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use TLS auth:" -msgstr "Автентифікація TLS:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cipher:" -msgstr "Шифр:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "Username:" -msgstr "Користувач:" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "X.509" -msgstr "X.509" - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"Сертифікати X.509\n" -"Спільний ключ\n" -"Пароль\n" -"X.509 з паролем" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway:" -msgstr "_Шлюз:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Import Saved Configuration..." -msgstr "_Імпорт збереженої конфігурації..." - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"_Назва, що використовується для ідентифікації з'єднання з приватною мережею, " -"наприклад \"Campus VPN\" чи \"Corporate Network\"" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Only use VPN connection for these addresses" -msgstr "Використовувати VPN _лише для цих адрес" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "none" -msgstr "немає" - -#: ../src/nm-openvpn-service.c:127 -msgid "" -"The VPN login failed because the user name and password were not accepted or " -"the certificate password was wrong." -msgstr "" -"Помилка входу у VPN, оскільки ім'я користувача та пароль не були прийняті " -"або неправильний пароль до сертифікату." - -#: ../src/nm-openvpn-service.c:129 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "Помилка входу у VPN, оскільки не вдається запустити програму VPN." - -#: ../src/nm-openvpn-service.c:131 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"Помилка входу у VPN, оскільки програма VPN не може з'єднатись з сервером VPN." - -#: ../src/nm-openvpn-service.c:133 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "Помилка входу у VPN, оскільки конфігурація VPN була неправильною." - -#: ../src/nm-openvpn-service.c:135 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"Помилка входу у VPN, оскільки програма VPN отримала неправильну конфігурацію " -"від сервера VPN." - -#: ../src/nm-openvpn-service.c:137 -msgid "VPN connection failed" -msgstr "Помилка з'єднання VPN" diff --git a/vpn-daemons/openvpn/po/vi.po b/vpn-daemons/openvpn/po/vi.po deleted file mode 100644 index 40a3f22183..0000000000 --- a/vpn-daemons/openvpn/po/vi.po +++ /dev/null @@ -1,418 +0,0 @@ -# Vietnamese translation for Network Manager Open VPN. -# Copyright © 2008 Free Software Foundation, Inc. -# Clytie Siddall , 2006-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn GNOME TRUNK\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-13 14:35+0000\n" -"PO-Revision-Date: 2008-06-06 14:34+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.7b3\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "_Mật khẩu :" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "Mật khẩu _phụ :" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "_Tên người dùng:" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "_Miền:" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "Kết nối nặc d_anh" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "Kết nối _với tư cách người dùng:" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "Nhớ mật khẩu cho _buổi hợp này" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "_Lưu mật khẩu trong vòng khoá" - -#: ../auth-dialog/main.c:181 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Bạn cần phải xác thực để truy cập Mạng Riêng Ảo (VPN) « %s »." - -#: ../auth-dialog/main.c:182 -msgid "Authenticate VPN" -msgstr "Xác thực VPN" - -#: ../auth-dialog/main.c:195 -msgid "Certificate pass_word:" -msgstr "Mật _khẩu chứng nhận:" - -#: ../auth-dialog/main.c:210 -msgid "Certificate password:" -msgstr "Mật khẩu chứng nhận:" - -#: ../properties/nm-openvpn.c:150 -msgid "OpenVPN Client" -msgstr "Ứng dụng khách OpenVPN" - -#: ../properties/nm-openvpn.c:824 -msgid "The following OpenVPN connection will be created:" -msgstr "Kết nối OpenVPN này sẽ được tạo :" - -#: ../properties/nm-openvpn.c:826 -#, c-format -msgid "Name: %s" -msgstr "Tên: %s" - -#: ../properties/nm-openvpn.c:834 -msgid "Connection Type: X.509 Certificates" -msgstr "Kiểu kết nối: chứng nhận X.509" - -#: ../properties/nm-openvpn.c:837 -#: ../properties/nm-openvpn.c:864 -#: ../properties/nm-openvpn.c:876 -#, c-format -msgid "CA: %s" -msgstr "Nhà cầm quyền chứng nhận: %s" - -#: ../properties/nm-openvpn.c:840 -#: ../properties/nm-openvpn.c:879 -#, c-format -msgid "Cert: %s" -msgstr "Chứng nhận: %s" - -#: ../properties/nm-openvpn.c:843 -#: ../properties/nm-openvpn.c:882 -#, c-format -msgid "Key: %s" -msgstr "Khoá: %s" - -#: ../properties/nm-openvpn.c:847 -msgid "Connection Type: Shared Key" -msgstr "Kiểu kết nối: khoá chia sẻ" - -#: ../properties/nm-openvpn.c:850 -#, c-format -msgid "Shared Key: %s" -msgstr "Khoá chia sẻ: %s" - -#: ../properties/nm-openvpn.c:853 -#, c-format -msgid "Local IP: %s" -msgstr "IP cục bộ : %s" - -#: ../properties/nm-openvpn.c:856 -#, c-format -msgid "Remote IP: %s" -msgstr "IP ở xa: %s" - -#: ../properties/nm-openvpn.c:861 -msgid "Connection Type: Password" -msgstr "Kiểu kết nối: mật khẩu" - -#: ../properties/nm-openvpn.c:867 -#: ../properties/nm-openvpn.c:885 -#, c-format -msgid "Username: %s" -msgstr "Tên người dùng: %s" - -#: ../properties/nm-openvpn.c:873 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "Kiểu kết nối: X.509 và xác thực mật khẩu" - -#: ../properties/nm-openvpn.c:891 -#, c-format -msgid "Remote: %s" -msgstr "Ở xa: %s" - -#: ../properties/nm-openvpn.c:894 -#, c-format -msgid "Port: %s" -msgstr "Cổng: %s" - -#: ../properties/nm-openvpn.c:897 -#, c-format -msgid "Device: %s" -msgstr "Thiết bị: %s" - -#: ../properties/nm-openvpn.c:897 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:897 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:900 -#, c-format -msgid "Protocol: %s" -msgstr "Giao thức: %s" - -#: ../properties/nm-openvpn.c:900 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:900 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:904 -#, c-format -msgid "Routes: %s" -msgstr "Tuyến: %s" - -#: ../properties/nm-openvpn.c:908 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "Nén bằng LZO: %s" - -#: ../properties/nm-openvpn.c:908 -msgid "Yes" -msgstr "Có" - -#: ../properties/nm-openvpn.c:908 -msgid "No" -msgstr "Không" - -#: ../properties/nm-openvpn.c:912 -#, c-format -msgid "Cipher: %s" -msgstr "Mật mã: %s" - -#: ../properties/nm-openvpn.c:917 -#, c-format -msgid "TLS auth: %s %s" -msgstr "Xác thực TLS: %s %s" - -#: ../properties/nm-openvpn.c:921 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Chi tiết kết nối có thể được sửa đổi dùng nút « Sửa »." - -#: ../properties/nm-openvpn.c:1151 -msgid "Cannot import settings" -msgstr "Không thể nhập thiết lập" - -#: ../properties/nm-openvpn.c:1153 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "Tập tin thiết lập VPN « %s » không chứa dữ liệu hợp lệ." - -#: ../properties/nm-openvpn.c:1200 -msgid "Select file to import" -msgstr "Chọn tập tin cần nhập vào" - -#: ../properties/nm-openvpn.c:1259 -#: ../properties/nm-openvpn.c:1271 -#: ../properties/nm-openvpn.c:1274 -msgid "Select CA to use" -msgstr "Chọn nhà cầm quyền chứng nhận (CA) cần dùng" - -#: ../properties/nm-openvpn.c:1262 -#: ../properties/nm-openvpn.c:1277 -msgid "Select certificate to use" -msgstr "Chọn chứng nhận cần dùng" - -#: ../properties/nm-openvpn.c:1265 -#: ../properties/nm-openvpn.c:1280 -msgid "Select key to use" -msgstr "Chọn khoá cần dùng" - -#: ../properties/nm-openvpn.c:1268 -msgid "Select shared key to use" -msgstr "Chọn khoá chia sẻ cần dùng" - -#: ../properties/nm-openvpn.c:1283 -msgid "Select TA to use" -msgstr "Chọn TA cần dùng" - -#: ../properties/nm-openvpn.c:1525 -#. printf ("in impl_export\n"); -msgid "Save as..." -msgstr "Lưu dạng..." - -#: ../properties/nm-openvpn.c:1554 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Một tập tin tên « %s » đã có." - -#: ../properties/nm-openvpn.c:1557 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Bạn có muốn thay thế nó bằng tập tin đang lưu không?" - -#: ../properties/nm-openvpn.c:1571 -msgid "Failed to export configuration" -msgstr "Lỗi xuất cấu hình" - -#: ../properties/nm-openvpn.c:1573 -#, c-format -msgid "Failed to save file %s" -msgstr "Lỗi lưu tập tin %s" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "(Default: 1194)" -msgstr "(Mặc định: 1194)" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "65536" -msgstr "65536" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "v.d.: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "Ad_vanced" -msgstr "Cấp ca_o" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "C_A file:" -msgstr "Tập tin nhà cầm _quyền chứng nhận:" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "C_ertificate:" -msgstr "C_hứng nhận:" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Co_nnection type:" -msgstr "Kiểu kết _nối:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Connection na_me:" -msgstr "Tên _kết nối:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Direction:" -msgstr "Hướng:" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Import _Saved Configuration..." -msgstr "Nhập cấu hình đã _lưu..." - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Tên dùng để nhận diện kết nối cho mạng riêng, v.d. « VPN đại học » hay « Mạng " -"công ty »." - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Network" -msgstr "Mạng" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Only use _VPN connection for these addresses:" -msgstr "Chỉ dùng kết nối _VPN cho những địa chỉ này:" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "OpenVPN Advanced Options" -msgstr "Tùy chọn cấp cao OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "OpenVPN Configuration" -msgstr "Cấu hình OpenVPN" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Hãy gõ dưới đây thông tin được cung cấp bởi nhà quản trị hệ thống. Đừng gõ mật khẩu vào đây: bạn sẽ được nhắc gõ nó trong khi kết nối." - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your administrator for the file." -msgstr "" -"Ghi chú : tập tin nhập vào không phải là tập tin cấu hình OpenVPN. Hãy xin nhà " -"quản trị hệ thống cung cấp tập tin đó." - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Shared _key:" -msgstr "_Khoá chia sẻ:" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "TLS-Auth" -msgstr "XácT-TLS" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use L_ZO compression" -msgstr "Nén bằng L_ZO" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use TA_P device" -msgstr "Dùng thiết bị TA_P" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "Use _TCP connection" -msgstr "Dùng kết nối _TCP" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "Use _TLS auth:" -msgstr "Dùng xác thực ĐTLS:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "Use cip_her:" -msgstr "Dùng _mật mã:" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" -"Chứng nhận X.509\n" -"Khoá chia sẻ sẵn\n" -"Xác thực bằng mật khẩu\n" -"X.509 và xác thực bằng mật khẩu" - -#: ../properties/nm-openvpn-dialog.glade.h:29 -msgid "_0" -msgstr "_0" - -#: ../properties/nm-openvpn-dialog.glade.h:30 -msgid "_1" -msgstr "_1" - -#: ../properties/nm-openvpn-dialog.glade.h:31 -msgid "_Gateway address:" -msgstr "Địa chỉ cổn_g ra:" - -#: ../properties/nm-openvpn-dialog.glade.h:32 -msgid "_Gateway port:" -msgstr "Cổn_g là cổng ra:" - -#: ../properties/nm-openvpn-dialog.glade.h:33 -msgid "_Key:" -msgstr "_Phím:" - -#: ../properties/nm-openvpn-dialog.glade.h:34 -msgid "_Local IP:" -msgstr "IP cục _bộ :" - -#: ../properties/nm-openvpn-dialog.glade.h:35 -msgid "_Remote IP:" -msgstr "IP ở _xa:" - -#: ../properties/nm-openvpn-dialog.glade.h:36 -msgid "_User name:" -msgstr "_Tên người dùng:" - -#: ../properties/nm-openvpn-dialog.glade.h:37 -msgid "_none" -msgstr "khô_ng có" diff --git a/vpn-daemons/openvpn/po/zh_CN.po b/vpn-daemons/openvpn/po/zh_CN.po deleted file mode 100644 index 1eaae3d5cf..0000000000 --- a/vpn-daemons/openvpn/po/zh_CN.po +++ /dev/null @@ -1,373 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Funda Wang , 2004. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-04 00:45+0800\n" -"PO-Revision-Date: 2006-02-04 01:03+0800\n" -"Last-Translator: Funda Wang \n" -"Language-Team: zh_CN \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:148 -msgid "_Password:" -msgstr "密码(_P)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:149 -msgid "_Secondary Password:" -msgstr "次要密码(_S)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Username:" -msgstr "用户名(_U)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:274 -msgid "_Domain:" -msgstr "域(_D)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect _anonymously" -msgstr "匿名连接(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:365 -msgid "Connect as _user:" -msgstr "连接为用户(_U)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "此会话记住密码(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "在密钥环中保存密码(_S)" - -#: ../auth-dialog/main.c:214 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "要访问虚拟私网“%s”，您必须进行身份验证。" - -#: ../auth-dialog/main.c:215 -msgid "Authenticate VPN" -msgstr "验证 VPN" - -#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252 -msgid "Certificate password:" -msgstr "证书密码：" - -#: ../nm-openvpn.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "添加、删除和编辑 VPN 连接" - -#: ../nm-openvpn.desktop.in.h:2 -msgid "VPN Connection Manager (OpenVPN)" -msgstr "VPN 连接管理器(OpenVPN)" - -#: ../properties/nm-openvpn.c:108 -msgid "OpenVPN Client" -msgstr "OpenVPN 客户端" - -#: ../properties/nm-openvpn.c:614 -msgid "The following OpenVPN connection will be created:" -msgstr "即将创建下面的 VPN 连接：" - -#: ../properties/nm-openvpn.c:616 -#, c-format -msgid "Name: %s" -msgstr "名称：%s" - -#: ../properties/nm-openvpn.c:624 -msgid "Connection Type: X.509 Certificates" -msgstr "连接类型：X.509 证书" - -#: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654 -#: ../properties/nm-openvpn.c:666 -#, c-format -msgid "CA: %s" -msgstr "CA：%s" - -#: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669 -#, c-format -msgid "Cert: %s" -msgstr "证书：%s" - -#: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672 -#, c-format -msgid "Key: %s" -msgstr "密钥：%s" - -#: ../properties/nm-openvpn.c:637 -msgid "Connection Type: Shared Key" -msgstr "" - -#: ../properties/nm-openvpn.c:640 -#, c-format -msgid "Shared Key: %s" -msgstr "共享密钥：%s" - -#: ../properties/nm-openvpn.c:643 -#, c-format -msgid "Local IP: %s" -msgstr "本地 IP：%s" - -#: ../properties/nm-openvpn.c:646 -#, c-format -msgid "Remote IP: %s" -msgstr "远程 IP：%s" - -#: ../properties/nm-openvpn.c:651 -msgid "Connection Type: Password" -msgstr "连接类型：密码" - -#: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675 -#, c-format -msgid "Username: %s" -msgstr "用户名：%s" - -#: ../properties/nm-openvpn.c:663 -msgid "Connection Type: X.509 with Password Authentication" -msgstr "" - -#: ../properties/nm-openvpn.c:681 -#, c-format -msgid "Remote: %s" -msgstr "远程：%s" - -#: ../properties/nm-openvpn.c:684 -#, c-format -msgid "Device: %s" -msgstr "设备：%s" - -#: ../properties/nm-openvpn.c:684 -msgid "TAP" -msgstr "TAP" - -#: ../properties/nm-openvpn.c:684 -msgid "TUN" -msgstr "TUN" - -#: ../properties/nm-openvpn.c:687 -#, c-format -msgid "Protocol: %s" -msgstr "协议：%s" - -#: ../properties/nm-openvpn.c:687 -msgid "TCP" -msgstr "TCP" - -#: ../properties/nm-openvpn.c:687 -msgid "UDP" -msgstr "UDP" - -#: ../properties/nm-openvpn.c:691 -#, c-format -msgid "Routes: %s" -msgstr "路由：%s" - -#: ../properties/nm-openvpn.c:695 -#, c-format -msgid "Use LZO Compression: %s" -msgstr "使用 LZO 压缩：%s" - -#: ../properties/nm-openvpn.c:695 -msgid "Yes" -msgstr "是" - -#: ../properties/nm-openvpn.c:695 -msgid "No" -msgstr "否" - -#: ../properties/nm-openvpn.c:698 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" - -#: ../properties/nm-openvpn.c:849 -msgid "Cannot import settings" -msgstr "无法导入设置" - -#: ../properties/nm-openvpn.c:851 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "VPN 设置文件“%s”不包含有效数据。" - -#: ../properties/nm-openvpn.c:885 -msgid "Select file to import" -msgstr "选择要导入的文件" - -#: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978 -msgid "Select CA to use" -msgstr "选择要使用的 CA" - -#: ../properties/nm-openvpn.c:969 -msgid "Select certificate to use" -msgstr "选择要使用的证书" - -#: ../properties/nm-openvpn.c:972 -msgid "Select key to use" -msgstr "选择要使用的密钥" - -#: ../properties/nm-openvpn.c:975 -msgid "Select shared key to use" -msgstr "选择要使用的共享密钥" - -#. printf ("in impl_export\n"); -#: ../properties/nm-openvpn.c:1147 -msgid "Save as..." -msgstr "另存为..." - -#: ../properties/nm-openvpn.c:1177 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "已经存在名为“%s”的文件。" - -#: ../properties/nm-openvpn.c:1180 -msgid "Do you want to replace it with the one you are saving?" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid "Connection Name" -msgstr "连接名称" - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Optional Information" -msgstr "可选信息" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "Required Information" -msgstr "请求的信息" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "CA file:" -msgstr "CA 文件：" - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "Certificate:" -msgstr "证书：" - -#: ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Connection Type:" -msgstr "连接类型：" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Key:" -msgstr "密钥：" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "Local IP:" -msgstr "本地 IP：" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Password" -msgstr "密码" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "" -"Please note that the file you import is not an OpenVPN configuration file. " -"Ask your adminstrator for the file." -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "Remote IP:" -msgstr "远程 IP：" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Shared Key:" -msgstr "共享密钥：" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Shared key" -msgstr "共享要密钥" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Use LZO compression" -msgstr "使用 LZO 压缩" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Use TAP device" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Use TCP connection" -msgstr "使用 TCP 连接" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Username:" -msgstr "用户名：" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "X.509" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "" -"X.509 Certificates\n" -"Pre-shared key\n" -"Password Authentication\n" -"X.509 with Password Authentication" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:25 -msgid "_Gateway:" -msgstr "网关(_G)：" - -#: ../properties/nm-openvpn-dialog.glade.h:26 -msgid "_Import Saved Configuration..." -msgstr "导入保存的配置(_I)..." - -#: ../properties/nm-openvpn-dialog.glade.h:27 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" - -#: ../properties/nm-openvpn-dialog.glade.h:28 -msgid "_Only use VPN connection for these addresses" -msgstr "这些地址只使用 VPN 连接(_O)" - -#: ../src/nm-openvpn-service.c:136 -msgid "" -"The VPN login failed because the user name and password were not accepted or " -"the certificate password was wrong." -msgstr "" - -#: ../src/nm-openvpn-service.c:138 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" - -#: ../src/nm-openvpn-service.c:140 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" - -#: ../src/nm-openvpn-service.c:142 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "" - -#: ../src/nm-openvpn-service.c:144 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" - -#: ../src/nm-openvpn-service.c:146 -msgid "VPN connection failed" -msgstr "VPN 连接失败" - diff --git a/vpn-daemons/openvpn/po/zh_HK.po b/vpn-daemons/openvpn/po/zh_HK.po deleted file mode 100644 index 64daf64a31..0000000000 --- a/vpn-daemons/openvpn/po/zh_HK.po +++ /dev/null @@ -1,449 +0,0 @@ -# Chinese (Hong Kong) translation of NetworkManager-openvpn. -# Copyright (C) 2007 Free Software Foundation, Inc. -# Chao-Hsiung Liao , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn 0.7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-22 20:04+0800\n" -"PO-Revision-Date: 2008-08-22 20:04+0800\n" -"Last-Translator: Chao-Hsiung Liao \n" -"Language-Team: Chinese (Hong Kong) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "密碼(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "第二組密碼(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "使用者名稱(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "網域(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "匿名連線(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "以使用者連線(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "記住這個作業階段的密碼(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "將密碼儲存到密碼匙圈(_S)" - -#: ../auth-dialog/main.c:187 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "你需要驗證才能存取虛擬私人網絡「%s」。" - -#: ../auth-dialog/main.c:188 -msgid "Authenticate VPN" -msgstr "驗證 VPN" - -#: ../auth-dialog/main.c:201 -msgid "Certificate pass_word:" -msgstr "證書密碼(_W):" - -#: ../auth-dialog/main.c:216 -msgid "Certificate password:" -msgstr "證書密碼:" - -#: ../properties/auth-helpers.c:69 -msgid "Choose a Certificate Authority certificate..." -msgstr "選擇一個核證機關的證書..." - -#: ../properties/auth-helpers.c:88 -msgid "Choose your personal certificate..." -msgstr "選擇你的個人證書..." - -#: ../properties/auth-helpers.c:106 -msgid "Choose your private key..." -msgstr "選擇你的私密密碼匙..." - -#: ../properties/auth-helpers.c:159 -msgid "Choose an OpenVPN static key..." -msgstr "選擇 OpenVPN 靜態密碼匙..." - -#: ../properties/auth-helpers.c:183 ../properties/auth-helpers.c:862 -msgid "None" -msgstr "無" - -#: ../properties/auth-helpers.c:518 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "PEM 證書 (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:578 -msgid "OpenVPN Static Keys (*.key)" -msgstr "OpenVPN 靜態密碼匙 (*.key)" - -#: ../properties/auth-helpers.c:689 -msgid "Default" -msgstr "預設值" - -#: ../properties/nm-openvpn.c:52 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:53 -msgid "Compatible with the OpenVPN server." -msgstr "兼容於 OpenVPN 伺服器。" - -#: ../properties/nm-openvpn.c:310 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "證書 (TLS)" - -#: ../properties/nm-openvpn.c:322 -msgid "Password" -msgstr "密碼" - -#: ../properties/nm-openvpn.c:336 -msgid "Password with Certificates (TLS)" -msgstr "證書密碼 (TLS)" - -#: ../properties/nm-openvpn.c:348 -msgid "Static Key" -msgstr "靜態密碼匙" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "驗證" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "一般" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "如果使用密碼匙方向，在 VPN 對等端也同樣必須使用。舉例來說，如果對等端使用「1」，這個連線必須使用「0」。如果你不確定要使用什麼數值，請聯絡你的系統管理員。" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "進階(_V)..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "CA 證書:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "加密器:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "一般" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "密碼匙方向:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "密碼匙檔案:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "本地端 IP 位址:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "OpenVPN 進階選項" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Private Key:" -msgstr "私密密碼匙:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Static Key:" -msgstr "靜態密碼匙:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Type:" -msgstr "類型:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Use L_ZO data compression" -msgstr "使用 L_ZO 資料壓縮" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Use a TA_P device" -msgstr "使用 TA_P 裝置" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use a _TCP connection" -msgstr "使用 _TCP 連線" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use additional TLS authentication" -msgstr "使用額外的 TLS 驗證" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use custom gateway p_ort:" -msgstr "使用自選通訊閘連接埠(_O):" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "User Certificate:" -msgstr "使用證書:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "User name:" -msgstr "使用者名稱:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "_Gateway:" -msgstr "通訊閘(_G):" - -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "加入、移除與編輯 VPN 連線" - -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "VPN 連線管理程式 (OpenVPN)" - -#~ msgid "The following OpenVPN connection will be created:" -#~ msgstr "將建立下列 OpenVPN 連線:" - -#~ msgid "Name: %s" -#~ msgstr "名稱: %s" - -#~ msgid "Connection Type: X.509 Certificates" -#~ msgstr "連線類型: X.509 憑證" - -#~ msgid "CA: %s" -#~ msgstr "憑證機構: %s" - -#~ msgid "Cert: %s" -#~ msgstr "憑證: %s" - -#~ msgid "Key: %s" -#~ msgstr "金鑰: %s" - -#~ msgid "Connection Type: Shared Key" -#~ msgstr "連線類型: 分享式金鑰" - -#~ msgid "Shared Key: %s" -#~ msgstr "分享金鑰: %s" - -#~ msgid "Local IP: %s" -#~ msgstr "本地端 IP: %s" - -#~ msgid "Remote IP: %s" -#~ msgstr "遠端 IP: %s" - -#~ msgid "Connection Type: Password" -#~ msgstr "連線類型: 密碼 " - -#~ msgid "Username: %s" -#~ msgstr "使用者名稱: %s" - -#~ msgid "Connection Type: X.509 with Password Authentication" -#~ msgstr "連線類型: 具密碼驗證的 X.509 憑證" - -#~ msgid "Remote: %s" -#~ msgstr "遠端: %s" - -#~ msgid "Port: %s" -#~ msgstr "連接埠: %s" - -#~ msgid "Device: %s" -#~ msgstr "裝置: %s" - -#~ msgid "TAP" -#~ msgstr "TAP" - -#~ msgid "TUN" -#~ msgstr "TUN" - -#~ msgid "Protocol: %s" -#~ msgstr "通訊協定: %s" - -#~ msgid "TCP" -#~ msgstr "TCP" - -#~ msgid "UDP" -#~ msgstr "UDP" - -#~ msgid "Routes: %s" -#~ msgstr "路由: %s" - -#~ msgid "Use LZO Compression: %s" -#~ msgstr "使用 LZO 壓縮: %s" - -#~ msgid "Yes" -#~ msgstr "是" - -#~ msgid "No" -#~ msgstr "否" - -#~ msgid "TLS auth: %s %s" -#~ msgstr "TLS 驗證: %s %s" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "連線詳細資訊可以使用「編輯」按鈕改變。" - -#~ msgid "Cannot import settings" -#~ msgstr "不能匯入設定值" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN 設定檔「%s」沒有包含有效的資料。" - -#~ msgid "Select file to import" -#~ msgstr "選取要匯入的檔案" - -#~ msgid "Select CA to use" -#~ msgstr "選取要使用的憑證機構" - -#~ msgid "Select certificate to use" -#~ msgstr "選取要使用的憑證" - -#~ msgid "Select key to use" -#~ msgstr "選取要使用的金鑰" - -#~ msgid "Select shared key to use" -#~ msgstr "選擇要使用的分享金鑰" - -#~ msgid "Select TA to use" -#~ msgstr "選取要使用的 TA" - -#~ msgid "Save as..." -#~ msgstr "另存為..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "已存在一個名為「%s」的檔案。" - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "是否要以儲存的版本來替換它？" - -#~ msgid "Failed to export configuration" -#~ msgstr "匯出組態失敗" - -#~ msgid "Failed to save file %s" -#~ msgstr "儲存檔案「%s」時失敗" - -#~ msgid "0" -#~ msgstr "0" - -#~ msgid "1" -#~ msgstr "1" - -#~ msgid "Connection Information" -#~ msgstr "連線資訊" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "範例: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "CA file:" -#~ msgstr "CA 檔案:" - -#~ msgid "CA file:" -#~ msgstr "CA 檔案:" - -#~ msgid "Connection Name" -#~ msgstr "連線名稱" - -#~ msgid "Connection Type:" -#~ msgstr "連線類型:" - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "用來識別連線到私人網路的名稱，例如「Campus VPN」或「Corporate Network」" - -#~ msgid "Optional" -#~ msgstr "選擇性的" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "請在下面輸入您的系統管理者提供的資訊。請勿在此輸入密碼，當進行連線時便會提" -#~ "示您輸入。" - -#~ msgid "" -#~ "Please note that the file you import is not an OpenVPN configuration " -#~ "file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "請注意您所匯入的檔案並非 OpenVPN 組態檔案。請向您的系統管理者索取該檔案。" - -#~ msgid "Remote IP:" -#~ msgstr "遠端 IP:" - -#~ msgid "Shared key" -#~ msgstr "分享金鑰" - -#~ msgid "Use TLS auth:" -#~ msgstr "使用 TLS 驗證:" - -#~ msgid "Use cipher:" -#~ msgstr "使用加密器:" - -#~ msgid "X.509" -#~ msgstr "X.509" - -#~ msgid "" -#~ "X.509 Certificates\n" -#~ "Pre-shared key\n" -#~ "Password Authentication\n" -#~ "X.509 with Password Authentication" -#~ msgstr "" -#~ "X.509 憑證\n" -#~ "預先分享的金鑰\n" -#~ "密碼驗證\n" -#~ "X.509 密碼驗證" - -#~ msgid "X.509/Pass" -#~ msgstr "X.509/通過" - -#~ msgid "_Gateway Address:" -#~ msgstr "通訊閘位址(_G):" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "匯入儲存的組態(_I)..." - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "只對這些位址使用 _VPN 連線" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "VPN 登入失敗，因為使用者名稱與密碼不符或憑證密碼錯誤。" - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "VPN 登入失敗，因為 VPN 程式無法啟動。" - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "VPN 登入失敗，因為 VPN 程式無法連線至 VPN 伺服器。" - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "VPN 登入失敗，因為 VPN 組態選項無效。" - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "VPN 登入失敗，因為 VPN 程式從 VPN 伺服器接收到無效的組態。" - -#~ msgid "VPN connection failed" -#~ msgstr "VPN 連線失敗" diff --git a/vpn-daemons/openvpn/po/zh_TW.po b/vpn-daemons/openvpn/po/zh_TW.po deleted file mode 100755 index 66a7cfb1c5..0000000000 --- a/vpn-daemons/openvpn/po/zh_TW.po +++ /dev/null @@ -1,452 +0,0 @@ -# Chinese (Taiwan) translation of NetworkManager-openvpn. -# Copyright (C) 2007 Free Software Foundation, Inc. -# Chao-Hsiung Liao , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-openvpn 0.7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-22 20:04+0800\n" -"PO-Revision-Date: 2007-03-01 21:06+0800\n" -"Last-Translator: Chao-Hsiung Liao \n" -"Language-Team: Chinese (traditional) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Password:" -msgstr "密碼(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:146 -msgid "_Secondary Password:" -msgstr "第二組密碼(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Username:" -msgstr "使用者名稱(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:265 -msgid "_Domain:" -msgstr "網域(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect _anonymously" -msgstr "匿名連線(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:362 -msgid "Connect as _user:" -msgstr "以使用者連線(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:471 -msgid "_Remember password for this session" -msgstr "記住這個作業階段的密碼(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:473 -msgid "_Save password in keyring" -msgstr "將密碼儲存到鑰匙圈(_S)" - -#: ../auth-dialog/main.c:187 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "您需要驗證才能存取虛擬私人網路「%s」。" - -#: ../auth-dialog/main.c:188 -msgid "Authenticate VPN" -msgstr "驗證 VPN" - -#: ../auth-dialog/main.c:201 -msgid "Certificate pass_word:" -msgstr "憑證密碼(_W):" - -#: ../auth-dialog/main.c:216 -msgid "Certificate password:" -msgstr "憑證密碼:" - -#: ../properties/auth-helpers.c:69 -msgid "Choose a Certificate Authority certificate..." -msgstr "選擇一個憑證管理中心的憑證..." - -#: ../properties/auth-helpers.c:88 -msgid "Choose your personal certificate..." -msgstr "選擇您的個人憑證..." - -#: ../properties/auth-helpers.c:106 -msgid "Choose your private key..." -msgstr "選擇您的私密金鑰..." - -#: ../properties/auth-helpers.c:159 -msgid "Choose an OpenVPN static key..." -msgstr "選擇 OpenVPN 靜態金鑰..." - -#: ../properties/auth-helpers.c:183 ../properties/auth-helpers.c:862 -msgid "None" -msgstr "無" - -#: ../properties/auth-helpers.c:518 -msgid "PEM certificates (*.pem, *.crt, *.key)" -msgstr "PEM 憑證 (*.pem, *.crt, *.key)" - -#: ../properties/auth-helpers.c:578 -msgid "OpenVPN Static Keys (*.key)" -msgstr "OpenVPN 靜態金鑰 (*.key)" - -#: ../properties/auth-helpers.c:689 -msgid "Default" -msgstr "預設值" - -#: ../properties/nm-openvpn.c:52 -msgid "OpenVPN" -msgstr "OpenVPN" - -#: ../properties/nm-openvpn.c:53 -msgid "Compatible with the OpenVPN server." -msgstr "相容於 OpenVPN 伺服器。" - -#: ../properties/nm-openvpn.c:310 ../properties/nm-openvpn-dialog.glade.h:7 -msgid "Certificates (TLS)" -msgstr "憑證 (TLS)" - -#: ../properties/nm-openvpn.c:322 -msgid "Password" -msgstr "密碼" - -#: ../properties/nm-openvpn.c:336 -msgid "Password with Certificates (TLS)" -msgstr "憑證密碼 (TLS)" - -#: ../properties/nm-openvpn.c:348 -msgid "Static Key" -msgstr "靜態金鑰" - -#: ../properties/nm-openvpn-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-openvpn-dialog.glade.h:2 -msgid "Authentication" -msgstr "驗證" - -#: ../properties/nm-openvpn-dialog.glade.h:3 -msgid "General" -msgstr "一般" - -#: ../properties/nm-openvpn-dialog.glade.h:4 -msgid "" -"If key direction is used, it must be the opposite of that used on the VPN " -"peer. For example, if the peer uses '1', this connection must use '0'. If " -"you are unsure what value to use, contact your system administrator." -msgstr "" -"如果使用金鑰方向，在 VPN 對等端也同樣必須使用。舉例來說，如果對等端使用" -"「1」，這個連線必須使用「0」。如果您不確定要使用什麼數值，請連絡您的系統管理" -"員。" - -#: ../properties/nm-openvpn-dialog.glade.h:5 -msgid "Ad_vanced..." -msgstr "進階(_V)..." - -#: ../properties/nm-openvpn-dialog.glade.h:6 -msgid "CA Certificate:" -msgstr "CA 憑證:" - -#: ../properties/nm-openvpn-dialog.glade.h:8 -msgid "Cipher:" -msgstr "加密器:" - -#: ../properties/nm-openvpn-dialog.glade.h:9 -msgid "General" -msgstr "一般" - -#: ../properties/nm-openvpn-dialog.glade.h:10 -msgid "Key Direction:" -msgstr "金鑰方向:" - -#: ../properties/nm-openvpn-dialog.glade.h:11 -msgid "Key File:" -msgstr "金鑰檔案:" - -#: ../properties/nm-openvpn-dialog.glade.h:12 -msgid "Local IP Address:" -msgstr "本地端 IP 位址:" - -#: ../properties/nm-openvpn-dialog.glade.h:13 -msgid "OpenVPN Advanced Options" -msgstr "OpenVPN 進階選項" - -#: ../properties/nm-openvpn-dialog.glade.h:14 -msgid "Private Key:" -msgstr "私密金鑰:" - -#: ../properties/nm-openvpn-dialog.glade.h:15 -msgid "Static Key:" -msgstr "靜態金鑰:" - -#: ../properties/nm-openvpn-dialog.glade.h:16 -msgid "Type:" -msgstr "類型:" - -#: ../properties/nm-openvpn-dialog.glade.h:17 -msgid "Use L_ZO data compression" -msgstr "使用 L_ZO 資料壓縮" - -#: ../properties/nm-openvpn-dialog.glade.h:18 -msgid "Use a TA_P device" -msgstr "使用 TA_P 裝置" - -#: ../properties/nm-openvpn-dialog.glade.h:19 -msgid "Use a _TCP connection" -msgstr "使用 _TCP 連線" - -#: ../properties/nm-openvpn-dialog.glade.h:20 -msgid "Use additional TLS authentication" -msgstr "使用額外的 TLS 驗證" - -#: ../properties/nm-openvpn-dialog.glade.h:21 -msgid "Use custom gateway p_ort:" -msgstr "使用自訂通訊閘連接埠(_O):" - -#: ../properties/nm-openvpn-dialog.glade.h:22 -msgid "User Certificate:" -msgstr "使用憑證:" - -#: ../properties/nm-openvpn-dialog.glade.h:23 -msgid "User name:" -msgstr "使用者名稱:" - -#: ../properties/nm-openvpn-dialog.glade.h:24 -msgid "_Gateway:" -msgstr "通訊閘(_G):" - -#~ msgid "Add, Remove, and Edit VPN Connections" -#~ msgstr "加入、移除與編輯 VPN 連線" - -#~ msgid "VPN Connection Manager (OpenVPN)" -#~ msgstr "VPN 連線管理程式 (OpenVPN)" - -#~ msgid "The following OpenVPN connection will be created:" -#~ msgstr "將建立下列 OpenVPN 連線:" - -#~ msgid "Name: %s" -#~ msgstr "名稱: %s" - -#~ msgid "Connection Type: X.509 Certificates" -#~ msgstr "連線類型: X.509 憑證" - -#~ msgid "CA: %s" -#~ msgstr "憑證機構: %s" - -#~ msgid "Cert: %s" -#~ msgstr "憑證: %s" - -#~ msgid "Key: %s" -#~ msgstr "金鑰: %s" - -#~ msgid "Connection Type: Shared Key" -#~ msgstr "連線類型: 分享式金鑰" - -#~ msgid "Shared Key: %s" -#~ msgstr "分享金鑰: %s" - -#~ msgid "Local IP: %s" -#~ msgstr "本地端 IP: %s" - -#~ msgid "Remote IP: %s" -#~ msgstr "遠端 IP: %s" - -#~ msgid "Connection Type: Password" -#~ msgstr "連線類型: 密碼 " - -#~ msgid "Username: %s" -#~ msgstr "使用者名稱: %s" - -#~ msgid "Connection Type: X.509 with Password Authentication" -#~ msgstr "連線類型: 具密碼驗證的 X.509 憑證" - -#~ msgid "Remote: %s" -#~ msgstr "遠端: %s" - -#~ msgid "Port: %s" -#~ msgstr "連接埠: %s" - -#~ msgid "Device: %s" -#~ msgstr "裝置: %s" - -#~ msgid "TAP" -#~ msgstr "TAP" - -#~ msgid "TUN" -#~ msgstr "TUN" - -#~ msgid "Protocol: %s" -#~ msgstr "通訊協定: %s" - -#~ msgid "TCP" -#~ msgstr "TCP" - -#~ msgid "UDP" -#~ msgstr "UDP" - -#~ msgid "Routes: %s" -#~ msgstr "路由: %s" - -#~ msgid "Use LZO Compression: %s" -#~ msgstr "使用 LZO 壓縮: %s" - -#~ msgid "Yes" -#~ msgstr "是" - -#~ msgid "No" -#~ msgstr "否" - -#~ msgid "TLS auth: %s %s" -#~ msgstr "TLS 驗證: %s %s" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "連線詳細資訊可以使用「編輯」按鈕改變。" - -#~ msgid "Cannot import settings" -#~ msgstr "不能匯入設定值" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN 設定檔「%s」沒有包含有效的資料。" - -#~ msgid "Select file to import" -#~ msgstr "選取要匯入的檔案" - -#~ msgid "Select CA to use" -#~ msgstr "選取要使用的憑證機構" - -#~ msgid "Select certificate to use" -#~ msgstr "選取要使用的憑證" - -#~ msgid "Select key to use" -#~ msgstr "選取要使用的金鑰" - -#~ msgid "Select shared key to use" -#~ msgstr "選擇要使用的分享金鑰" - -#~ msgid "Select TA to use" -#~ msgstr "選取要使用的 TA" - -#~ msgid "Save as..." -#~ msgstr "另存為..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "已存在一個名為「%s」的檔案。" - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "是否要以儲存的版本來替換它？" - -#~ msgid "Failed to export configuration" -#~ msgstr "匯出組態失敗" - -#~ msgid "Failed to save file %s" -#~ msgstr "儲存檔案「%s」時失敗" - -#~ msgid "0" -#~ msgstr "0" - -#~ msgid "1" -#~ msgstr "1" - -#~ msgid "Connection Information" -#~ msgstr "連線資訊" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "範例: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "CA file:" -#~ msgstr "CA 檔案:" - -#~ msgid "CA file:" -#~ msgstr "CA 檔案:" - -#~ msgid "Connection Name" -#~ msgstr "連線名稱" - -#~ msgid "Connection Type:" -#~ msgstr "連線類型:" - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "用來識別連線到私人網路的名稱，例如「Campus VPN」或「Corporate Network」" - -#~ msgid "Optional" -#~ msgstr "選擇性的" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "請在下面輸入您的系統管理者提供的資訊。請勿在此輸入密碼，當進行連線時便會提" -#~ "示您輸入。" - -#~ msgid "" -#~ "Please note that the file you import is not an OpenVPN configuration " -#~ "file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "請注意您所匯入的檔案並非 OpenVPN 組態檔案。請向您的系統管理者索取該檔案。" - -#~ msgid "Remote IP:" -#~ msgstr "遠端 IP:" - -#~ msgid "Shared key" -#~ msgstr "分享金鑰" - -#~ msgid "Use TLS auth:" -#~ msgstr "使用 TLS 驗證:" - -#~ msgid "Use cipher:" -#~ msgstr "使用加密器:" - -#~ msgid "X.509" -#~ msgstr "X.509" - -#~ msgid "" -#~ "X.509 Certificates\n" -#~ "Pre-shared key\n" -#~ "Password Authentication\n" -#~ "X.509 with Password Authentication" -#~ msgstr "" -#~ "X.509 憑證\n" -#~ "預先分享的金鑰\n" -#~ "密碼驗證\n" -#~ "X.509 密碼驗證" - -#~ msgid "X.509/Pass" -#~ msgstr "X.509/通過" - -#~ msgid "_Gateway Address:" -#~ msgstr "通訊閘位址(_G):" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "匯入儲存的組態(_I)..." - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "只對這些位址使用 _VPN 連線" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "VPN 登入失敗，因為使用者名稱與密碼不符或憑證密碼錯誤。" - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "VPN 登入失敗，因為 VPN 程式無法啟動。" - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "VPN 登入失敗，因為 VPN 程式無法連線至 VPN 伺服器。" - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "VPN 登入失敗，因為 VPN 組態選項無效。" - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "VPN 登入失敗，因為 VPN 程式從 VPN 伺服器接收到無效的組態。" - -#~ msgid "VPN connection failed" -#~ msgstr "VPN 連線失敗" diff --git a/vpn-daemons/openvpn/properties/.cvsignore b/vpn-daemons/openvpn/properties/.cvsignore deleted file mode 100644 index 3dda72986f..0000000000 --- a/vpn-daemons/openvpn/properties/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/vpn-daemons/openvpn/properties/Makefile.am b/vpn-daemons/openvpn/properties/Makefile.am deleted file mode 100644 index e949e00508..0000000000 --- a/vpn-daemons/openvpn/properties/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -plugindir = $(libdir)/NetworkManager -plugin_LTLIBRARIES = libnm-openvpn-properties.la - -libnm_openvpn_properties_la_SOURCES = \ - nm-openvpn.c \ - nm-openvpn.h \ - auth-helpers.c \ - auth-helpers.h \ - import-export.c \ - import-export.h - -gladedir = $(datadir)/gnome-vpn-properties/openvpn -glade_DATA = nm-openvpn-dialog.glade - -libnm_openvpn_properties_la_CFLAGS = \ - $(GLADE_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(LIBGNOMEUI_CFLAGS) \ - $(NETWORK_MANAGER_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ - -I$(top_srcdir)/ \ - -DICONDIR=\""$(datadir)/pixmaps"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" - -libnm_openvpn_properties_la_LIBADD = \ - $(GLADE_LIBS) \ - $(GTK_LIBS) \ - $(GCONF_LIBS) \ - $(LIBGNOMEUI_LIBS) \ - $(NETWORK_MANAGER_LIBS) \ - $(top_builddir)/common-gnome/libnm-openvpn-common-gnome.la - -libnm_openvpn_properties_la_LDFLAGS = \ - -avoid-version - -CLEANFILES = *.bak *.gladep *~ - -EXTRA_DIST = \ - $(glade_DATA) diff --git a/vpn-daemons/openvpn/properties/auth-helpers.c b/vpn-daemons/openvpn/properties/auth-helpers.c deleted file mode 100644 index daee9af1f0..0000000000 --- a/vpn-daemons/openvpn/properties/auth-helpers.c +++ /dev/null @@ -1,1107 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * - * Copyright (C) 2008 Dan Williams, - * Copyright (C) 2008 Tambet Ingo, - * - * 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. - * - **************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "auth-helpers.h" -#include "nm-openvpn.h" -#include "src/nm-openvpn-service.h" -#include "common-gnome/keyring-helpers.h" - -static void -show_password (GtkToggleButton *togglebutton, GtkEntry *password_entry) -{ - gtk_entry_set_visibility (password_entry, gtk_toggle_button_get_active (togglebutton)); -} - -static GtkWidget * -fill_password (GladeXML *xml, - const char *widget_name, - NMConnection *connection, - gboolean priv_key_password) -{ - GtkWidget *widget; - GtkWidget *show_passwords; - char *password; - - widget = glade_xml_get_widget (xml, widget_name); - g_assert (widget); - - show_passwords = glade_xml_get_widget (xml, "show_passwords"); - g_signal_connect (show_passwords, "toggled", G_CALLBACK (show_password), widget); - - if (!connection) - return widget; - - password = NULL; - - if (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM) { - NMSettingVPN *s_vpn; - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - if (s_vpn) { - const char *tmp; - - tmp = nm_setting_vpn_get_secret (s_vpn, priv_key_password ? NM_OPENVPN_KEY_CERTPASS : NM_OPENVPN_KEY_PASSWORD); - if (tmp) - password = gnome_keyring_memory_strdup (tmp); - } - } else { - NMSettingConnection *s_con; - gboolean unused; - - s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); - password = keyring_helpers_lookup_secret (nm_setting_connection_get_uuid (s_con), - priv_key_password ? NM_OPENVPN_KEY_CERTPASS : NM_OPENVPN_KEY_PASSWORD, - &unused); - } - - if (password) { - gtk_entry_set_text (GTK_ENTRY (widget), password); - gnome_keyring_memory_free (password); - } - - return widget; -} - -void -fill_vpn_passwords (GladeXML *xml, - GtkSizeGroup *group, - NMConnection *connection, - const char *contype, - ChangedCallback changed_cb, - gpointer user_data) -{ - GtkWidget *w = NULL; - - if (!strcmp (contype, NM_OPENVPN_CONTYPE_TLS)) - w = fill_password (xml, "tls_private_key_password_entry", connection, TRUE); - else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) - w = fill_password (xml, "pw_password_entry", connection, FALSE); - else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - GtkWidget *w2 = NULL; - - w = fill_password (xml, "pw_tls_password_entry", connection, FALSE); - - w2 = fill_password (xml, "pw_tls_private_key_password_entry", connection, TRUE); - if (w2) { - gtk_size_group_add_widget (group, w2); - g_signal_connect (w2, "changed", G_CALLBACK (changed_cb), user_data); - } - } - - if (w) { - gtk_size_group_add_widget (group, w); - g_signal_connect (w, "changed", G_CALLBACK (changed_cb), user_data); - } -} - -void -tls_pw_init_auth_widget (GladeXML *xml, - GtkSizeGroup *group, - NMSettingVPN *s_vpn, - const char *contype, - const char *prefix, - ChangedCallback changed_cb, - gpointer user_data) -{ - GtkWidget *widget; - const char *value; - char *tmp; - GtkFileFilter *filter; - - g_return_if_fail (xml != NULL); - g_return_if_fail (group != NULL); - g_return_if_fail (changed_cb != NULL); - g_return_if_fail (prefix != NULL); - - tmp = g_strdup_printf ("%s_ca_cert_chooser", prefix); - widget = glade_xml_get_widget (xml, tmp); - g_free (tmp); - - gtk_size_group_add_widget (group, widget); - filter = tls_file_chooser_filter_new (); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE); - gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget), - _("Choose a Certificate Authority certificate...")); - g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (changed_cb), user_data); - - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CA); - if (value && strlen (value)) - gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value); - } - - if (!strcmp (contype, NM_OPENVPN_CONTYPE_TLS) || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - tmp = g_strdup_printf ("%s_user_cert_chooser", prefix); - widget = glade_xml_get_widget (xml, tmp); - g_free (tmp); - - gtk_size_group_add_widget (group, widget); - filter = tls_file_chooser_filter_new (); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE); - gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget), - _("Choose your personal certificate...")); - g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (changed_cb), user_data); - - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CERT); - if (value && strlen (value)) - gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value); - } - - tmp = g_strdup_printf ("%s_private_key_chooser", prefix); - widget = glade_xml_get_widget (xml, tmp); - g_free (tmp); - - gtk_size_group_add_widget (group, widget); - filter = tls_file_chooser_filter_new (); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE); - gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget), - _("Choose your private key...")); - g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (changed_cb), user_data); - - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_KEY); - if (value && strlen (value)) - gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value); - } - } - - if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD) || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - tmp = g_strdup_printf ("%s_username_entry", prefix); - widget = glade_xml_get_widget (xml, tmp); - g_free (tmp); - - gtk_size_group_add_widget (group, widget); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_USERNAME); - if (value && strlen (value)) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (changed_cb), user_data); - } -} - -#define SK_DIR_COL_NAME 0 -#define SK_DIR_COL_NUM 1 - -void -sk_init_auth_widget (GladeXML *xml, - GtkSizeGroup *group, - NMSettingVPN *s_vpn, - ChangedCallback changed_cb, - gpointer user_data) -{ - GtkWidget *widget; - const char *value = NULL; - GtkListStore *store; - GtkTreeIter iter; - gint active = -1; - gint direction = -1; - GtkFileFilter *filter; - - g_return_if_fail (xml != NULL); - g_return_if_fail (group != NULL); - g_return_if_fail (changed_cb != NULL); - - widget = glade_xml_get_widget (xml, "sk_key_chooser"); - gtk_size_group_add_widget (group, widget); - filter = sk_file_chooser_filter_new (); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE); - gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget), - _("Choose an OpenVPN static key...")); - g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (changed_cb), user_data); - - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_STATIC_KEY); - if (value && strlen (value)) - gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value); - } - - store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT); - - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_STATIC_KEY_DIRECTION); - if (value && strlen (value)) { - long int tmp; - - errno = 0; - tmp = strtol (value, NULL, 10); - if (errno == 0 && (tmp == 0 || tmp == 1)) - direction = (guint32) tmp; - } - } - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, SK_DIR_COL_NAME, _("None"), SK_DIR_COL_NUM, -1, -1); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, SK_DIR_COL_NAME, "0", SK_DIR_COL_NUM, 0, -1); - if (direction == 0) - active = 1; - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, SK_DIR_COL_NAME, "1", SK_DIR_COL_NUM, 1, -1); - if (direction == 1) - active = 2; - - widget = glade_xml_get_widget (xml, "sk_direction_combo"); - gtk_size_group_add_widget (group, widget); - - gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); - g_object_unref (store); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 0 : active); - - widget = glade_xml_get_widget (xml, "sk_dir_help_label"); - gtk_size_group_add_widget (group, widget); - - widget = glade_xml_get_widget (xml, "sk_local_address_entry"); - gtk_size_group_add_widget (group, widget); - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (changed_cb), user_data); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_LOCAL_IP); - if (value && strlen (value)) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } -} - -static gboolean -validate_file_chooser (GladeXML *xml, const char *name) -{ - GtkWidget *widget; - char *str; - - widget = glade_xml_get_widget (xml, name); - str = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); - if (!str || !strlen (str)) - return FALSE; - return TRUE; -} - -static gboolean -validate_tls (GladeXML *xml, const char *prefix, GError **error) -{ - char *tmp; - gboolean valid; - - tmp = g_strdup_printf ("%s_ca_cert_chooser", prefix); - valid = validate_file_chooser (xml, tmp); - g_free (tmp); - if (!valid) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_OPENVPN_KEY_CA); - return FALSE; - } - - tmp = g_strdup_printf ("%s_user_cert_chooser", prefix); - valid = validate_file_chooser (xml, tmp); - g_free (tmp); - if (!valid) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_OPENVPN_KEY_CERT); - return FALSE; - } - - tmp = g_strdup_printf ("%s_private_key_chooser", prefix); - valid = validate_file_chooser (xml, tmp); - g_free (tmp); - if (!valid) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_OPENVPN_KEY_KEY); - return FALSE; - } - - return TRUE; -} - -gboolean -auth_widget_check_validity (GladeXML *xml, const char *contype, GError **error) -{ - GtkWidget *widget; - const char *str; - - if (!strcmp (contype, NM_OPENVPN_CONTYPE_TLS)) { - if (!validate_tls (xml, "tls", error)) - return FALSE; - } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - if (!validate_tls (xml, "pw_tls", error)) - return FALSE; - - widget = glade_xml_get_widget (xml, "pw_tls_username_entry"); - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (!str || !strlen (str)) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_OPENVPN_KEY_USERNAME); - return FALSE; - } - } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) { - if (!validate_file_chooser (xml, "pw_ca_cert_chooser")) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_OPENVPN_KEY_CA); - return FALSE; - } - widget = glade_xml_get_widget (xml, "pw_username_entry"); - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (!str || !strlen (str)) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_OPENVPN_KEY_USERNAME); - return FALSE; - } - } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY)) { - if (!validate_file_chooser (xml, "sk_key_chooser")) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_OPENVPN_KEY_STATIC_KEY); - return FALSE; - } - - widget = glade_xml_get_widget (xml, "sk_local_address_entry"); - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (!str || !strlen (str)) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_OPENVPN_KEY_LOCAL_IP); - return FALSE; - } - } else - g_assert_not_reached (); - - return TRUE; -} - -static void -update_from_filechooser (GladeXML *xml, - const char *key, - const char *prefix, - const char *widget_name, - NMSettingVPN *s_vpn) -{ - GtkWidget *widget; - char *tmp, *filename; - - g_return_if_fail (xml != NULL); - g_return_if_fail (key != NULL); - g_return_if_fail (prefix != NULL); - g_return_if_fail (widget_name != NULL); - g_return_if_fail (s_vpn != NULL); - - tmp = g_strdup_printf ("%s_%s", prefix, widget_name); - widget = glade_xml_get_widget (xml, tmp); - g_free (tmp); - - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); - if (!filename) - return; - - if (strlen (filename)) - nm_setting_vpn_add_data_item (s_vpn, key, filename); - - g_free (filename); -} - -static void -update_tls (GladeXML *xml, const char *prefix, NMSettingVPN *s_vpn) -{ - update_from_filechooser (xml, NM_OPENVPN_KEY_CA, prefix, "ca_cert_chooser", s_vpn); - update_from_filechooser (xml, NM_OPENVPN_KEY_CERT, prefix, "user_cert_chooser", s_vpn); - update_from_filechooser (xml, NM_OPENVPN_KEY_KEY, prefix, "private_key_chooser", s_vpn); -} - -static void -update_username (GladeXML *xml, const char *prefix, NMSettingVPN *s_vpn) -{ - GtkWidget *widget; - char *tmp; - const char *str; - - g_return_if_fail (xml != NULL); - g_return_if_fail (prefix != NULL); - g_return_if_fail (s_vpn != NULL); - - tmp = g_strdup_printf ("%s_username_entry", prefix); - widget = glade_xml_get_widget (xml, tmp); - g_free (tmp); - - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_USERNAME, str); -} - -gboolean -auth_widget_update_connection (GladeXML *xml, - const char *contype, - NMSettingVPN *s_vpn) -{ - GtkTreeModel *model; - GtkTreeIter iter; - GtkWidget *widget; - - if (!strcmp (contype, NM_OPENVPN_CONTYPE_TLS)) { - update_tls (xml, "tls", s_vpn); - } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) { - update_from_filechooser (xml, NM_OPENVPN_KEY_CA, "pw", "ca_cert_chooser", s_vpn); - update_username (xml, "pw", s_vpn); - } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - update_tls (xml, "pw_tls", s_vpn); - update_username (xml, "pw_tls", s_vpn); - } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY)) { - update_from_filechooser (xml, NM_OPENVPN_KEY_STATIC_KEY, "sk", "key_chooser", s_vpn); - widget = glade_xml_get_widget (xml, "sk_direction_combo"); - g_assert (widget); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)) { - int direction = -1; - - gtk_tree_model_get (model, &iter, SK_DIR_COL_NUM, &direction, -1); - if (direction > -1) { - char *tmp = g_strdup_printf ("%d", direction); - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_STATIC_KEY_DIRECTION, tmp); - g_free (tmp); - } - } - } else - g_assert_not_reached (); - - return TRUE; -} - -static gboolean -save_secret (GladeXML *xml, - const char *widget_name, - const char *vpn_uuid, - const char *vpn_name, - const char *secret_name) -{ - GtkWidget *w; - const char *secret; - GnomeKeyringResult result; - gboolean ret; - - w = glade_xml_get_widget (xml, widget_name); - g_assert (w); - secret = gtk_entry_get_text (GTK_ENTRY (w)); - if (secret && strlen (secret)) { - result = keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, secret_name, secret); - ret = result == GNOME_KEYRING_RESULT_OK; - if (!ret) - g_warning ("%s: failed to save user password to keyring.", __func__); - } else - ret = keyring_helpers_delete_secret (vpn_uuid, secret_name); - - return ret; -} - -gboolean -auth_widget_save_secrets (GladeXML *xml, - const char *contype, - const char *uuid, - const char *name) -{ - gboolean ret; - - if (!strcmp (contype, NM_OPENVPN_CONTYPE_TLS)) - ret = save_secret (xml, "tls_private_key_password_entry", uuid, name, NM_OPENVPN_KEY_CERTPASS); - else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) - ret = save_secret (xml, "pw_password_entry", uuid, name, NM_OPENVPN_KEY_PASSWORD); - else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - ret = save_secret (xml, "pw_tls_password_entry", uuid, name, NM_OPENVPN_KEY_PASSWORD); - ret = save_secret (xml, "pw_tls_private_key_password_entry", uuid, name, NM_OPENVPN_KEY_CERTPASS); - } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY)) - /* No secrets here */ - ret = TRUE; - else - g_assert_not_reached (); - - return ret; -} - -static const char * -find_tag (const char *tag, const char *buf, gsize len) -{ - gsize i, taglen; - - taglen = strlen (tag); - if (len < taglen) - return NULL; - - for (i = 0; i < len - taglen; i++) { - if (memcmp (buf + i, tag, taglen) == 0) - return buf + i; - } - return NULL; -} - -static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----"; -static const char *pem_dsa_key_begin = "-----BEGIN DSA PRIVATE KEY-----"; -static const char *pem_cert_begin = "-----BEGIN CERTIFICATE-----"; - -static gboolean -tls_default_filter (const GtkFileFilterInfo *filter_info, gpointer data) -{ - char *contents = NULL, *p, *ext; - gsize bytes_read = 0; - gboolean show = FALSE; - struct stat statbuf; - - if (!filter_info->filename) - return FALSE; - - p = strrchr (filter_info->filename, '.'); - if (!p) - return FALSE; - - ext = g_ascii_strdown (p, -1); - if (!ext) - return FALSE; - if (strcmp (ext, ".pem") && strcmp (ext, ".crt") && strcmp (ext, ".key") && strcmp (ext, ".cer")) { - g_free (ext); - return FALSE; - } - g_free (ext); - - /* Ignore files that are really large */ - if (!stat (filter_info->filename, &statbuf)) { - if (statbuf.st_size > 500000) - return FALSE; - } - - if (!g_file_get_contents (filter_info->filename, &contents, &bytes_read, NULL)) - return FALSE; - - if (bytes_read < 400) /* needs to be lower? */ - goto out; - - /* Check for PEM signatures */ - if (find_tag (pem_rsa_key_begin, (const char *) contents, bytes_read)) { - show = TRUE; - goto out; - } - - if (find_tag (pem_dsa_key_begin, (const char *) contents, bytes_read)) { - show = TRUE; - goto out; - } - - if (find_tag (pem_cert_begin, (const char *) contents, bytes_read)) { - show = TRUE; - goto out; - } - -out: - g_free (contents); - return show; -} - -GtkFileFilter * -tls_file_chooser_filter_new (void) -{ - GtkFileFilter *filter; - - filter = gtk_file_filter_new (); - gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME, tls_default_filter, NULL, NULL); - gtk_file_filter_set_name (filter, _("PEM certificates (*.pem, *.crt, *.key, *.cer)")); - return filter; -} - - -static const char *sk_key_begin = "-----BEGIN OpenVPN Static key V1-----"; - -static gboolean -sk_default_filter (const GtkFileFilterInfo *filter_info, gpointer data) -{ - int fd; - unsigned char buffer[1024]; - ssize_t bytes_read; - gboolean show = FALSE; - char *p; - char *ext; - - if (!filter_info->filename) - return FALSE; - - p = strrchr (filter_info->filename, '.'); - if (!p) - return FALSE; - - ext = g_ascii_strdown (p, -1); - if (!ext) - return FALSE; - if (strcmp (ext, ".key")) { - g_free (ext); - return FALSE; - } - g_free (ext); - - fd = open (filter_info->filename, O_RDONLY); - if (fd < 0) - return FALSE; - - bytes_read = read (fd, buffer, sizeof (buffer) - 1); - if (bytes_read < 400) /* needs to be lower? */ - goto out; - buffer[bytes_read] = '\0'; - - /* Check for PEM signatures */ - if (find_tag (sk_key_begin, (const char *) buffer, bytes_read)) { - show = TRUE; - goto out; - } - -out: - close (fd); - return show; -} - -GtkFileFilter * -sk_file_chooser_filter_new (void) -{ - GtkFileFilter *filter; - - filter = gtk_file_filter_new (); - gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME, sk_default_filter, NULL, NULL); - gtk_file_filter_set_name (filter, _("OpenVPN Static Keys (*.key)")); - return filter; -} - -static const char *advanced_keys[] = { - NM_OPENVPN_KEY_PORT, - NM_OPENVPN_KEY_COMP_LZO, - NM_OPENVPN_KEY_TAP_DEV, - NM_OPENVPN_KEY_PROTO_TCP, - NM_OPENVPN_KEY_CIPHER, - NM_OPENVPN_KEY_TA_DIR, - NM_OPENVPN_KEY_TA, - NULL -}; - -static void -copy_values (const char *key, const char *value, gpointer user_data) -{ - GHashTable *hash = (GHashTable *) user_data; - const char **i; - - for (i = &advanced_keys[0]; *i; i++) { - if (strcmp (key, *i)) - continue; - - g_hash_table_insert (hash, g_strdup (key), g_strdup (value)); - } -} - -GHashTable * -advanced_dialog_new_hash_from_connection (NMConnection *connection, - GError **error) -{ - GHashTable *hash; - NMSettingVPN *s_vpn; - - hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - nm_setting_vpn_foreach_data_item (s_vpn, copy_values, hash); - return hash; -} - -static void -port_toggled_cb (GtkWidget *check, gpointer user_data) -{ - GladeXML *xml = (GladeXML *) user_data; - GtkWidget *widget; - - widget = glade_xml_get_widget (xml, "port_spinbutton"); - gtk_widget_set_sensitive (widget, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check))); -} - -static const char * -nm_find_openvpn (void) -{ - static const char *openvpn_binary_paths[] = { - "/usr/sbin/openvpn", - "/sbin/openvpn", - NULL - }; - const char **openvpn_binary = openvpn_binary_paths; - - while (*openvpn_binary != NULL) { - if (g_file_test (*openvpn_binary, G_FILE_TEST_EXISTS)) - break; - openvpn_binary++; - } - - return *openvpn_binary; -} - -#define TLS_CIPHER_COL_NAME 0 -#define TLS_CIPHER_COL_DEFAULT 1 - -static void -populate_cipher_combo (GtkComboBox *box, const char *user_cipher) -{ - GtkListStore *store; - GtkTreeIter iter; - const char *openvpn_binary = NULL; - gchar *tmp, **items, **item; - gboolean user_added = FALSE; - char *argv[3]; - GError *error = NULL; - gboolean success, found_blank = FALSE; - - openvpn_binary = nm_find_openvpn (); - if (!openvpn_binary) - return; - - argv[0] = (char *) openvpn_binary; - argv[1] = "--show-ciphers"; - argv[2] = NULL; - - success = g_spawn_sync ("/", argv, NULL, 0, NULL, NULL, &tmp, NULL, NULL, &error); - if (!success) { - g_warning ("%s: couldn't determine ciphers: %s", __func__, error->message); - g_error_free (error); - return; - } - - store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT); - gtk_combo_box_set_model (box, GTK_TREE_MODEL (store)); - - /* Add default option which won't pass --cipher to openvpn */ - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - TLS_CIPHER_COL_NAME, _("Default"), - TLS_CIPHER_COL_DEFAULT, TRUE, -1); - - items = g_strsplit (tmp, "\n", 0); - g_free (tmp); - - for (item = items; *item; item++) { - char *space = strchr (*item, ' '); - - /* Don't add anything until after the first blank line */ - if (!found_blank) { - if (!strlen (*item)) - found_blank = TRUE; - continue; - } - - if (space) - *space = '\0'; - - if (strlen (*item)) { - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - TLS_CIPHER_COL_NAME, *item, - TLS_CIPHER_COL_DEFAULT, FALSE, -1); - if (user_cipher && !strcmp (*item, user_cipher)) { - gtk_combo_box_set_active_iter (box, &iter); - user_added = TRUE; - } - } - } - - /* Add the user-specified cipher if it exists wasn't found by openvpn */ - if (user_cipher && !user_added) { - gtk_list_store_insert (store, &iter, 1); - gtk_list_store_set (store, &iter, - TLS_CIPHER_COL_NAME, user_cipher, - TLS_CIPHER_COL_DEFAULT, FALSE -1); - gtk_combo_box_set_active_iter (box, &iter); - } else if (!user_added) { - gtk_combo_box_set_active (box, 0); - } - - g_object_unref (G_OBJECT (store)); - g_strfreev (items); -} - -static void -tls_auth_toggled_cb (GtkWidget *widget, gpointer user_data) -{ - GladeXML *xml = (GladeXML *) user_data; - gboolean use_auth = FALSE; - - widget = glade_xml_get_widget (xml, "tls_auth_checkbutton"); - use_auth = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - - widget = glade_xml_get_widget (xml, "tls_dir_help_label"); - gtk_widget_set_sensitive (widget, use_auth); - widget = glade_xml_get_widget (xml, "direction_label"); - gtk_widget_set_sensitive (widget, use_auth); - widget = glade_xml_get_widget (xml, "tls_auth_label"); - gtk_widget_set_sensitive (widget, use_auth); - widget = glade_xml_get_widget (xml, "tls_auth_chooser"); - gtk_widget_set_sensitive (widget, use_auth); - widget = glade_xml_get_widget (xml, "direction_combo"); - gtk_widget_set_sensitive (widget, use_auth); -} - -#define TA_DIR_COL_NAME 0 -#define TA_DIR_COL_NUM 1 - -GtkWidget * -advanced_dialog_new (GHashTable *hash, const char *contype) -{ - GladeXML *xml; - GtkWidget *dialog = NULL; - char *glade_file = NULL; - GtkWidget *widget; - const char *value; - - g_return_val_if_fail (hash != NULL, NULL); - - glade_file = g_strdup_printf ("%s/%s", GLADEDIR, "nm-openvpn-dialog.glade"); - xml = glade_xml_new (glade_file, "openvpn-advanced-dialog", GETTEXT_PACKAGE); - if (xml == NULL) - goto out; - - dialog = glade_xml_get_widget (xml, "openvpn-advanced-dialog"); - if (!dialog) { - g_object_unref (G_OBJECT (xml)); - goto out; - } - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - - g_object_set_data_full (G_OBJECT (dialog), "glade-xml", - xml, (GDestroyNotify) g_object_unref); - g_object_set_data (G_OBJECT (dialog), "connection-type", GINT_TO_POINTER (contype)); - - widget = glade_xml_get_widget (xml, "port_checkbutton"); - g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (port_toggled_cb), xml); - - value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_PORT); - if (value && strlen (value)) { - long int tmp; - - errno = 0; - tmp = strtol (value, NULL, 10); - if (errno == 0 && tmp > 0 && tmp < 65536 && tmp != 1194) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - - widget = glade_xml_get_widget (xml, "port_spinbutton"); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), - (gdouble) tmp); - } - gtk_widget_set_sensitive (widget, TRUE); - } else { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - - widget = glade_xml_get_widget (xml, "port_spinbutton"); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), 1194.0); - gtk_widget_set_sensitive (widget, FALSE); - } - - value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_COMP_LZO); - if (value && !strcmp (value, "yes")) { - widget = glade_xml_get_widget (xml, "lzo_checkbutton"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - } - - value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_PROTO_TCP); - if (value && !strcmp (value, "yes")) { - widget = glade_xml_get_widget (xml, "tcp_checkbutton"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - } - - value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_TAP_DEV); - if (value && !strcmp (value, "yes")) { - widget = glade_xml_get_widget (xml, "tap_checkbutton"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - } - - if ( !strcmp (contype, NM_OPENVPN_CONTYPE_TLS) - || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS) - || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) { - GtkListStore *store; - GtkTreeIter iter; - int direction = -1, active = -1; - - widget = glade_xml_get_widget (xml, "cipher_combo"); - value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_CIPHER); - populate_cipher_combo (GTK_COMBO_BOX (widget), value); - - widget = glade_xml_get_widget (xml, "tls_auth_checkbutton"); - value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_TA); - if (value && strlen (value)) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (tls_auth_toggled_cb), xml); - tls_auth_toggled_cb (widget, xml); - - widget = glade_xml_get_widget (xml, "direction_combo"); - value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_TA_DIR); - if (value && strlen (value)) { - direction = (int) strtol (value, NULL, 10); - /* If direction is not 0 or 1, use no direction */ - if (direction != 0 && direction != 1) - direction = -1; - } - - store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, TA_DIR_COL_NAME, _("None"), TA_DIR_COL_NUM, -1, -1); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, TA_DIR_COL_NAME, "0", TA_DIR_COL_NUM, 0, -1); - if (direction == 0) - active = 1; - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, TA_DIR_COL_NAME, "1", TA_DIR_COL_NUM, 1, -1); - if (direction == 1) - active = 2; - - gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); - g_object_unref (store); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 0 : active); - - value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_TA); - if (value && strlen (value)) { - widget = glade_xml_get_widget (xml, "tls_auth_chooser"); - gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value); - } - } else { - widget = glade_xml_get_widget (xml, "options_notebook"); - gtk_notebook_remove_page (GTK_NOTEBOOK (widget), 1); - } - -out: - g_free (glade_file); - return dialog; -} - -GHashTable * -advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error) -{ - GHashTable *hash; - GtkWidget *widget; - GladeXML *xml; - const char *contype = NULL; - - g_return_val_if_fail (dialog != NULL, NULL); - if (error) - g_return_val_if_fail (*error == NULL, NULL); - - xml = g_object_get_data (G_OBJECT (dialog), "glade-xml"); - g_return_val_if_fail (xml != NULL, NULL); - - hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - - widget = glade_xml_get_widget (xml, "port_checkbutton"); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { - int port; - - widget = glade_xml_get_widget (xml, "port_spinbutton"); - port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget)); - g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_PORT), g_strdup_printf ("%d", port)); - } - - widget = glade_xml_get_widget (xml, "lzo_checkbutton"); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) - g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_COMP_LZO), g_strdup ("yes")); - - widget = glade_xml_get_widget (xml, "tcp_checkbutton"); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) - g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_PROTO_TCP), g_strdup ("yes")); - - widget = glade_xml_get_widget (xml, "tap_checkbutton"); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) - g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_TAP_DEV), g_strdup ("yes")); - - contype = g_object_get_data (G_OBJECT (dialog), "connection-type"); - if (!strcmp (contype, NM_OPENVPN_CONTYPE_TLS) || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - GtkTreeModel *model; - GtkTreeIter iter; - - widget = glade_xml_get_widget (xml, "cipher_combo"); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)) { - char *cipher = NULL; - gboolean is_default = TRUE; - - gtk_tree_model_get (model, &iter, - TLS_CIPHER_COL_NAME, &cipher, - TLS_CIPHER_COL_DEFAULT, &is_default, -1); - if (!is_default && cipher) { - g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_CIPHER), g_strdup (cipher)); - } - } - - widget = glade_xml_get_widget (xml, "tls_auth_checkbutton"); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { - char *filename; - - widget = glade_xml_get_widget (xml, "tls_auth_chooser"); - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); - if (filename && strlen (filename)) { - g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_TA), g_strdup (filename)); - } - g_free (filename); - - widget = glade_xml_get_widget (xml, "direction_combo"); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)) { - int direction = -1; - - gtk_tree_model_get (model, &iter, TA_DIR_COL_NUM, &direction, -1); - if (direction >= 0) { - g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_TA_DIR), - g_strdup_printf ("%d", direction)); - } - } - } - } - - return hash; -} - diff --git a/vpn-daemons/openvpn/properties/auth-helpers.h b/vpn-daemons/openvpn/properties/auth-helpers.h deleted file mode 100644 index 0d3f53aae8..0000000000 --- a/vpn-daemons/openvpn/properties/auth-helpers.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * - * Copyright (C) 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifndef _AUTH_HELPERS_H_ -#define _AUTH_HELPERS_H_ - -#include -#include -#include -#include - -#include -#include - -typedef void (*ChangedCallback) (GtkWidget *widget, gpointer user_data); - -void fill_vpn_passwords (GladeXML *xml, - GtkSizeGroup *group, - NMConnection *connection, - const char *contype, - ChangedCallback changed_cb, - gpointer user_data); - -void tls_pw_init_auth_widget (GladeXML *xml, - GtkSizeGroup *group, - NMSettingVPN *s_vpn, - const char *contype, - const char *prefix, - ChangedCallback changed_cb, - gpointer user_data); - -void sk_init_auth_widget (GladeXML *xml, - GtkSizeGroup *group, - NMSettingVPN *s_vpn, - ChangedCallback changed_cb, - gpointer user_data); - -gboolean auth_widget_check_validity (GladeXML *xml, const char *contype, GError **error); - -gboolean auth_widget_update_connection (GladeXML *xml, - const char *contype, - NMSettingVPN *s_vpn); - -gboolean auth_widget_save_secrets (GladeXML *xml, - const char *contype, - const char *uuid, - const char *name); - -GtkFileFilter *tls_file_chooser_filter_new (void); - -GtkFileFilter *sk_file_chooser_filter_new (void); - -GtkWidget *advanced_dialog_new (GHashTable *hash, const char *contype); - -GHashTable *advanced_dialog_new_hash_from_connection (NMConnection *connection, GError **error); - -GHashTable *advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error); - -#endif diff --git a/vpn-daemons/openvpn/properties/import-export.c b/vpn-daemons/openvpn/properties/import-export.c deleted file mode 100644 index d5744ccf36..0000000000 --- a/vpn-daemons/openvpn/properties/import-export.c +++ /dev/null @@ -1,379 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * - * Copyright (C) 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -#include "import-export.h" -#include "nm-openvpn.h" -#include "../src/nm-openvpn-service.h" - -#define CLIENT_TAG "client" -#define DEV_TAG "dev" -#define PROTO_TAG "proto" -#define REMOTE_TAG "remote" -#define CA_TAG "ca" -#define CERT_TAG "cert" -#define KEY_TAG "key" -#define CIPHER_TAG "cipher" -#define COMP_TAG "comp-lzo" -#define IFCONFIG_TAG "ifconfig" -#define SECRET_TAG "secret" -#define AUTH_USER_PASS_TAG "auth-user-pass" -#define TLS_AUTH_TAG "tls-auth" - -static gboolean -handle_path_item (const char *line, - const char *tag, - const char *key, - NMSettingVPN *s_vpn, - const char *path, - char **leftover) -{ - char *tmp, *file, *unquoted, *p, *full_path = NULL; - gboolean quoted = FALSE; - - if (leftover) - g_return_val_if_fail (*leftover == NULL, FALSE); - - if (strncmp (line, tag, strlen (tag))) - return FALSE; - - tmp = g_strdup (line + strlen (tag)); - file = g_strstrip (tmp); - if (!strlen (file)) - goto out; - - /* If file isn't an absolute file name, add the default path */ - if (!g_path_is_absolute (file)) { - full_path = g_build_filename (path, file, NULL); - file = full_path; - } - - /* Simple unquote */ - if ((file[0] == '"') || (file[0] == '\'')) { - quoted = TRUE; - file++; - } - - /* Unquote stuff using openvpn unquoting rules */ - unquoted = g_malloc0 (strlen (file) + 1); - for (p = unquoted; *file; file++, p++) { - if (quoted && ((*file == '"') || (*file == '\''))) - break; - else if (!quoted && isspace (*file)) - break; - - if (*file == '\\' && *(file+1) == '\\') - *p = *(++file); - else if (*file == '\\' && *(file+1) == '"') - *p = *(++file); - else if (*file == '\\' && *(file+1) == ' ') - *p = *(++file); - else - *p = *file; - } - if (leftover && *file) - *leftover = file + 1; - - nm_setting_vpn_add_data_item (s_vpn, key, unquoted); - g_free (unquoted); - -out: - g_free (tmp); - if (full_path) - g_free (full_path); - return TRUE; -} - -static char ** -get_args (const char *line) -{ - char **split, **sanitized, **tmp, **tmp2; - - split = g_strsplit_set (line, " \t", 0); - sanitized = g_malloc0 (sizeof (char *) * (g_strv_length (split) + 1)); - - for (tmp = split, tmp2 = sanitized; *tmp; tmp++) { - if (strlen (*tmp)) - *tmp2++ = g_strdup (*tmp); - } - - g_strfreev (split); - return sanitized; -} - -static void -handle_direction (const char *tag, const char *key, char *leftover, NMSettingVPN *s_vpn) -{ - glong direction; - - if (!leftover) - return; - - leftover = g_strstrip (leftover); - if (!strlen (leftover)) - return; - - errno = 0; - direction = strtol (leftover, NULL, 10); - if (errno == 0) { - if (direction == 0) - nm_setting_vpn_add_data_item (s_vpn, key, "0"); - else if (direction == 1) - nm_setting_vpn_add_data_item (s_vpn, key, "1"); - } else - g_warning ("%s: unknown %s direction '%s'", __func__, tag, leftover); -} - -NMConnection * -do_import (const char *path, char **lines, GError **error) -{ - NMConnection *connection = NULL; - NMSettingConnection *s_con; - NMSettingVPN *s_vpn; - char *last_dot; - char **line; - gboolean have_client = FALSE, have_remote = FALSE; - gboolean have_pass = FALSE, have_sk = FALSE; - const char *ctype = NULL; - char *basename; - char *default_path; - - connection = nm_connection_new (); - s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ()); - nm_connection_add_setting (connection, NM_SETTING (s_con)); - - s_vpn = NM_SETTING_VPN (nm_setting_vpn_new ()); - - g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_OPENVPN, NULL); - - /* Get the default path for ca, cert, key file, these files maybe - * in same path with the configuration file */ - default_path = g_path_get_dirname (path); - - basename = g_path_get_basename (path); - last_dot = strrchr (basename, '.'); - if (last_dot) - *last_dot = '\0'; - g_object_set (s_con, NM_SETTING_CONNECTION_ID, basename, NULL); - g_free (basename); - - for (line = lines; *line; line++) { - char *comment, **items, *leftover = NULL; - - if ((comment = strchr (*line, '#'))) - *comment = '\0'; - if ((comment = strchr (*line, ';'))) - *comment = '\0'; - if (!strlen (*line)) - continue; - - if (!strncmp (*line, CLIENT_TAG, strlen (CLIENT_TAG))) - have_client = TRUE; - - if (!strncmp (*line, DEV_TAG, strlen (DEV_TAG))) { - if (strstr (*line, "tun")) { - /* ignore; default is tun */ - } else if (strstr (*line, "tap")) { - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_TAP_DEV, "yes"); - } else - g_warning ("%s: unknown dev option '%s'", __func__, *line); - - continue; - } - - if (!strncmp (*line, PROTO_TAG, strlen (PROTO_TAG))) { - if (strstr (*line, "udp")) { - /* ignore; udp is default */ - } else if (strstr (*line, "tcp")) { - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP, "yes"); - } else - g_warning ("%s: unknown proto option '%s'", __func__, *line); - - continue; - } - - if (!strncmp (*line, COMP_TAG, strlen (COMP_TAG))) { - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, "yes"); - continue; - } - - if (!strncmp (*line, REMOTE_TAG, strlen (REMOTE_TAG))) { - items = get_args (*line + strlen (REMOTE_TAG)); - if (!items) - continue; - - if (g_strv_length (items) >= 1) { - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE, items[0]); - have_remote = TRUE; - - if (g_strv_length (items) >= 2) { - glong port; - - errno = 0; - port = strtol (items[1], NULL, 10); - if ((errno == 0) && (port > 0) && (port < 65536)) { - char *tmp = g_strdup_printf ("%d", (guint32) port); - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_PORT, tmp); - g_free (tmp); - } else - g_warning ("%s: invalid remote port in option '%s'", __func__, *line); - } - } - g_strfreev (items); - - if (!nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE)) - g_warning ("%s: unknown remote option '%s'", __func__, *line); - continue; - } - - if (handle_path_item (*line, CA_TAG, NM_OPENVPN_KEY_CA, s_vpn, default_path, NULL)) - continue; - - if (handle_path_item (*line, CERT_TAG, NM_OPENVPN_KEY_CERT, s_vpn, default_path, NULL)) - continue; - - if (handle_path_item (*line, KEY_TAG, NM_OPENVPN_KEY_KEY, s_vpn, default_path, NULL)) - continue; - - if (handle_path_item (*line, SECRET_TAG, NM_OPENVPN_KEY_STATIC_KEY, - s_vpn, default_path, &leftover)) { - handle_direction ("secret", - NM_OPENVPN_KEY_STATIC_KEY_DIRECTION, - leftover, - s_vpn); - continue; - } - - if (handle_path_item (*line, TLS_AUTH_TAG, NM_OPENVPN_KEY_TA, - s_vpn, default_path, &leftover)) { - handle_direction ("tls-auth", - NM_OPENVPN_KEY_TA_DIR, - leftover, - s_vpn); - continue; - } - - if (!strncmp (*line, CIPHER_TAG, strlen (CIPHER_TAG))) { - items = get_args (*line + strlen (CIPHER_TAG)); - if (!items) - continue; - - if (g_strv_length (items)) - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_CIPHER, items[0]); - - g_strfreev (items); - continue; - } - - if (!strncmp (*line, IFCONFIG_TAG, strlen (IFCONFIG_TAG))) { - items = get_args (*line + strlen (IFCONFIG_TAG)); - if (!items) - continue; - - if (g_strv_length (items) == 2) { - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_LOCAL_IP, items[0]); - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE_IP, items[1]); - } else - g_warning ("%s: unknown ifconfig option '%s'", __func__, *line); - g_strfreev (items); - continue; - } - - if (!strncmp (*line, AUTH_USER_PASS_TAG, strlen (AUTH_USER_PASS_TAG))) - have_pass = TRUE; - } - - if (nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_STATIC_KEY)) - have_sk = TRUE; - - if (!have_client && !have_sk) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_FILE_NOT_OPENVPN, - "The file to import wasn't a valid OpenVPN client configuration."); - g_object_unref (connection); - connection = NULL; - } else if (!have_remote) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_FILE_NOT_OPENVPN, - "The file to import wasn't a valid OpenVPN configure (no remote)."); - g_object_unref (connection); - connection = NULL; - } else { - gboolean have_certs = FALSE, have_ca = FALSE; - - if (nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CA)) - have_ca = TRUE; - - if ( have_ca - && nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CERT) - && nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_KEY)) - have_certs = TRUE; - - /* Determine connection type */ - if (have_pass) { - if (have_certs) - ctype = NM_OPENVPN_CONTYPE_PASSWORD_TLS; - else if (have_ca) - ctype = NM_OPENVPN_CONTYPE_PASSWORD; - } else if (have_certs) { - ctype = NM_OPENVPN_CONTYPE_TLS; - } else if (have_sk) - ctype = NM_OPENVPN_CONTYPE_STATIC_KEY; - - if (!ctype) - ctype = NM_OPENVPN_CONTYPE_TLS; - - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_CONNECTION_TYPE, ctype); - } - - g_free (default_path); - - nm_connection_add_setting (connection, NM_SETTING (s_vpn)); - return connection; -} - -gboolean -do_export (const char *path, NMConnection *connection, GError **error) -{ - return FALSE; -} - - diff --git a/vpn-daemons/openvpn/properties/import-export.h b/vpn-daemons/openvpn/properties/import-export.h deleted file mode 100644 index 1c5fbc9f1f..0000000000 --- a/vpn-daemons/openvpn/properties/import-export.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * - * Copyright (C) 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifndef _IMPORT_EXPORT_H_ -#define _IMPORT_EXPORT_H_ - -#include -#include - -NMConnection *do_import (const char *path, char **lines, GError **error); - -gboolean do_export (const char *path, NMConnection *connection, GError **error); - -#endif diff --git a/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade b/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade deleted file mode 100644 index 80c0ba44e2..0000000000 --- a/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade +++ /dev/null @@ -1,1134 +0,0 @@ - - - - - - window1 - - - True - 12 - 16 - - - True - 6 - - - True - 0 - <b>General</b> - True - - - False - False - - - - - True - 12 - - - True - 1 - 2 - 6 - 6 - - - True - 1 - 0 - - - True - True - - - - - 1 - 2 - - - - - - True - 0 - _Gateway: - True - gateway_entry - - - - - - - - - - - 1 - - - - - False - - - - - True - 6 - - - True - 0 - <b>Authentication</b> - True - - - False - False - - - - - True - 12 - - - True - 3 - 2 - 6 - 6 - - - True - 1 - 0 - - - True - - - - - - 1 - 2 - - - - - True - 0 - Type: - - - - - - - - - True - False - False - - - True - 4 - 2 - 6 - 6 - - - True - 1 - 0 - - - True - - - - - 1 - 2 - - - - - - True - 0 - User Certificate: - - - - - - - - True - 0 - CA Certificate: - - - 1 - 2 - - - - - - True - 1 - 0 - - - True - - - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Private Key: - - - 2 - 3 - - - - - - True - 1 - 0.019999999552965164 - - - True - - - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - Private Key Password: - - - 3 - 4 - - - - - - True - 1 - 0 - - - True - True - False - - - - - 1 - 2 - 3 - 4 - - - - - - - - True - page 1 - - - tab - False - - - - - True - 3 - 2 - 6 - 6 - - - True - 1 - 0 - - - True - True - - - - - 1 - 2 - - - - - - True - 0 - User name: - - - - - - - - True - 0 - CA Certificate: - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - Password: - - - 1 - 2 - GTK_FILL - - - - - - True - 1 - 0 - - - True - - - - - 1 - 2 - 2 - 3 - - - - - - True - 1 - 0 - - - True - True - False - - - - - 1 - 2 - 1 - 2 - - - - - - 1 - - - - - True - page 2 - - - tab - 1 - False - - - - - True - 6 - 2 - 6 - 6 - - - True - 1 - 0 - - - True - True - - - - - 1 - 2 - - - - - - True - 0 - User name: - - - - - - - - True - 0 - CA Certificate: - - - 3 - 4 - - - - - - True - 0 - User Certificate: - - - 2 - 3 - - - - - - True - 1 - 0 - - - True - - - - - 1 - 2 - 3 - 4 - - - - - - True - 1 - 0 - - - True - - - - - 1 - 2 - 2 - 3 - - - - - - True - 1 - 0 - - - True - True - False - - - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Password: - - - 1 - 2 - - - - - - True - 0 - Private Key: - - - 4 - 5 - - - - - - True - 1 - 0 - - - True - - - - - 1 - 2 - 4 - 5 - - - - - - True - 0 - Private Key Password: - - - 5 - 6 - - - - - - True - 1 - 0 - - - True - True - False - - - - - 1 - 2 - 5 - 6 - - - - - - 2 - - - - - True - page 3 - - - tab - 2 - False - - - - - True - 4 - 2 - 6 - 6 - - - - - - True - 1 - 0 - - - True - 0 - <i>If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator.</i> - True - True - - - - - 1 - 2 - 2 - 3 - - - - - - True - 1 - 0 - - - True - - - - - - 1 - 2 - 1 - 2 - - - - - - True - 1 - 0 - - - True - - - - - 1 - 2 - - - - - - True - 0 - Static Key: - - - - - - - - True - 0 - Key Direction: - - - 1 - 2 - - - - - - True - Local IP Address: - - - 3 - 4 - - - - - True - 1 - 0 - - - True - True - - - - - 1 - 2 - 3 - 4 - - - - - - 3 - - - - - True - page 4 - - - tab - 3 - False - - - - - 2 - 1 - 2 - - - - - True - True - Show passwords - True - 0 - True - - - 2 - 2 - 3 - GTK_FILL - - - - - - - - 1 - - - - - False - False - 1 - - - - - True - 1 - 0 - - - True - True - 0 - - - True - 6 - - - True - gtk-preferences - - - False - False - - - - - True - Ad_vanced... - True - True - - - False - False - 1 - - - - - - - - - False - False - GTK_PACK_END - 2 - - - - - - - 5 - OpenVPN Advanced Options - GTK_WIN_POS_CENTER_ON_PARENT - True - stock-preferences - GDK_WINDOW_TYPE_HINT_DIALOG - True - False - - - True - 2 - - - True - True - - - True - 12 - 6 - - - True - 6 - - - True - True - Use custom gateway p_ort: - True - 0 - True - - - False - - - - - True - True - 1194 1 65535 1 10 10 - 1 - True - - - False - False - 1 - - - - - False - - - - - True - True - Use L_ZO data compression - True - 0 - True - - - False - 1 - - - - - True - True - Use a _TCP connection - True - 0 - True - - - False - 2 - - - - - True - True - Use a TA_P device - True - 0 - True - - - False - 3 - - - - - - - True - General - - - tab - False - - - - - True - 12 - 3 - 2 - 12 - 6 - - - - - - True - 3 - 2 - 12 - 6 - - - - - - True - 0 - Key File: - - - - - True - - - - 1 - 2 - 1 - 2 - - - - - True - - - 1 - 2 - - - - - True - 1 - 0 - - - True - 0 - <i>If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator.</i> - True - True - - - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - Key Direction: - - - 1 - 2 - - - - - 1 - 2 - 2 - 3 - - - - - True - True - Use additional TLS authentication - True - 0 - True - - - 2 - 1 - 2 - - - - - True - 0 - Cipher: - - - - - - - - True - - - - 1 - 2 - - - - - - 1 - - - - - True - Certificates (TLS) - - - tab - 1 - False - - - - - False - False - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - gtk-cancel - True - -6 - - - - - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff --git a/vpn-daemons/openvpn/properties/nm-openvpn.c b/vpn-daemons/openvpn/properties/nm-openvpn.c deleted file mode 100644 index d58f76ebec..0000000000 --- a/vpn-daemons/openvpn/properties/nm-openvpn.c +++ /dev/null @@ -1,766 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * CVSID: $Id$ - * - * nm-openvpn.c : GNOME UI dialogs for configuring openvpn VPN connections - * - * Copyright (C) 2005 Tim Niemueller - * Copyright (C) 2008 Dan Williams, - * Based on work by David Zeuthen, - * - * 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. - * - **************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#define NM_VPN_API_SUBJECT_TO_CHANGE - -#include -#include -#include -#include - -#include "common-gnome/keyring-helpers.h" -#include "src/nm-openvpn-service.h" -#include "nm-openvpn.h" -#include "auth-helpers.h" -#include "import-export.h" - -#define OPENVPN_PLUGIN_NAME _("OpenVPN") -#define OPENVPN_PLUGIN_DESC _("Compatible with the OpenVPN server.") -#define OPENVPN_PLUGIN_SERVICE NM_DBUS_SERVICE_OPENVPN - - -/************** plugin class **************/ - -static void openvpn_plugin_ui_interface_init (NMVpnPluginUiInterface *iface_class); - -G_DEFINE_TYPE_EXTENDED (OpenvpnPluginUi, openvpn_plugin_ui, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_INTERFACE, - openvpn_plugin_ui_interface_init)) - -/************** UI widget class **************/ - -static void openvpn_plugin_ui_widget_interface_init (NMVpnPluginUiWidgetInterface *iface_class); - -G_DEFINE_TYPE_EXTENDED (OpenvpnPluginUiWidget, openvpn_plugin_ui_widget, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, - openvpn_plugin_ui_widget_interface_init)) - -#define OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OPENVPN_TYPE_PLUGIN_UI_WIDGET, OpenvpnPluginUiWidgetPrivate)) - -typedef struct { - GladeXML *xml; - GtkWidget *widget; - GtkSizeGroup *group; - GtkWindowGroup *window_group; - gboolean window_added; - GHashTable *advanced; -} OpenvpnPluginUiWidgetPrivate; - - -#define COL_AUTH_NAME 0 -#define COL_AUTH_PAGE 1 -#define COL_AUTH_TYPE 2 - -GQuark -openvpn_plugin_ui_error_quark (void) -{ - static GQuark error_quark = 0; - - if (G_UNLIKELY (error_quark == 0)) - error_quark = g_quark_from_static_string ("openvpn-plugin-ui-error-quark"); - - return error_quark; -} - -/* This should really be standard. */ -#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } - -GType -openvpn_plugin_ui_error_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = { - /* Unknown error. */ - ENUM_ENTRY (OPENVPN_PLUGIN_UI_ERROR_UNKNOWN, "UnknownError"), - /* The connection was missing invalid. */ - ENUM_ENTRY (OPENVPN_PLUGIN_UI_ERROR_INVALID_CONNECTION, "InvalidConnection"), - /* The specified property was invalid. */ - ENUM_ENTRY (OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, "InvalidProperty"), - /* The specified property was missing and is required. */ - ENUM_ENTRY (OPENVPN_PLUGIN_UI_ERROR_MISSING_PROPERTY, "MissingProperty"), - /* The file to import could not be read. */ - ENUM_ENTRY (OPENVPN_PLUGIN_UI_ERROR_FILE_NOT_READABLE, "FileNotReadable"), - /* The file to import could was not an OpenVPN client file. */ - ENUM_ENTRY (OPENVPN_PLUGIN_UI_ERROR_FILE_NOT_OPENVPN, "FileNotOpenVPN"), - { 0, 0, 0 } - }; - etype = g_enum_register_static ("OpenvpnPluginUiError", values); - } - return etype; -} - -static gboolean -check_validity (OpenvpnPluginUiWidget *self, GError **error) -{ - OpenvpnPluginUiWidgetPrivate *priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GtkWidget *widget; - const char *str; - GtkTreeModel *model; - GtkTreeIter iter; - const char *contype = NULL; - - widget = glade_xml_get_widget (priv->xml, "gateway_entry"); - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (!str || !strlen (str)) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_OPENVPN_KEY_REMOTE); - return FALSE; - } - - widget = glade_xml_get_widget (priv->xml, "auth_combo"); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); - g_assert (model); - g_assert (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)); - - gtk_tree_model_get (model, &iter, COL_AUTH_TYPE, &contype, -1); - if (!auth_widget_check_validity (priv->xml, contype, error)) - return FALSE; - - return TRUE; -} - -static void -stuff_changed_cb (GtkWidget *widget, gpointer user_data) -{ - g_signal_emit_by_name (OPENVPN_PLUGIN_UI_WIDGET (user_data), "changed"); -} - -static void -auth_combo_changed_cb (GtkWidget *combo, gpointer user_data) -{ - OpenvpnPluginUiWidget *self = OPENVPN_PLUGIN_UI_WIDGET (user_data); - OpenvpnPluginUiWidgetPrivate *priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GtkWidget *auth_notebook; - GtkWidget *show_passwords; - GtkTreeModel *model; - GtkTreeIter iter; - gint new_page = 0; - - auth_notebook = glade_xml_get_widget (priv->xml, "auth_notebook"); - g_assert (auth_notebook); - show_passwords = glade_xml_get_widget (priv->xml, "show_passwords"); - g_assert (auth_notebook); - - model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); - g_assert (model); - g_assert (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)); - - gtk_tree_model_get (model, &iter, COL_AUTH_PAGE, &new_page, -1); - - /* Static key page doesn't have any passwords */ - gtk_widget_set_sensitive (show_passwords, new_page != 3); - - gtk_notebook_set_current_page (GTK_NOTEBOOK (auth_notebook), new_page); - - stuff_changed_cb (combo, self); -} - -static void -advanced_dialog_close_cb (GtkWidget *dialog, gpointer user_data) -{ - gtk_widget_hide (dialog); - /* gtk_widget_destroy() will remove the window from the window group */ - gtk_widget_destroy (dialog); -} - -static void -advanced_dialog_response_cb (GtkWidget *dialog, gint response, gpointer user_data) -{ - OpenvpnPluginUiWidget *self = OPENVPN_PLUGIN_UI_WIDGET (user_data); - OpenvpnPluginUiWidgetPrivate *priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GError *error = NULL; - - if (response != GTK_RESPONSE_OK) { - advanced_dialog_close_cb (dialog, self); - return; - } - - if (priv->advanced) - g_hash_table_destroy (priv->advanced); - priv->advanced = advanced_dialog_new_hash_from_dialog (dialog, &error); - if (!priv->advanced) { - g_message ("%s: error reading advanced settings: %s", __func__, error->message); - g_error_free (error); - } - advanced_dialog_close_cb (dialog, self); - - stuff_changed_cb (NULL, self); -} - -static void -advanced_button_clicked_cb (GtkWidget *button, gpointer user_data) -{ - OpenvpnPluginUiWidget *self = OPENVPN_PLUGIN_UI_WIDGET (user_data); - OpenvpnPluginUiWidgetPrivate *priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GtkWidget *dialog, *toplevel, *widget; - GtkTreeModel *model; - GtkTreeIter iter; - const char *contype = NULL; - - toplevel = gtk_widget_get_toplevel (priv->widget); - g_return_if_fail (GTK_WIDGET_TOPLEVEL (toplevel)); - - widget = glade_xml_get_widget (priv->xml, "auth_combo"); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)) - gtk_tree_model_get (model, &iter, COL_AUTH_TYPE, &contype, -1); - - dialog = advanced_dialog_new (priv->advanced, contype); - if (!dialog) { - g_warning ("%s: failed to create the Advanced dialog!", __func__); - return; - } - - gtk_window_group_add_window (priv->window_group, GTK_WINDOW (dialog)); - if (!priv->window_added) { - gtk_window_group_add_window (priv->window_group, GTK_WINDOW (toplevel)); - priv->window_added = TRUE; - } - - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel)); - g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (advanced_dialog_response_cb), self); - g_signal_connect (G_OBJECT (dialog), "close", G_CALLBACK (advanced_dialog_close_cb), self); - - gtk_widget_show_all (dialog); -} - -static gboolean -init_plugin_ui (OpenvpnPluginUiWidget *self, NMConnection *connection, GError **error) -{ - OpenvpnPluginUiWidgetPrivate *priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - NMSettingVPN *s_vpn; - GtkWidget *widget; - GtkListStore *store; - GtkTreeIter iter; - int active = -1; - const char *value; - const char *contype = NM_OPENVPN_CONTYPE_TLS; - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - - priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - - widget = glade_xml_get_widget (priv->xml, "gateway_entry"); - if (!widget) - return FALSE; - gtk_size_group_add_widget (priv->group, widget); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE); - if (value) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - widget = glade_xml_get_widget (priv->xml, "auth_combo"); - if (!widget) - return FALSE; - gtk_size_group_add_widget (priv->group, widget); - - store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING); - - if (s_vpn) { - contype = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CONNECTION_TYPE); - if (contype) { - if ( strcmp (contype, NM_OPENVPN_CONTYPE_TLS) - && strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY) - && strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD) - && strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) - contype = NM_OPENVPN_CONTYPE_TLS; - } else - contype = NM_OPENVPN_CONTYPE_TLS; - } - - /* TLS auth widget */ - tls_pw_init_auth_widget (priv->xml, priv->group, s_vpn, - NM_OPENVPN_CONTYPE_TLS, "tls", - stuff_changed_cb, self); - fill_vpn_passwords (priv->xml, priv->group, connection, - NM_OPENVPN_CONTYPE_TLS, stuff_changed_cb, self); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - COL_AUTH_NAME, _("Certificates (TLS)"), - COL_AUTH_PAGE, 0, - COL_AUTH_TYPE, NM_OPENVPN_CONTYPE_TLS, - -1); - - /* Password auth widget */ - tls_pw_init_auth_widget (priv->xml, priv->group, s_vpn, - NM_OPENVPN_CONTYPE_PASSWORD, "pw", - stuff_changed_cb, self); - fill_vpn_passwords (priv->xml, priv->group, connection, - NM_OPENVPN_CONTYPE_PASSWORD, stuff_changed_cb, self); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - COL_AUTH_NAME, _("Password"), - COL_AUTH_PAGE, 1, - COL_AUTH_TYPE, NM_OPENVPN_CONTYPE_PASSWORD, - -1); - if ((active < 0) && !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) - active = 1; - - /* Password+TLS auth widget */ - tls_pw_init_auth_widget (priv->xml, priv->group, s_vpn, - NM_OPENVPN_CONTYPE_PASSWORD_TLS, "pw_tls", - stuff_changed_cb, self); - fill_vpn_passwords (priv->xml, priv->group, connection, - NM_OPENVPN_CONTYPE_PASSWORD_TLS, stuff_changed_cb, self); - - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - COL_AUTH_NAME, _("Password with Certificates (TLS)"), - COL_AUTH_PAGE, 2, - COL_AUTH_TYPE, NM_OPENVPN_CONTYPE_PASSWORD_TLS, - -1); - if ((active < 0) && !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) - active = 2; - - /* Static key auth widget */ - sk_init_auth_widget (priv->xml, priv->group, s_vpn, stuff_changed_cb, self); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - COL_AUTH_NAME, _("Static Key"), - COL_AUTH_PAGE, 3, - COL_AUTH_TYPE, NM_OPENVPN_CONTYPE_STATIC_KEY, - -1); - if ((active < 0) && !strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY)) - active = 3; - - gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); - g_object_unref (store); - g_signal_connect (widget, "changed", G_CALLBACK (auth_combo_changed_cb), self); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 0 : active); - - widget = glade_xml_get_widget (priv->xml, "advanced_button"); - g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (advanced_button_clicked_cb), self); - - return TRUE; -} - -static GObject * -get_widget (NMVpnPluginUiWidgetInterface *iface) -{ - OpenvpnPluginUiWidget *self = OPENVPN_PLUGIN_UI_WIDGET (iface); - OpenvpnPluginUiWidgetPrivate *priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - - return G_OBJECT (priv->widget); -} - -static void -hash_copy_advanced (gpointer key, gpointer data, gpointer user_data) -{ - NMSettingVPN *s_vpn = NM_SETTING_VPN (user_data); - const char *value = (const char *) data; - - nm_setting_vpn_add_data_item (s_vpn, (const char *) key, value); -} - -static const char * -get_auth_type (GladeXML *glade_xml) -{ - GtkComboBox *combo; - GtkTreeModel *model; - GtkTreeIter iter; - const char *auth_type = NULL; - - combo = GTK_COMBO_BOX (glade_xml_get_widget (glade_xml, "auth_combo")); - model = gtk_combo_box_get_model (combo); - if (gtk_combo_box_get_active_iter (combo, &iter)) - gtk_tree_model_get (model, &iter, COL_AUTH_TYPE, &auth_type, -1); - - return auth_type; -} - -static gboolean -update_connection (NMVpnPluginUiWidgetInterface *iface, - NMConnection *connection, - GError **error) -{ - OpenvpnPluginUiWidget *self = OPENVPN_PLUGIN_UI_WIDGET (iface); - OpenvpnPluginUiWidgetPrivate *priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - NMSettingVPN *s_vpn; - GtkWidget *widget; - char *str; - const char *auth_type; - gboolean valid = FALSE; - - if (!check_validity (self, error)) - return FALSE; - - s_vpn = NM_SETTING_VPN (nm_setting_vpn_new ()); - g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_OPENVPN, NULL); - - /* Gateway */ - widget = glade_xml_get_widget (priv->xml, "gateway_entry"); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE, str); - - auth_type = get_auth_type (priv->xml); - if (auth_type) { - nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_CONNECTION_TYPE, auth_type); - auth_widget_update_connection (priv->xml, auth_type, s_vpn); - } - - if (priv->advanced) - g_hash_table_foreach (priv->advanced, hash_copy_advanced, s_vpn); - - nm_connection_add_setting (connection, NM_SETTING (s_vpn)); - valid = TRUE; - - return valid; -} - -static gboolean -save_secrets (NMVpnPluginUiWidgetInterface *iface, - NMConnection *connection, - GError **error) -{ - OpenvpnPluginUiWidgetPrivate *priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (iface); - NMSettingConnection *s_con; - const char *auth_type, *uuid, *id; - gboolean ret = FALSE; - - s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); - if (!s_con) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_CONNECTION, - "%s", "missing 'connection' setting"); - return FALSE; - } - - id = nm_setting_connection_get_id (s_con); - uuid = nm_setting_connection_get_uuid (s_con); - - auth_type = get_auth_type (priv->xml); - if (auth_type) - ret = auth_widget_save_secrets (priv->xml, auth_type, uuid, id); - - if (!ret) - g_set_error (error, OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_UNKNOWN, - "%s", "Saving secrets to gnome keyring failed."); - return ret; -} - -static NMVpnPluginUiWidgetInterface * -nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error) -{ - NMVpnPluginUiWidgetInterface *object; - OpenvpnPluginUiWidgetPrivate *priv; - char *glade_file; - - if (error) - g_return_val_if_fail (*error == NULL, NULL); - - object = NM_VPN_PLUGIN_UI_WIDGET_INTERFACE (g_object_new (OPENVPN_TYPE_PLUGIN_UI_WIDGET, NULL)); - if (!object) { - g_set_error (error, OPENVPN_PLUGIN_UI_ERROR, 0, "could not create openvpn object"); - return NULL; - } - - priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (object); - - glade_file = g_strdup_printf ("%s/%s", GLADEDIR, "nm-openvpn-dialog.glade"); - priv->xml = glade_xml_new (glade_file, "openvpn-vbox", GETTEXT_PACKAGE); - if (priv->xml == NULL) { - g_set_error (error, OPENVPN_PLUGIN_UI_ERROR, 0, - "could not load required resources at %s", glade_file); - g_free (glade_file); - g_object_unref (object); - return NULL; - } - g_free (glade_file); - - priv->widget = glade_xml_get_widget (priv->xml, "openvpn-vbox"); - if (!priv->widget) { - g_set_error (error, OPENVPN_PLUGIN_UI_ERROR, 0, "could not load UI widget"); - g_object_unref (object); - return NULL; - } - g_object_ref_sink (priv->widget); - - priv->window_group = gtk_window_group_new (); - - if (!init_plugin_ui (OPENVPN_PLUGIN_UI_WIDGET (object), connection, error)) { - g_object_unref (object); - return NULL; - } - - priv->advanced = advanced_dialog_new_hash_from_connection (connection, error); - if (!priv->advanced) { - g_object_unref (object); - return NULL; - } - - return object; -} - -static void -dispose (GObject *object) -{ - OpenvpnPluginUiWidget *plugin = OPENVPN_PLUGIN_UI_WIDGET (object); - OpenvpnPluginUiWidgetPrivate *priv = OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE (plugin); - - if (priv->group) - g_object_unref (priv->group); - - if (priv->window_group) - g_object_unref (priv->window_group); - - if (priv->widget) - g_object_unref (priv->widget); - - if (priv->xml) - g_object_unref (priv->xml); - - if (priv->advanced) - g_hash_table_destroy (priv->advanced); - - G_OBJECT_CLASS (openvpn_plugin_ui_widget_parent_class)->dispose (object); -} - -static void -openvpn_plugin_ui_widget_class_init (OpenvpnPluginUiWidgetClass *req_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (req_class); - - g_type_class_add_private (req_class, sizeof (OpenvpnPluginUiWidgetPrivate)); - - object_class->dispose = dispose; -} - -static void -openvpn_plugin_ui_widget_init (OpenvpnPluginUiWidget *plugin) -{ -} - -static void -openvpn_plugin_ui_widget_interface_init (NMVpnPluginUiWidgetInterface *iface_class) -{ - /* interface implementation */ - iface_class->get_widget = get_widget; - iface_class->update_connection = update_connection; - iface_class->save_secrets = save_secrets; -} - -static NMConnection * -import (NMVpnPluginUiInterface *iface, const char *path, GError **error) -{ - NMConnection *connection = NULL; - char *contents = NULL; - char **lines = NULL; - char *ext; - - ext = strrchr (path, '.'); - if (!ext) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_FILE_NOT_OPENVPN, - "unknown OpenVPN file extension"); - goto out; - } - - if (strcmp (ext, ".ovpn") && strcmp (ext, ".conf") && strcmp (ext, ".cnf")) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_FILE_NOT_OPENVPN, - "unknown OpenVPN file extension"); - goto out; - } - - if (!g_file_get_contents (path, &contents, NULL, error)) - return NULL; - - lines = g_strsplit_set (contents, "\r\n", 0); - if (g_strv_length (lines) <= 1) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_FILE_NOT_READABLE, - "not a valid OpenVPN configuration file"); - goto out; - } - - connection = do_import (path, lines, error); - -out: - if (lines) - g_strfreev (lines); - g_free (contents); - return connection; -} - -static gboolean -export (NMVpnPluginUiInterface *iface, - const char *path, - NMConnection *connection, - GError **error) -{ - return do_export (path, connection, error); -} - -static char * -get_suggested_name (NMVpnPluginUiInterface *iface, NMConnection *connection) -{ - NMSettingConnection *s_con; - const char *id; - - g_return_val_if_fail (connection != NULL, NULL); - - s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); - g_return_val_if_fail (s_con != NULL, NULL); - - id = nm_setting_connection_get_id (s_con); - g_return_val_if_fail (id != NULL, NULL); - - return g_strdup_printf ("%s (openvpn).conf", id); -} - -static guint32 -get_capabilities (NMVpnPluginUiInterface *iface) -{ - return (NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT | NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT); -} - -static gboolean -delete_connection (NMVpnPluginUiInterface *iface, - NMConnection *connection, - GError **error) -{ - NMSettingConnection *s_con; - const char *uuid; - - /* Remove any secrets in the keyring associated with this connection's UUID */ - s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); - if (!s_con) { - g_set_error (error, - OPENVPN_PLUGIN_UI_ERROR, - OPENVPN_PLUGIN_UI_ERROR_INVALID_CONNECTION, - "missing 'connection' setting"); - return FALSE; - } - - uuid = nm_setting_connection_get_uuid (s_con); - keyring_helpers_delete_secret (uuid, NM_OPENVPN_KEY_PASSWORD); - keyring_helpers_delete_secret (uuid, NM_OPENVPN_KEY_CERTPASS); - - return TRUE; -} - -static NMVpnPluginUiWidgetInterface * -ui_factory (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error) -{ - return nm_vpn_plugin_ui_widget_interface_new (connection, error); -} - -static void -get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) -{ - switch (prop_id) { - case NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: - g_value_set_string (value, OPENVPN_PLUGIN_NAME); - break; - case NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: - g_value_set_string (value, OPENVPN_PLUGIN_DESC); - break; - case NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: - g_value_set_string (value, OPENVPN_PLUGIN_SERVICE); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -openvpn_plugin_ui_class_init (OpenvpnPluginUiClass *req_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (req_class); - - object_class->get_property = get_property; - - g_object_class_override_property (object_class, - NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME, - NM_VPN_PLUGIN_UI_INTERFACE_NAME); - - g_object_class_override_property (object_class, - NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC, - NM_VPN_PLUGIN_UI_INTERFACE_DESC); - - g_object_class_override_property (object_class, - NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE, - NM_VPN_PLUGIN_UI_INTERFACE_SERVICE); -} - -static void -openvpn_plugin_ui_init (OpenvpnPluginUi *plugin) -{ -} - -static void -openvpn_plugin_ui_interface_init (NMVpnPluginUiInterface *iface_class) -{ - /* interface implementation */ - iface_class->ui_factory = ui_factory; - iface_class->get_capabilities = get_capabilities; - iface_class->import = import; - iface_class->export = export; - iface_class->get_suggested_name = get_suggested_name; - iface_class->delete_connection = delete_connection; -} - - -G_MODULE_EXPORT NMVpnPluginUiInterface * -nm_vpn_plugin_ui_factory (GError **error) -{ - if (error) - g_return_val_if_fail (*error == NULL, NULL); - - return NM_VPN_PLUGIN_UI_INTERFACE (g_object_new (OPENVPN_TYPE_PLUGIN_UI, NULL)); -} - diff --git a/vpn-daemons/openvpn/properties/nm-openvpn.h b/vpn-daemons/openvpn/properties/nm-openvpn.h deleted file mode 100644 index 70a5b72218..0000000000 --- a/vpn-daemons/openvpn/properties/nm-openvpn.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * nm-openvpn.h : GNOME UI dialogs for configuring openvpn VPN connections - * - * Copyright (C) 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifndef _NM_OPENVPN_H_ -#define _NM_OPENVPN_H_ - -#include - -typedef enum -{ - OPENVPN_PLUGIN_UI_ERROR_UNKNOWN = 0, - OPENVPN_PLUGIN_UI_ERROR_INVALID_CONNECTION, - OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - OPENVPN_PLUGIN_UI_ERROR_MISSING_PROPERTY, - OPENVPN_PLUGIN_UI_ERROR_FILE_NOT_READABLE, - OPENVPN_PLUGIN_UI_ERROR_FILE_NOT_OPENVPN -} OpenvpnPluginUiError; - -#define OPENVPN_TYPE_PLUGIN_UI_ERROR (openvpn_plugin_ui_error_get_type ()) -GType openvpn_plugin_ui_error_get_type (void); - -#define OPENVPN_PLUGIN_UI_ERROR (openvpn_plugin_ui_error_quark ()) -GQuark openvpn_plugin_ui_error_quark (void); - - -#define OPENVPN_TYPE_PLUGIN_UI (openvpn_plugin_ui_get_type ()) -#define OPENVPN_PLUGIN_UI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), OPENVPN_TYPE_PLUGIN_UI, OpenvpnPluginUi)) -#define OPENVPN_PLUGIN_UI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), OPENVPN_TYPE_PLUGIN_UI, OpenvpnPluginUiClass)) -#define OPENVPN_IS_PLUGIN_UI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OPENVPN_TYPE_PLUGIN_UI)) -#define OPENVPN_IS_PLUGIN_UI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), OPENVPN_TYPE_PLUGIN_UI)) -#define OPENVPN_PLUGIN_UI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), OPENVPN_TYPE_PLUGIN_UI, OpenvpnPluginUiClass)) - -typedef struct _OpenvpnPluginUi OpenvpnPluginUi; -typedef struct _OpenvpnPluginUiClass OpenvpnPluginUiClass; - -struct _OpenvpnPluginUi { - GObject parent; -}; - -struct _OpenvpnPluginUiClass { - GObjectClass parent; -}; - -GType openvpn_plugin_ui_get_type (void); - - -#define OPENVPN_TYPE_PLUGIN_UI_WIDGET (openvpn_plugin_ui_widget_get_type ()) -#define OPENVPN_PLUGIN_UI_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), OPENVPN_TYPE_PLUGIN_UI_WIDGET, OpenvpnPluginUiWidget)) -#define OPENVPN_PLUGIN_UI_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), OPENVPN_TYPE_PLUGIN_UI_WIDGET, OpenvpnPluginUiWidgetClass)) -#define OPENVPN_IS_PLUGIN_UI_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OPENVPN_TYPE_PLUGIN_UI_WIDGET)) -#define OPENVPN_IS_PLUGIN_UI_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), OPENVPN_TYPE_PLUGIN_UI_WIDGET)) -#define OPENVPN_PLUGIN_UI_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), OPENVPN_TYPE_PLUGIN_UI_WIDGET, OpenvpnPluginUiWidgetClass)) - -typedef struct _OpenvpnPluginUiWidget OpenvpnPluginUiWidget; -typedef struct _OpenvpnPluginUiWidgetClass OpenvpnPluginUiWidgetClass; - -struct _OpenvpnPluginUiWidget { - GObject parent; -}; - -struct _OpenvpnPluginUiWidgetClass { - GObjectClass parent; -}; - -GType openvpn_plugin_ui_widget_get_type (void); - -#endif /* _NM_OPENVPN_H_ */ - diff --git a/vpn-daemons/openvpn/src/.cvsignore b/vpn-daemons/openvpn/src/.cvsignore deleted file mode 100644 index ecd7517520..0000000000 --- a/vpn-daemons/openvpn/src/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile.in -Makefile -nm-openvpn-service -nm-openvpn-service-openvpn-helper diff --git a/vpn-daemons/openvpn/src/Makefile.am b/vpn-daemons/openvpn/src/Makefile.am deleted file mode 100644 index 4a95da052c..0000000000 --- a/vpn-daemons/openvpn/src/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -AM_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(NETWORK_MANAGER_CFLAGS) \ - -DDBUS_API_SUBJECT_TO_CHANGE \ - -DG_DISABLE_DEPRECATED \ - -DBINDIR=\"$(bindir)\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DVERSION="\"$(VERSION)\"" \ - -DLIBDIR=\""$(libdir)"\" \ - -DLIBEXECDIR=\""$(libexecdir)"\" \ - -DLOCALSTATEDIR=\""$(localstatedir)"\" \ - -DDATADIR=\"$(datadir)\" - -libexec_PROGRAMS = nm-openvpn-service nm-openvpn-service-openvpn-helper - -nm_openvpn_service_SOURCES = \ - nm-openvpn-service.c \ - nm-openvpn-service.h - - -nm_openvpn_service_LDADD = $(NETWORK_MANAGER_LIBS) -lnm_glib_vpn - - -nm_openvpn_service_openvpn_helper_SOURCES = \ - nm-openvpn-service-openvpn-helper.c - -nm_openvpn_service_openvpn_helper_LDADD = \ - $(DBUS_LIBS) \ - $(NETWORK_MANAGER_LIBS) - -CLEANFILES = *~ diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c b/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c deleted file mode 100644 index cba4514c16..0000000000 --- a/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c +++ /dev/null @@ -1,398 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* nm-openvpn-service-openvpn-helper - helper called after OpenVPN established - * a connection, uses DBUS to send information back to nm-openvpn-service - * - * Tim Niemueller [www.niemueller.de] - * Based on work by Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2005 Red Hat, Inc. - * (C) Copyright 2005 Tim Niemueller - * - * $Id$ - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "nm-openvpn-service.h" -#include "nm-utils.h" - -/* These are here because nm-dbus-glib-types.h isn't exported */ -#define DBUS_TYPE_G_ARRAY_OF_UINT (dbus_g_type_get_collection ("GArray", G_TYPE_UINT)) -#define DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_ARRAY_OF_UINT)) - -static void -helper_failed (DBusGConnection *connection, const char *reason) -{ - DBusGProxy *proxy; - GError *err = NULL; - - nm_warning ("nm-openvpn-service-openvpn-helper did not receive a valid %s from openvpn", reason); - - proxy = dbus_g_proxy_new_for_name (connection, - NM_DBUS_SERVICE_OPENVPN, - NM_VPN_DBUS_PLUGIN_PATH, - NM_VPN_DBUS_PLUGIN_INTERFACE); - - dbus_g_proxy_call (proxy, "SetFailure", &err, - G_TYPE_STRING, reason, - G_TYPE_INVALID, - G_TYPE_INVALID); - - if (err) { - nm_warning ("Could not send failure information: %s", err->message); - g_error_free (err); - } - - g_object_unref (proxy); - - exit (1); -} - -static void -send_ip4_config (DBusGConnection *connection, GHashTable *config) -{ - DBusGProxy *proxy; - GError *err = NULL; - - proxy = dbus_g_proxy_new_for_name (connection, - NM_DBUS_SERVICE_OPENVPN, - NM_VPN_DBUS_PLUGIN_PATH, - NM_VPN_DBUS_PLUGIN_INTERFACE); - - dbus_g_proxy_call (proxy, "SetIp4Config", &err, - dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), - config, - G_TYPE_INVALID, - G_TYPE_INVALID); - - if (err) { - nm_warning ("Could not send failure information: %s", err->message); - g_error_free (err); - } - - g_object_unref (proxy); -} - -static GValue * -str_to_gvalue (const char *str, gboolean try_convert) -{ - GValue *val; - - /* Empty */ - if (!str || strlen (str) < 1) - return NULL; - - if (!g_utf8_validate (str, -1, NULL)) { - if (try_convert && !(str = g_convert (str, -1, "ISO-8859-1", "UTF-8", NULL, NULL, NULL))) - str = g_convert (str, -1, "C", "UTF-8", NULL, NULL, NULL); - - if (!str) - /* Invalid */ - return NULL; - } - - val = g_slice_new0 (GValue); - g_value_init (val, G_TYPE_STRING); - g_value_set_string (val, str); - - return val; -} - -static GValue * -uint_to_gvalue (guint32 num) -{ - GValue *val; - - if (num == 0) - return NULL; - - val = g_slice_new0 (GValue); - g_value_init (val, G_TYPE_UINT); - g_value_set_uint (val, num); - - return val; -} - -static GValue * -addr_to_gvalue (const char *str) -{ - struct in_addr temp_addr; - GValue *val; - - /* Empty */ - if (!str || strlen (str) < 1) - return NULL; - - if (inet_pton (AF_INET, str, &temp_addr) <= 0) - return NULL; - - val = g_slice_new0 (GValue); - g_value_init (val, G_TYPE_UINT); - g_value_set_uint (val, temp_addr.s_addr); - - return val; -} - -static GValue * -parse_addr_list (GValue *value_array, const char *str) -{ - char **split; - int i; - struct in_addr temp_addr; - GArray *array; - - /* Empty */ - if (!str || strlen (str) < 1) - return value_array; - - if (value_array) - array = (GArray *) g_value_get_boxed (value_array); - else - array = g_array_new (FALSE, FALSE, sizeof (guint)); - - split = g_strsplit (str, " ", -1); - for (i = 0; split[i]; i++) { - if (inet_pton (AF_INET, split[i], &temp_addr) > 0) - g_array_append_val (array, temp_addr.s_addr); - } - - g_strfreev (split); - - if (!value_array && array->len > 0) { - value_array = g_slice_new0 (GValue); - g_value_init (value_array, DBUS_TYPE_G_UINT_ARRAY); - g_value_set_boxed (value_array, array); - } - - return value_array; -} - -static GValue * -get_routes (void) -{ - GValue *value = NULL; - GPtrArray *routes; - char *tmp; - int i; - -#define BUFLEN 256 - - routes = g_ptr_array_new (); - - for (i = 1; i < 256; i++) { - GArray *array; - char buf[BUFLEN]; - struct in_addr network; - struct in_addr netmask; - struct in_addr gateway = { 0, }; - guint32 prefix, metric = 0; - - snprintf (buf, BUFLEN, "route_network_%d", i); - tmp = getenv (buf); - if (!tmp || strlen (tmp) < 1) - break; - - if (inet_pton (AF_INET, tmp, &network) <= 0) { - nm_warning ("Ignoring invalid static route address '%s'", tmp ? tmp : "NULL"); - continue; - } - - snprintf (buf, BUFLEN, "route_netmask_%d", i); - tmp = getenv (buf); - if (!tmp || inet_pton (AF_INET, tmp, &netmask) <= 0) { - nm_warning ("Ignoring invalid static route netmask '%s'", tmp ? tmp : "NULL"); - continue; - } - - snprintf (buf, BUFLEN, "route_gateway_%d", i); - tmp = getenv (buf); - /* gateway can be missing */ - if (tmp && (inet_pton (AF_INET, tmp, &gateway) <= 0)) { - nm_warning ("Ignoring invalid static route gateway '%s'", tmp ? tmp : "NULL"); - continue; - } - - snprintf (buf, BUFLEN, "route_metric_%d", i); - tmp = getenv (buf); - /* metric can be missing */ - if (tmp && strlen (tmp)) { - long int tmp_metric; - - errno = 0; - tmp_metric = strtol (tmp, NULL, 10); - if (errno || tmp_metric < 0 || tmp_metric > G_MAXUINT32) { - nm_warning ("Ignoring invalid static route metric '%s'", tmp); - continue; - } - metric = (guint32) tmp_metric; - } - - array = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 4); - g_array_append_val (array, network.s_addr); - prefix = nm_utils_ip4_netmask_to_prefix (netmask.s_addr); - g_array_append_val (array, prefix); - g_array_append_val (array, gateway.s_addr); - g_array_append_val (array, metric); - g_ptr_array_add (routes, array); - } - - if (routes->len > 0) { - value = g_new0 (GValue, 1); - g_value_init (value, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT); - g_value_take_boxed (value, routes); - } else - g_ptr_array_free (routes, TRUE); - - return value; -} - -int -main (int argc, char *argv[]) -{ - DBusGConnection *connection; - GHashTable *config; - char *tmp; - GValue *val; - int i; - GError *err = NULL; - GValue *dns_list = NULL; - GValue *nbns_list = NULL; - GValue *dns_domain = NULL; - struct in_addr temp_addr; - - g_type_init (); - - connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err); - if (!connection) { - nm_warning ("Could not get the system bus: %s", err->message); - exit (1); - } - - config = g_hash_table_new (g_str_hash, g_str_equal); - - /* External world-visible VPN gateway */ - val = addr_to_gvalue (getenv ("trusted_ip")); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, val); - else - helper_failed (connection, "VPN Gateway"); - - /* Internal VPN subnet gateway */ - val = addr_to_gvalue (getenv ("route_vpn_gateway")); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, val); - - /* Tunnel device */ - val = str_to_gvalue (getenv ("dev"), FALSE); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val); - else - helper_failed (connection, "Tunnel Device"); - - /* IP address */ - val = addr_to_gvalue (getenv ("ifconfig_local")); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, val); - else - helper_failed (connection, "IP4 Address"); - - /* PTP address; for vpnc PTP address == internal IP4 address */ - val = addr_to_gvalue (getenv ("ifconfig_remote")); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PTP, val); - - /* Netmask */ - tmp = getenv ("route_netmask_1"); - if (tmp && inet_pton (AF_INET, tmp, &temp_addr) > 0) { - GValue *val; - - val = g_slice_new0 (GValue); - g_value_init (val, G_TYPE_UINT); - g_value_set_uint (val, nm_utils_ip4_netmask_to_prefix (temp_addr.s_addr)); - - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val); - } - - val = get_routes (); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, val); - - /* DNS and WINS servers */ - for (i = 1; i < 256; i++) { - char *env_name; - - env_name = g_strdup_printf ("foreign_option_%d", i); - tmp = getenv (env_name); - g_free (env_name); - - if (!tmp || strlen (tmp) < 1) - break; - - if (!g_str_has_prefix (tmp, "dhcp-option ")) - continue; - - tmp += 12; /* strlen ("dhcp-option ") */ - - if (g_str_has_prefix (tmp, "DNS ")) - dns_list = parse_addr_list (dns_list, tmp + 4); - else if (g_str_has_prefix (tmp, "WINS ")) - nbns_list = parse_addr_list (nbns_list, tmp + 5); - else if (g_str_has_prefix (tmp, "DOMAIN ") && !dns_domain) - dns_domain = str_to_gvalue (tmp + 7, FALSE); - } - - if (dns_list) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_DNS, dns_list); - if (nbns_list) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_NBNS, nbns_list); - if (dns_domain) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, dns_domain); - - /* Tunnel MTU */ - tmp = getenv ("tun_mtu"); - if (tmp && strlen (tmp)) { - long int mtu; - - errno = 0; - mtu = strtol (tmp, NULL, 10); - if (errno || mtu < 0 || mtu > 20000) { - nm_warning ("Ignoring invalid tunnel MTU '%s'", tmp); - } else { - val = uint_to_gvalue ((guint32) mtu); - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_MTU, val); - } - } - - /* Send the config info to nm-openvpn-service */ - send_ip4_config (connection, config); - - return 0; -} diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service.c b/vpn-daemons/openvpn/src/nm-openvpn-service.c deleted file mode 100644 index ae5eab96cb..0000000000 --- a/vpn-daemons/openvpn/src/nm-openvpn-service.c +++ /dev/null @@ -1,1081 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* nm-openvpn-service - openvpn integration with NetworkManager - * - * Tim Niemueller - * Dan Williams - * - * 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. - * - * $Id$ - * - */ - - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "nm-openvpn-service.h" -#include "nm-utils.h" - -#define NM_OPENVPN_HELPER_PATH LIBEXECDIR"/nm-openvpn-service-openvpn-helper" - -G_DEFINE_TYPE (NMOpenvpnPlugin, nm_openvpn_plugin, NM_TYPE_VPN_PLUGIN) - -#define NM_OPENVPN_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_OPENVPN_PLUGIN, NMOpenvpnPluginPrivate)) - -typedef struct { - char *username; - char *password; - char *priv_key_pass; - GIOChannel *socket_channel; - guint socket_channel_eventid; -} NMOpenvpnPluginIOData; - -typedef struct { - GPid pid; - guint connect_timer; - guint connect_count; - NMOpenvpnPluginIOData *io_data; -} NMOpenvpnPluginPrivate; - -typedef struct { - const char *name; - GType type; - gint int_min; - gint int_max; - gboolean address; -} ValidProperty; - -static ValidProperty valid_properties[] = { - { NM_OPENVPN_KEY_CA, G_TYPE_STRING, 0, 0, FALSE }, - { NM_OPENVPN_KEY_CERT, G_TYPE_STRING, 0, 0, FALSE }, - { NM_OPENVPN_KEY_CIPHER, G_TYPE_STRING, 0, 0, FALSE }, - { NM_OPENVPN_KEY_COMP_LZO, G_TYPE_BOOLEAN, 0, 0, FALSE }, - { NM_OPENVPN_KEY_CONNECTION_TYPE, G_TYPE_STRING, 0, 0, FALSE }, - { NM_OPENVPN_KEY_TAP_DEV, G_TYPE_BOOLEAN, 0, 0, FALSE }, - { NM_OPENVPN_KEY_KEY, G_TYPE_STRING, 0, 0, FALSE }, - { NM_OPENVPN_KEY_LOCAL_IP, G_TYPE_STRING, 0, 0, TRUE }, - { NM_OPENVPN_KEY_PROTO_TCP, G_TYPE_BOOLEAN, 0, 0, FALSE }, - { NM_OPENVPN_KEY_PORT, G_TYPE_INT, 1, 65535, FALSE }, - { NM_OPENVPN_KEY_REMOTE, G_TYPE_STRING, 0, 0, FALSE }, - { NM_OPENVPN_KEY_REMOTE_IP, G_TYPE_STRING, 0, 0, TRUE }, - { NM_OPENVPN_KEY_STATIC_KEY, G_TYPE_STRING, 0, 0, FALSE }, - { NM_OPENVPN_KEY_STATIC_KEY_DIRECTION, G_TYPE_INT, 0, 1, FALSE }, - { NM_OPENVPN_KEY_TA, G_TYPE_STRING, 0, 0, FALSE }, - { NM_OPENVPN_KEY_TA_DIR, G_TYPE_INT, 0, 1, FALSE }, - { NM_OPENVPN_KEY_USERNAME, G_TYPE_STRING, 0, 0, FALSE }, - { NULL, G_TYPE_NONE, FALSE } -}; - -static ValidProperty valid_secrets[] = { - { NM_OPENVPN_KEY_PASSWORD, G_TYPE_STRING, 0, 0, FALSE }, - { NM_OPENVPN_KEY_CERTPASS, G_TYPE_STRING, 0, 0, FALSE }, - { NM_OPENVPN_KEY_NOSECRET, G_TYPE_STRING, 0, 0, FALSE }, - { NULL, G_TYPE_NONE, FALSE } -}; - -static gboolean -validate_address (const char *address) -{ - const char *p = address; - - if (!address || !strlen (address)) - return FALSE; - - /* Ensure it's a valid DNS name or IP address */ - while (*p) { - if (!isalnum (*p) && (*p != '-') && (*p != '.')) - return FALSE; - p++; - } - return TRUE; -} - -typedef struct ValidateInfo { - ValidProperty *table; - GError **error; - gboolean have_items; -} ValidateInfo; - -static void -validate_one_property (const char *key, const char *value, gpointer user_data) -{ - ValidateInfo *info = (ValidateInfo *) user_data; - int i; - - if (*(info->error)) - return; - - info->have_items = TRUE; - - /* 'name' is the setting name; always allowed but unused */ - if (!strcmp (key, NM_SETTING_NAME)) - return; - - for (i = 0; info->table[i].name; i++) { - ValidProperty prop = info->table[i]; - long int tmp; - - if (strcmp (prop.name, key)) - continue; - - switch (prop.type) { - case G_TYPE_STRING: - if (!prop.address || validate_address (value)) - return; /* valid */ - - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "invalid address '%s'", - key); - break; - case G_TYPE_INT: - errno = 0; - tmp = strtol (value, NULL, 10); - if (errno == 0 && tmp >= prop.int_min && tmp <= prop.int_max) - return; /* valid */ - - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "invalid integer property '%s' or out of range [%d -> %d]", - key, prop.int_min, prop.int_max); - break; - case G_TYPE_BOOLEAN: - if (!strcmp (value, "yes") || !strcmp (value, "no")) - return; /* valid */ - - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "invalid boolean property '%s' (not yes or no)", - key); - break; - default: - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "unhandled property '%s' type %s", - key, g_type_name (prop.type)); - break; - } - } - - /* Did not find the property from valid_properties or the type did not match */ - if (!info->table[i].name) { - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "property '%s' invalid or not supported", - key); - } -} - -static gboolean -nm_openvpn_properties_validate (NMSettingVPN *s_vpn, GError **error) -{ - ValidateInfo info = { &valid_properties[0], error, FALSE }; - - nm_setting_vpn_foreach_data_item (s_vpn, validate_one_property, &info); - if (!info.have_items) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "%s", - "No VPN configuration options."); - return FALSE; - } - - return *error ? FALSE : TRUE; -} - -static gboolean -nm_openvpn_secrets_validate (NMSettingVPN *s_vpn, GError **error) -{ - ValidateInfo info = { &valid_secrets[0], error, FALSE }; - - nm_setting_vpn_foreach_secret (s_vpn, validate_one_property, &info); - if (!info.have_items) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "%s", - "No VPN secrets!"); - return FALSE; - } - - return *error ? FALSE : TRUE; -} - -static void -nm_openvpn_disconnect_management_socket (NMOpenvpnPlugin *plugin) -{ - NMOpenvpnPluginPrivate *priv = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin); - NMOpenvpnPluginIOData *io_data = priv->io_data; - - /* This should not throw a warning since this can happen in - non-password modes */ - if (!io_data) - return; - - g_source_remove (io_data->socket_channel_eventid); - g_io_channel_shutdown (io_data->socket_channel, FALSE, NULL); - g_io_channel_unref (io_data->socket_channel); - - g_free (io_data->username); - g_free (io_data->password); - - g_free (priv->io_data); - priv->io_data = NULL; -} - -static char * -ovpn_quote_string (const char *unquoted) -{ - char *quoted = NULL, *q; - char *u = (char *) unquoted; - - g_return_val_if_fail (unquoted != NULL, NULL); - - /* FIXME: use unpaged memory */ - quoted = q = g_malloc0 (strlen (unquoted) * 2); - while (*u) { - /* Escape certain characters */ - if (*u == ' ' || *u == '\\' || *u == '"') - *q++ = '\\'; - *q++ = *u++; - } - - return quoted; -} - -static gboolean -handle_management_socket (NMVPNPlugin *plugin, - GIOChannel *source, - GIOCondition condition, - NMVPNPluginFailure *out_failure) -{ - NMOpenvpnPluginIOData *io_data = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin)->io_data; - gboolean again = TRUE; - char *str = NULL, *auth, *buf; - gsize written; - - if (!(condition & G_IO_IN)) - return TRUE; - - if (g_io_channel_read_line (source, &str, NULL, NULL, NULL) != G_IO_STATUS_NORMAL) - return TRUE; - - if (strlen (str) < 1) - goto out; - - if (sscanf (str, ">PASSWORD:Need '%a[^']'", &auth) > 0) { - if (strcmp (auth, "Auth") == 0) { - if (io_data->username != NULL && io_data->password != NULL) { - char *quser, *qpass; - - /* Quote strings passed back to openvpn */ - quser = ovpn_quote_string (io_data->username); - qpass = ovpn_quote_string (io_data->password); - buf = g_strdup_printf ("username \"%s\" \"%s\"\n" - "password \"%s\" \"%s\"\n", - auth, quser, - auth, qpass); - memset (qpass, 0, strlen (qpass)); - g_free (qpass); - g_free (quser); - - /* Will always write everything in blocking channels (on success) */ - g_io_channel_write_chars (source, buf, strlen (buf), &written, NULL); - g_io_channel_flush (source, NULL); - g_free (buf); - } else - nm_warning ("Auth requested but one of username or password is missing"); - } else if (!strcmp (auth, "Private Key")) { - if (io_data->priv_key_pass) { - char *qpass; - - /* Quote strings passed back to openvpn */ - qpass = ovpn_quote_string (io_data->priv_key_pass); - buf = g_strdup_printf ("password \"%s\" \"%s\"\n", auth, qpass); - memset (qpass, 0, strlen (qpass)); - g_free (qpass); - - /* Will always write everything in blocking channels (on success) */ - g_io_channel_write_chars (source, buf, strlen (buf), &written, NULL); - g_io_channel_flush (source, NULL); - g_free (buf); - } else - nm_warning ("Certificate password requested but private key password == NULL"); - } else { - nm_warning ("No clue what to send for username/password request for '%s'", auth); - if (out_failure) - *out_failure = NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED; - again = FALSE; - } - free (auth); - } else if (sscanf (str, ">PASSWORD:Verification Failed: '%a[^']'", &auth) > 0) { - if (!strcmp (auth, "Auth")) - nm_warning ("Password verification failed"); - else if (!strcmp (auth, "Private Key")) - nm_warning ("Private key verification failed"); - else - nm_warning ("Unknown verification failed: %s", auth); - - free (auth); - - if (out_failure) - *out_failure = NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED; - again = FALSE; - } - -out: - g_free (str); - return again; -} - -static gboolean -nm_openvpn_socket_data_cb (GIOChannel *source, GIOCondition condition, gpointer user_data) -{ - NMVPNPlugin *plugin = NM_VPN_PLUGIN (user_data); - NMVPNPluginFailure failure = NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED; - - if (!handle_management_socket (plugin, source, condition, &failure)) { - nm_vpn_plugin_failure (plugin, failure); - nm_vpn_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_STOPPED); - return FALSE; - } - - return TRUE; -} - -static gboolean -nm_openvpn_connect_timer_cb (gpointer data) -{ - NMOpenvpnPlugin *plugin = NM_OPENVPN_PLUGIN (data); - NMOpenvpnPluginPrivate *priv = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin); - struct sockaddr_in serv_addr; - gboolean connected = FALSE; - gint socket_fd = -1; - NMOpenvpnPluginIOData *io_data = priv->io_data; - - priv->connect_count++; - - /* open socket and start listener */ - socket_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (socket_fd < 0) - return FALSE; - - serv_addr.sin_family = AF_INET; - if (inet_pton (AF_INET, "127.0.0.1", &(serv_addr.sin_addr)) <= 0) - nm_warning ("%s: could not convert 127.0.0.1", __func__); - serv_addr.sin_port = htons (1194); - - connected = (connect (socket_fd, (struct sockaddr *) &serv_addr, sizeof (serv_addr)) == 0); - if (!connected) { - close (socket_fd); - if (priv->connect_count <= 30) - return TRUE; - - priv->connect_timer = 0; - - nm_warning ("Could not open management socket"); - nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED); - nm_vpn_plugin_set_state (NM_VPN_PLUGIN (plugin), NM_VPN_SERVICE_STATE_STOPPED); - } else { - GIOChannel *openvpn_socket_channel; - guint openvpn_socket_channel_eventid; - - openvpn_socket_channel = g_io_channel_unix_new (socket_fd); - openvpn_socket_channel_eventid = g_io_add_watch (openvpn_socket_channel, - G_IO_IN, - nm_openvpn_socket_data_cb, - plugin); - - g_io_channel_set_encoding (openvpn_socket_channel, NULL, NULL); - io_data->socket_channel = openvpn_socket_channel; - io_data->socket_channel_eventid = openvpn_socket_channel_eventid; - } - - priv->connect_timer = 0; - return FALSE; -} - -static void -nm_openvpn_schedule_connect_timer (NMOpenvpnPlugin *plugin) -{ - NMOpenvpnPluginPrivate *priv = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin); - - if (priv->connect_timer == 0) - priv->connect_timer = g_timeout_add (200, nm_openvpn_connect_timer_cb, plugin); -} - -static void -openvpn_watch_cb (GPid pid, gint status, gpointer user_data) -{ - NMVPNPlugin *plugin = NM_VPN_PLUGIN (user_data); - NMOpenvpnPluginPrivate *priv = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin); - NMVPNPluginFailure failure = NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED; - guint error = 0; - gboolean good_exit = FALSE; - - if (WIFEXITED (status)) { - error = WEXITSTATUS (status); - if (error != 0) - nm_warning ("openvpn exited with error code %d", error); - } - else if (WIFSTOPPED (status)) - nm_warning ("openvpn stopped unexpectedly with signal %d", WSTOPSIG (status)); - else if (WIFSIGNALED (status)) - nm_warning ("openvpn died with signal %d", WTERMSIG (status)); - else - nm_warning ("openvpn died from an unknown cause"); - - /* Reap child if needed. */ - waitpid (priv->pid, NULL, WNOHANG); - priv->pid = 0; - - /* OpenVPN doesn't supply useful exit codes :( */ - switch (error) { - case 0: - good_exit = TRUE; - break; - default: - failure = NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED; - break; - } - - /* Try to get the last bits of data from openvpn */ - if (priv->io_data && priv->io_data->socket_channel) { - GIOChannel *channel = priv->io_data->socket_channel; - GIOCondition condition; - - while ((condition = g_io_channel_get_buffer_condition (channel)) & G_IO_IN) { - if (!handle_management_socket (plugin, channel, condition, &failure)) { - good_exit = FALSE; - break; - } - } - } - - if (!good_exit) - nm_vpn_plugin_failure (plugin, failure); - - nm_vpn_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_STOPPED); -} - -static const char * -validate_connection_type (const char *ctype) -{ - if (ctype) { - if ( !strcmp (ctype, NM_OPENVPN_CONTYPE_TLS) - || !strcmp (ctype, NM_OPENVPN_CONTYPE_STATIC_KEY) - || !strcmp (ctype, NM_OPENVPN_CONTYPE_PASSWORD) - || !strcmp (ctype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) - return ctype; - } - return NULL; -} - -static const char * -nm_find_openvpn (void) -{ - static const char *openvpn_binary_paths[] = { - "/usr/sbin/openvpn", - "/sbin/openvpn", - NULL - }; - const char **openvpn_binary = openvpn_binary_paths; - - while (*openvpn_binary != NULL) { - if (g_file_test (*openvpn_binary, G_FILE_TEST_EXISTS)) - break; - openvpn_binary++; - } - - return *openvpn_binary; -} - -static void -free_openvpn_args (GPtrArray *args) -{ - g_ptr_array_foreach (args, (GFunc) g_free, NULL); - g_ptr_array_free (args, TRUE); -} - -static void -add_openvpn_arg (GPtrArray *args, const char *arg) -{ - g_return_if_fail (args != NULL); - g_return_if_fail (arg != NULL); - - g_ptr_array_add (args, (gpointer) g_strdup (arg)); -} - -static gboolean -add_openvpn_arg_int (GPtrArray *args, const char *arg) -{ - long int tmp_int; - - g_return_val_if_fail (args != NULL, FALSE); - g_return_val_if_fail (arg != NULL, FALSE); - - /* Convert -> int and back to string for security's sake since - * strtol() ignores some leading and trailing characters. - */ - errno = 0; - tmp_int = strtol (arg, NULL, 10); - if (errno != 0) - return FALSE; - g_ptr_array_add (args, (gpointer) g_strdup_printf ("%d", (guint32) tmp_int)); - return TRUE; -} - -static gboolean -nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - NMSettingVPN *s_vpn, - const char *default_username, - GError **error) -{ - NMOpenvpnPluginPrivate *priv = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin); - const char *openvpn_binary, *connection_type, *tmp; - GPtrArray *args; - GSource *openvpn_watch; - GPid pid; - - /* Find openvpn */ - openvpn_binary = nm_find_openvpn (); - if (!openvpn_binary) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "%s", - "Could not find the openvpn binary."); - return FALSE; - } - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CONNECTION_TYPE); - connection_type = validate_connection_type (tmp); - if (!connection_type) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "%s", - "Invalid connection type."); - return FALSE; - } - - args = g_ptr_array_new (); - add_openvpn_arg (args, openvpn_binary); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--remote"); - add_openvpn_arg (args, tmp); - } - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO); - if (tmp && !strcmp (tmp, "yes")) - add_openvpn_arg (args, "--comp-lzo"); - - add_openvpn_arg (args, "--nobind"); - - /* Device, either tun or tap */ - add_openvpn_arg (args, "--dev"); - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TAP_DEV); - if (tmp && !strcmp (tmp, "yes")) - add_openvpn_arg (args, "tap"); - else - add_openvpn_arg (args, "tun"); - - /* Protocol, either tcp or udp */ - add_openvpn_arg (args, "--proto"); - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_PROTO_TCP); - if (tmp && !strcmp (tmp, "yes")) - add_openvpn_arg (args, "tcp-client"); - else - add_openvpn_arg (args, "udp"); - - /* Port */ - add_openvpn_arg (args, "--port"); - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_PORT); - if (tmp && strlen (tmp)) { - if (!add_openvpn_arg_int (args, tmp)) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Invalid port number '%s'.", - tmp); - free_openvpn_args (args); - return FALSE; - } - } else { - /* Default to IANA assigned port 1194 */ - add_openvpn_arg (args, "1194"); - } - - /* Cipher */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CIPHER); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--cipher"); - add_openvpn_arg (args, tmp); - } - - /* TA */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--tls-auth"); - add_openvpn_arg (args, tmp); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA_DIR); - if (tmp && strlen (tmp)) - add_openvpn_arg (args, tmp); - } - - /* Syslog */ - add_openvpn_arg (args, "--syslog"); - add_openvpn_arg (args, "nm-openvpn"); - - /* Punch script security in the face; this option was added to OpenVPN 2.1-rc9 - * and defaults to disallowing any scripts, a behavior change from previous - * versions. - */ - add_openvpn_arg (args, "--script-security"); - add_openvpn_arg (args, "2"); - - /* Up script, called when connection has been established or has been restarted */ - add_openvpn_arg (args, "--up"); - add_openvpn_arg (args, NM_OPENVPN_HELPER_PATH); - add_openvpn_arg (args, "--up-restart"); - - /* Keep key and tun if restart is needed */ - add_openvpn_arg (args, "--persist-key"); - add_openvpn_arg (args, "--persist-tun"); - - /* Management socket for localhost access to supply username and password */ - add_openvpn_arg (args, "--management"); - add_openvpn_arg (args, "127.0.0.1"); - /* with have nobind, thus 1194 should be free, it is the IANA assigned port */ - add_openvpn_arg (args, "1194"); - /* Query on the management socket for user/pass */ - add_openvpn_arg (args, "--management-query-passwords"); - - /* do not let openvpn setup routes, NM will handle it */ - add_openvpn_arg (args, "--route-noexec"); - - /* Now append configuration options which are dependent on the configuration type */ - if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_TLS)) { - add_openvpn_arg (args, "--client"); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CA); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--ca"); - add_openvpn_arg (args, tmp); - } - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CERT); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--cert"); - add_openvpn_arg (args, tmp); - } - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_KEY); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--key"); - add_openvpn_arg (args, tmp); - } - } else if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_STATIC_KEY)) { - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_STATIC_KEY); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--secret"); - add_openvpn_arg (args, tmp); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_STATIC_KEY_DIRECTION); - if (tmp && strlen (tmp)) - add_openvpn_arg (args, tmp); - } - - add_openvpn_arg (args, "--ifconfig"); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_LOCAL_IP); - if (!tmp) { - /* Insufficient data (FIXME: this should really be detected when validating the properties */ - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "%s", - "Missing required local IP address for static key mode."); - free_openvpn_args (args); - return FALSE; - } - add_openvpn_arg (args, tmp); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE_IP); - if (!tmp) { - /* Insufficient data (FIXME: this should really be detected when validating the properties */ - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "%s", - "Missing required remote IP address for static key mode."); - free_openvpn_args (args); - return FALSE; - } - add_openvpn_arg (args, tmp); - } else if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD)) { - /* Client mode */ - add_openvpn_arg (args, "--client"); - /* Use user/path authentication */ - add_openvpn_arg (args, "--auth-user-pass"); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CA); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--ca"); - add_openvpn_arg (args, tmp); - } - } else if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - add_openvpn_arg (args, "--client"); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CA); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--ca"); - add_openvpn_arg (args, tmp); - } - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CERT); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--cert"); - add_openvpn_arg (args, tmp); - } - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_KEY); - if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--key"); - add_openvpn_arg (args, tmp); - } - - /* Use user/path authentication */ - add_openvpn_arg (args, "--auth-user-pass"); - } else { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Unknown connection type '%s'.", - connection_type); - free_openvpn_args (args); - return FALSE; - } - - g_ptr_array_add (args, NULL); - - if (!g_spawn_async (NULL, (char **) args->pdata, NULL, - G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, error)) { - free_openvpn_args (args); - return FALSE; - } - free_openvpn_args (args); - - nm_info ("openvpn started with pid %d", pid); - - priv->pid = pid; - openvpn_watch = g_child_watch_source_new (pid); - g_source_set_callback (openvpn_watch, (GSourceFunc) openvpn_watch_cb, plugin, NULL); - g_source_attach (openvpn_watch, NULL); - g_source_unref (openvpn_watch); - - /* Listen to the management socket for a few connection types: - PASSWORD: Will require username and password - X509USERPASS: Will require username and password and maybe certificate password - X509: May require certificate password - */ - if ( !strcmp (connection_type, NM_OPENVPN_CONTYPE_TLS) - || !strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD) - || !strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - NMOpenvpnPluginIOData *io_data; - - io_data = g_new0 (NMOpenvpnPluginIOData, 1); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_USERNAME); - io_data->username = tmp ? g_strdup (tmp) : NULL; - /* Use the default username if it wasn't overridden by the user */ - if (!io_data->username && default_username) - io_data->username = g_strdup (default_username); - - tmp = nm_setting_vpn_get_secret (s_vpn, NM_OPENVPN_KEY_PASSWORD); - io_data->password = tmp ? g_strdup (tmp) : NULL; - - tmp = nm_setting_vpn_get_secret (s_vpn, NM_OPENVPN_KEY_CERTPASS); - io_data->priv_key_pass = tmp ? g_strdup (tmp) : NULL; - - priv->io_data = io_data; - - nm_openvpn_schedule_connect_timer (plugin); - } - - return TRUE; -} - -static gboolean -real_connect (NMVPNPlugin *plugin, - NMConnection *connection, - GError **error) -{ - NMSettingVPN *s_vpn; - const char *connection_type; - const char *user_name; - const char *tmp; - - s_vpn = NM_SETTING_VPN (nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN)); - if (!s_vpn) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "%s", - "Could not process the request because the VPN connection settings were invalid."); - return FALSE; - } - - user_name = nm_setting_vpn_get_user_name (s_vpn); - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CONNECTION_TYPE); - connection_type = validate_connection_type (tmp); - - /* Need a username for any password-based connection types */ - if ( !strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS) - || !strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD)) { - if (!user_name && !nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_USERNAME)) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "%s", - "Could not process the request because no username was provided."); - return FALSE; - } - } - - /* Validate the properties */ - if (!nm_openvpn_properties_validate (s_vpn, error)) - return FALSE; - - /* Static Key doesn't need secrets; the rest do */ - if (strcmp (connection_type, NM_OPENVPN_CONTYPE_STATIC_KEY)) { - if (!nm_openvpn_secrets_validate (s_vpn, error)) - return FALSE; - } - - /* Finally try to start OpenVPN */ - if (!nm_openvpn_start_openvpn_binary (NM_OPENVPN_PLUGIN (plugin), s_vpn, user_name, error)) - return FALSE; - - return TRUE; -} - -static gboolean -real_need_secrets (NMVPNPlugin *plugin, - NMConnection *connection, - char **setting_name, - GError **error) -{ - NMSettingVPN *s_vpn; - const char *connection_type; - gboolean need_secrets = FALSE; - const char *tmp; - - g_return_val_if_fail (NM_IS_VPN_PLUGIN (plugin), FALSE); - g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); - - s_vpn = NM_SETTING_VPN (nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN)); - if (!s_vpn) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "%s", - "Could not process the request because the VPN connection settings were invalid."); - return FALSE; - } - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CONNECTION_TYPE); - connection_type = validate_connection_type (tmp); - - if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) { - /* Will require a password and maybe private key password */ - if (!nm_setting_vpn_get_secret (s_vpn, NM_OPENVPN_KEY_CERTPASS)) - need_secrets = TRUE; - - if (!nm_setting_vpn_get_secret (s_vpn, NM_OPENVPN_KEY_PASSWORD)) - need_secrets = TRUE; - } else if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD)) { - /* Will require a password */ - if (!nm_setting_vpn_get_secret (s_vpn, NM_OPENVPN_KEY_PASSWORD)) - need_secrets = TRUE; - } else if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_TLS)) { - /* May require private key password */ - if (!nm_setting_vpn_get_secret (s_vpn, NM_OPENVPN_KEY_CERTPASS)) - need_secrets = TRUE; - } - - if (need_secrets) - *setting_name = NM_SETTING_VPN_SETTING_NAME; - - return need_secrets; -} - -static gboolean -ensure_killed (gpointer data) -{ - int pid = GPOINTER_TO_INT (data); - - if (kill (pid, 0) == 0) - kill (pid, SIGKILL); - - return FALSE; -} - -static gboolean -real_disconnect (NMVPNPlugin *plugin, - GError **err) -{ - NMOpenvpnPluginPrivate *priv = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin); - - if (priv->pid) { - if (kill (priv->pid, SIGTERM) == 0) - g_timeout_add (2000, ensure_killed, GINT_TO_POINTER (priv->pid)); - else - kill (priv->pid, SIGKILL); - - nm_info ("Terminated openvpn daemon with PID %d.", priv->pid); - priv->pid = 0; - } - - return TRUE; -} - -static void -nm_openvpn_plugin_init (NMOpenvpnPlugin *plugin) -{ -} - -static void -nm_openvpn_plugin_class_init (NMOpenvpnPluginClass *plugin_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (plugin_class); - NMVPNPluginClass *parent_class = NM_VPN_PLUGIN_CLASS (plugin_class); - - g_type_class_add_private (object_class, sizeof (NMOpenvpnPluginPrivate)); - - /* virtual methods */ - parent_class->connect = real_connect; - parent_class->need_secrets = real_need_secrets; - parent_class->disconnect = real_disconnect; -} - -static void -plugin_state_changed (NMOpenvpnPlugin *plugin, - NMVPNServiceState state, - gpointer user_data) -{ - NMOpenvpnPluginPrivate *priv = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin); - - switch (state) { - case NM_VPN_SERVICE_STATE_UNKNOWN: - case NM_VPN_SERVICE_STATE_INIT: - case NM_VPN_SERVICE_STATE_SHUTDOWN: - case NM_VPN_SERVICE_STATE_STOPPING: - case NM_VPN_SERVICE_STATE_STOPPED: - /* Cleanup on failure */ - if (priv->connect_timer) { - g_source_remove (priv->connect_timer); - priv->connect_timer = 0; - } - nm_openvpn_disconnect_management_socket (plugin); - break; - default: - break; - } -} - -NMOpenvpnPlugin * -nm_openvpn_plugin_new (void) -{ - NMOpenvpnPlugin *plugin; - - plugin = (NMOpenvpnPlugin *) g_object_new (NM_TYPE_OPENVPN_PLUGIN, - NM_VPN_PLUGIN_DBUS_SERVICE_NAME, - NM_DBUS_SERVICE_OPENVPN, - NULL); - if (plugin) - g_signal_connect (G_OBJECT (plugin), "state-changed", G_CALLBACK (plugin_state_changed), NULL); - - return plugin; -} - -static void -quit_mainloop (NMVPNPlugin *plugin, gpointer user_data) -{ - g_main_loop_quit ((GMainLoop *) user_data); -} - -int -main (int argc, char *argv[]) -{ - NMOpenvpnPlugin *plugin; - GMainLoop *main_loop; - - g_type_init (); - - if (system ("/sbin/modprobe tun") == -1) - exit (EXIT_FAILURE); - - plugin = nm_openvpn_plugin_new (); - if (!plugin) - exit (EXIT_FAILURE); - - main_loop = g_main_loop_new (NULL, FALSE); - - g_signal_connect (plugin, "quit", - G_CALLBACK (quit_mainloop), - main_loop); - - g_main_loop_run (main_loop); - - g_main_loop_unref (main_loop); - g_object_unref (plugin); - - exit (EXIT_SUCCESS); -} diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service.h b/vpn-daemons/openvpn/src/nm-openvpn-service.h deleted file mode 100644 index 82158b509a..0000000000 --- a/vpn-daemons/openvpn/src/nm-openvpn-service.h +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */ -/* nm-openvpn-service - openvpn integration with NetworkManager - * - * Tim Niemueller - * Based on work by Dan Williams - * - * 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. - * - */ - -#ifndef NM_OPENVPN_SERVICE_H -#define NM_OPENVPN_SERVICE_H - -#include -#include -#include - -#define NM_TYPE_OPENVPN_PLUGIN (nm_openvpn_plugin_get_type ()) -#define NM_OPENVPN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_OPENVPN_PLUGIN, NMOpenvpnPlugin)) -#define NM_OPENVPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_OPENVPN_PLUGIN, NMOpenvpnPluginClass)) -#define NM_IS_OPENVPN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_OPENVPN_PLUGIN)) -#define NM_IS_OPENVPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_OPENVPN_PLUGIN)) -#define NM_OPENVPN_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_OPENVPN_PLUGIN, NMOpenvpnPluginClass)) - -#define NM_DBUS_SERVICE_OPENVPN "org.freedesktop.NetworkManager.openvpn" -#define NM_DBUS_INTERFACE_OPENVPN "org.freedesktop.NetworkManager.openvpn" -#define NM_DBUS_PATH_OPENVPN "/org/freedesktop/NetworkManager/openvpn" - -#define NM_OPENVPN_KEY_CA "ca" -#define NM_OPENVPN_KEY_CERT "cert" -#define NM_OPENVPN_KEY_CIPHER "cipher" -#define NM_OPENVPN_KEY_COMP_LZO "comp-lzo" -#define NM_OPENVPN_KEY_CONNECTION_TYPE "connection-type" -#define NM_OPENVPN_KEY_TAP_DEV "tap-dev" -#define NM_OPENVPN_KEY_KEY "key" -#define NM_OPENVPN_KEY_LOCAL_IP "local-ip" -#define NM_OPENVPN_KEY_PROTO_TCP "proto-tcp" -#define NM_OPENVPN_KEY_PORT "port" -#define NM_OPENVPN_KEY_REMOTE "remote" -#define NM_OPENVPN_KEY_REMOTE_IP "remote-ip" -#define NM_OPENVPN_KEY_STATIC_KEY "static-key" -#define NM_OPENVPN_KEY_STATIC_KEY_DIRECTION "static-key-direction" -#define NM_OPENVPN_KEY_TA "ta" -#define NM_OPENVPN_KEY_TA_DIR "ta-dir" -#define NM_OPENVPN_KEY_USERNAME "username" - -#define NM_OPENVPN_KEY_PASSWORD "password" -#define NM_OPENVPN_KEY_CERTPASS "cert-pass" -/* Internal auth-dialog -> service token indicating that no secrets are - * required for the connection. - */ -#define NM_OPENVPN_KEY_NOSECRET "no-secret" - -#define NM_OPENVPN_CONTYPE_TLS "tls" -#define NM_OPENVPN_CONTYPE_STATIC_KEY "static-key" -#define NM_OPENVPN_CONTYPE_PASSWORD "password" -#define NM_OPENVPN_CONTYPE_PASSWORD_TLS "password-tls" - -typedef struct { - NMVPNPlugin parent; -} NMOpenvpnPlugin; - -typedef struct { - NMVPNPluginClass parent; -} NMOpenvpnPluginClass; - -GType nm_openvpn_plugin_get_type (void); - -NMOpenvpnPlugin *nm_openvpn_plugin_new (void); - -#endif /* NM_OPENVPN_SERVICE_H */ diff --git a/vpn-daemons/pptp/.cvsignore b/vpn-daemons/pptp/.cvsignore deleted file mode 100644 index f8b78243fd..0000000000 --- a/vpn-daemons/pptp/.cvsignore +++ /dev/null @@ -1,30 +0,0 @@ -Makefile -Makefile.in -NetworkManager-ppp*.tar.gz -aclocal.m4 -autom4te.cache -compile -configure -config.guess -config.h.in -config.h -config.log -config.status -config.sub -depcomp -install-sh -intltool-extract.in -intltool-extract -intltool-merge.in -intltool-merge -intltool-update.in -intltool-update -libtool -ltmain.sh -missing -mkinstalldirs -nm-ppp-starter.name -nm-ppp.desktop -stamp-h1 -COPYING -INSTALL diff --git a/vpn-daemons/pptp/AUTHORS b/vpn-daemons/pptp/AUTHORS deleted file mode 100644 index 60e6332ad4..0000000000 --- a/vpn-daemons/pptp/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -Antony Mee -Tim Niemueller -Dan Williams - diff --git a/vpn-daemons/pptp/COPYING b/vpn-daemons/pptp/COPYING deleted file mode 100644 index d60c31a97a..0000000000 --- a/vpn-daemons/pptp/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 Library 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 Library General -Public License instead of this License. diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog deleted file mode 100644 index 830a9acb6a..0000000000 --- a/vpn-daemons/pptp/ChangeLog +++ /dev/null @@ -1,257 +0,0 @@ -2008-11-29 Dan Williams - - * properties/nm-pptp.c - - (auth_methods_setup, advanced_dialog_new_hash_from_dialog): add EAP - to the auth method list - -2008-11-24 Dan Williams - - * src/nm-pptp-service.c - - (construct_pppd_args): send username to server (bgo #561941) - -2008-11-04 Dan Williams - - Fix bgo #559152 - - * src/nm-pptp-pppd-plugin.c - - (nm_ip_up): remote peer's address is the PTP address, not the external - gateway address - - * src/nm-pptp-service.c - - (construct_pppd_args): allow easier PPP debugging - - (service_ip4_config_cb): insert the VPN gateway's public IP address - into the IP4 config - - (real_connect, real_disconnect, state_changed_cb, dispose): cache - the connection so that the VPN gateway's public IP address can be - retrieved from it when the IP4 config comes back from pppd - -2008-10-26 Dan Williams - - * properties/nm-pptp.c - - Update for setting accessor changes - -2008-10-24 Dan Williams - - * src/nm-pptp-service.c - - (construct_pppd_args): pppd always parses /etc/ppp/options, so always - add really important stuff to the command line to ensure that NM - overrides /etc/ppp/options (bgo #556781) - -2008-10-14 Dan Williams - - * src/nm-pptp-pppd-plugin.c - - (nm_ip_up): pass VPN gateway up to nm-pptp-service - -2008-10-12 Dan Williams - - Patch from Bin Li , based on patches by Tambet - (openvpn) and Dan (vpnc) - - * common-gnome/* - - Copy over common keyring functions - - * auth-dialog/Makefile.am - auth-dialog/main.c - - Use common keyring functions - - * properties/Makefile.am - properties/nm-pptp-dialog.glade - properties/nm-pptp.c - properties/nm-pptp.h - - Add a 'password' entry and read/write the password when appropriate - -2008-09-29 Dan Williams - - * properties/nm-pptp-dialog.glade - - "Domain" -> "NT Domain" to clarify what it's really for - -2008-09-29 Dan Williams - - * src/nm-pptp-serivce.c - - (impl_pptp_service_need_secrets): use the expected Windows-style - 'domain\\username' format, not whatever I made up - -2008-09-25 Dan Williams - - * src/nm-pptp-service.c - - (nm_pptp_ppp_service_cache_credentials, impl_pptp_service_need_secrets): - when a domain is specified, synthesize the username passed to pppd - as username@domain - -2008-08-28 Dan Williams - - * src/nm-pptp-service.c - - (nm_pptp_ppp_service_cache_credentials, nm_pptp_properties_validate, - real_connect, real_need_secrets): handle split VPN secrets - -2008-08-28 Dan Williams - - * auth-dialog/main.c - - (get_secrets): don't gtk_widget_show_all() because that exposes - widgets that were supposed to be hidden - - (main): don't segfault on missing passwords (like hitting Cancel) - -2008-08-26 Dan Williams - - * auth-dialog/main.c - - Convert to connection UUIDs (requires NM svn 4013 or later) - - General cleanups - -2008-08-11 Dan Williams - - Update to match NM svn3924 vpn setting changes; verify options better; - return more informative errors on VPN launch failures. - -2008-08-07 Dan Williams - - * src/nm-pptp-pppd-plugin.c - - (nm_ip_up): use correct option index (bgo #517468) - -2008-07-27 Dan Williams - - Patch from Michael Biebl - - * Move service to $LIBEXECDIR, remove unneeded compilation flags, move - properties plugin to $LIBDIR/NetworkManager - -2008-07-21 Dan Williams - - * src/nm-pptp-service.c - - (state_changed_cb): remove the timeout handler when it's no longer - needed either; if pppd died on startup (wrong options) then the - timeout wouldn't have been removed before - -2008-07-20 Dan Williams - - Port to NM 0.7 VPN plugin API - -2008-04-27 Dan Williams - - * properties/Makefile.am - - Avoid versioning properties plugin (gnome.org #529836) - -2007-12-17 Dan Williams - - Patch from Christian Persch - - Fix up the build (gnome.org #473298) - -2007-08-14 Dan Williams - - * src/nm-openvpn-service.c - - Handle NM_VPN_STATE_* -> NM_VPN_SERVICE_STATE_* and NMVPNState -> - NMVPNServiceState renames - -2007-07-26 Dan Williams - - Patch from Kelemen Gábor - - * auth-dialog-general/nm-ppp-auth.glade - - Mark non-translated strings as non-translatable (#411875) - -2007-07-26 Dan Williams - - Patch from Robert Buchholz - - * src/Makefile.am - - Fix for new pppd files layout (#454741) - -2007-06-21 Christopher Aillon - - * nm-ppp-starter.name.in: - Make the properties library path multilib friendly (#447577) - -2007-06-13 Christopher Aillon - - Patch from Christian Persch - - * vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c: - HIGify the auth dialog; matches changes to libgnomeui - -2007-06-11 Christopher Aillon - - Patch from Christian Persch - - * configure.in: - * Makefile.am: - Add a dependency on libnm-util and also removes the expansion of paths - from configure which is disrecommended by automake. (446330) - -2007-06-11 Christian Persch - - * properties/nm-ppp-dialog.glade: HIGify. Bug #383034. - -2007-06-05 Christopher Aillon - - Patch from Christian Persch - - * auth-dialog/main.c: - * auth-dialog-general/main.c: - Stop leaking GnomeProgram objects. - -2007-02-02 Dan Williams - - * src/nm-ppp-starter.c - - (nm_ppp_dbus_process_helper_ip4_config): use uint32 arrays instead - of appending multiple entries with the same key - -2006-12-03 Dan Williams - - Patch from Nathaniel McCallum - - * properties/nm-ppp-dialog.glade - properties/nm-ppp-properties.c - src/nm-ppp-starter.c - - Add option for Stateful MPPE - -2006-10-30 Tambet Ingo - - * src/nm-pppd-plugin.c: Remove the leading NetworkManager directory - from NM includes since the NM pkg-config file already adds that. - - * properties/vpnui_impl.c: Ditto. - - * properties/vpnui_impl.h: Ditto. - - * src/nm-ppp-starter.c: Ditto. - - * src/Makefile.am: Add NetworkManager to CFLAGS and LDADD. - - * properties/Makefile.am: Add NetworkManager to CFLAGS and LDADD. - -2006-06-20 Satoru SATOH - - * configure.in (ALL_LINGUAS): Added ja (Japanese). - -2006-06-01 Antony Mee - - * DBUS revamp is complete possible to have various - authentication methods, ptys etc. - * version bumped to 0.6.9 to bring closer in line with NM - * nm-pptp-service-pppd-plugin.c -> nm-pppd-plugin.c: - The pppd plugin has now been generalised to work with - any ppp protocol. (Options do not exist in the config - dialog yet however) - * src/Makefile.am: fixed to install pppd plugin correctly - (unsure about -fPIC usage!) - -2006-04-23 Dan Williams - - Patch from j@bootlab.org - * src/Makefile.am: add missing files so make distcheck works - -2006-03-29 Robert Love - - * src/nm-pptp-service.c: New eigth argument to DBUS VPN method, the - per-route MSS. PPTP does not care about the MSS, so we send zero. - -2006-01-05 Tim Niemueller - - * configure.in: Explicitly set AUX_DIR to . to prevent autoconf from - searching (and finding) install-sh in ../.., which lead to - problems. - -2005-11-17 Antony Mee - - * started work based on openvpn work - diff --git a/vpn-daemons/pptp/INSTALL b/vpn-daemons/pptp/INSTALL deleted file mode 100644 index 54caf7c190..0000000000 --- a/vpn-daemons/pptp/INSTALL +++ /dev/null @@ -1,229 +0,0 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. - - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/vpn-daemons/pptp/Makefile.am b/vpn-daemons/pptp/Makefile.am deleted file mode 100644 index 685686f3e5..0000000000 --- a/vpn-daemons/pptp/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -AUTOMAKE_OPTIONS = foreign - -if WITH_GNOME -SUBDIRS = src common-gnome auth-dialog properties po -else -SUBDIRS = src -endif - -dbusservicedir = $(sysconfdir)/dbus-1/system.d -dbusservice_DATA = nm-pptp-service.conf - -nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN -nmvpnservice_DATA = nm-pptp-service.name - -if WITH_GNOME -desktopdir = $(datadir)/applications -desktop_in_files = nm-pptp.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - -icondir = $(datadir)/icons/hicolor/48x48/apps -icon_DATA = gnome-mime-application-x-pptp-settings.png -endif - -nm-pptp-service.name: $(srcdir)/nm-pptp-service.name.in - sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@ - -EXTRA_DIST = nm-pptp-service.name.in \ - $(dbusservice_DATA) \ - $(desktop_in_files) \ - $(icon_DATA) \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in - -CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~ -DISTCLEANFILES = intltool-extract intltool-merge intltool-update diff --git a/vpn-daemons/pptp/NEWS b/vpn-daemons/pptp/NEWS deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/vpn-daemons/pptp/README b/vpn-daemons/pptp/README deleted file mode 100644 index b26aa2d0d5..0000000000 --- a/vpn-daemons/pptp/README +++ /dev/null @@ -1,17 +0,0 @@ -PPTP support for NetworkManager - -This requires the Linux PPTP client installed -http://pptpclient.sourceforge.net/ - -0.7.x version: -(C) 2008 Dan Williams , and Tambet Ingo - -0.6.x version: -(C) 2005 - 2007 Antony Mee http://www.students.ncl.ac.uk/a.j.mee -Based entirely on OpenVPN support by Tim Niemueller http://www.niemueller.de - - -Theory of operation ------------------------------- - - diff --git a/vpn-daemons/pptp/TODO b/vpn-daemons/pptp/TODO deleted file mode 100644 index 735f8c7d48..0000000000 --- a/vpn-daemons/pptp/TODO +++ /dev/null @@ -1,147 +0,0 @@ -Future plans are currently hanging on what people want out of this. -It appears - - ^^^^^ ROAD MAP ^^^^^ - -\/\/\/ CURRENT VERSION \/\/\/ - -Version 0.7.0-beta ------------------- - - * Renamed/relabled things to be consistent with a general PPPd service - * Total revamp of the configuration interface - - More abstract. Seperated the dialog (glade) details - from behaviour considerable. Implementation now simply - requires a glade file and a few lines of rather declarative - code. - * Add configuration options to select alternative ptys - - though only PPTP is actually defined at the moment - - Dial-up has been put in to the configuration as a - "feature preview" but it doesn't actually do anything - at present. - * Runs pppd asynchronously (allows pppd to fork) - * Crash on disconnect fixed. - * Added "debug mode" to show more detailed output. - -Bugs: - * Does not seem to remember you login information even if - told to do so. (FIXED) - * Still only support for CHAP authentication. - - -Version 0.6.9 --------------------------------- - -Bugs: - * Possible NetworkManager crash on disconnect from VPN! (FIXED) - * Add dialog option to select different authentication methods - * Add dialog options for the rest of the 'hard coded' pppd options. (FIXED) - - - --------------------------------- -PREHISTORY -Version 0.1.0 -> 0.5.0 - -Hi Nikolaus, - -Yes, I've did quite a bit of work on it. Infact I totally revamped it to use a pppd plugin as it's helper. (Thus is can do the DNS + routing without modifications to your local /etc/ppp files) - -Actually there is one exception... Many distros have an ip-up script which implements usepeerdns functionality thus replacing resolve.conf... This conflicts with NetworkManager's actions so may need to be removed. Sadly there appears to be no way to tell pppd NOT to execute /etc/ppp/ip-up if it exists! - -Uses a pppd plugin to handle CHAP authentication (not sure of the V2 implications...) and ip-up functionality... It explicitly resolves the IP of the vpn server before starting pppd. And starts pppd with the pty option rather than letting pptp start pppd (as recomented by the pptp maintainer). - -Sadly, I haven't quite figured out how I'm gonna get the username and password from the vpn-daemon to the pppd helper plugin infact I've just got my credentials hard coded in the plugin for testing! -The reason I haven't fixed that is that there is another strange behaviour where by the pptp vpn daemon (sometimes!) takes NM down when it exits!! It seems to seg fault but I can't find the cause. I've been really busy but would love somone to take a look at this. I can upload it in it's present state with instructions for where to insert your credentials if you/anyone else would be willing to try it and perhaps assist me. - -tOnY - - -Nikolaus Filus wrote: - -> Hi, -> -> I just managed to get your pptp plugin "working" for my university setup. It was a hard piece of work, since I'm not familiar with NM or pptp details. There are several issues to be fixed and I hope this report will be usefull for you. I don't attach patches as my modifications are just hacks :) -> -> 1. nm-pptp-service-pptp-helper -> The while-loop doesn't work, as I wasn't able to find a place, where -> foreign_option_%i shall be defined. It seems to me as if this code is incomplete and you wanted to scan through the whole environment and -> analyse the options. I had to manually add parsing of DNS, DNS1 and DNS2 which are set in my environment, or my resolv.conf is empty after connecting to the vpn. -> -> 2. nm-pptp-service -> encrypt-mppe was never attached to my pppd options and I had to add -> -> g_ptr_array_add (pptp_argv, (gpointer) "require-mschap-v2"); -> g_ptr_array_add (pptp_argv, (gpointer) "mppe"); -> g_ptr_array_add (pptp_argv, (gpointer) "required,stateless"); -> -> outside the for-loop. As you can see, I also need the "require-mschap-v2" option. For this to work I need to specify a special remotename, which is NOT the hostname, as used in your code. This also requires a second line -> in chap-secrets. -> -> 3. configuration -> By default a new default route to ppp0 is specified, deleting the old one. I need to preserve it (by setting vpn-routes to 0.0.0.0/0) and add -> -> route add -host vpn-gw dev eth1 -> route add default dev ppp0 -> -> manually. -> -> -> With this modifications, I was able to connect the vpn at my university "using" networkmanager. -> -> -> Are you working on the pppd plugin as announced on the mailinglist? I would be glad to test it :) -> -> -> Thanks for your work -> -> Nikolaus Filus -> -> -> - - - - - -Dan Williams wrote: - -> But in your case, the pppd-vpn-service daemon could just do whatever it -> does to start the connection, but provide a dbus service that when -> called, returns the password and username. The pppd plugin would then -> call this dbus service and request the pass & user. -> -> -> -That is precisely what I intend and started implementing it. I just wanted to fix the strange and 'intermittent' segfault before -adding anymore complexity. - -I only hesitated when naming the dbus service. - -> There are some things to think hard about here though, namely the -> security of it. If you have a daemon providing a dbus service, unless -> you lock it down anyone can call its methods. So you'd have to make -> sure that you lock down the dbus policy for the service-daemon pretty -> tight. If you restrict it to just 'root'/uid 0, any root app could ask -> for the user and password. But then again, any 'root' app can do -> horrible things to your system anyway. So this might be an acceptable -> course of action. -> -> -I imagined that root access would be sufficient in this case too. I suppose -the only other way is for the vpn-daemon to pass some secret cookie to the -pppd on start up that the plugin then uses when asking for the user/pass later -but that too would open all kinds of security holes I suppose. - -Anyway... A root process could overwrite the pppd plugin in /usr/lib with -something malicious so I can't see any possible gain. Just as a root process could -overwrite the vpnc binary with a script which 'tee' s the standard input to a file :-) - -> Ideally this could be solved upstream in pppd. But at some point you -> simply do best-effort to hide the username & password from view, keep -> investigating how to do it better, and fix it a bit later. -> -> -Exactly. "Just works" not "Will at some future time just work" right :-) - -tOnY diff --git a/vpn-daemons/pptp/auth-dialog/.cvsignore b/vpn-daemons/pptp/auth-dialog/.cvsignore deleted file mode 100644 index 1ea3436e9e..0000000000 --- a/vpn-daemons/pptp/auth-dialog/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile.in -Makefile -nm-ppp-auth-dialog -.libs -.deps diff --git a/vpn-daemons/pptp/auth-dialog/Makefile.am b/vpn-daemons/pptp/auth-dialog/Makefile.am deleted file mode 100644 index 28aaf7f699..0000000000 --- a/vpn-daemons/pptp/auth-dialog/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -INCLUDES = -I${top_srcdir} - -libexec_PROGRAMS = nm-pptp-auth-dialog - -nm_pptp_auth_dialog_CPPFLAGS = \ - $(NM_UTILS_CFLAGS) \ - $(GTHREAD_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBGNOMEUI_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ - -DICONDIR=\""$(datadir)/pixmaps"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DBINDIR=\""$(bindir)"\" \ - -DDBUS_API_SUBJECT_TO_CHANGE \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" \ - $(NULL) - -nm_pptp_auth_dialog_SOURCES = \ - main.c \ - gnome-two-password-dialog.c \ - gnome-two-password-dialog.h \ - $(NULL) - -nm_pptp_auth_dialog_LDADD = \ - $(GTK_LIBS) \ - $(LIBGNOMEUI_LIBS) \ - $(top_builddir)/common-gnome/libnm-pptp-common-gnome.la \ - $(NULL) - -CLEANFILES = *~ diff --git a/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c b/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c deleted file mode 100644 index f00037922d..0000000000 --- a/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c +++ /dev/null @@ -1,743 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* gnome-password-dialog.c - A use password prompting dialog widget. - - Copyright (C) 1999, 2000 Eazel, Inc. - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the ree Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Authors: Ramiro Estrugo -*/ - -#include -//#include "gnome-i18nP.h" -#include "gnome-two-password-dialog.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - - -struct GnomeTwoPasswordDialogDetails -{ - /* Attributes */ - gboolean readonly_username; - gboolean readonly_domain; - - gboolean show_username; - gboolean show_domain; - gboolean show_password; - gboolean show_password_secondary; - - /* TODO: */ - gboolean remember; - char *remember_label_text; - - /* Internal widgetry and flags */ - GtkWidget *username_entry; - GtkWidget *password_entry; - GtkWidget *password_entry_secondary; - GtkWidget *domain_entry; - - GtkWidget *table_alignment; - GtkWidget *table; - - GtkWidget *remember_session_button; - GtkWidget *remember_forever_button; - - GtkWidget *radio_vbox; - GtkWidget *connect_with_no_userpass_button; - GtkWidget *connect_with_userpass_button; - - gboolean anon_support_on; - - char *secondary_password_label; -}; - -/* Caption table rows indices */ -static const guint CAPTION_TABLE_USERNAME_ROW = 0; -static const guint CAPTION_TABLE_PASSWORD_ROW = 1; - -/* GnomeTwoPasswordDialogClass methods */ -static void gnome_two_password_dialog_class_init (GnomeTwoPasswordDialogClass *password_dialog_class); -static void gnome_two_password_dialog_init (GnomeTwoPasswordDialog *password_dialog); - -/* GObjectClass methods */ -static void gnome_two_password_dialog_finalize (GObject *object); - - -/* GtkDialog callbacks */ -static void dialog_show_callback (GtkWidget *widget, - gpointer callback_data); -static void dialog_close_callback (GtkWidget *widget, - gpointer callback_data); - -static gpointer parent_class; - -GType -gnome_two_password_dialog_get_type (void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo info = { - sizeof (GnomeTwoPasswordDialogClass), - NULL, NULL, - (GClassInitFunc) gnome_two_password_dialog_class_init, - NULL, NULL, - sizeof (GnomeTwoPasswordDialog), 0, - (GInstanceInitFunc) gnome_two_password_dialog_init, - NULL - }; - - type = g_type_register_static (gtk_dialog_get_type(), - "GnomeTwoPasswordDialog", - &info, 0); - - parent_class = g_type_class_ref (gtk_dialog_get_type()); - } - - return type; -} - - -static void -gnome_two_password_dialog_class_init (GnomeTwoPasswordDialogClass * klass) -{ - G_OBJECT_CLASS (klass)->finalize = gnome_two_password_dialog_finalize; -} - -static void -gnome_two_password_dialog_init (GnomeTwoPasswordDialog *password_dialog) -{ - password_dialog->details = g_new0 (GnomeTwoPasswordDialogDetails, 1); - password_dialog->details->show_username = TRUE; - password_dialog->details->show_password = TRUE; - password_dialog->details->show_password_secondary = TRUE; - password_dialog->details->anon_support_on = FALSE; - - password_dialog->details->secondary_password_label = g_strdup ( _("_Secondary Password:") ); -} - -/* GObjectClass methods */ -static void -gnome_two_password_dialog_finalize (GObject *object) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (object); - - g_object_unref (password_dialog->details->username_entry); - g_object_unref (password_dialog->details->domain_entry); - g_object_unref (password_dialog->details->password_entry); - g_object_unref (password_dialog->details->password_entry_secondary); - - g_free (password_dialog->details->remember_label_text); - g_free (password_dialog->details->secondary_password_label); - g_free (password_dialog->details); - - if (G_OBJECT_CLASS (parent_class)->finalize != NULL) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); -} - -/* GtkDialog callbacks */ -static void -dialog_show_callback (GtkWidget *widget, gpointer callback_data) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (callback_data); - - if (GTK_WIDGET_VISIBLE (password_dialog->details->username_entry) && - !password_dialog->details->readonly_username) { - gtk_widget_grab_focus (password_dialog->details->username_entry); - } else if (GTK_WIDGET_VISIBLE (password_dialog->details->domain_entry) && - !password_dialog->details->readonly_domain) { - gtk_widget_grab_focus (password_dialog->details->domain_entry); - } else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry)) { - gtk_widget_grab_focus (password_dialog->details->password_entry); - } else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry_secondary)) { - gtk_widget_grab_focus (password_dialog->details->password_entry_secondary); - } -} - -static void -dialog_close_callback (GtkWidget *widget, gpointer callback_data) -{ - gtk_widget_hide (widget); -} - -static void -userpass_radio_button_clicked (GtkWidget *widget, gpointer callback_data) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (callback_data); - - if (widget == password_dialog->details->connect_with_no_userpass_button) { - gtk_widget_set_sensitive ( - password_dialog->details->table, FALSE); - } - else { /* the other button */ - gtk_widget_set_sensitive ( - password_dialog->details->table, TRUE); - } -} - -static void -add_row (GtkWidget *table, int row, const char *label_text, GtkWidget *entry) -{ - GtkWidget *label; - - label = gtk_label_new_with_mnemonic (label_text); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - - gtk_table_attach_defaults (GTK_TABLE (table), label, - 0, 1, row, row + 1); - gtk_table_attach_defaults (GTK_TABLE (table), entry, - 1, 2, row, row + 1); - - gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); -} - -static void -remove_child (GtkWidget *child, GtkWidget *table) -{ - gtk_container_remove (GTK_CONTAINER (table), child); -} - -static void -add_table_rows (GnomeTwoPasswordDialog *password_dialog) -{ - int row; - GtkWidget *table; - int offset; - - if (password_dialog->details->anon_support_on) { - offset = 12; - } - else { - offset = 0; - } - - gtk_alignment_set_padding (GTK_ALIGNMENT (password_dialog->details->table_alignment), - 0, 0, offset, 0); - - table = password_dialog->details->table; - /* This will not kill the entries, since they are ref:ed */ - gtk_container_foreach (GTK_CONTAINER (table), - (GtkCallback)remove_child, table); - - row = 0; - if (password_dialog->details->show_username) - add_row (table, row++, _("_Username:"), password_dialog->details->username_entry); - if (password_dialog->details->show_domain) - add_row (table, row++, _("_Domain:"), password_dialog->details->domain_entry); - if (password_dialog->details->show_password) - add_row (table, row++, _("_Password:"), password_dialog->details->password_entry); - if (password_dialog->details->show_password_secondary) - add_row (table, row++, password_dialog->details->secondary_password_label, - password_dialog->details->password_entry_secondary); - - gtk_widget_show_all (table); -} - -static void -username_entry_activate (GtkWidget *widget, GtkWidget *dialog) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (dialog); - - if (GTK_WIDGET_VISIBLE (password_dialog->details->domain_entry) && - GTK_WIDGET_SENSITIVE (password_dialog->details->domain_entry)) - gtk_widget_grab_focus (password_dialog->details->domain_entry); - else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry)) - gtk_widget_grab_focus (password_dialog->details->password_entry); - else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry_secondary) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry_secondary)) - gtk_widget_grab_focus (password_dialog->details->password_entry_secondary); -} - -static void -domain_entry_activate (GtkWidget *widget, GtkWidget *dialog) -{ - GnomeTwoPasswordDialog *password_dialog; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (dialog); - - if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry)) - gtk_widget_grab_focus (password_dialog->details->password_entry); - else if (GTK_WIDGET_VISIBLE (password_dialog->details->password_entry_secondary) && - GTK_WIDGET_SENSITIVE (password_dialog->details->password_entry_secondary)) - gtk_widget_grab_focus (password_dialog->details->password_entry_secondary); -} - - -/* Public GnomeTwoPasswordDialog methods */ -GtkWidget * -gnome_two_password_dialog_new (const char *dialog_title, - const char *message, - const char *username, - const char *password, - gboolean readonly_username) -{ - GnomeTwoPasswordDialog *password_dialog; - GtkDialog *dialog; - GtkWidget *table; - GtkLabel *message_label; - GtkWidget *hbox; - GtkWidget *vbox; - GtkWidget *main_vbox; - GtkWidget *dialog_icon; - GSList *group; - - password_dialog = GNOME_TWO_PASSWORD_DIALOG (gtk_widget_new (gnome_two_password_dialog_get_type (), NULL)); - dialog = GTK_DIALOG (password_dialog); - - gtk_window_set_title (GTK_WINDOW (password_dialog), dialog_title); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - - gtk_dialog_add_buttons (dialog, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - gtk_dialog_set_default_response (GTK_DIALOG (password_dialog), GTK_RESPONSE_OK); - - /* Setup the dialog */ - gtk_dialog_set_has_separator (dialog, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 5); - gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6); - - gtk_window_set_position (GTK_WINDOW (password_dialog), GTK_WIN_POS_CENTER); - gtk_window_set_modal (GTK_WINDOW (password_dialog), TRUE); - - g_signal_connect (password_dialog, "show", - G_CALLBACK (dialog_show_callback), password_dialog); - g_signal_connect (password_dialog, "close", - G_CALLBACK (dialog_close_callback), password_dialog); - - /* the radio buttons for anonymous login */ - password_dialog->details->connect_with_no_userpass_button = - gtk_radio_button_new_with_mnemonic (NULL, _("Connect _anonymously")); - group = gtk_radio_button_get_group ( - GTK_RADIO_BUTTON (password_dialog->details->connect_with_no_userpass_button)); - password_dialog->details->connect_with_userpass_button = - gtk_radio_button_new_with_mnemonic ( - group, _("Connect as _user:")); - - if (username != NULL && *username != 0) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->connect_with_userpass_button), TRUE); - } else { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->connect_with_no_userpass_button), TRUE); - } - - password_dialog->details->radio_vbox = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (password_dialog->details->radio_vbox), - password_dialog->details->connect_with_no_userpass_button, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (password_dialog->details->radio_vbox), - password_dialog->details->connect_with_userpass_button, - FALSE, FALSE, 0); - g_signal_connect (password_dialog->details->connect_with_no_userpass_button, "clicked", - G_CALLBACK (userpass_radio_button_clicked), password_dialog); - g_signal_connect (password_dialog->details->connect_with_userpass_button, "clicked", - G_CALLBACK (userpass_radio_button_clicked), password_dialog); - - /* The table that holds the captions */ - password_dialog->details->table_alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); - - password_dialog->details->table = table = gtk_table_new (3, 2, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_container_add (GTK_CONTAINER (password_dialog->details->table_alignment), table); - - password_dialog->details->username_entry = gtk_entry_new (); - password_dialog->details->domain_entry = gtk_entry_new (); - password_dialog->details->password_entry = gtk_entry_new (); - password_dialog->details->password_entry_secondary = gtk_entry_new (); - - /* We want to hold on to these during the table rearrangement */ -#if GLIB_CHECK_VERSION (2, 10, 0) - g_object_ref_sink (password_dialog->details->username_entry); - g_object_ref_sink (password_dialog->details->domain_entry); - g_object_ref_sink (password_dialog->details->password_entry); - g_object_ref_sink (password_dialog->details->password_entry_secondary); -#else - g_object_ref (password_dialog->details->username_entry); - gtk_object_sink (GTK_OBJECT (password_dialog->details->username_entry)); - g_object_ref (password_dialog->details->domain_entry); - gtk_object_sink (GTK_OBJECT (password_dialog->details->domain_entry)); - g_object_ref (password_dialog->details->password_entry); - gtk_object_sink (GTK_OBJECT (password_dialog->details->password_entry)); - g_object_ref (password_dialog->details->password_entry_secondary); - gtk_object_sink (GTK_OBJECT (password_dialog->details->password_entry_secondary)); -#endif - - gtk_entry_set_visibility (GTK_ENTRY (password_dialog->details->password_entry), FALSE); - gtk_entry_set_visibility (GTK_ENTRY (password_dialog->details->password_entry_secondary), FALSE); - - g_signal_connect (password_dialog->details->username_entry, - "activate", - G_CALLBACK (username_entry_activate), - password_dialog); - g_signal_connect (password_dialog->details->domain_entry, - "activate", - G_CALLBACK (domain_entry_activate), - password_dialog); - g_signal_connect_swapped (password_dialog->details->password_entry, - "activate", - G_CALLBACK (gtk_window_activate_default), - password_dialog); - g_signal_connect_swapped (password_dialog->details->password_entry_secondary, - "activate", - G_CALLBACK (gtk_window_activate_default), - password_dialog); - add_table_rows (password_dialog); - - /* Adds some eye-candy to the dialog */ - hbox = gtk_hbox_new (FALSE, 12); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - dialog_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment (GTK_MISC (dialog_icon), 0.5, 0.0); - gtk_box_pack_start (GTK_BOX (hbox), dialog_icon, FALSE, FALSE, 0); - - /* Fills the vbox */ - main_vbox = gtk_vbox_new (FALSE, 18); - - if (message) { - message_label = GTK_LABEL (gtk_label_new (message)); - gtk_label_set_justify (message_label, GTK_JUSTIFY_LEFT); - gtk_label_set_line_wrap (message_label, TRUE); - - gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label), - FALSE, FALSE, 0); - } - - vbox = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->radio_vbox, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->table_alignment, - FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (hbox), main_vbox, FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (password_dialog)->vbox), - hbox, - TRUE, /* expand */ - TRUE, /* fill */ - 0); /* padding */ - - gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox); - - password_dialog->details->remember_session_button = - gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session")); - password_dialog->details->remember_forever_button = - gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring")); - - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, - FALSE, FALSE, 0); - - gnome_two_password_dialog_set_username (password_dialog, username); - gnome_two_password_dialog_set_password (password_dialog, password); - gnome_two_password_dialog_set_readonly_domain (password_dialog, readonly_username); - - return GTK_WIDGET (password_dialog); -} - -gboolean -gnome_two_password_dialog_run_and_block (GnomeTwoPasswordDialog *password_dialog) -{ - gint button_clicked; - - g_return_val_if_fail (password_dialog != NULL, FALSE); - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), FALSE); - - button_clicked = gtk_dialog_run (GTK_DIALOG (password_dialog)); - gtk_widget_hide (GTK_WIDGET (password_dialog)); - - return button_clicked == GTK_RESPONSE_OK; -} - -void -gnome_two_password_dialog_set_username (GnomeTwoPasswordDialog *password_dialog, - const char *username) -{ - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - g_return_if_fail (password_dialog->details->username_entry != NULL); - - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->username_entry), - username?username:""); -} - -void -gnome_two_password_dialog_set_password (GnomeTwoPasswordDialog *password_dialog, - const char *password) -{ - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->password_entry), - password ? password : ""); -} - -void -gnome_two_password_dialog_set_password_secondary (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary) -{ - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->password_entry_secondary), - password_secondary ? password_secondary : ""); -} - -void -gnome_two_password_dialog_set_domain (GnomeTwoPasswordDialog *password_dialog, - const char *domain) -{ - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - g_return_if_fail (password_dialog->details->domain_entry != NULL); - - gtk_entry_set_text (GTK_ENTRY (password_dialog->details->domain_entry), - domain ? domain : ""); -} - - -void -gnome_two_password_dialog_set_show_username (GnomeTwoPasswordDialog *password_dialog, - gboolean show) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - show = !!show; - if (password_dialog->details->show_username != show) { - password_dialog->details->show_username = show; - add_table_rows (password_dialog); - } -} - -void -gnome_two_password_dialog_set_show_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean show) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - show = !!show; - if (password_dialog->details->show_domain != show) { - password_dialog->details->show_domain = show; - add_table_rows (password_dialog); - } -} - -void -gnome_two_password_dialog_set_show_password (GnomeTwoPasswordDialog *password_dialog, - gboolean show) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - show = !!show; - if (password_dialog->details->show_password != show) { - password_dialog->details->show_password = show; - add_table_rows (password_dialog); - } -} - -void -gnome_two_password_dialog_set_show_password_secondary (GnomeTwoPasswordDialog *password_dialog, - gboolean show) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - show = !!show; - if (password_dialog->details->show_password_secondary != show) { - password_dialog->details->show_password_secondary = show; - add_table_rows (password_dialog); - } -} - -void -gnome_two_password_dialog_set_readonly_username (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - password_dialog->details->readonly_username = readonly; - - gtk_widget_set_sensitive (password_dialog->details->username_entry, - !readonly); -} - -void -gnome_two_password_dialog_set_readonly_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - password_dialog->details->readonly_domain = readonly; - - gtk_widget_set_sensitive (password_dialog->details->domain_entry, - !readonly); -} - -char * -gnome_two_password_dialog_get_username (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->username_entry))); -} - -char * -gnome_two_password_dialog_get_domain (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->domain_entry))); -} - -char * -gnome_two_password_dialog_get_password (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->password_entry))); -} - -char * -gnome_two_password_dialog_get_password_secondary (GnomeTwoPasswordDialog *password_dialog) -{ - g_return_val_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog), NULL); - - return g_strdup (gtk_entry_get_text (GTK_ENTRY (password_dialog->details->password_entry_secondary))); -} - -void -gnome_two_password_dialog_set_show_userpass_buttons (GnomeTwoPasswordDialog *password_dialog, - gboolean show_userpass_buttons) -{ - if (show_userpass_buttons) { - password_dialog->details->anon_support_on = TRUE; - gtk_widget_show (password_dialog->details->radio_vbox); - if (gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON (password_dialog->details->connect_with_no_userpass_button))) { - gtk_widget_set_sensitive (password_dialog->details->table, FALSE); - } - else { - gtk_widget_set_sensitive (password_dialog->details->table, TRUE); - } - } else { - password_dialog->details->anon_support_on = FALSE; - gtk_widget_hide (password_dialog->details->radio_vbox); - gtk_widget_set_sensitive (password_dialog->details->table, TRUE); - } - - add_table_rows (password_dialog); -} - -gboolean -gnome_two_password_dialog_anon_selected (GnomeTwoPasswordDialog *password_dialog) -{ - return password_dialog->details->anon_support_on && - gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON ( - password_dialog->details->connect_with_no_userpass_button)); -} - -void -gnome_two_password_dialog_set_show_remember (GnomeTwoPasswordDialog *password_dialog, - gboolean show_remember) -{ - if (show_remember) { - gtk_widget_show (password_dialog->details->remember_session_button); - gtk_widget_show (password_dialog->details->remember_forever_button); - } else { - gtk_widget_hide (password_dialog->details->remember_session_button); - gtk_widget_hide (password_dialog->details->remember_forever_button); - } -} - -void -gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, - GnomeTwoPasswordDialogRemember remember) -{ - gboolean session, forever; - - session = FALSE; - forever = FALSE; - if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) { - session = TRUE; - } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){ - forever = TRUE; - } - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button), - session); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button), - forever); -} - -GnomeTwoPasswordDialogRemember -gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog) -{ - gboolean session, forever; - - session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button)); - forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button)); - if (forever) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER; - } else if (session) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION; - } - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; -} - -void gnome_two_password_dialog_set_password_secondary_label (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary_label) -{ - g_return_if_fail (password_dialog != NULL); - g_return_if_fail (GNOME_IS_TWO_PASSWORD_DIALOG (password_dialog)); - - g_free (password_dialog->details->secondary_password_label); - password_dialog->details->secondary_password_label = g_strdup (password_secondary_label); - - if (password_dialog->details->show_password_secondary) { - add_table_rows (password_dialog); - } -} diff --git a/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h b/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h deleted file mode 100644 index 4a38e8e1c5..0000000000 --- a/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h +++ /dev/null @@ -1,116 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* gnome-two-password-dialog.h - A use password prompting dialog widget - asking for two passwords. Based of - gnome-password-dialog.[ch] from libgnomeui - - Copyright (C) 1999, 2000 Eazel, Inc. - Copyright (C) 2005, Red Hat, Inc. - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Authors: Ramiro Estrugo -*/ - -#ifndef GNOME_TWO_PASSWORD_DIALOG_H -#define GNOME_TWO_PASSWORD_DIALOG_H - -#include - -G_BEGIN_DECLS - -#define GNOME_TYPE_TWO_PASSWORD_DIALOG (gnome_two_password_dialog_get_type ()) -#define GNOME_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialog)) -#define GNOME_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialogClass)) -#define GNOME_IS_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG)) -#define GNOME_IS_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG)) - -typedef struct GnomeTwoPasswordDialog GnomeTwoPasswordDialog; -typedef struct GnomeTwoPasswordDialogClass GnomeTwoPasswordDialogClass; -typedef struct GnomeTwoPasswordDialogDetails GnomeTwoPasswordDialogDetails; - -struct GnomeTwoPasswordDialog -{ - GtkDialog gtk_dialog; - - GnomeTwoPasswordDialogDetails *details; -}; - -struct GnomeTwoPasswordDialogClass -{ - GtkDialogClass parent_class; -}; - -typedef enum { - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER -} GnomeTwoPasswordDialogRemember; - - -GType gnome_two_password_dialog_get_type (void); -GtkWidget* gnome_two_password_dialog_new (const char *dialog_title, - const char *message, - const char *username, - const char *password, - gboolean readonly_username); - -gboolean gnome_two_password_dialog_run_and_block (GnomeTwoPasswordDialog *password_dialog); - -/* Attribute mutators */ -void gnome_two_password_dialog_set_show_username (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_set_show_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_set_show_password (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_set_show_password_secondary (GnomeTwoPasswordDialog *password_dialog, - gboolean show); -void gnome_two_password_dialog_set_username (GnomeTwoPasswordDialog *password_dialog, - const char *username); -void gnome_two_password_dialog_set_domain (GnomeTwoPasswordDialog *password_dialog, - const char *domain); -void gnome_two_password_dialog_set_password (GnomeTwoPasswordDialog *password_dialog, - const char *password); -void gnome_two_password_dialog_set_password_secondary (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary); -void gnome_two_password_dialog_set_readonly_username (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly); -void gnome_two_password_dialog_set_readonly_domain (GnomeTwoPasswordDialog *password_dialog, - gboolean readonly); - -void gnome_two_password_dialog_set_password_secondary_label (GnomeTwoPasswordDialog *password_dialog, - const char *password_secondary_description); - -void gnome_two_password_dialog_set_show_remember (GnomeTwoPasswordDialog *password_dialog, - gboolean show_remember); -void gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, - GnomeTwoPasswordDialogRemember remember); -GnomeTwoPasswordDialogRemember gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog); -void gnome_two_password_dialog_set_show_userpass_buttons (GnomeTwoPasswordDialog *password_dialog, - gboolean show_userpass_buttons); - -/* Attribute accessors */ -char * gnome_two_password_dialog_get_username (GnomeTwoPasswordDialog *password_dialog); -char * gnome_two_password_dialog_get_domain (GnomeTwoPasswordDialog *password_dialog); -char * gnome_two_password_dialog_get_password (GnomeTwoPasswordDialog *password_dialog); -char * gnome_two_password_dialog_get_password_secondary (GnomeTwoPasswordDialog *password_dialog); - -gboolean gnome_two_password_dialog_anon_selected (GnomeTwoPasswordDialog *password_dialog); - -G_END_DECLS - -#endif /* GNOME_TWO_PASSWORD_DIALOG_H */ diff --git a/vpn-daemons/pptp/auth-dialog/main.c b/vpn-daemons/pptp/auth-dialog/main.c deleted file mode 100644 index 6662f24a3a..0000000000 --- a/vpn-daemons/pptp/auth-dialog/main.c +++ /dev/null @@ -1,187 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager Wireless Applet -- Display wireless access points and allow user control - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2008 Red Hat, Inc. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include - -#include - -#include "src/nm-pptp-service.h" -#include "common-gnome/keyring-helpers.h" -#include "gnome-two-password-dialog.h" - -#define KEYRING_UUID_TAG "connection-uuid" -#define KEYRING_SN_TAG "setting-name" -#define KEYRING_SK_TAG "setting-key" - -static gboolean -get_secrets (const char *vpn_uuid, - const char *vpn_name, - const char *vpn_service, - gboolean retry, - char **password) -{ - GnomeTwoPasswordDialog *dialog; - gboolean is_session = TRUE; - char *prompt; - - g_return_val_if_fail (vpn_uuid != NULL, FALSE); - g_return_val_if_fail (vpn_name != NULL, FALSE); - g_return_val_if_fail (password != NULL, FALSE); - g_return_val_if_fail (*password == NULL, FALSE); - - *password = keyring_helpers_lookup_secret (vpn_uuid, NM_PPTP_KEY_PASSWORD, &is_session); - if (!retry && *password) - return TRUE; - - prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name); - dialog = GNOME_TWO_PASSWORD_DIALOG (gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE)); - g_free (prompt); - - gnome_two_password_dialog_set_show_username (dialog, FALSE); - gnome_two_password_dialog_set_show_userpass_buttons (dialog, FALSE); - gnome_two_password_dialog_set_show_domain (dialog, FALSE); - gnome_two_password_dialog_set_show_remember (dialog, TRUE); - gnome_two_password_dialog_set_show_password_secondary (dialog, FALSE); - - /* If nothing was found in the keyring, default to not remembering any secrets */ - if (*password) { - /* Otherwise set default remember based on which keyring the secrets were found in */ - if (is_session) - gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION); - else - gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER); - } else - gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING); - - /* if retrying, pre-fill dialog with the password */ - if (*password) { - gnome_two_password_dialog_set_password (dialog, *password); - g_free (*password); - *password = NULL; - } - - gtk_widget_show (GTK_WIDGET (dialog)); - - if (gnome_two_password_dialog_run_and_block (dialog)) { - const char *keyring = NULL; - gboolean save = FALSE; - - *password = gnome_two_password_dialog_get_password (dialog); - - switch (gnome_two_password_dialog_get_remember (dialog)) { - case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: - keyring = "session"; - /* Fall through */ - case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER: - save = TRUE; - break; - default: - break; - } - - if (save) { - if (*password) { - keyring_helpers_save_secret (vpn_uuid, vpn_name, keyring, - NM_PPTP_KEY_PASSWORD, *password); - } - } - } - - gtk_widget_hide (GTK_WIDGET (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); - - return TRUE; -} - -int -main (int argc, char *argv[]) -{ - gboolean retry = FALSE; - gchar *vpn_name = NULL; - gchar *vpn_uuid = NULL; - gchar *vpn_service = NULL; - char *password = NULL; - char buf[1]; - int ret, exit_status = 1; - GOptionContext *context; - GnomeProgram *program; - GOptionEntry entries[] = { - { "reprompt", 'r', 0, G_OPTION_ARG_NONE, &retry, "Reprompt for passwords", NULL}, - { "uuid", 'u', 0, G_OPTION_ARG_STRING, &vpn_uuid, "UUID of VPN connection", NULL}, - { "name", 'n', 0, G_OPTION_ARG_STRING, &vpn_name, "Name of VPN connection", NULL}, - { "service", 's', 0, G_OPTION_ARG_STRING, &vpn_service, "VPN service type", NULL}, - { NULL } - }; - - bindtextdomain (GETTEXT_PACKAGE, NULL); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - context = g_option_context_new ("- pptp auth dialog"); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); - - program = gnome_program_init ("nm-pptp-auth-dialog", VERSION, - LIBGNOMEUI_MODULE, - argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, context, - GNOME_PARAM_NONE); - - if (vpn_uuid == NULL || vpn_name == NULL || vpn_service == NULL) { - fprintf (stderr, "Have to supply UUID, name, and service\n"); - goto out; - } - - if (strcmp (vpn_service, NM_DBUS_SERVICE_PPTP) != 0) { - fprintf (stderr, "This dialog only works with the '%s' service\n", NM_DBUS_SERVICE_PPTP); - goto out; - } - - if (!get_secrets (vpn_uuid, vpn_name, vpn_service, retry, &password)) - goto out; - - /* dump the passwords to stdout */ - printf ("%s\n%s\n", NM_PPTP_KEY_PASSWORD, password); - printf ("\n\n"); - - if (password) { - memset (password, 0, strlen (password)); - gnome_keyring_memory_free (password); - } - exit_status = 0; - - /* for good measure, flush stdout since Kansas is going Bye-Bye */ - fflush (stdout); - - /* wait for data on stdin */ - ret = fread (buf, sizeof (char), sizeof (buf), stdin); - -out: - g_object_unref (program); - return exit_status; -} diff --git a/vpn-daemons/pptp/autogen.sh b/vpn-daemons/pptp/autogen.sh deleted file mode 100755 index 1ebfe88484..0000000000 --- a/vpn-daemons/pptp/autogen.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. -REQUIRED_AUTOMAKE_VERSION=1.9 -PKG_NAME=NetworkManager-pptp - -(test -f $srcdir/configure.in \ - && test -f $srcdir/auth-dialog/main.c) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} - - -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} -USE_GNOME2_MACROS=1 . gnome-autogen.sh - - diff --git a/vpn-daemons/pptp/common-gnome/Makefile.am b/vpn-daemons/pptp/common-gnome/Makefile.am deleted file mode 100644 index bae9975136..0000000000 --- a/vpn-daemons/pptp/common-gnome/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -noinst_LTLIBRARIES=libnm-pptp-common-gnome.la - -libnm_pptp_common_gnome_la_CPPFLAGS = \ - $(NM_UTILS_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ - -DG_DISABLE_DEPRECATED - -libnm_pptp_common_gnome_la_SOURCES= \ - keyring-helpers.c \ - keyring-helpers.h - -libnm_pptp_common_gnome_la_LIBADD = \ - $(NM_UTILS_LIBS) \ - $(GLIB_LIBS) \ - $(GNOMEKEYRING_LIBS) - diff --git a/vpn-daemons/pptp/common-gnome/keyring-helpers.c b/vpn-daemons/pptp/common-gnome/keyring-helpers.c deleted file mode 100644 index 364aca84f4..0000000000 --- a/vpn-daemons/pptp/common-gnome/keyring-helpers.c +++ /dev/null @@ -1,158 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager Wireless Applet -- Display wireless access points and allow user control - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2008 Red Hat, Inc. - */ - -#include -#include - -#include - -#include "keyring-helpers.h" -#include "../src/nm-pptp-service.h" - -#define KEYRING_UUID_TAG "connection-uuid" -#define KEYRING_SN_TAG "setting-name" -#define KEYRING_SK_TAG "setting-key" - -char * -keyring_helpers_lookup_secret (const char *vpn_uuid, - const char *secret_name, - gboolean *is_session) -{ - GList *found_list = NULL; - GnomeKeyringResult ret; - GnomeKeyringFound *found; - char *secret; - - ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET, - &found_list, - KEYRING_UUID_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - vpn_uuid, - KEYRING_SN_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - NM_SETTING_VPN_SETTING_NAME, - KEYRING_SK_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - secret_name, - NULL); - if ((ret != GNOME_KEYRING_RESULT_OK) || (g_list_length (found_list) == 0)) - return NULL; - - found = (GnomeKeyringFound *) found_list->data; - - if (is_session) { - if (strcmp (found->keyring, "session") == 0) - *is_session = TRUE; - else - *is_session = FALSE; - } - - secret = found->secret ? gnome_keyring_memory_strdup (found->secret) : NULL; - gnome_keyring_found_list_free (found_list); - - return secret; -} - -GnomeKeyringResult -keyring_helpers_save_secret (const char *vpn_uuid, - const char *vpn_name, - const char *keyring, - const char *secret_name, - const char *secret) -{ - char *display_name; - GnomeKeyringResult ret; - GnomeKeyringAttributeList *attrs = NULL; - guint32 id = 0; - - display_name = g_strdup_printf ("VPN %s secret for %s/%s/" NM_SETTING_VPN_SETTING_NAME, - secret_name, - vpn_name, - NM_DBUS_SERVICE_PPTP); - - attrs = gnome_keyring_attribute_list_new (); - gnome_keyring_attribute_list_append_string (attrs, - KEYRING_UUID_TAG, - vpn_uuid); - gnome_keyring_attribute_list_append_string (attrs, - KEYRING_SN_TAG, - NM_SETTING_VPN_SETTING_NAME); - gnome_keyring_attribute_list_append_string (attrs, - KEYRING_SK_TAG, - secret_name); - - ret = gnome_keyring_item_create_sync (keyring, - GNOME_KEYRING_ITEM_GENERIC_SECRET, - display_name, - attrs, - secret, - TRUE, - &id); - gnome_keyring_attribute_list_free (attrs); - g_free (display_name); - return ret; -} - -static void -ignore_callback (GnomeKeyringResult result, gpointer data) -{ -} - -gboolean -keyring_helpers_delete_secret (const char *vpn_uuid, - const char *secret_name) -{ - GList *found = NULL, *iter; - GnomeKeyringResult ret; - - g_return_val_if_fail (vpn_uuid != NULL, FALSE); - g_return_val_if_fail (secret_name != NULL, FALSE); - - ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET, - &found, - KEYRING_UUID_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - vpn_uuid, - KEYRING_SN_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - NM_SETTING_VPN_SETTING_NAME, - KEYRING_SK_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - secret_name, - NULL); - if (ret != GNOME_KEYRING_RESULT_OK && ret != GNOME_KEYRING_RESULT_NO_MATCH) - return FALSE; - if (g_list_length (found) == 0) - return TRUE; - - /* delete them all */ - for (iter = found; iter; iter = g_list_next (iter)) { - GnomeKeyringFound *item = (GnomeKeyringFound *) iter->data; - - gnome_keyring_item_delete (item->keyring, item->item_id, - ignore_callback, NULL, NULL); - } - - gnome_keyring_found_list_free (found); - return TRUE; -} - diff --git a/vpn-daemons/pptp/common-gnome/keyring-helpers.h b/vpn-daemons/pptp/common-gnome/keyring-helpers.h deleted file mode 100644 index 76040a3f5b..0000000000 --- a/vpn-daemons/pptp/common-gnome/keyring-helpers.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager Wireless Applet -- Display wireless access points and allow user control - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2008 Red Hat, Inc. - */ - -#ifndef KEYRING_HELPERS_H -#define KEYRING_HELPERS_H - -#include -#include -#include - -char *keyring_helpers_lookup_secret ( - const char *vpn_uuid, - const char *secret_name, - gboolean *is_session); - -GnomeKeyringResult keyring_helpers_save_secret ( - const char *vpn_uuid, - const char *vpn_name, - const char *keyring, - const char *secret_name, - const char *secret); - -gboolean keyring_helpers_delete_secret ( - const char *vpn_uuid, - const char *secret_name); - -#endif /* KEYRING_HELPERS_H */ - diff --git a/vpn-daemons/pptp/configure.in b/vpn-daemons/pptp/configure.in deleted file mode 100644 index 85719e4488..0000000000 --- a/vpn-daemons/pptp/configure.in +++ /dev/null @@ -1,142 +0,0 @@ -AC_PREREQ(2.59) - -AC_INIT(NetworkManager-pptp, 0.7.0, dcbw@redhat.com, NetworkManager-pptp) -AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 subdir-objects]) -AM_MAINTAINER_MODE - -AC_CONFIG_HEADER(config.h) - -dnl -dnl Require programs -dnl -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_INSTALL -AC_PROG_LIBTOOL - -dnl -dnl Required headers -dnl -AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h syslog.h unistd.h) - -AC_CHECK_HEADERS(pppd/pppd.h,, - AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.)) - -AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory])) - -if test -n "$with_pppd_plugin_dir" ; then - PPPD_PLUGIN_DIR="$with_pppd_plugin_dir" -else - PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.4" -fi -AC_SUBST(PPPD_PLUGIN_DIR) - -dnl -dnl Checks for typedefs, structures, and compiler characteristics. -dnl -AC_TYPE_MODE_T -AC_TYPE_PID_T -AC_HEADER_TIME - -dnl -dnl Checks for library functions. -dnl -AC_PROG_GCC_TRADITIONAL -AC_FUNC_MEMCMP -AC_CHECK_FUNCS(select socket uname) - -dnl -dnl GNOME support -dnl -AC_ARG_WITH(gnome, AC_HELP_STRING([--without-gnome], [Build NetworkManager-pptp without GNOME support, e.g. vpn service only])) -AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno) - -GETTEXT_PACKAGE=NetworkManager-pptp -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) - -IT_PROG_INTLTOOL([0.35]) -AM_GLIB_GNU_GETTEXT - -PKG_CHECK_MODULES(GTHREAD, gthread-2.0) -AC_SUBST(GTHREAD_CFLAGS) -AC_SUBST(GTHREAD_LIBS) - -PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74) -AC_SUBST(DBUS_GLIB_CFLAGS) -AC_SUBST(DBUS_GLIB_LIBS) - -PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.7.0 libnm-util libnm_glib libnm_glib_vpn) -AC_SUBST(NM_UTILS_CFLAGS) -AC_SUBST(NM_UTILS_LIBS) - -if test x"$with_gnome" != xno; then - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - - PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) - AC_SUBST(GDK_PIXBUF_CFLAGS) - AC_SUBST(GDK_PIXBUF_LIBS) - - PKG_CHECK_MODULES(GLADE, libglade-2.0) - AC_SUBST(GLADE_CFLAGS) - AC_SUBST(GLADE_LIBS) - - PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) - AC_SUBST(LIBGNOMEUI_CFLAGS) - AC_SUBST(LIBGNOMEUI_LIBS) - - PKG_CHECK_MODULES(GCONF, gconf-2.0) - AC_SUBST(GCONF_CFLAGS) - AC_SUBST(GCONF_LIBS) - - PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1) - AC_SUBST(GNOMEKEYRING_CFLAGS) - AC_SUBST(GNOMEKEYRING_LIBS) -fi - -AC_ARG_ENABLE(more-warnings, -AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), -set_more_warnings="$enableval",[ -if test -d "$srcdir/{arch}" || test -d "$srcdir/CVS"; then - set_more_warnings=yes -else - set_more_warnings=no -fi -]) -AC_MSG_CHECKING(for more warnings, including -Werror) -if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT(yes) - CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS" - - for option in -Wno-unused -Wno-strict-aliasing -Wno-sign-compare -Wdeclaration-after-statement -Wno-pointer-sign ; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done - unset option -else - AC_MSG_RESULT(no) -fi - -AC_OUTPUT([ -Makefile -src/Makefile -common-gnome/Makefile -auth-dialog/Makefile -properties/Makefile -po/Makefile.in -]) - diff --git a/vpn-daemons/pptp/doc/example-pptp-system-wide-connection.sh b/vpn-daemons/pptp/doc/example-pptp-system-wide-connection.sh deleted file mode 100755 index 19f79ef081..0000000000 --- a/vpn-daemons/pptp/doc/example-pptp-system-wide-connection.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# This is an example of how to install a system-wide connection that -# cannot be edited by unprivileged users using nm-vpn-properties. This -# script needs to be run as root and you may need to restart any -# gconfd daemons after the script has run (logging in and out will -# suffice) - -NAME="ppp-system-wide" -ESCAPED_NAME="ppp-system-wide" -REMOTE="1.2.3.4" -# must be either yes or no -USEMPPE="yes" - -IPSEC_ROUTES="[172.16.0.0/16,192.168.4.0/24]" - -GCONF_PATH="/system/networking/vpn_connections/$ESCAPED_NAME" - -GCONFTOOL2_OPTS="--direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory" - -gconftool-2 $GCONFTOOL2_OPTS --type string --set $GCONF_PATH/name "$NAME" -gconftool-2 $GCONFTOOL2_OPTS --type string --set $GCONF_PATH/service_name "org.freedesktop.NetworkManager.ppp_starter" -gconftool-2 $GCONFTOOL2_OPTS --type list --list-type=string --set $GCONF_PATH/vpn_data ["pptp-remote","$REMOTE","encrypt-mppe",$USEMPPE] -gconftool-2 $GCONFTOOL2_OPTS --type list --list-type=string --set $GCONF_PATH/routes $IPSEC_ROUTES - diff --git a/vpn-daemons/pptp/gnome-mime-application-x-pptp-settings.png b/vpn-daemons/pptp/gnome-mime-application-x-pptp-settings.png deleted file mode 100644 index d8354ff65551b1db41091b57532368acf26271d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2595 zcmV+;3f%RHP)g+^_g)%r(wSEz|A?gQf{XydxAW?5aE zE+*PEtr~}}iP_dBbd9vhh829k)<;>9hZ00U@WpG8;V}cu?Dsn}-*BY^3=g|&vL}A| z?!DZ(_x#TJoyYfGRd&0bo@PRwjWIKM6q74#3~v-+tr94cBim1BhanMgY3@zXTvPEiJA1 z`0?Y90T}r#3FhL(ix^V^q}17a8a!%9PEKZJ-6<}QSFBjU!+9PkK)iu*;lhO}0h$gE zoGmIUG9)G@x>bBEP|6uV6k|+4(@G)mzpk!s(u$9E4}hFMe_qZ?Kt`c+*K`3$O;1lR z&d<-EkaC{{He{-{f^^-Y8!cLEozN#FV3wk-@S6FFOKT}TIsrfaBz?Y1_qd? zcDs$>U<+UY`txXYhR3dZG$1+q2SOE z_4oIaMx!-bEergjqZcUkQBID4!!v9)280 zxOf5e4-Q|mTCILvU0tNr+9)_Um|p?~F{?o-wR+SXZnp_A!aH64Lv*vgk(!#k$=BDH zX3m_+!yT2}S${$?0Od{n$}3vZ=)7l!K?=t-)n9$Hr^78T;l|CK;P-$lNSp;R8nwo^gh?*Pg>EpaV zu|j(P0D9xCpV6}9RQk5`JRSOAFMWHlgn##J;`8*8@e9iTsMGPj5>Gj++hIo=g;To zmz0!DF8~-6fts=^jo!}uCAGIcq}rNF>M?f<*N3oWm6iwRm%a28M;b*26UxG4e6Dib zqtoel$c(1^{Zu>9;w5;Fso$7{D>aODL=H_I9OFn=?}l4i0hVsjpYNXd|hkOrgR9rqMdou>fq;>-7hh zC(I2DpEH}HqoX;En!92tY3Yw$$`4qrOqJZcPwAV#f5D1FUVe2oJrkcGVq`G~uF|4N zjb7vk*s!oLwz{N_s4sjT85ub)eZ~T?F+M)tc>45d`nsxz-EFa0M79{Bi0Fm1?cKe6 zjvS8{_VxAAGqG_Lx8prm6_%EMckc&0Tf}`_7sRt%Ers}}6CgrDLU=d}q>E}!>rWU! zCAD1{5(_frl+E0TBl` zdu?dIkw&cpq5I41AhI3;b{> z(_`)-bB~#i0Y(O>9ziNCEJk>+FAv;@_hFVYp7loq5QSc(y}g|u(Dk6fNDuy8==@t& ze9Eusg$0f(36Kb2w96y2hdgF5B0xbC3~P7iFc?7_z25h+G^&)z0$`p35 zAvQLa3JMAcUFe!MYiQM~RSW`PWhGUnL#1NMAeCSm8yj8Jae&dgV!=}Y?qc9FYHF&huaVZ4iYb+I*XtvjfjamNj-#TY zT%K^pe@_mo8mO$BrF)Ofd;aDmRv; z-3hF}a^=bbarov~0NkxQj73F7F6ALemk z(%IQbnVFfK0Dh;QG%odHb-L{(K4?_y8Y0|(2>%0~4B zXoP`a=H4C+nxGSu2A47K+_{s}?s)NlXUMstqJqwxIRgVWc)CM9T031L9`bLYbkax= zNQF=yc^rU{fglebK4j`(Al1Ty%a$$UlsTHj*TGQ!$dMzkK3w+IbO5*}C}3E>e!W`| zNUh*M0$M3(H;`(Tzi}rhV)ga)tUTgp-@bj|{z37l%n2>dJ=k7<9x);M9>b|qr(7FN z$oFXMz((&{xpSrzd>goa z{W>cyXkilV0hB9nW)v)L_dJo0#>(M=z!P>s6?<-Ou01_H-Hz5nwBPvgSux&o((Z|V z=yvHl2>=Yjx%FQzMxGe2|B(N^K&h|l|NmR%zbyX|U;rP9vz1Q6+}8jA002ovPDHLk FV1mA;+W7zg diff --git a/vpn-daemons/pptp/nm-pptp-service.conf b/vpn-daemons/pptp/nm-pptp-service.conf deleted file mode 100644 index aa5400d19d..0000000000 --- a/vpn-daemons/pptp/nm-pptp-service.conf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/vpn-daemons/pptp/nm-pptp-service.name.in b/vpn-daemons/pptp/nm-pptp-service.name.in deleted file mode 100644 index b0cf2b0176..0000000000 --- a/vpn-daemons/pptp/nm-pptp-service.name.in +++ /dev/null @@ -1,8 +0,0 @@ -[VPN Connection] -name=pptp -service=org.freedesktop.NetworkManager.pptp -program=@LIBEXECDIR@/nm-pptp-service - -[GNOME] -auth-dialog=nm-pptp-auth-dialog -properties=libnm-pptp-properties diff --git a/vpn-daemons/pptp/nm-pptp.desktop.in b/vpn-daemons/pptp/nm-pptp.desktop.in deleted file mode 100644 index b9e3bc914e..0000000000 --- a/vpn-daemons/pptp/nm-pptp.desktop.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_Name=PPTP VPN Connection Manager -_GenericName=PPTP VPN Connection Manager -_Comment=Add, Remove, and Edit PPTP VPN Connections -Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.pptp --import-file %f -Icon=gnome-mime-application-x-ppp-settings -Terminal=false -Type=Application -DocPath= -Categories=GNOME;Application;Network; -MimeType=application/x-ppp-settings -NoDisplay=true diff --git a/vpn-daemons/pptp/po/.cvsignore b/vpn-daemons/pptp/po/.cvsignore deleted file mode 100644 index 11c8241741..0000000000 --- a/vpn-daemons/pptp/po/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -Makefile.in.in -Makefile -Makefile.in -POTFILES -*.gmo -*.pot -.intltool-merge-cache -stamp-it diff --git a/vpn-daemons/pptp/po/ChangeLog b/vpn-daemons/pptp/po/ChangeLog deleted file mode 100644 index f14eeb4cdb..0000000000 --- a/vpn-daemons/pptp/po/ChangeLog +++ /dev/null @@ -1,530 +0,0 @@ -2008-12-07 Simos Xenitellis - - * el.po: Updated Greek translation by Evgenia Petoumenou. - -2008-12-05 Mario Blättermann - - * de.po: Updated German translation - -2008-11-29 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2008-11-22 Mario Blättermann - - * de.po: Updated German translation by Hauke Mehrtens. - -2008-11-19 Tomasz Dominikowski - - * pl.po: Updated Polish translation - -2008-11-07 Og Maciel - - * pt_BR.po: Updated Brazilian Portuguese translation by - Fabricio Godoy. - -2008-10-23 Og Maciel - - * pt_BR.po: Updated Brazilian Portuguese translation by - Fabricio Godoy and Vladimir Melo. - -2008-10-19 Ihar Hrachyshka - - * be@latin.po: Updated Belarusian Latin translation by Ihar Hrachyshka. - -2008-10-16 Jorge Gonzalez - - * es.po: Updated Spanish translation. - -2008-10-16 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-10-11 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-10-04 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2008-10-01 Priit Laes - - * et.po: Translation updated by Mattias Põldaru - -2008-10-01 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-09-25 Gabor Kelemen - - * hu.po: Translation updated. - -2008-09-25 Žygimantas Beručka - - * LINGUAS: Added "lt". - -2008-09-25 Žygimantas Beručka - - * lt.po: Added Lithuanian translation. - -2008-09-20 Luca Ferretti - - * it.po: Updated Italian translation by Francesco Marletta. - -2008-09-17 Petr Kovar - - * cs.po: Updated Czech translation by Jiri Eischmann. - -2008-09-15 Wouter Bolsterlee - - * nl.po: Added Dutch translation by Tino Meinen. - -2008-09-09 Inaki Larranaga Murgoitio - - * eu.po: Updated Basque translation. - -2008-08-25 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-08-24 Tomasz Dominikowski - - * pl.po: Updated Polish translation - -2008-08-22 Chao-Hsiung Liao - - * LINGUAS: Added zh_HK zh_TW. - * zh_HK.po: Added Traditional Chinese translation(Hong Kong). - * zh_TW.po: Added Traditional Chinese translation(Taiwan). - -2008-08-17 Claude Paroz - - * LINGUAS: Added missing fr. - * fr.po: Updated translation by Robert-André Mauchin and Claude Paroz. - -2008-08-14 Leonid Kanter - - * ru.po: Updated Russian translation - -2008-08-14 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-08-14 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2008-08-07 Leonid Kanter - - * ru.po: Updated Russian translation - -2008-08-02 Alexander Shopov - - * bg.po: Updated Bulgarian translation by - Alexander Shopov - -2008-07-31 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2008-07-31 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2008-07-25 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-07-25 Jorge Gonzalez - - * es.po: Updated Spanish translation. - -2008-06-06 Clytie Siddall - - * vi.po: Updated Vietnamese translation. - -2008-05-06 Gabor Kelemen - - * hu.po: Translation updated. - -2008-04-26 Gabor Kelemen - - * hu.po: Translation updated. - -2008-04-21 Yair Hershkovitz - - * he.po: Updated Hebrew translation. - -2008-03-19 Gabor Kelemen - - * hu.po: Translation updated - -2008-03-09 Philip Withnall - - * en_GB.po: Updated British English translation. - -2008-02-28 Gil Forcada - - * ca.po: Updated Catalan translation. - -2008-02-20 Inaki Larranaga Murgoitio - - * LINGUAS: Added 'eu' (Basque) entry. - * eu.po: Added Basque translation. - -2008-02-17 Yair Hershkovitz - - * he.po, LINGUAS: Added Hebrew translation. - -2008-01-19 Stéphane Raimbault - - * fr.po: Updated French translation by Robert-André Mauchin. - -2007-12-29 Changwoo Ryu - - * ko.po: Updated Korean translation by Namhyung Kim. - -2007-12-26 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-12-06 Jakub Friedl - - * cs.po: Added 'cs' to linguas. - -2007-12-03 Changwoo Ryu - - * LINGUAS: Added 'ko'. Bug #501020. - -2007-11-02 Kjartan Maraas - - * nb.po: Updated Norwegian bokmål translation. - -2007-10-31 Gabor Kelemen - - * hu.po: Translation updated - -2007-10-28 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2007-10-28 Priit Laes - - * et.po: Translation updated by Priit Laes. - -2007-10-27 Ihar Hrachyshka - - * be@latin.po: Updated Belarusian Latin translation. - -2007-10-26 Jorge Gonzalez - - * es.po: Updated Spanish translation. - -2007-10-06 Funda Wang - - * zh_CN.po: Updated Simplified Chinese translation. - -2007-09-23 Gil Forcada - - * ca.po: Updated Catalan translation. - -2007-09-15 Leonardo Ferreira Fontenelle - - * pt_BR.po: Brazilian Portuguese translation updated by Luiz Armesto - . - -2007-08-20 Wadim Dziedzic - - * nb.po: Updated Polish translation. - -2007-08-17 Kjartan Maraas - - * nb.po: Updated Norwegian bokmål translation. - -2007-08-15 Kostas Papadimas - - * el.po: Updated Greek Translation - -2007-08-11 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2007-07-23 Satoru SATOH - - * ja.po: Updated Japanese translation. - -2007-04-16 Ihar Hrachyshka - - * be@latin.po: Added Belarusian Latin translation. - * LINGUAS: Added 'be@latin'. - -2007-03-10 Hendrik Richter - - * de.po: Updated German translation, by - Thomas Gier - -2007-03-07 Vladimer Sichinava - - * ka.po: Updated Georgian translation by - Malkhaz Barkalaya - -2007-03-06 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2007-03-04 Priit Laes - - * et.po: Updated Estonian translation by Ivar Smolin . - -2007-03-03 Leonid Kanter - - * ru.po: Updated Russian translation - -2007-02-28 Artur Flinta - - * pl.po: Updated Polish translation by GNOME PL Team. - -2007-02-28 Leonid Kanter - - * ru.po: Updated (partially) Russian translation - -2007-02-28 Kjartan Maraas - - * nb.po: Updated Norwegian bokmål translation. - -2007-02-25 Priit Laes - - * LINGUAS, et.po: Added incomplete Estonian translation. - -2007-02-25 Changwoo Ryu - - * ko.po: Added Korean translation by Young-Ho Cha. - -2007-02-23 Raphael Higino - - * pt_BR.po: Updated Brazilian Portuguese translation. - -2007-02-18 Artur Flinta - - * pl.po: Updated Polish translation by GNOME PL Team. - -2007-02-16 Maxim Dziumanenko - - * uk.po: Add Ukrainian translation. - * LINGUAS: Add uk to list. - -2007-02-16 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-02-13 Lasse Bang Mikkelsen - - * da.po: Updated Danish translation. - -2007-02-11 Stéphane Raimbault - - * fr.po: Added French translation by Jonathan Ernst. - -2007-02-9 Djihed Afifi - - * ar.po: Updated Arabic Translation by Khaled Hosny. - -2007-02-08 Duarte Loreto - - * pt.po: Added Portuguese translation. - * LINGUAS: Added Portuguese (pt). - -2007-02-07 Ignacio Casal Quinteiro - - * gl.po: Updated Galician Translation. - -2007-02-04 AP S Alam - - * pa.po: Punjabi Translation is added - * LINGUAS: pa added to list - -2007-02-03 Ignacio Casal Quinteiro - - * gl.po: Added Galician Translation. - * LINGUAS: Added 'gl' - -2007-02-02 Alexander Shopov - - * bg.po: Added Bulgarian translation by - Alexander Shopov - * LINGUAS: Added "bg" (Bulgarian). - -2007-01-31 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2007-01-30 Theppitak Karoonboonyanan - - * th.po: Added Thai translation. - * LINGUAS: Added 'th'. - -2007-01-21 Josep Puigdemont i Casamajó - - * ca.po: Updated Catalan translation by - Gil Forcada . - -2007-01-13 Raphael Higino - - * LINGUAS: Added pt_BR. - * pt_BR.po: Added Brazilian Portuguese translation. - -2007-01-13 Kostas Papadimas - - * el.po: Added Greek Translation - * LINGUAS: Added el to the list - -2007-01-13 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-01-12 Jovan Naumovski - - * mk.po: Added Macedonian translation. - * LINGUAS: Added mk to the list. - -2007-01-05 Clytie Siddall - - * vi.po: Updated Vietnamese translation. - -2007-01-01 David Lodge - - * en_GB.po: Updated English (British) translation - -2006-12-29 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2006-12-28 David Lodge - - * en_GB.po: Updated English (British) translation - -2006-12-13 Gabor Kelemen - - * hu.po: Translation updated. - -2006-12-05 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2006-12-04 Gabor Kelemen - - * hu.po: Translation updated. - -2006-12-04 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-11-18 Djihed Afifi - - * ar.po: Added Arabic Translation. - * LINGUAS: Added ar. - -2006-11-17 Gabor Kelemen - - * hu.po: Translation updated. - -2006-11-02 Pema Geyleg - - * LINGUAS: Added "dz". - * dz.po: Added Dzongkha Translation. - -2006-10-30 Kjartan Maraas - - * LINGUAS: Add «nb» - * nb.po: Add this here. - -2006-10-21 Gabor Kelemen - - * hu.po: Translation added. - -2006-09-30 Alessio Frusciante - - * it.po: Added Italian translation by - Francesco Marletta . - * LINGUAS: Added "it" (Italian). - -2006-09-15 Josep Puigdemont i Casamajó - - * ca.po: Updated Catalan translation with corrections from - Xavier Conde . - -2006-09-14 David Lodge - - * en_GB.po: Updated English (British) translation - * LINGUAS: Added en_GB - -2006-09-03 Josep Puigdemont i Casamajó - - * ca.po: Added Catalan translation by - Gil Forcada - * LINGUAS: added "ca" to the list of language codes. - -2006-08-26 Clytie Siddall - - * vi.po: Added Vietnamese translation. - * LINGUAS: added "vi" to the list of language codes. - -2006-08-21 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-08-20 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-08-17 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2006-08-16 Ilkka Tuohela - - * fi.po: Added Finnish translation. - -2006-08-14 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2006-07-20 Satoru SATOH - - * ja.po: Added Japanese translation. - -2006-07-16 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2006-07-16 Funda Wang - - * zh_CN.po: Added Simplified Chinese translation. - -2006-07-12 Christian Rose - - * sv.po: Updated Swedish translation. - -2006-06-28 Jakub Friedl - - * cs.po: Added Czech translation. - -2006-01-18 Lasse Bang Mikkelsen - - * da.po: Updated Danish translation. - -2006-01-17 Lasse Bang Mikkelsen - - * POTFILES.in: Removed nm-pptp-service-pptp-helper.c - -2005-06-17 David Zeuthen - - * POTFILES.in: Added nm-vpnc.desktop.in - - * da.po: Updated danish translations - -2005-06-16 David Zeuthen - - * da.po: Updated danish translations - diff --git a/vpn-daemons/pptp/po/LINGUAS b/vpn-daemons/pptp/po/LINGUAS deleted file mode 100644 index 1d03bfaefa..0000000000 --- a/vpn-daemons/pptp/po/LINGUAS +++ /dev/null @@ -1,40 +0,0 @@ -# please keep this list sorted alphabetically -# -ar -be@latin -bg -ca -cs -da -de -dz -el -en_GB -es -et -eu -fi -fr -gl -he -hu -it -ja -ka -ko -lt -mk -nb -nl -pa -pl -pt -pt_BR -ru -sv -th -uk -vi -zh_CN -zh_HK -zh_TW diff --git a/vpn-daemons/pptp/po/POTFILES.in b/vpn-daemons/pptp/po/POTFILES.in deleted file mode 100644 index 458888ed13..0000000000 --- a/vpn-daemons/pptp/po/POTFILES.in +++ /dev/null @@ -1,9 +0,0 @@ -# List of source files containing translatable strings. -# Please keep this file sorted alphabetically. -auth-dialog/gnome-two-password-dialog.c -auth-dialog/main.c -nm-pptp.desktop.in -properties/advanced-dialog.c -properties/nm-pptp-dialog.glade -properties/nm-pptp.c -src/nm-pptp-service.c diff --git a/vpn-daemons/pptp/po/ar.po b/vpn-daemons/pptp/po/ar.po deleted file mode 100644 index b229a5f4ea..0000000000 --- a/vpn-daemons/pptp/po/ar.po +++ /dev/null @@ -1,556 +0,0 @@ -# translation of NetworkManager-pptp.HEAD.ar.po to Arabic -# Arabic translations for PACKAGE package. -# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Automatically generated, 2006. -# Khaled Hosny , 2007. -msgid "" -msgstr "" -"Project-Id-Version: Project\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-31 10:41+0100\n" -"PO-Revision-Date: 2007-12-26 09:09+0100\n" -"Last-Translator: Djihed Afifi \n" -"Language-Team: Arabic \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && " -"n<=10 ? 2 : 3\n" -"X-Poedit-Language: Arabic\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_كلمة سر ثانوية:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "ا_سم المستخدم:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "ال_نطاق:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_كلمة السر:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "اتّصل كم_جهول" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "اتصل _كمستخدم:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -#, fuzzy -msgid "_Remember passwords for this session" -msgstr "_تذكّر كلمة السر لهذه الجلسة" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -#, fuzzy -msgid "_Save passwords in keyring" -msgstr "ا_حفظ كلمة السر في حلقة المفاتيح" - -#: ../auth-dialog/main.c:169 -#, fuzzy, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "تحتاج للتوثق لتنفُذ إلى '%s'." - -#: ../auth-dialog/main.c:170 -#, fuzzy -msgid "Authenticate VPN" -msgstr "وثّق ال_ندّ" - -#: ../nm-pptp.desktop.in.h:1 -#, fuzzy -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "أضِف، احذِف، و حرِّر اتصالات VPN" - -#: ../nm-pptp.desktop.in.h:2 -#, fuzzy -msgid "PPTP VPN Connection Manager" -msgstr "فشل اتصال VPN" - -#: ../properties/advanced-dialog.c:173 -msgid "All Available (Default)" -msgstr "" - -#: ../properties/advanced-dialog.c:177 -msgid "128-bit (most secure)" -msgstr "" - -#: ../properties/advanced-dialog.c:186 -msgid "40-bit (less secure)" -msgstr "" - -#: ../properties/advanced-dialog.c:257 -msgid "PAP" -msgstr "" - -#: ../properties/advanced-dialog.c:263 -msgid "CHAP" -msgstr "" - -#: ../properties/advanced-dialog.c:269 -#, fuzzy -msgid "MSCHAP" -msgstr "ارفض MSCHAP" - -#: ../properties/advanced-dialog.c:275 -msgid "MSCHAPv2" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:1 -#, fuzzy -msgid "Authentication" -msgstr "التوثق" - -#: ../properties/nm-pptp-dialog.glade.h:2 -#, fuzzy -msgid "Echo" -msgstr "التعمية" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:4 -#, fuzzy -msgid "Optional" -msgstr "خيارات IP" - -#: ../properties/nm-pptp-dialog.glade.h:5 -#, fuzzy -msgid "Security and Compression" -msgstr "الضغط" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:7 -#, fuzzy -msgid "Allow BSD data compression" -msgstr "اسمح ب_ضغط BSD" - -#: ../properties/nm-pptp-dialog.glade.h:8 -#, fuzzy -msgid "Allow Deflate data compression" -msgstr "ا_سمح بتفريغ الضغط" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow Stateful Encryption" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:12 -#, fuzzy -msgid "Domain:" -msgstr "ال_نطاق:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Security:" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Send PPP echo packets" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use Point-to-Point Encryption (MPPE)" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:16 -#, fuzzy -msgid "Use TCP header compression" -msgstr "استخدم ضغط MPPC" - -#: ../properties/nm-pptp-dialog.glade.h:17 -#, fuzzy -msgid "User name:" -msgstr "ا_سم المستخدم:" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Gateway:" -msgstr "ال_بوّابة:" - -#: ../properties/nm-pptp-dialog.glade.h:19 -msgid "gtk-cancel" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:20 -msgid "gtk-ok" -msgstr "" - -#: ../properties/nm-pptp.c:50 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "" - -#: ../properties/nm-pptp.c:51 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "" - -#~ msgid "Authentication Type:" -#~ msgstr "نوع التوثق:" - -#~ msgid "_Remember for this session" -#~ msgstr "_تذكّر لهذه الجلسة" - -#~ msgid "_Save in keyring" -#~ msgstr "ا_حفظ في حلقة المفاتيح" - -#~ msgid "Authenticate Connection" -#~ msgstr "وثِّق الإتصال" - -#~ msgid "" -#~ "Authentication Information\n" -#~ "\n" -#~ "The connection '%s' may need some form of authentication.\n" -#~ "\n" -#~ "Please select an appropriate authentication type and provide the " -#~ "necessary credentials below:\n" -#~ msgstr "" -#~ "معلومات التوثّق\n" -#~ "\n" -#~ "قد يحتاج الإتصال '%s' إلى نوع من التوثّق.\n" -#~ "\n" -#~ "من فضلك انتقِ نوع التوثّق المناسب و اعطِ البيانات الضروريّة بأسفل:\n" - -#~ msgid "Authentication Required" -#~ msgstr "التوثق مطلوب" - -#~ msgid "_Authentication Type:" -#~ msgstr "نوع ال_توثق:" - -#~ msgid "_Remote name:" -#~ msgstr "الإسم ال_بعيد:" - -#~ msgid "VPN Connection Manager (PPP generic)" -#~ msgstr "مدير اتصالات VPN (PPP عام)" - -#~ msgid "00:00:00:00" -#~ msgstr "00:00:00:00" - -#~ msgid "Delays & Timeouts" -#~ msgstr "التأخيرات والمهل" - -#~ msgid "Packet Parameters" -#~ msgstr "معاملات الرزم" - -#~ msgid "Example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "مثال: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "" -#~ "A list of extra options to pppd as would be typed on the command line" -#~ msgstr "قائمة بخيارات pppd في صورتها في سطر الأوامر" - -#~ msgid "C_hannel:" -#~ msgstr "ال_قناة:" - -#~ msgid "Co_nnect delay:" -#~ msgstr "تأ_خير الإتصال:" - -#~ msgid "Compression & Encryption" -#~ msgstr "الضغط والتعمية" - -#~ msgid "Connection" -#~ msgstr "الإتصال" - -#~ msgid "Connection na_me:" -#~ msgstr "إ_سم الإتصال:" - -#~ msgid "Context _number:" -#~ msgstr "رقم السيا_ق:" - -#~ msgid "Custom _PPP options:" -#~ msgstr "خيارات PPP _مخصصة:" - -#~ msgid "Debug _output" -#~ msgstr "خرج النقح:" - -#~ msgid "Disconnect after this many LCP echo requests fail" -#~ msgstr "اقطع الإتصال بعد فشل طلبات صدى LCP الكثيرة هذه" - -#~ msgid "E_xclusive device access (UUCP-style lock)" -#~ msgstr "نفاذ ح_صري للجهاز (قفل بنمط UUCP)" - -#~ msgid "Enable stateful _MPPE" -#~ msgstr "ف_عّل MPPE الحالي" - -#~ msgid "Find Device" -#~ msgstr "اعثر على الجهاز" - -#~ msgid "" -#~ "For security reasons, options entered in the box above are checked " -#~ "against a list of allowed options before a connection is established. " -#~ "Currently there are no options on the list." -#~ msgstr "" -#~ "للأسباب الأمنية، تُفحص الخيارات المدخلة في هذا الصندوق مقابل قائمة " -#~ "بالخيارات المسموح بها قبل بدأ الإتصال. لا توجد خيارات في القائمة حاليا." - -#~ msgid "GPRS Options" -#~ msgstr "خيارات GPRS" - -#~ msgid "Host name or IP address of the PPTP server" -#~ msgstr "اسم أو عنوان IP لخادم PPTP" - -#~ msgid "IP a_ddress:" -#~ msgstr "ع_نوان IP:" - -#~ msgid "" -#~ "If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -#~ msgstr "إذا لم يُسمح بضغط BSD سيمرر الخيار 'nobsdcomp' إلى pppd" - -#~ msgid "" -#~ "If Deflate compression is not allowed the 'nodefate' option is passed to " -#~ "pppd" -#~ msgstr "إذا لم يُسمح بالضغط الإفتراضي سيمرر الخيار 'nodefate' إلى pppd" - -#~ msgid "Maximum Receive Unit" -#~ msgstr "أقصى وحدة تلقِّي" - -#~ msgid "Maximum Transmit Unit" -#~ msgstr "أقصى وحدة نقل" - -#~ msgid "PPP Options" -#~ msgstr "خيارات PPP" - -#~ msgid "Refuse C_HAP" -#~ msgstr "ا_رفض CHAP" - -#~ msgid "Refuse _EAP" -#~ msgstr "ار_فض EAP" - -#~ msgid "Refuse _MS CHAP" -#~ msgstr "ارف_ض MS CHAP" - -#~ msgid "Require 128 bit M_PPE encryption" -#~ msgstr "تطلّب ت_عمية 128 bit MPPE" - -#~ msgid "Require MPPE _encryption" -#~ msgstr "تطلّب تعم_ية MPPE" - -#~ msgid "Require explicit IP _address" -#~ msgstr "تطلّب ع_نوان IP صريح" - -#~ msgid "Requires existing network connection" -#~ msgstr "تطلّب اتصال شبكة موجود مسبقا" - -#~ msgid "Routing" -#~ msgstr "التّوجيه" - -#~ msgid "Serial Options" -#~ msgstr "خيارات التسلسل" - -#~ msgid "Service providers GPRS access point from device config" -#~ msgstr "نقطة الوصول إلى موفِّر خدمة GPRS من إعداد الجهاز " - -#~ msgid "Service providers IP address" -#~ msgstr "عنوان IP موفِّر الخدمة" - -#~ msgid "Telep_hone number:" -#~ msgstr "رقم ال_هاتف:" - -#~ msgid "" -#~ "This is the friendly name that will be used to identify this network " -#~ "connection, \n" -#~ "e.g. \"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "هذا اسم لتعريف اتصال الشبكة،\n" -#~ "مثل \"Campus VPN\" أو \"Corporate Network\"" - -#~ msgid "Time in seconds between echo requests" -#~ msgstr "الوقت بالثواني بين طلبات الصدى" - -#~ msgid "Typ_e:" -#~ msgstr "النّ_وع:" - -#~ msgid "Use peer _DNS" -#~ msgstr "است_خدم DNS الندّ" - -#~ msgid "When checked the \"refuse-chap\" option is passed to pppd." -#~ msgstr "عند اختياره، سيمرر خيار \"refuse-chap\" إلى pppd." - -#~ msgid "When checked the \"refuse-eap\" option is passed to pppd." -#~ msgstr "عند اختياره، سيمرر خيار \"refuse-eap\" إلى pppd." - -#~ msgid "When checked the \"refuse-mschap\" option is passed to pppd." -#~ msgstr "عند اختياره، سيمرر خيار \"refuse-mschap\" إلى pppd." - -#~ msgid "When checked the 'lock' option is passed to pppd" -#~ msgstr "عند اختياره، سيمرر خيار 'lock' إلى pppd." - -#~ msgid "When checked the 'require-mppc' option is passed to pppd" -#~ msgstr "عند اختياره، سيمرر خيار 'require-mppc' إلى pppd." - -#~ msgid "" -#~ "When checked this sets the pppd 'debug' option and adds some extra " -#~ "information from the NetworkManager plugin" -#~ msgstr "" -#~ "عند اختياره، سيمرر خيار 'debug' إلى pppd ويضيف معلومات إضافيّة من ملحق " -#~ "مدير الشبكة" - -#~ msgid "When checked this sets the pppd 'noipdefault' option" -#~ msgstr "عند اختياره، سيمرر خيار'noipdefault' إلى pppd." - -#~ msgid "When checked this sets the pppd 'usepeerdns' option" -#~ msgstr "عند اختياره، سيمرر خيار 'usepeerdns' إلى pppd." - -#~ msgid "" -#~ "When this check box is cleared the \"noauth\" option is passed to pppd." -#~ msgstr "عند مسح هذا الصندوق سيمرر الخيار \"noauth\" إلى pppd." - -#~ msgid "_Access point name:" -#~ msgstr "اسم نقطة ال_وصول:" - -#~ msgid "_Device address:" -#~ msgstr "عنوان ال_جهاز:" - -#~ msgid "_Hardware RTS/CTS" -#~ msgstr "RTS/CTS عتادي_" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "ا_ستورد اعدادات محفوظة..." - -#~ msgid "_Modem connection" -#~ msgstr "اتصال م_ودم" - -#~ msgid "_Only use VPN connection for these addresses:" -#~ msgstr "استخدم _فقط اتصالات VPN لهذه العناوين:" - -#~ msgid "_Packet type:" -#~ msgstr "نوع الر_زمة" - -#~ msgid "_Peer DNS through tunnel" -#~ msgstr "_ند DNS عبر نفق" - -#~ msgid "_Require MPPC compression" -#~ msgstr "ت_طلّب ضغط MPPC" - -#~ msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -#~ msgstr "نفق pppd (PPTP، BTGPRS، Dialup)" - -#~ msgid "Name" -#~ msgstr "الإسم" - -#~ msgid "PPTP Server" -#~ msgstr "خادم PPTP" - -#~ msgid "Telephone Number" -#~ msgstr "رقم الهاتف" - -#~ msgid "Bluetooth Address" -#~ msgstr "عنوان البلوتوث" - -#~ msgid "Bluetooth Channel" -#~ msgstr "قناة البلوتوث" - -#~ msgid "GPRS APN" -#~ msgstr "GPRS APN" - -#~ msgid "GPRS IP" -#~ msgstr "GPRS IP" - -#~ msgid "GPRS Context No." -#~ msgstr "رقم سياق GPRS." - -#~ msgid "GPRS Packet Type" -#~ msgstr "نوع حزمة GPRS" - -#~ msgid "Use CTS/RTS flow control" -#~ msgstr "استخدم تحكم CTS/RTS في التدفق" - -#~ msgid "Connect via a modem" -#~ msgstr "اتصل عبر مودم" - -#~ msgid "Require IP to be provided" -#~ msgstr "تطلّب إعطاء IP" - -#~ msgid "Use Peer DNS" -#~ msgstr "استخدم DNS الندّ" - -#~ msgid "Use MPPE encryption" -#~ msgstr "استخدم تعمية MPPE" - -#~ msgid "Use 128 bit MPPE encryption" -#~ msgstr "استخدم تعمية 128 bit MPPE" - -#~ msgid "Enable stateful MPPE" -#~ msgstr "فعّل MPPE الحالي" - -#~ msgid "Do not use deflate compression" -#~ msgstr "لا تستخدم ضغط مُفرِّغ" - -#~ msgid "Do not use BSD compression" -#~ msgstr "لا تستخدم ضغط BSD" - -#~ msgid "Exclusive device access by pppd" -#~ msgstr "وصول حصري للجهاز بواسطة pppd" - -#~ msgid "Authenticate remote peer" -#~ msgstr "وثِّق الندّ البعيد" - -#~ msgid "Refuse EAP" -#~ msgstr "ارفض EAP" - -#~ msgid "Refuse CHAP" -#~ msgstr "ارفض CHAP" - -#~ msgid "Maximum transmit unit (in bytes)" -#~ msgstr "اقصى وحدة نقل (بالبايت)" - -#~ msgid "Maximum receive unit (in bytes)" -#~ msgstr "اقصى وحدو استلام (بالبايت)" - -#~ msgid "Number of failed LCP echos to cause disconnect" -#~ msgstr "رقم طلبات صدى LCP الفاشلة المؤدية لقطع الإتصال" - -#~ msgid "Interval (in seconds) at which to issue LCP echos" -#~ msgstr "الفترة (بالثواني) بين طلبات صدى LCP" - -#~ msgid "Interval (in milliseconds) to wait before connecting." -#~ msgstr "الفترة (بالمللي ثانية) قبل الإتصال." - -#~ msgid "Custom PPP options" -#~ msgstr "خيارات PPP مخصصة" - -#~ msgid "Use Peer DNS over the Tunnel" -#~ msgstr "استخدم DNS الندّ عبر نفق" - -#~ msgid "Specific networks available" -#~ msgstr "شبكات معيّنة متوفّرة" - -#~ msgid "Limit to specific networks" -#~ msgstr "حُدّه بشبكات معينة" - -#~ msgid "The following '%s' connection will be created:" -#~ msgstr "سيُنشأ الإتصال '%s' التالي:" - -#~ msgid "\t%s: %s\n" -#~ msgstr "\t%s: %s\n" - -#~ msgid "The connection details can be changed using the \"Back\" button." -#~ msgstr "يمكن تغيير تفاصيل الإتصال باستخدام زر \"الخلف\"." - -#~ msgid "Select file to import" -#~ msgstr "انتقِ ملفّ للإستيراد" - -#~ msgid "Save as..." -#~ msgstr "احفظ كـ..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "يوجد ملف بالإسم \"%s\" مسبقاً." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "أتريد استبداله بالملف الذي تقوم بحفظه؟" diff --git a/vpn-daemons/pptp/po/be@latin.po b/vpn-daemons/pptp/po/be@latin.po deleted file mode 100644 index c952b0b960..0000000000 --- a/vpn-daemons/pptp/po/be@latin.po +++ /dev/null @@ -1,180 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-19 01:38+0300\n" -"PO-Revision-Date: 2007-04-15 22:03+0300\n" -"Last-Translator: Ihar Hrachyshka \n" -"Language-Team: Belarusian Latin \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Belarusian\n" -"X-Poedit-Country: BELARUS\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Druhi parol:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Nazva karystalnika:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domen:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Parol:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Spałučysia _ananimna" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Spałučysia jak _karystalnik:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Zapaminaj paroli dla hetaj sesii" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Zachavaj paroli ŭ klučnika" - -#: ../auth-dialog/main.c:62 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Treba spraŭdzić asobu, kab atrymać dostup da VPN „%s”." - -#: ../auth-dialog/main.c:63 -msgid "Authenticate VPN" -msgstr "Spraŭdź VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Dadavaj, vydalaj i redahuj spałučeńni PPTP VPN" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "Kiraŭnik spałučeńniaŭ PPTP VPN" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Usio mahčymaje (zmoŭčana)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128 bitaŭ (biaśpiečniejšaje)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40 bitaŭ (mienš biaśpiečnaje)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Spraŭdžvańnie" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Recha" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Hałoŭnaje" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Dadatkovaje" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Biaśpieka j kampresija" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "_Asablivaje..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Dazvol kampresiju _BSD" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Dazvol kampresiju _Deflate" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Dazvol _poŭnastanavaje šyfravańnie" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Dazvol nastupnyja metady spraŭdžvańnia:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Zmoŭčana" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "NT Domain:" -msgstr "Damen NT:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Password:" -msgstr "Parol:" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Send PPP _echo packets" -msgstr "Vysyłaj _rechavyja pakunki PPP" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Show password" -msgstr "Pakazvaj parol" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "Use TCP _header compression" -msgstr "Užyj kampresiju _zahałoŭkaŭ TCP" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Užyj šyfravańnie MPPE" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "User name:" -msgstr "Karystalnik:" - -#: ../properties/nm-pptp-dialog.glade.h:19 -msgid "_Gateway:" -msgstr "_Brama:" - -#: ../properties/nm-pptp-dialog.glade.h:20 -msgid "_Security:" -msgstr "_Biaśpieka:" - -#: ../properties/nm-pptp.c:50 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Pratakoł tunelnaha PPP (PPTP)" - -#: ../properties/nm-pptp.c:51 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Absłuhoŭvaje servery PPTP VPN ad Microsoft dy inšych." diff --git a/vpn-daemons/pptp/po/bg.po b/vpn-daemons/pptp/po/bg.po deleted file mode 100644 index dc5f46ed67..0000000000 --- a/vpn-daemons/pptp/po/bg.po +++ /dev/null @@ -1,548 +0,0 @@ -# Bulgarian translation of NetworkManager-pptp po-file -# Copyright (C) 2007, 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager-pptp package. -# Alexander Shopov , 2007, 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp trunk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-02 08:59+0300\n" -"PO-Revision-Date: 2008-08-01 07:26+0300\n" -"Last-Translator: Alexander Shopov \n" -"Language-Team: Bulgarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Втора парола:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Потребителско _име:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Домейн:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Парола:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "_Анонимно свързване" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Свързване _като потребителя:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Запомняне на паролата за тази сесия" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "Запазване на паролата в клю_чодържателя" - -#: ../auth-dialog/main.c:169 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Трябва да се идентифицирате, за да достъпите ВЧМ „%s“." - -#: ../auth-dialog/main.c:170 -msgid "Authenticate VPN" -msgstr "Идентифициране на ВЧМ" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Добавяне, изтриване и редактиране на връзки към ВЧМ по PPTP" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "Управление на връзки за ВЧМ по PPTP" - -#: ../properties/advanced-dialog.c:173 -msgid "All Available (Default)" -msgstr "Всички налични (стандартно)" - -#: ../properties/advanced-dialog.c:177 -msgid "128-bit (most secure)" -msgstr "128-битово (най-сигурно)" - -#: ../properties/advanced-dialog.c:186 -msgid "40-bit (less secure)" -msgstr "40-битово (несигурно)" - -#: ../properties/advanced-dialog.c:257 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:263 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:269 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:275 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Идентифициране" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Ехо" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Общи" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Допълнителни" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Сигурност и компресия" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "_Допълнителни…" - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow BSD data compression" -msgstr "Разрешаване на компресия BSD" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow Deflate data compression" -msgstr "Разрешаване на компресия deflate" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow Stateful Encryption" -msgstr "Разрешаване на компресия със запомняне на състояние" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Разрешаване на следните методи за идентификация:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Стандартно" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "Домейн:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Security:" -msgstr "Сигурност:" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Send PPP echo packets" -msgstr "Пращане на пакети „echo“ по PPP" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use Point-to-Point Encryption (MPPE)" -msgstr "Използване на шифриране точка до точка (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "Use TCP header compression" -msgstr "Използване на компресия на заглавните части на TCP" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "User name:" -msgstr "Потребителско име:" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Gateway:" -msgstr "_Шлюз:" - -#: ../properties/nm-pptp-dialog.glade.h:19 -msgid "gtk-cancel" -msgstr "gtk-cancel" - -#: ../properties/nm-pptp-dialog.glade.h:20 -msgid "gtk-ok" -msgstr "gtk-ok" - -#: ../properties/nm-pptp.c:50 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Тунелиращ протокол — точка до точка (PPTP)" - -#: ../properties/nm-pptp.c:51 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Съвместим със сървърите на Microsoft и други за ВЧМ по PPTP." - -#~ msgid "Authentication Type:" -#~ msgstr "Вид на идентификацията:" - -#~ msgid "_Remember for this session" -#~ msgstr "_Запомняне за тази сесия" - -#~ msgid "_Save in keyring" -#~ msgstr "Запазване в клю_чодържателя" - -#~ msgid "Authenticate Connection" -#~ msgstr "Идентифициране на връзката" - -#~ msgid "" -#~ "Authentication Information\n" -#~ "\n" -#~ "The connection '%s' may need some form of authentication.\n" -#~ "\n" -#~ "Please select an appropriate authentication type and provide the " -#~ "necessary credentials below:\n" -#~ msgstr "" -#~ "Информация за идентификация\n" -#~ "\n" -#~ "Връзката „%s“ се нуждае от някаква форма на идентификация.\n" -#~ "\n" -#~ "Изберете подходящия вид идентификация и добавете необходимата за това " -#~ "информация отдолу:\n" - -#~ msgid "Authentication Required" -#~ msgstr "Изисква се идентификация" - -#~ msgid "_Authentication Type:" -#~ msgstr "_Вид на идентификацията:" - -#~ msgid "_Remote name:" -#~ msgstr "_Отдалечено име:" - -#~ msgid "auth-chap-window" -#~ msgstr "прозорец-за-идентификация-с-chap" - -#~ msgid "auth-mschapv2-window" -#~ msgstr "прозорец-за-идентификация-с-mschapv2" - -#~ msgid "auth-none-window" -#~ msgstr "прозорец-за-никаква-идентификация" - -#~ msgid "VPN Connection Manager (PPP generic)" -#~ msgstr "Управление на връзките към ВЧМ (за PPP)" - -#~ msgid "00:00:00:00" -#~ msgstr "00:00:00:00" - -#~ msgid "Connection Name" -#~ msgstr "Име на връзката" - -#~ msgid "Delays and TImeouts" -#~ msgstr "Забавяния и изтичане на времето" - -#~ msgid "Packet Parameters" -#~ msgstr "Параметри на пакетите" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "например: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "" -#~ "A list of extra options to pppd as would be typed on the command line" -#~ msgstr "" -#~ "Списък с допълнителните опции за pppd, които ще бъдат предадени през " -#~ "командния ред" - -#~ msgid "Compression & Encryption" -#~ msgstr "Компресия и шифриране" - -#~ msgid "Connection" -#~ msgstr "Връзката" - -#~ msgid "Debug Output" -#~ msgstr "Изход за изчистване на грешки" - -#~ msgid "Disconnect after this many LCP echo requests fail" -#~ msgstr "" -#~ "Прекъсване на връзката след следния брой неуспешни заявки „echo“ по LCP" - -#~ msgid "Enable stateful MPPE" -#~ msgstr "Включване на MPPE със запомняне на състоянието" - -#~ msgid "Exclusive device access (UUCP-style lock)" -#~ msgstr "Изключителен достъп до устройство (заключване в стил UUCP)" - -#~ msgid "Find Device" -#~ msgstr "Търсене на устройство" - -#~ msgid "" -#~ "For security reasons, options entered in the box above are checked " -#~ "against a list of allowed options before a connection is established. " -#~ "Currently there are no options on the list." -#~ msgstr "" -#~ "По причини свързани със сигурността опциите въведени в полето отгоре се " -#~ "сравняват със списък на позволените опции, преди да се осъществи връзка. " -#~ "В момента няма опции в списъка." - -#~ msgid "GPRS Options" -#~ msgstr "Опции за GPRS" - -#~ msgid "Hardware RTS/CTS" -#~ msgstr "Хардуерна поддръжка на RTS/CTS" - -#~ msgid "Host name or IP address of the PPTP server" -#~ msgstr "Име или адрес на сървъра за PPTP" - -#~ msgid "" -#~ "If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -#~ msgstr "" -#~ "Ако компресията BSD не е позволена, на pppd се подава опцията „nobsdcomp“." - -#~ msgid "" -#~ "If Deflate compression is not allowed the 'nodefate' option is passed to " -#~ "pppd" -#~ msgstr "" -#~ "Ако компресията deflate не е позволена, на pppd се подава опцията " -#~ "„nodeflate“." - -#~ msgid "Maximum Receive Unit" -#~ msgstr "Максимален пакет за приемане" - -#~ msgid "Maximum Transmit Unit" -#~ msgstr "Максимален пакет за предаване" - -#~ msgid "Modem Connection" -#~ msgstr "Връзка през модем" - -#~ msgid "PPP Options" -#~ msgstr "Настройки на PPP" - -#~ msgid "Peer DNS through tunnel" -#~ msgstr "DNS от съседа през тунел" - -#~ msgid "Refuse CHAP" -#~ msgstr "Отказване на CHAP" - -#~ msgid "Refuse EAP" -#~ msgstr "Отказване на EAP" - -#~ msgid "Refuse MS CHAP" -#~ msgstr "Отказване на MS CHAP" - -#~ msgid "Require 128 bit MPPE encryption" -#~ msgstr "Изискване на 128-битово шифриране MPPE" - -#~ msgid "Require Explicit IP Addr" -#~ msgstr "Изискване на изричен адрес по IP" - -#~ msgid "Require MPPC Compression" -#~ msgstr "Изискване на компресия MPPC" - -#~ msgid "Require MPPE encryption" -#~ msgstr "Изискване на шифриране MPPE" - -#~ msgid "Requires existing network connection" -#~ msgstr "Изисква съществуваща мрежова връзка" - -#~ msgid "Routing" -#~ msgstr "Маршрутизация" - -#~ msgid "Serial Options" -#~ msgstr "Настройки на серийния порт" - -#~ msgid "Service providers GPRS access point from device config" -#~ msgstr "" -#~ "Точката за достъп на доставчика на услуги по GPRS от настройките на " -#~ "устройството" - -#~ msgid "Service providers IP address" -#~ msgstr "Адрес по IP на доставчика на услуги" - -#~ msgid "Telephone number to dial" -#~ msgstr "Телефонен номер за набиране" - -#~ msgid "" -#~ "This is the friendly name that will be used to identify this network " -#~ "connection, \n" -#~ "e.g. \"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Име, което се ползва за различаването на връзката към тази мрежа, напр. " -#~ "„Корпоративна мрежа“." - -#~ msgid "Time in seconds between echo requests" -#~ msgstr "Интервал в секунди между заявките „echo“" - -#~ msgid "Type:" -#~ msgstr "Вид:" - -#~ msgid "Use Peer DNS" -#~ msgstr "Използване на DNS от съсед" - -#~ msgid "When checked the \"refuse-chap\" option is passed to pppd." -#~ msgstr "Когато е избрано, на pppd се подава опцията „refuse-chap“." - -#~ msgid "When checked the \"refuse-eap\" option is passed to pppd." -#~ msgstr "Когато е избрано, на pppd се подава опцията „refuse-eap“." - -#~ msgid "When checked the \"refuse-mschap\" option is passed to pppd." -#~ msgstr "Когато е избрано, на pppd се подава опцията „refuse-mschap“." - -#~ msgid "When checked the 'lock' option is passed to pppd" -#~ msgstr "Когато е избрано, на pppd се подава опцията „lock“." - -#~ msgid "When checked the 'require-mppc' option is passed to pppd" -#~ msgstr "Когато е избрано, на pppd се подава опцията „require-mppc“." - -#~ msgid "" -#~ "When checked this sets the pppd 'debug' option and adds some extra " -#~ "information from the NetworkManager plugin" -#~ msgstr "" -#~ "Когато е избрано, на pppd се подава опцията „debug“ и се добавя " -#~ "информация от приставката на NetworkManager." - -#~ msgid "When checked this sets the pppd 'noipdefault' option" -#~ msgstr "Когато е избрано, на pppd се подава опцията „noipdefault“." - -#~ msgid "When checked this sets the pppd 'usepeerdns' option" -#~ msgstr "Когато е избрано, на pppd се подава опцията „userpeerdns“." - -#~ msgid "" -#~ "When this check box is cleared the \"noauth\" option is passed to pppd." -#~ msgstr "Когато е избрано, на pppd се подава опцията „noauth“." - -#~ msgid "_Access Point Name:" -#~ msgstr "_Номер на точката за достъп:" - -#~ msgid "_Channel:" -#~ msgstr "_Канал:" - -#~ msgid "_Context Num" -#~ msgstr "Но_мер на контекста" - -#~ msgid "_Custom PPP options:" -#~ msgstr "_Допълнителни опции на PPP" - -#~ msgid "_Device Address:" -#~ msgstr "_Адрес на устройството:" - -#~ msgid "_IP Address:" -#~ msgstr "А_дрес по IP" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "_Внасяне на запазени настройки…" - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "Да се използва само връзката през _ВЧМ за тези адреси" - -#~ msgid "_Packet Type" -#~ msgstr "Вид _пакет" - -#~ msgid "_Telephone Number:" -#~ msgstr "_Телефонен номер:" - -#~ msgid "connect-delay" -#~ msgstr "забавяне при свързване" - -#~ msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -#~ msgstr "Тунел по pppd (PPTP, BTGPRS, връзка по телефона)" - -#~ msgid "Name" -#~ msgstr "Име" - -#~ msgid "PPTP Server" -#~ msgstr "Сървър за PPTP" - -#~ msgid "Telephone Number" -#~ msgstr "Телефонен номер" - -#~ msgid "Bluetooth Address" -#~ msgstr "Адрес по Bluetooth" - -#~ msgid "Bluetooth Channel" -#~ msgstr "Канал за Bluetooth" - -#~ msgid "GPRS APN" -#~ msgstr "№ на точка за достъп по GPRS" - -#~ msgid "GPRS IP" -#~ msgstr "IP по GPRS" - -#~ msgid "GPRS Context No." -#~ msgstr "№ на контекста на GPRS" - -#~ msgid "GPRS Packet Type" -#~ msgstr "Вид на пакетите по GPRS" - -#~ msgid "Use CTS/RTS flow control" -#~ msgstr "Използване на CTS/RTS" - -#~ msgid "Connect via a modem" -#~ msgstr "Свързване през модем" - -#~ msgid "Require IP to be provided" -#~ msgstr "Изискване на предоставянето на IP" - -#~ msgid "Use MPPE encryption" -#~ msgstr "Използване на шифриране MPPE" - -#~ msgid "Use 128 bit MPPE encryption" -#~ msgstr "Използване на 128-битово шифриране MPPE" - -#~ msgid "Do not use deflate compression" -#~ msgstr "Без използване на компресия deflate" - -#~ msgid "Do not use BSD compression" -#~ msgstr "Без използване на компресия BSD" - -#~ msgid "Exclusive device access by pppd" -#~ msgstr "Изключителен достъп до устройството от pppd" - -#~ msgid "Authenticate remote peer" -#~ msgstr "Идентифициране на отдалечен съсед" - -#~ msgid "Maximum transmit unit (in bytes)" -#~ msgstr "Максимален пакет за предаване (в байтове)" - -#~ msgid "Maximum receive unit (in bytes)" -#~ msgstr "Максимален пакет за приемане (в байтове)" - -#~ msgid "Number of failed LCP echos to cause disconnect" -#~ msgstr "" -#~ "Брой неуспешни заявки „echo“ по LCP, които да предизвикат прекъсване на " -#~ "връзката" - -#~ msgid "Interval (in seconds) at which to issue LCP echos" -#~ msgstr "Интервал (в секунди) между две последователни заявки „echo“ по LCP" - -#~ msgid "Interval (in milliseconds) to wait before connecting." -#~ msgstr "Интервал (в милисекунди) преди да се установи връзка." - -#~ msgid "Custom PPP options" -#~ msgstr "Допълнителни опции за PPP" - -#~ msgid "Use Peer DNS over the Tunnel" -#~ msgstr "Използване на DNS от съсед по тунел" - -#~ msgid "Specific networks available" -#~ msgstr "Налични са специфични мрежи" - -#~ msgid "Limit to specific networks" -#~ msgstr "Ограничаване до специфични мрежи" - -#~ msgid "The following '%s' connection will be created:" -#~ msgstr "Ще бъде създадена следната връзка „%s“:" - -#~ msgid "\t%s: %s\n" -#~ msgstr "\t%s: %s\n" - -#~ msgid "The connection details can be changed using the \"Back\" button." -#~ msgstr "Настройките на връзката могат да се редактират с бутона „Назад“." - -#~ msgid "Select file to import" -#~ msgstr "Избор на файл за внасяне" - -#~ msgid "Save as..." -#~ msgstr "Запазване като…" - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Файл с име „%s“ вече съществува." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Искате ли да го презапишете?" diff --git a/vpn-daemons/pptp/po/ca.po b/vpn-daemons/pptp/po/ca.po deleted file mode 100644 index 29c8afb53f..0000000000 --- a/vpn-daemons/pptp/po/ca.po +++ /dev/null @@ -1,652 +0,0 @@ -# Catalan translation of NetworkManager-pptp -# Copyright © 2005 The Free Software Foundation, Inc. -# This file is distributed under the same license as the -# NetworkManager-pptp package. -# Gil Forcada , 2006, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-28 16:36+0100\n" -"PO-Revision-Date: 2008-02-28 16:36+0100\n" -"Last-Translator: Gil Forcada \n" -"Language-Team: Catalan \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "Tipus d'autenticació:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "_Recorda-la per aquesta sessió" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_Desa-la a l'anell de claus" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "Us heu d'autenticar per a poder accedir a «%s»." - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "Autentica la connexió" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"Informació d'autenticació\n" -"\n" -"La connexió «%s» potser necessita alguna forma d'autenticació.\n" -"\n" -"Seleccioneu un tipus d'autenticació apropiada i proporcioneu les credencials " -"necessàries aquí sota:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "Es requereix autenticació" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "Tipus d'_autenticació:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Contrasenya:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "Nom _remot:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "Nom d'_usuari:" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Contrasenya _secundària:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domini:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Connecta _anònimament" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Connecta com a _usuari:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "_Recorda la contrasenya durant aquesta sessió" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_Desa la contrasenya a l'anell de claus" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Afegiu, suprimiu, i editeu connexions VPN" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "Gestor de connexions VPN (PPP genèric)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "Compressió" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Delays & Timeouts" -msgstr "Retards i temps d'espera" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Encryption" -msgstr "Xifratge" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "IP Options" -msgstr "Opcions d'IP" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "Packet Parameters" -msgstr "Paràmetres dels paquets" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Example: 172.16.0.0/16 10.11.12.0/24" -msgstr "Exemple: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "" -"Una llista d'opcions extra per al pppd, com si s'haguessin escrit a la línia " -"d'ordres" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "Allow B_SD Compression" -msgstr "Permet la compressió B_SD" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow _Deflate compression" -msgstr "Permet la compressió _desinflada" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Authentication" -msgstr "Autenticació" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "C_hannel:" -msgstr "_Canal:" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Co_nnect delay:" -msgstr "Retard de co_nnexió:" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "Compressió i xifratge" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "Connexió" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Connection na_me:" -msgstr "No_m de la connexió:" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Context _number:" -msgstr "_Número de context:" - -#: ../properties/nm-ppp-dialog.glade.h:18 -msgid "Custom _PPP options:" -msgstr "Opcions personalitzades del _PPP:" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Debug _output" -msgstr "Sortida _detallada" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "" -"Desconnecta si es produeixen aquesta quantitat d'errades en sol·licituds " -"d'eco LCP" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "E_xclusive device access (UUCP-style lock)" -msgstr "Accés e_xclusiu al dispositiu (bloqueig a l'estil UUCP)" - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "Enable stateful _MPPE" -msgstr "Habilita el _MPPE d'estats" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Find Device" -msgstr "Cerca un dispositiu" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"Per raons de seguretat, abans d'establir la connexió les opcions entrades a " -"la caixa de sobre són comparades amb una llista d'opcions permeses. " -"Actualment no hi ha opcions a la llista." - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "GPRS Options" -msgstr "Opcions GPRS" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "Host name or IP address of the PPTP server" -msgstr "Nom de la màquina o adreça IP del servidor PPTP" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "IP a_ddress:" -msgstr "A_dreça IP:" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" -"Si no està permesa la compressió BSD, es passarà l'opció «nobsdcomp» al pppd" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" -"Si no està permesa la compressió desinflada, es passarà l'opció «nodefate» " -"al pppd" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "Maximum Receive Unit" -msgstr "Unitat màxima de recepció" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Maximum Transmit Unit" -msgstr "Unitat màxima d'enviament" - -#: ../properties/nm-ppp-dialog.glade.h:32 -msgid "PPP Options" -msgstr "Opcions PPP" - -#: ../properties/nm-ppp-dialog.glade.h:33 -msgid "Refuse C_HAP" -msgstr "Rebutja C_HAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse _EAP" -msgstr "Rebutja _EAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Refuse _MS CHAP" -msgstr "Rebutja _MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require 128 bit M_PPE encryption" -msgstr "Requereix el xifratge M_PPE de 128 bits" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPE _encryption" -msgstr "Requereix el xifratg_e MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require explicit IP _address" -msgstr "Requereix explícitament una _adreça IP" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "Es requereix que ja hi hagi una connexió a la xarxa" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "Encaminament" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "Opcions del sèrie" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "" -"Punts d'accés proveïdors del servei GPRS des de la configuració del " -"dispositiu" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "Adreça IP del proveïdor del servei" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telep_hone number:" -msgstr "Número de _telèfon:" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"El nom que es farà servir per a identificar la connexió a la xarxa, \n" -"per exemple: «VPN del Campus» o «Xarxa corporativa»" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "Temps en segons entre sol·licituds d'eco" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Typ_e:" -msgstr "_Tipus:" - -# FIXME -#: ../properties/nm-ppp-dialog.glade.h:49 -msgid "Use peer _DNS" -msgstr "Utilitza un _DNS a iguals" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "Si està activat, es passa, l'opció «refuse-chap» al pppd." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "Si està activat, es passa l'opció «refuse-eap» al pppd." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "Si està activat, es passa l'opció «refuse-mschap» al pppd." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "Si està activat, es passa l'opció «lock» al pppd." - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "Si està activat, es passa l'opció «require-mppc» al pppd." - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" -"Si està activat, això estableix l'opció del pppd «debug» i afegeix " -"informació extra des del connector del NetworkManager" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "Si està activat, això estableix l'opció del pppd «noipdefault»" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "Si està activat, això estableix l'opció del pppd «userpeerdns»" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "Quan aquesta caixa està buida es passa l'opció «noauth» al pppd." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access point name:" -msgstr "Nom del punt d'_accés:" - -# FIXME -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Authenticate peer" -msgstr "_Autentica l'igual remot" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Device address:" -msgstr "Adreça del _dispositiu:" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Gateway:" -msgstr "_Pasarel·la:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Hardware RTS/CTS" -msgstr "_Maquinari RTS/CTS" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Import Saved Configuration..." -msgstr "_Importa la configuració desada..." - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_Modem connection" -msgstr "Connexió amb _mòdem" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Only use VPN connection for these addresses:" -msgstr "_Fes servir només la connexió VPN per a aquestes adreces:" - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Packet type:" -msgstr "Tipus de _paquet:" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Peer DNS through tunnel" -msgstr "DNS a i_guals a través del túnel" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Require MPPC compression" -msgstr "_Requereix la compressió MPPC" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "túnel pppd (PPTP, BGTPRS, Dialup)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "Nom" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "Servidor PPTP" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "Número de telèfon" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "Adreça Bluetooth" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "Canal Bluetooth" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "APN GPRS" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "IP GRPS" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "Número de context GPRS" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "Tipus de paquet GPRS" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "Utilitza el control de flux CTS/RTS" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "Connecta a través de mòdem" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "Requereix que es proporcioni la IP" - -# FIXME -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Utilitza un DNS a iguals" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "Utilitza el xifratge MPPE" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "Utilitza xifratge MPPE de 128 bits" - -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "Habilita el MPPE d'estats" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "Utilitza compressió MPPC" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "No utilitzis compressió desinflada" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "No utilitzis compressió BSD" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "Accés exclusiu al dispositiu pel pppd" - -# FIXME -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "Autentica l'igual remot" - -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "Rebutja EAP" - -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "Rebutja CHAP" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "Rebutja MSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "Unitat màxima de transmissió (en bytes)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "Unitat màxima de recepció (en bytes)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "Nombre d'ecos LCP fallats per causar la desconnexió" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "Interval (en segons) per enviar ecos LCP" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "Interval (en mil·lisegons) a esperar abans de connectar." - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "Opcions PPP personalitzables" - -# FIXME -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "Utilitza DNS a iguals pel túnel" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "Especifica les xarxes disponibles" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "Límit de xarxes disponibles" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "Es crearà la següent connexió «%s»:" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "Els detalls de la connexió es poden canviar amb el botó «Enrera»." - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "Seleccioneu el fitxer a importar" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "Anomena i desa..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Ja existeix un fitxer anomenat «%s»." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Voleu reemplaçar-lo amb el que voleu desar?" - -#: ../src/nm-ppp-starter.c:141 -msgid "VPN Connection failed" -msgstr "Ha fallat la connexió VPN" - -#~ msgid "Authenticate PPTP VPN" -#~ msgstr "Autentica la VPN PPTP" - -#~ msgid "PPTP Client" -#~ msgstr "Client PPTP" - -#~ msgid "Remote: %s" -#~ msgstr "Remot: %s" - -#~ msgid "Username: %s" -#~ msgstr "Nom d'usuari: %s" - -#~ msgid "Use MPPC Compression: %s" -#~ msgstr "Utilitza la compressió MPPC: %s" - -#~ msgid "Yes" -#~ msgstr "Sí" - -#~ msgid "No" -#~ msgstr "No" - -#~ msgid "Cannot import settings" -#~ msgstr "No s'han pogut importar els paràmetres" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "Les dades del fitxer dels paràmetres VPN «%s» no són vàlides." - -#~ msgid "Connection Name" -#~ msgstr "Nom de la connexió" - -#~ msgid "Required Information" -#~ msgstr "Informació requerida" - -#~ msgid "MS CHAP-v1/v2" -#~ msgstr "MS CHAP-v1/v2" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Introduïu la informació proporcionada pel vostre administrador de " -#~ "sistemes aquí sota. No hi introduïu la contrasenya, ja se us preguntarà " -#~ "quan us connecteu." - -#~ msgid "Username:" -#~ msgstr "Nom d'usuari:" - -#~ msgid "" -#~ "Your password must be defined \n" -#~ "in /etc/ppp/chap-secrets" -#~ msgstr "" -#~ "La contrasenya ha d'estar definida \n" -#~ "a /etc/ppp/chap-secrets" - -#~ msgid "auth-chap-window" -#~ msgstr "auth-chap-window" - -#~ msgid "auth-mschapv2-window" -#~ msgstr "auth-mschapv2-window" - -#~ msgid "auth-none-window" -#~ msgstr "auth-none-window" - -#~ msgid "Telephone number to dial" -#~ msgstr "Número de telèfon al que trucar" diff --git a/vpn-daemons/pptp/po/cs.po b/vpn-daemons/pptp/po/cs.po deleted file mode 100644 index 74275bf913..0000000000 --- a/vpn-daemons/pptp/po/cs.po +++ /dev/null @@ -1,175 +0,0 @@ -# Czech translation of NetworkManager-pptp. -# Copyright (C) 2008 the author(s) of NetworkManager-pptp. -# This file is distributed under the same license as the NetworkManager-pptp package. -# Jakub Friedl , 2006. -# Jiří Eischmann , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-17 22:20+0200\n" -"PO-Revision-Date: 2008-09-17 20:41+0100\n" -"Last-Translator: Jiří Eischmann \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Sekundární heslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Uživ. jméno:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Doména:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Heslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Připojit _anonymně" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Připojit jako _uživatel:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Zapamatovat heslo pro toto sezení" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Uložit hesla do svazku klíčů" - -#: ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Pro přístup k virtuální privátní síti '%s' musíte provést autentizaci." - -#: ../auth-dialog/main.c:141 -msgid "Authenticate VPN" -msgstr "Autentizovat VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Přidat, odstranit a upravit PPTP VPN připojení" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "Správce spojení PPTP VPN" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Vše dostupné (výchozí)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128 bitů (nejbezpečnější)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40 bitů (méně bezpečné)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Autentizace" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Echo" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Obecné" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Volitelné" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Bezpečnost a komprese" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "P_okročilé..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Povolit kompresi _BSD dat" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Povolit kompresi dat _Deflate" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Povolit st_avové šifrování" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Povolit následující metody autentizace:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Výchozí" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "Doména:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "Poslat PPP _echo pakety" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "Použít kompresi TCP _záhlaví" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Použít _Point-to-Point šifrování (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "Uživ. jméno:" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "_Brána:" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "_Bezpečnost:" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Point-to-Point Tunneling Protocol (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Kompatibilní s PPTP VPN servery od Microsoftu a ostatních." diff --git a/vpn-daemons/pptp/po/da.po b/vpn-daemons/pptp/po/da.po deleted file mode 100644 index b4340a6206..0000000000 --- a/vpn-daemons/pptp/po/da.po +++ /dev/null @@ -1,642 +0,0 @@ -# Danish translation of NetworkManager-pptp -# Copyright (C) 2005-2007 -# This file is distributed under the same license as the NetworkManager-pptp package. -# David Zeuthen , 2005. -# Lasse Bang Mikkelsen , 2006, 07. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-13 22:29+0100\n" -"PO-Revision-Date: 2007-02-13 22:27+0100\n" -"Last-Translator: Lasse Bang Mikkelsen \n" -"Language-Team: Danish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "Godkendelsestype:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "_Husk for denne session" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_Gem i nøglering" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "Godkendelse er påkrævet for at tilslutte til \"%s\"." - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "Godkend forbindelse" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"Godkendelsesinformation\n" -"\n" -"Forbindelsen \"%s\" kræver mulighed en form for godkendelse.\n" -"\n" -"Vælg venligst en passende godkendelsestype og angiv de nødvendige " -"oplysninger nedenfor:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "Godkendelse påkrævet" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "_Godkendelsestype:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Password:" -msgstr "_Adgangskode:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "_Fjernnavn:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:268 -msgid "_Username:" -msgstr "_Brugernavn:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:15 -msgid "auth-chap-window" -msgstr "auth-chap-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:16 -msgid "auth-mschapv2-window" -msgstr "auth-mschapv2-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:17 -msgid "auth-none-window" -msgstr "auth-none-window" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "_Sekundær adgangskode:" - -#: ../auth-dialog/gnome-two-password-dialog.c:270 -msgid "_Domain:" -msgstr "_Domæne:" - -#: ../auth-dialog/gnome-two-password-dialog.c:355 -msgid "Connect _anonymously" -msgstr "Tilslut _anonymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect as _user:" -msgstr "Tilslut som _bruger:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "_Husk adgangskode for denne session" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_Gem adgangskode i nøglering" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Tilføj, fjern og redigér VPN-forbindelser" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "VPN-forbindelser (generisk PPP)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "Komprimering" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Connection Name" -msgstr "Navn på forbindelse" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Delays and TImeouts" -msgstr "Forsinkelser og tidsudløb" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "Encryption" -msgstr "Kryptering" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "IP Options" -msgstr "IP-indstillinger" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Packet Parameters" -msgstr "Pakkeparametre" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "eksempel: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "" -"En liste af ekstra tilvalg til pppd, som det ville skrives på kommandolinjen" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow BSD Compression" -msgstr "Tillad BSD-komprimering" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Allow Deflate compression" -msgstr "Tillad Deflate-komprimering" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "Authenticate Peer" -msgstr "Godkend fjernserver" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Authentication" -msgstr "Godkendelse" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "Komprimering & kryptering" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "Forbindelse" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Debug Output" -msgstr "Fejlsøgningsuddata" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "Afbryd efter dette antal LCP ekko-forespørgsler fejler" - -#: ../properties/nm-ppp-dialog.glade.h:18 -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "Aktivér tilstandsbevidst MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Exclusive device access (UUCP-style lock)" -msgstr "Eksklusiv enhedsadgang (UUCP-lås)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Find Device" -msgstr "Find enhed" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"Af sikkerhedshensyn vil tilvalg indtastet i dette felt blive tjekket mod en " -"liste over tilladte tilvalg, inden en forbindelse etableres. Der er i " -"øjeblikket ingen tilvalg på listen." - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "GPRS Options" -msgstr "GPRS-indstillinger" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Hardware RTS/CTS" -msgstr "Hardware RTS/CTS" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "Host name or IP address of the PPTP server" -msgstr "Værtsnavn eller IP-adresse på PPTP-serveren" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" -"Hvis BSD-komprimering ikke er tilladt, sættes pppd-tilvalget \"nobsdcomp\"." - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" -"Hvis Deflate-komprimering ikke er tilladt, sættes pppd-tilvalget \"nodeflate" -"\"." - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "Maximum Receive Unit" -msgstr "Maksimal modtageenhed" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "Maximum Transmit Unit" -msgstr "Maksimal sendeenhed" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "Modem Connection" -msgstr "Modem-forbindelse" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "PPP Options" -msgstr "PPP-indstillinger" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Peer DNS through tunnel" -msgstr "Fjernserver DNS igennem tunnel" - -#: ../properties/nm-ppp-dialog.glade.h:32 -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "Afvis CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:33 -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "Afvis EAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse MS CHAP" -msgstr "Afvis MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Require 128 bit MPPE encryption" -msgstr "Påkræv 128-bit MPPE-kryptering" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require Explicit IP Addr" -msgstr "Påkræv fast IP-adresse" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPC Compression" -msgstr "Påkræv MPPC-komprimering" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require MPPE encryption" -msgstr "Påkræv MPPE-kryptering" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "Kræver eksisterende netværksforbindelse" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "Routing" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "Serielle indstillinger" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "Udbyderens GPRS-adgangspunkt fra enhedens konfiguration" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "Udbyderens IP-adresse" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telephone number to dial" -msgstr "Telefonnummer at ringe til" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"Dette er et brugervenligt navn til at identificere denne forbindelse, \n" -"f.eks. \"Universitets VPN\" eller \"Virksomhedens netværk\"" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "Tid i sekunder mellem ekko-forespørgsler" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Type:" -msgstr "Type:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Brug fjernserver DNS" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "Hvis afkrydset, sættes pppd-tilvalget \"refuse-chap\"." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "Hvis afkrydset, sættes pppd-tilvalget \"refuse-eap\"." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "Hvis afkrydset, sættes pppd-tilvalget \"refuse-mschap\"." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "Hvis afkrydset, sættes pppd-tilvalget \"lock\"." - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "Hvis afkrydset, sættes pppd-tilvalget \"require-mppc\"." - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" -"Hvis afkrydset, sættes pppd-tilvalget \"debug\" og der tilføjes ekstra " -"information fra NetworkManager-udvidelsesmodulet" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "Hvis afkrydset, sættes pppd-tilvalget \"noipdefault\"." - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "Hvis afkrydset, sættes pppd-tilvalget \"usepeerdns\"." - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "Hvis ikke-afkrydset, sættes pppd-tilvalget \"noauth\"." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access Point Name:" -msgstr "Navn på _adgangspunkt:" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Channel:" -msgstr "_Kanal:" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Context Num" -msgstr "_Kontekstnummer" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Custom PPP options:" -msgstr "_Brugerdefinerede PPP-indstillinger:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Device Address:" -msgstr "_Enhedsadresse:" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Gateway:" -msgstr "Ad_gangspunkt:" - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_IP Address:" -msgstr "_IP-adresse:" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Import Saved Configuration..." -msgstr "_Importér gemt konfiguration..." - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Only use VPN connection for these addresses" -msgstr "_Brug kun VPN-forbindelse til flg. adresser" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Packet Type" -msgstr "_Pakketype" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Telephone Number:" -msgstr "_Telefonnummer:" - -#: ../properties/nm-ppp-dialog.glade.h:70 -msgid "connect-delay" -msgstr "connect-delay" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "pppd-tunnel (PPTP, BTGPRS, opkald)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "Navn" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "PPTP-server" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "Telefonnummer" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "Bluetooth-adresse" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "Bluetooth-kanal" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "GPRS kontekstnr." - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "GPRS pakketype" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "Brug CTS/RTS flowkontrol" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "Tilslut via et modem" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "Påkræv at IP tilbydes" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "Brug MPPE-kryptering" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "Brug 128-bit MPPE-kryptering" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "Brug MPPC-komprimering" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "Brug ikke deflate-komprimering" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "Brug ikke BSD-komprimering" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "Eksklusiv enhedsadgang af pppd" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "Godkend fjernserver" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "Afvis MSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "Maksimal sendeenhed (i bytes)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "Maksimal modtageenhed (i bytes)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "Antal fejlede LCP ekkoer før der afbrydes" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "Interval (i sekunder) mellem LCP ekkoer" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "Interval (i millisekunder) som ventes inden der tilsluttes." - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "Brugerdefinerede PPP-indstillinger" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "Brug server DNS over tunnellen" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "Specifikke netværk tilgængelige" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "Begræns til specifikke netværk" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "Følgende \"%s\"-forbindelse vil blive oprettet:" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "Forbindelsens detaljer kan ændres ved at bruge knappen \"Tilbage\"." - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "Vælg fil der skal importeres" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "Gem som..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "En fil med navnet \"%s\" eksisterer allerede." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Vil du erstatte den med den du gemmer?" - -# -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "VPN-forbindelsen fejlede" - -#~ msgid "Required Information" -#~ msgstr "Påkrævede oplysninger" - -#, fuzzy -#~ msgid "Routing options" -#~ msgstr "Påkrævede oplysninger" - -# -#, fuzzy -#~ msgid "Connection Type:" -#~ msgstr "VPN-forbindelsen fejlede" - -#, fuzzy -#~ msgid "MPPE encryption" -#~ msgstr "Påkræv MPPE-kryptering" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Indtast oplysninger fra din systemadministrator nedenfor. Du skal ikke " -#~ "indtaste din adgangskode her, da du bliver spurgt om den ved tilslutning." - -#~ msgid "PPTP Client" -#~ msgstr "PPTP-klient" - -#~ msgid "Remote: %s" -#~ msgstr "Fjern: %s" - -#~ msgid "Username: %s" -#~ msgstr "Brugernavn: %s" - -#~ msgid "Use MPPC Compression: %s" -#~ msgstr "Brug MPPC-komprimering: %s" - -#~ msgid "Yes" -#~ msgstr "Ja" - -#~ msgid "No" -#~ msgstr "Nej" - -#~ msgid "Cannot import settings" -#~ msgstr "Kan ikke importere opsætning" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN-opsætningsfilen '%s' indeholder ikke gyldige data." - -#~ msgid "MS CHAP-v1/v2" -#~ msgstr "MS CHAP-v1/v2" - -#~ msgid "Username:" -#~ msgstr "Brugernavn:" - -#~ msgid "" -#~ "Your password must be defined \n" -#~ "in /etc/ppp/chap-secrets" -#~ msgstr "" -#~ "Din adgangskode skal være defineret \n" -#~ "i /etc/ppp/chap-secrets" diff --git a/vpn-daemons/pptp/po/de.po b/vpn-daemons/pptp/po/de.po deleted file mode 100644 index 5859e98e15..0000000000 --- a/vpn-daemons/pptp/po/de.po +++ /dev/null @@ -1,196 +0,0 @@ -# German translation of NetwokrManager. -# Copyright (C) 2005 Dan Williams -# This file is distributed under the same license as the NetworkManager package. -# Thomas Gier , 2007. -# Hauke Mehrtens , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-05 15:25+0100\n" -"PO-Revision-Date: 2008-12-05 16:26+0100\n" -"Last-Translator: Mario Blättermann \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Sekundäres Passwort:" - -# CHECK: accelerator -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Benutzername:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domäne" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Passwort:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "_Anonym verbinden" - -# CHECK: accelerator -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Als _Benutzer verbinden" - -# CHECK: accelerator -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "Passwort für _diese Sitzung behalten" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "Passwort im _Schlüsselbund speichern" - -#: ../auth-dialog/main.c:62 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Sie müssen sich legitimieren, um auf das Virtuelle Private Netz »%s« " -"zuzugreifen." - -#: ../auth-dialog/main.c:63 -msgid "Authenticate VPN" -msgstr "Legitimiere VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Hinzufügen, Entfernen und Bearbeiten von PPTP VPN-Verbindungen" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN-Verbindungs Manager" - -#: ../properties/advanced-dialog.c:145 -msgid "All Available (Default)" -msgstr "Alle verfügbaren (Vorgabe)" - -#: ../properties/advanced-dialog.c:149 -msgid "128-bit (most secure)" -msgstr "128-bit (am sichersten)" - -#: ../properties/advanced-dialog.c:158 -msgid "40-bit (less secure)" -msgstr "40-bit (weniger sicher)" - -#: ../properties/advanced-dialog.c:229 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:235 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:241 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:247 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/advanced-dialog.c:253 -msgid "EAP" -msgstr "EAP" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Legitimierung" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Echo" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Allgemein" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Optional" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Sicherheit und Komprimierung" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "Er_weitert …" - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "_BSD-Datenkomprimierung erlauben" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "_Deflate-Datenkomprimierung erlauben" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Erlaube st_ateful Verschlüsselung" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Erlaube die folgenden Methoden zur Authentifizierung:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Standard" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "NT Domain:" -msgstr "NT-Domäne:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Password:" -msgstr "Passwort:" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Send PPP _echo packets" -msgstr "Sende PPP-_Echo Pakete" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Show password" -msgstr "Zeige Passwort:" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "Use TCP _header compression" -msgstr "TCP-_Header-Komprimierung verwenden" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "_Point-to-Point Verschlüsselung (MPPE) verwenden" - -# CHECK: accelerator -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "User name:" -msgstr "Benutzername:" - -#: ../properties/nm-pptp-dialog.glade.h:19 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-pptp-dialog.glade.h:20 -msgid "_Security:" -msgstr "_Sicherheit" - -#: ../properties/nm-pptp.c:50 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Point-to-Point Tunneling Protocol (PPTP)" - -#: ../properties/nm-pptp.c:51 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Kompatibel mit Microsofts und anderen PPTP VPN Servern." - -#~ msgid "Authentication Type:" -#~ msgstr "Authentifikationstyp:" diff --git a/vpn-daemons/pptp/po/dz.po b/vpn-daemons/pptp/po/dz.po deleted file mode 100644 index 9e2c34d841..0000000000 --- a/vpn-daemons/pptp/po/dz.po +++ /dev/null @@ -1,206 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-20 03:31+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:268 -msgid "_Username:" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:270 -msgid "_Domain:" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Password:" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:355 -msgid "Connect _anonymously" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect as _user:" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" - -#: ../auth-dialog/main.c:162 -msgid "Authenticate PPTP VPN" -msgstr "" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "" - -#: ../nm-pptp.desktop.in.h:2 -msgid "VPN Connection Manager (PPTP)" -msgstr "" - -#: ../properties/nm-pptp.c:79 -msgid "PPTP Client" -msgstr "" - -#: ../properties/nm-pptp.c:387 -msgid "The following PPTP connection will be created:" -msgstr "" - -#: ../properties/nm-pptp.c:389 -#, c-format -msgid "Name: %s" -msgstr "" - -#: ../properties/nm-pptp.c:392 -#, c-format -msgid "Remote: %s" -msgstr "" - -#: ../properties/nm-pptp.c:395 -#, c-format -msgid "Username: %s" -msgstr "" - -#: ../properties/nm-pptp.c:399 -#, c-format -msgid "Routes: %s" -msgstr "" - -#: ../properties/nm-pptp.c:403 -#, c-format -msgid "Use MPPC Compression: %s" -msgstr "" - -#: ../properties/nm-pptp.c:403 ../properties/nm-pptp.c:405 -msgid "Yes" -msgstr "" - -#: ../properties/nm-pptp.c:403 ../properties/nm-pptp.c:405 -msgid "No" -msgstr "" - -#: ../properties/nm-pptp.c:405 -#, c-format -msgid "Use MPPE Encryption: %s" -msgstr "" - -#: ../properties/nm-pptp.c:408 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" - -#: ../properties/nm-pptp.c:484 -msgid "Cannot import settings" -msgstr "" - -#: ../properties/nm-pptp.c:486 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "" - -#: ../properties/nm-pptp.c:504 -msgid "Select file to import" -msgstr "" - -#. printf ("in impl_export\n"); -#: ../properties/nm-pptp.c:626 -msgid "Save as..." -msgstr "" - -#: ../properties/nm-pptp.c:656 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "" - -#: ../properties/nm-pptp.c:659 -msgid "Do you want to replace it with the one you are saving?" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Connection Name" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Required Information" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "MS CHAP-v1/v2" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Require MPPE encryption" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Use MPPC compression" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Username:" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "" -"Your password must be defined \n" -"in /etc/ppp/chap-secrets" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "_Gateway:" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "_Import Saved Configuration..." -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "_Only use VPN connection for these addresses" -msgstr "" - -#. No sophisticated error message for now -#: ../src/nm-pptp-service.c:126 -msgid "VPN Connection failed" -msgstr "" diff --git a/vpn-daemons/pptp/po/el.po b/vpn-daemons/pptp/po/el.po deleted file mode 100644 index 832df913e5..0000000000 --- a/vpn-daemons/pptp/po/el.po +++ /dev/null @@ -1,191 +0,0 @@ -# translation of NetworkManager-pptp.HEAD.po to -# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Kostas Papadimas , 2007. -# Jennie Petoumenou , 2008. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-07 15:33+0000\n" -"PO-Revision-Date: 2008-12-07 01:18+0200\n" -"Last-Translator: Jennie Petoumenou \n" -"Language-Team: Greek \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Δευτερεύον συνθηματικό:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Ό_νομα χρήστη:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Τομέας:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Συνθηματικό:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "_Ανώνυμη σύνδεση" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Σύνδεση ως _χρήστης:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "Απομνη_μόνευση συνθηματικών για αυτή τη συνεδρία" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "Απο_θήκευση συνθηματικών στην κλειδοθήκη" - -#: ../auth-dialog/main.c:62 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Χρειάζεστε πιστοποίηση για να αποκτήσετε πρόσβαση στο Ιδιωτικό Εικονικό " -"Δίκτυο (VPN) '%s'." - -#: ../auth-dialog/main.c:63 -msgid "Authenticate VPN" -msgstr "Πιστοποίηση VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Προσθήκη, απομάκρυνση και επεξεργασία συνδέσεων PPTP VPN" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "Διαχείριση συνδέσεων PPTP VPN" - -#: ../properties/advanced-dialog.c:145 -msgid "All Available (Default)" -msgstr "Όλες οι διαθέσιμες (προεπιλογή)" - -#: ../properties/advanced-dialog.c:149 -msgid "128-bit (most secure)" -msgstr "128-bit (μέγιστη ασφάλεια)" - -#: ../properties/advanced-dialog.c:158 -msgid "40-bit (less secure)" -msgstr "40-bit (μικρότερη ασφάλεια)" - -#: ../properties/advanced-dialog.c:229 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:235 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:241 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:247 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/advanced-dialog.c:253 -msgid "EAP" -msgstr "EAP" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Πιστοποίηση" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Echo" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Γενικά" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Προαιρετικά" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Ασφάλεια και Συμπίεση" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "Για π_ροχωρημένους..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Να επιτρέπεται η συμπίεση _BSD" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Να επιτρέπεται η συμπίεση _Deflate" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Να επιτρέπεται η _stateful κρυπτογράφηση" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Να επιτρέπονται οι ακόλουθες μέθοδοι πιστοποίησης:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Προεπιλεγμένη" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "NT Domain:" -msgstr "Τομέας ΝΤ:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Password:" -msgstr "Συνθηματικό:" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Send PPP _echo packets" -msgstr "Αποστολή πακέτων _echo PPP" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Show password" -msgstr "Εμφάνιση συνθηματικού" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "Use TCP _header compression" -msgstr "Χρήση συμπίεσης _κεφαλίδων TCP" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Χρήση κρυπτογράφησης _Point-to-Point (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "User name:" -msgstr "Όνομα χρήστη:" - -#: ../properties/nm-pptp-dialog.glade.h:19 -msgid "_Gateway:" -msgstr "Πύ_λη:" - -#: ../properties/nm-pptp-dialog.glade.h:20 -msgid "_Security:" -msgstr "_Ασφάλεια:" - -#: ../properties/nm-pptp.c:50 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Πρωτόκολλο Point-to-Point Tunneling (PPTP)" - -#: ../properties/nm-pptp.c:51 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "" -"Συμβατό με τους εξυπηρετητές PPTP VPN της Microsoft και άλλων εταιρειών." diff --git a/vpn-daemons/pptp/po/en_GB.po b/vpn-daemons/pptp/po/en_GB.po deleted file mode 100644 index 7d56212626..0000000000 --- a/vpn-daemons/pptp/po/en_GB.po +++ /dev/null @@ -1,591 +0,0 @@ -# English (British) translation for gnome-torrent -# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the gnome-torrent package. -# David Lodge , 2006 -# -msgid "" -msgstr "" -"Project-Id-Version: gnome-torrent\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-09 15:24+0000\n" -"PO-Revision-Date: 2006-12-28 18:55-0000\n" -"Last-Translator: David Lodge \n" -"Language-Team: en_GB \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "Authentication Type:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "_Remember for this session" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_Save in keyring" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "You need to authenticate to access '%s'." - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "Authenticate Connection" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "Authentication Required" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "_Authentication Type:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Password:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "_Remote name:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Username:" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Secondary Password:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domain:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Connect _anonymously" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Connect as _user:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "_Remember password for this session" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_Save password in keyring" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Add, Remove, and Edit VPN Connections" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "VPN Connection Manager (PPP generic)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "Compression" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Delays & Timeouts" -msgstr "Delays & TImeouts" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Encryption" -msgstr "Encryption" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "IP Options" -msgstr "IP Options" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "Packet Parameters" -msgstr "Packet Parameters" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Example: 172.16.0.0/16 10.11.12.0/24" -msgstr "Example: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "A list of extra options to pppd as would be typed on the command line" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "Allow B_SD Compression" -msgstr "Allow B_SD Compression" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow _Deflate compression" -msgstr "Allow _Deflate compression" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Authentication" -msgstr "Authentication" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "C_hannel:" -msgstr "C_hannel:" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Co_nnect delay:" -msgstr "Co_nnect delay:" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "Compression & Encryption" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "Connection" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Connection na_me:" -msgstr "Connection na_me:" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Context _number:" -msgstr "Context _number:" - -#: ../properties/nm-ppp-dialog.glade.h:18 -msgid "Custom _PPP options:" -msgstr "Custom _PPP options:" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Debug _output" -msgstr "Debug _output" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "Disconnect after this many LCP echo requests fail" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "E_xclusive device access (UUCP-style lock)" -msgstr "E_xclusive device access (UUCP-style lock)" - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "Enable stateful _MPPE" -msgstr "Enable stateful _MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Find Device" -msgstr "Find Device" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "GPRS Options" -msgstr "GPRS Options" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "Host name or IP address of the PPTP server" -msgstr "Host name or IP address of the PPTP server" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "IP a_ddress:" -msgstr "IP a_ddress:" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "Maximum Receive Unit" -msgstr "Maximum Receive Unit" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Maximum Transmit Unit" -msgstr "Maximum Transmit Unit" - -#: ../properties/nm-ppp-dialog.glade.h:32 -msgid "PPP Options" -msgstr "PPP Options" - -#: ../properties/nm-ppp-dialog.glade.h:33 -msgid "Refuse C_HAP" -msgstr "Refuse C_HAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse _EAP" -msgstr "Refuse _EAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Refuse _MS CHAP" -msgstr "Refuse _MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require 128 bit M_PPE encryption" -msgstr "Require 128-bit M_PPE encryption" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPE _encryption" -msgstr "Require MPPE _encryption" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require explicit IP _address" -msgstr "Require explicit IP _address" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "Requires existing network connection" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "Routing" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "Serial Options" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "Service providers GPRS access point from device config" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "Service providers IP address" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telep_hone number:" -msgstr "Telep_hone number:" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "Time in seconds between echo requests" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Typ_e:" -msgstr "Typ_e:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -msgid "Use peer _DNS" -msgstr "Use peer _DNS" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "When checked the \"refuse-chap\" option is passed to pppd." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "When checked the \"refuse-eap\" option is passed to pppd." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "When checked the \"refuse-mschap\" option is passed to pppd." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "When checked the 'lock' option is passed to pppd" - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "When checked the 'require-mppc' option is passed to pppd" - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "When checked this sets the pppd 'noipdefault' option" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "When checked this sets the pppd 'usepeerdns' option" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "" -"When this check box is cleared the \"noauth\" option is passed to pppd." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access point name:" -msgstr "_Access point name:" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Authenticate peer" -msgstr "_Authenticate peer" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Device address:" -msgstr "_Device address:" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Hardware RTS/CTS" -msgstr "_Hardware RTS/CTS" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Import Saved Configuration..." -msgstr "_Import Saved Configuration..." - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_Modem connection" -msgstr "_Modem connection" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Only use VPN connection for these addresses:" -msgstr "_Only use VPN connection for these addresses:" - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Packet type:" -msgstr "_Packet type:" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Peer DNS through tunnel" -msgstr "_Peer DNS through tunnel" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Require MPPC compression" -msgstr "_Require MPPC compression" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "pppd tunnel (PPTP, BTGPRS, Dial-up)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "Name" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "PPTP Server" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "Telephone Number" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "Bluetooth Address" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "Bluetooth Channel" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "GPRS Context No." - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "GPRS Packet Type" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "Use CTS/RTS flow control" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "Connect via a modem" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "Require IP to be provided" - -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Use Peer DNS" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "Use MPPE encryption" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "Use 128-bit MPPE encryption" - -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "Enable stateful MPPE" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "Use MPPC compression" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "Do not use deflate compression" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "Do not use BSD compression" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "Exclusive device access by pppd" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "Authenticate remote peer" - -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "Refuse EAP" - -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "Refuse CHAP" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "Refuse MSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "Maximum transmit unit (in bytes)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "Maximum receive unit (in bytes)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "Number of failed LCP echos to cause disconnect" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "Interval (in seconds) at which to issue LCP echos" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "Interval (in milliseconds) to wait before connecting." - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "Custom PPP options" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "Use Peer DNS over the Tunnel" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "Specific networks available" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "Limit to specific networks" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "The following '%s' connection will be created:" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "The connection details can be changed using the \"Back\" button." - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "Select file to import" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "Save as..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "A file named \"%s\" already exists." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Do you want to replace it with the one you are saving?" - -#: ../src/nm-ppp-starter.c:141 -msgid "VPN Connection failed" -msgstr "VPN Connection failed" - -#~ msgid "auth-chap-window" -#~ msgstr "auth-chap-window" - -#~ msgid "auth-mschapv2-window" -#~ msgstr "auth-mschapv2-window" - -#~ msgid "auth-none-window" -#~ msgstr "auth-none-window" - -#~ msgid "Connection Name" -#~ msgstr "Connection Name" - -#~ msgid "Telephone number to dial" -#~ msgstr "Telephone number to dial" diff --git a/vpn-daemons/pptp/po/es.po b/vpn-daemons/pptp/po/es.po deleted file mode 100644 index 0cc50013d3..0000000000 --- a/vpn-daemons/pptp/po/es.po +++ /dev/null @@ -1,191 +0,0 @@ -# translation of NetworkManager-pptp.HEAD.po to Español -# translation of NetworkManager-openvpn.HEAD.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Francisco Javier F. Serrador , 2006. -# Jorge González , 2007, 2008. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-12 15:03+0000\n" -"PO-Revision-Date: 2008-10-16 21:06+0200\n" -"Last-Translator: Jorge González \n" -"Language-Team: Español \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Contraseña _secundaria:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Contraseña:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Conectar como -anónimo" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Conectar como _usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Recordar las contraseñas para esta sesión" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Guardar las contraseña en el depósito de claves" - -#: ../auth-dialog/main.c:62 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Necesita autenticarse para acceder a la red privada virtual «%s»" - -#: ../auth-dialog/main.c:63 -msgid "Authenticate VPN" -msgstr "Autenticar VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Añadir, eliminar y editar conexiones VPN PPTP" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "Gestor de conexiones VPN PPTP" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Todas las disponibles (predeterminado)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128-bit (más seguro)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40-bit (menos seguro)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Autenticación" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Eco" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "General" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Opcional" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Seguridad y compresión" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "A_vanzado..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Permitir compresión de datos _BSD" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Permitir compresión de datos _Deflate" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Permitir cifrado de est_ado completo" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Permitir los siguientes métodos de autenticación:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Predeterminado" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "NT Domain:" -msgstr "Dominio de red:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Password:" -msgstr "Contraseña:" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Send PPP _echo packets" -msgstr "Mandar paquetes _eco PPP" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Show password" -msgstr "Mostrar contraseña" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "Use TCP _header compression" -msgstr "Usar compresión de _cabeceras TCP" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Usar cifrado pun_to a punto (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "User name:" -msgstr "Usuario:" - -#: ../properties/nm-pptp-dialog.glade.h:19 -msgid "_Gateway:" -msgstr "_Pasarela:" - -#: ../properties/nm-pptp-dialog.glade.h:20 -msgid "_Security:" -msgstr "_Seguridad:" - -#: ../properties/nm-pptp.c:50 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Protocolo de túnel punto a punto (PPTP)" - -#: ../properties/nm-pptp.c:51 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Compatible con servidores PPTP VPN de Microsoft y otros." - -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" - -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" diff --git a/vpn-daemons/pptp/po/et.po b/vpn-daemons/pptp/po/et.po deleted file mode 100644 index aa588801e2..0000000000 --- a/vpn-daemons/pptp/po/et.po +++ /dev/null @@ -1,475 +0,0 @@ -# GNOME NetworkManager - PPTP klient -# -# Copyright (C) 2007 The GNOME Project. -# This file is distributed under the same license as the NetworkManager-pptp package. -# -# Priit Laes , 2007. -# Ivar Smolin , 2007. -# Mattias Põldaru , 2007-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-12 11:38+0000\n" -"PO-Revision-Date: 2008-09-28 21:16+0300\n" -"Last-Translator: Mattias Põldaru \n" -"Language-Team: Estonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Teisene parool:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Kasutajanimi:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domeen:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Parool:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Ühendu _anonüümselt" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Ühendu ka_sutajana:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Jäta paroolid selle sessiooni ajaks meelde" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "Paroolide _salvestamine võtmerõngasse" - -#: ../auth-dialog/main.c:168 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Ligipääsuks '%s' VPN-i võrku pead autentima." - -#: ../auth-dialog/main.c:169 -msgid "Authenticate VPN" -msgstr "VPN-i autentimine" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "PPTP VPN-ühenduste lisamine, muutmine ja eemaldamine" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN-ühenduste haldur" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Kõik saadaval (vaikimisi)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128-bitine (kõige turvalisem)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40-bitine (vähem turvaline)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Autentimine" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Echo" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Üldine" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Valikuline" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Turvalisus ja tihendamine" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "_Laiendatud..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "_BSD tihendus on lubatud" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "_Deflate-tihendus on lubatud" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Stateful-tihendus on lubatud" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Luba järgnevad autentimise meetodid:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Vaikimisi" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "Domeen:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "Saada PPP _echo pakette" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "Kasuta TCP-_päiste tihendamist" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Kasuta _Point-to-Point krüpteerimist (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "Kasutajanimi:" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "_Turvalisus:" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Point-to-Point tunneli protokoll (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Ühilduv Microsofti ja teiste PPTP VPN serveritega." - -#, fuzzy -#~ msgid "Authentication Type:" -#~ msgstr "PPTP VPN-i autentimine" - -#, fuzzy -#~ msgid "_Remember for this session" -#~ msgstr "_Jäta parool selle sessiooni ajaks meelde" - -#, fuzzy -#~ msgid "_Save in keyring" -#~ msgstr "Parooli _salvestamine võtmerõngasse" - -#, fuzzy -#~ msgid "Authenticate Connection" -#~ msgstr "Ühendus tühistatud" - -#, fuzzy -#~ msgid "Authentication Required" -#~ msgstr "Autentimine on vajalik" - -#, fuzzy -#~ msgid "_Authentication Type:" -#~ msgstr "PPTP VPN-i autentimine" - -#, fuzzy -#~ msgid "_Remote name:" -#~ msgstr "_Kasutajanimi:" - -#, fuzzy -#~ msgid "VPN Connection Manager (PPP generic)" -#~ msgstr "VPN ühenduse haldamine (PPTP)" -#~ msgid "00:00:00:00" -#~ msgstr "00:00:00:00" - -#, fuzzy -#~ msgid "Delays & Timeouts" -#~ msgstr "Fotod ja muusika" - -#, fuzzy -#~ msgid "Packet Parameters" -#~ msgstr "Algoritmi parameetrid" - -#, fuzzy -#~ msgid "Example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "näide: 172.16.0.0/16 10.11.12.0/24" - -#, fuzzy -#~ msgid "Allow B_SD Compression" -#~ msgstr "BSD-tihendus on lubatud" - -#, fuzzy -#~ msgid "C_hannel:" -#~ msgstr "_Kanal:" - -#, fuzzy -#~ msgid "Co_nnect delay:" -#~ msgstr "Ühendu ka_sutajana:" -#~ msgid "Compression & Encryption" -#~ msgstr "Tihendus ja krüptimine" - -#, fuzzy -#~ msgid "Connection" -#~ msgstr "VPN ühenduse loomine nurjus" - -#, fuzzy -#~ msgid "Connection na_me:" -#~ msgstr "Ühenduse nimi" - -#, fuzzy -#~ msgid "Context _number:" -#~ msgstr "Ühendu ka_sutajana:" - -#, fuzzy -#~ msgid "Custom _PPP options:" -#~ msgstr "Bonobo aktiveerimisvõtmed" - -#, fuzzy -#~ msgid "Debug _output" -#~ msgstr "# Väljundmuutujad" - -#, fuzzy -#~ msgid "Enable stateful _MPPE" -#~ msgstr "Peitmisnuppude peitmine lubatud" - -#, fuzzy -#~ msgid "Find Device" -#~ msgstr "Võrguseade:\t%s\n" - -#, fuzzy -#~ msgid "GPRS Options" -#~ msgstr "GTK+ sätted" - -#, fuzzy -#~ msgid "IP a_ddress:" -#~ msgstr "IP aadress" -#~ msgid "PPP Options" -#~ msgstr "PPP-valikud" - -#, fuzzy -#~ msgid "Refuse C_HAP" -#~ msgstr "Keskmine aeg:\t%s ms\n" - -#, fuzzy -#~ msgid "Refuse _EAP" -#~ msgstr "Keskmine aeg:\t%s ms\n" - -#, fuzzy -#~ msgid "Refuse _MS CHAP" -#~ msgstr "Keskmine aeg:\t%s ms\n" - -#, fuzzy -#~ msgid "Require 128 bit M_PPE encryption" -#~ msgstr "Nõua MPPE krüpteerimist" - -#, fuzzy -#~ msgid "Require MPPE _encryption" -#~ msgstr "Nõua MPPE krüpteerimist" - -#, fuzzy -#~ msgid "Require explicit IP _address" -#~ msgstr " AADR := { IP_AADRESS | any }\n" - -#, fuzzy -#~ msgid "Requires existing network connection" -#~ msgstr "Kasutan ühendust serveriga %s:%d.\n" - -#, fuzzy -#~ msgid "Routing" -#~ msgstr "Ruutingutabeli hankimine" - -#, fuzzy -#~ msgid "Serial Options" -#~ msgstr "GTK+ sätted" - -#, fuzzy -#~ msgid "Service providers IP address" -#~ msgstr "" -#~ "Staatiline IP aadress\n" -#~ "DHCP" - -#, fuzzy -#~ msgid "Telep_hone number:" -#~ msgstr "Telefoninumber" - -#, fuzzy -#~ msgid "" -#~ "This is the friendly name that will be used to identify this network " -#~ "connection, \n" -#~ "e.g. \"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "Eravõrgu eristamise _nimi, nt \"Kool\" või \"Ametivõrk\"." - -#, fuzzy -#~ msgid "Time in seconds between echo requests" -#~ msgstr "Sekundites määratud ajavahemik olekuuenduste vahel" - -#, fuzzy -#~ msgid "Typ_e:" -#~ msgstr "Liik:" - -#, fuzzy -#~ msgid "Use peer _DNS" -#~ msgstr " -d, --domain DNS domeeni nimi\n" - -#, fuzzy -#~ msgid "_Access point name:" -#~ msgstr "Programmi %(name)s käivitamine (%(prog)s)" - -#, fuzzy -#~ msgid "_Device address:" -#~ msgstr "Aadressi tüüp" - -#, fuzzy -#~ msgid "_Hardware RTS/CTS" -#~ msgstr "Riistvaraline seade" -#~ msgid "_Import Saved Configuration..." -#~ msgstr "_Importi salvestatud seadistus..." - -#, fuzzy -#~ msgid "_Modem connection" -#~ msgstr "Modemiühendus" - -#, fuzzy -#~ msgid "_Only use VPN connection for these addresses:" -#~ msgstr "_Kasuta VPN-ühendust ainult neile aadressidele" - -#, fuzzy -#~ msgid "_Packet type:" -#~ msgstr "tundmatu paketi tüüp" - -#, fuzzy -#~ msgid "_Require MPPC compression" -#~ msgstr "MPPC tihendamise kasutamine" - -#, fuzzy -#~ msgid "Name" -#~ msgstr "Nimi: %s" -#~ msgid "PPTP Server" -#~ msgstr "PPTP Server" -#~ msgid "Telephone Number" -#~ msgstr "Telefoninumber" - -#, fuzzy -#~ msgid "Bluetooth Address" -#~ msgstr "Aadressi tüüp" - -#, fuzzy -#~ msgid "Bluetooth Channel" -#~ msgstr "Kanali nimi: %s" - -#, fuzzy -#~ msgid "GPRS IP" -#~ msgstr "IP andmed" - -#, fuzzy -#~ msgid "GPRS Context No." -#~ msgstr "Allikas '%s' jaoks pole konteksti saadaval" - -#, fuzzy -#~ msgid "GPRS Packet Type" -#~ msgstr "tundmatu paketi tüüp" - -#, fuzzy -#~ msgid "Connect via a modem" -#~ msgstr "Ühendu ka_sutajana:" - -#, fuzzy -#~ msgid "Use Peer DNS" -#~ msgstr " -d, --domain DNS domeeni nimi\n" - -#, fuzzy -#~ msgid "Use 128 bit MPPE encryption" -#~ msgstr "MPPE krüpteerimise kasutamine: %s" - -#, fuzzy -#~ msgid "Enable stateful MPPE" -#~ msgstr "Peitmisnuppude peitmine lubatud" - -#, fuzzy -#~ msgid "Do not use deflate compression" -#~ msgstr "MPPC tihendamise kasutamine" - -#, fuzzy -#~ msgid "Do not use BSD compression" -#~ msgstr "MPPC tihendamise kasutamine" - -#, fuzzy -#~ msgid "Authenticate remote peer" -#~ msgstr "PPTP VPN-i autentimine" -#~ msgid "Custom PPP options" -#~ msgstr "PPP kohandatud valikud" - -#, fuzzy -#~ msgid "Specific networks available" -#~ msgstr "Fail ei ole kättesaadav" - -#, fuzzy -#~ msgid "Limit to specific networks" -#~ msgstr "Paneeliga seotud rakendused" - -#, fuzzy -#~ msgid "The following '%s' connection will be created:" -#~ msgstr "Luuakse järgmine PPTP ühendus:" - -#, fuzzy -#~ msgid "\t%s: %s\n" -#~ msgstr "Marsruudid: %s" - -#, fuzzy -#~ msgid "The connection details can be changed using the \"Back\" button." -#~ msgstr "Ühenduse üksikasju saab muuta kasutades \"Muuda\" nuppu." -#~ msgid "Select file to import" -#~ msgstr "Imporditava faili valimine" -#~ msgid "Save as..." -#~ msgstr "Salvesta kui..." -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Fail nimega \"%s\" on juba olemas." -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Kas soovid seda salvestatava failiga asendada?" - -#, fuzzy -#~ msgid "auth-chap-window" -#~ msgstr "Sulgeb käesoleva akna" - -#, fuzzy -#~ msgid "auth-mschapv2-window" -#~ msgstr "Sulgeb käesoleva akna" - -#, fuzzy -#~ msgid "auth-none-window" -#~ msgstr "Puudub (samasse aknasse)" -#~ msgid "Connection Name" -#~ msgstr "Ühenduse nimi" - -#, fuzzy -#~ msgid "Telephone number to dial" -#~ msgstr "Imporditavate ridade arv" - diff --git a/vpn-daemons/pptp/po/eu.po b/vpn-daemons/pptp/po/eu.po deleted file mode 100644 index 9d365bd7cc..0000000000 --- a/vpn-daemons/pptp/po/eu.po +++ /dev/null @@ -1,176 +0,0 @@ -# translation of eu.po to Basque -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Iñaki Larrañaga Murgoitio , 2008. -msgid "" -msgstr "" -"Project-Id-Version: eu\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-09 16:53+0200\n" -"PO-Revision-Date: 2008-09-09 17:02+0200\n" -"Last-Translator: Iñaki Larrañaga Murgoitio \n" -"Language-Team: Basque \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Bigarren pasahitza:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Erabiltzaile-izena:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domeinua:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Pasahitza:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Konektatu _anonimo gisa" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Konektatu _erabiltzaile gisa:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Gogoratu pasahitza saio honetan" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Gorde pasahitza gako-sortan" - -#: ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Autentifikatu egin behar zara '%s' VPN-ra sarbidetzeko." - -#: ../auth-dialog/main.c:141 -msgid "Authenticate VPN" -msgstr "Autentifikatu VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Gehitu, kendu eta editatu PPTP VPN konexioak" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN konexio-kudeatzailea" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Erabilgarri denak (lehenetsia)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128 bit (seguruena)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40 bit (ez hain segurua)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Autentifikazioa" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Ohiartzuna" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Orokorra" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Aukerakoa" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Segurtasuna eta konpresioa" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "_Aurreratua..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Onartu _BSD datu-konpresioa" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Onartu _Deflate datu-konpresioa" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Onartu enkripzioa _egoerarekin" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Onartu honako autentifikazio metodoak:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Lehenetsia" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "Domeinua:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "Bidali PPP _oihartzun-paketeak" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "Erabili TCP _goiburu-konpresioa" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Erabili _puntutik punturako enkriptatzea (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "Erabiltzaile-izena:" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "_Atebidea:" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "_Segurtasuna:" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Puntutik punturako tunelaren protokoloa (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Microsoft eta beste PPTP VPN zerbitzariekin bateragarria." - diff --git a/vpn-daemons/pptp/po/fi.po b/vpn-daemons/pptp/po/fi.po deleted file mode 100644 index d3fd584cba..0000000000 --- a/vpn-daemons/pptp/po/fi.po +++ /dev/null @@ -1,757 +0,0 @@ -# Finnish messages for NetworkManager-pptp. -# Copyright (C) 2006-2008 Ilkka Tuohela -# Ilkka Tuohela , 2006-2008. -# -# Suomennos: http://gnome.fi/ -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-29 20:26+0300\n" -"PO-Revision-Date: 2008-11-29 20:00+0300\n" -"Last-Translator: Ilkka Tuohela \n" -"Language-Team: Finnish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Toissijainen salasana:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Käyttäjätunnus:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Toimialue:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Salasana:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Yhdistä _anonyymisti" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Yhdistä _käyttäjänä:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Muista salasana istunnon ajan" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Tallenna salasana avainrenkaaseen" - -#: ../auth-dialog/main.c:62 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Yhteydenotto VPN-verkkoon \"%s\" vaatii todentamista." - -#: ../auth-dialog/main.c:63 -msgid "Authenticate VPN" -msgstr "Todenna VPN-yhteys" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Lisää, poista tai muokkaa PPTP VPN -yhteyksiä" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN -yhteyksien hallinta" - -#: ../properties/advanced-dialog.c:144 -msgid "All Available (Default)" -msgstr "Kaikki mahdolliset (oletus)" - -#: ../properties/advanced-dialog.c:148 -msgid "128-bit (most secure)" -msgstr "128-bittinen (turvallisempi)" - -#: ../properties/advanced-dialog.c:157 -msgid "40-bit (less secure)" -msgstr "40-bittinen (vähemmän turvallinen" - -#: ../properties/advanced-dialog.c:228 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:234 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:240 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:246 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Todentaminen" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Kaiutus" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Yleisasetukset" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Lisävalinnat" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Salaus ja pakkaus" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "_Lisäasetukset..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Salli _BSD-pakkaus" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Salli _deflate-pakkaus" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Salli _tilallinen salaus" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Salli seuraavat tunnistusmenetelmät:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Oletus" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "NT Domain:" -msgstr "NT-toimialue:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Password:" -msgstr "Salasana:" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Send PPP _echo packets" -msgstr "Lähetä PPP:n _echo-paketteja" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Show password" -msgstr "Näytä salasana" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "Use TCP _header compression" -msgstr "Käytä TCP-_otsakkeiden pakkausta" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Käytä _Point-to-Point-salausta (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "User name:" -msgstr "Käyttäjätunnus:" - -#: ../properties/nm-pptp-dialog.glade.h:19 -msgid "_Gateway:" -msgstr "_Yhdyskäytävä:" - -#: ../properties/nm-pptp-dialog.glade.h:20 -msgid "_Security:" -msgstr "_Salaus:" - -#: ../properties/nm-pptp.c:50 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Point-to-Point Tunneling Protocol (PPTP)" - -#: ../properties/nm-pptp.c:51 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Yhteensopiva Microsoftin ja muiden PPTP VPN-palvelinten kanssa." - -#~ msgid "Authentication Type:" -#~ msgstr "Todentamistapa:" - -#~ msgid "_Remember for this session" -#~ msgstr "_Muista tämän istunnon ajan" - -#~ msgid "_Save in keyring" -#~ msgstr "_Tallenna avainrenkaaseen" - -#~ msgid "Authenticate Connection" -#~ msgstr "Todenna VPN-yhteys" - -#~ msgid "" -#~ "Authentication Information\n" -#~ "\n" -#~ "The connection '%s' may need some form of authentication.\n" -#~ "\n" -#~ "Please select an appropriate authentication type and provide the " -#~ "necessary credentials below:\n" -#~ msgstr "" -#~ "Tietoja todentamisesta\n" -#~ "\n" -#~ "Yhteys \"%s\" saattaa vaatia todentamista.\n" -#~ "\n" -#~ "Valitse sopiva todentamistapa ja syötä allaoleviin kenttiin tarvittavat " -#~ "tiedot:\n" - -#~ msgid "Authentication Required" -#~ msgstr "Todentaminen vaaditaan" - -#~ msgid "_Authentication Type:" -#~ msgstr "_Todentamistapa:" - -#~ msgid "_Remote name:" -#~ msgstr "_Nimi palvelimella:" - -#~ msgid "VPN Connection Manager (PPP generic)" -#~ msgstr "VPN-yhteyksien hallinta (yleinen PPP)" - -#~ msgid "00:00:00:00" -#~ msgstr "00:00:00:00" - -#~ msgid "Delays & Timeouts" -#~ msgstr "Viiveet ja aikakatkaisut" - -#~ msgid "Packet Parameters" -#~ msgstr "Pakettiparameterit" - -#~ msgid "Example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "Esimerkki: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "" -#~ "A list of extra options to pppd as would be typed on the command line" -#~ msgstr "Lista valitsimista pppd:lle, komentoriviltä annettavassa muodossa" - -#~ msgid "Allow B_SD Compression" -#~ msgstr "Salli B_SD-pakkaus" - -#~ msgid "C_hannel:" -#~ msgstr "_Kanava:" - -#~ msgid "Co_nnect delay:" -#~ msgstr "_Yhteysviive:" - -#~ msgid "Compression & Encryption" -#~ msgstr "Pakkaus ja salaus" - -#~ msgid "Connection" -#~ msgstr "Yhteys" - -#~ msgid "Connection na_me:" -#~ msgstr "Yhteyden ni_mi:" - -#~ msgid "Context _number:" -#~ msgstr "_Kontekstin numero:" - -#~ msgid "Custom _PPP options:" -#~ msgstr "Omat _PPP-valitsimet:" - -#~ msgid "Debug _output" -#~ msgstr "_Vianetsintätuloste" - -#~ msgid "Disconnect after this many LCP echo requests fail" -#~ msgstr "Katkaise yhteys, kun näin monta LCP ECHO-pyyntö epäonnistuu" - -#~ msgid "E_xclusive device access (UUCP-style lock)" -#~ msgstr "Laite varataan käyttöön (UUCP-tyylinen lukko)" - -#~ msgid "Enable stateful _MPPE" -#~ msgstr "Käytä tilallista _MPPE:tä" - -#~ msgid "Find Device" -#~ msgstr "Etsi laite" - -#~ msgid "" -#~ "For security reasons, options entered in the box above are checked " -#~ "against a list of allowed options before a connection is established. " -#~ "Currently there are no options on the list." -#~ msgstr "" -#~ "Turvallisuussyistä ylläolevaan laatikkoon syötettyjä valitsimia verrataan " -#~ "listaan sallituista valitsimista. Tällä hetkellä lista ei sisällä mitään " -#~ "valitsimia." - -#~ msgid "GPRS Options" -#~ msgstr "GPRS-valitsimet" - -#~ msgid "Host name or IP address of the PPTP server" -#~ msgstr "PPTP-palvelimen konenimi tai IP-osoite" - -#~ msgid "IP a_ddress:" -#~ msgstr "_IP-osoite:" - -#~ msgid "" -#~ "If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -#~ msgstr "" -#~ "Jos BSD-pakkaus ei ole sallittu, annetaan pppd:lle valitsin 'nobsdcomp'" - -#~ msgid "" -#~ "If Deflate compression is not allowed the 'nodefate' option is passed to " -#~ "pppd" -#~ msgstr "" -#~ "Jos deflate-pakkaus ei ole sallittu, annetaan pppd:lle valitsin " -#~ "'nodeflate'" - -#~ msgid "Maximum Receive Unit" -#~ msgstr "MRU" - -#~ msgid "Maximum Transmit Unit" -#~ msgstr "MTU" - -#~ msgid "PPP Options" -#~ msgstr "PPP-valinnat" - -#~ msgid "Refuse C_HAP" -#~ msgstr "Kiellä C_HAP" - -#~ msgid "Refuse _EAP" -#~ msgstr "Kiellä _EAP" - -#~ msgid "Refuse _MS CHAP" -#~ msgstr "Kiellä _MS CHAP" - -#~ msgid "Require 128 bit M_PPE encryption" -#~ msgstr "Vaadi 128-bittinen M_PPE-salaus" - -#~ msgid "Require MPPE _encryption" -#~ msgstr "Vaadi MPPE-_salaus" - -#~ msgid "Require explicit IP _address" -#~ msgstr "Vaadi erikseen määritelty IP-_osoite" - -#~ msgid "Requires existing network connection" -#~ msgstr "Vaatii olemassaolevan verkkoyhteyden" - -#~ msgid "Routing" -#~ msgstr "Reititys" - -#~ msgid "Serial Options" -#~ msgstr "Sarjaportin valinnat" - -#~ msgid "Service providers GPRS access point from device config" -#~ msgstr "Palveluntarjoan GPRS APN laitteen asetuksista" - -#~ msgid "Service providers IP address" -#~ msgstr "Palveluntarjoajan IP-osoite" - -#~ msgid "Telep_hone number:" -#~ msgstr "_Puhelinnumero:" - -#~ msgid "" -#~ "This is the friendly name that will be used to identify this network " -#~ "connection, \n" -#~ "e.g. \"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Nimi, jota käytetään verkkoyhteyden tunnistamiseen, esimerkiksi " -#~ "\"Kampusverkko\" tai \"Yritysverkko\"." - -#~ msgid "Time in seconds between echo requests" -#~ msgstr "ECHO-pyyntöjen välissä oleva aika sekunteina" - -#~ msgid "Typ_e:" -#~ msgstr "_Tyyppi:" - -#~ msgid "Use peer _DNS" -#~ msgstr "Käytä saatuja _DNS-asetuksia" - -#~ msgid "When checked the \"refuse-chap\" option is passed to pppd." -#~ msgstr "Kun asetettu, annetaan pppd:lle valitsin 'refuse-chap'." - -#~ msgid "When checked the \"refuse-eap\" option is passed to pppd." -#~ msgstr "Kun asetettu, annetaan pppd:lle valitsin 'refuse-eap'." - -#~ msgid "When checked the \"refuse-mschap\" option is passed to pppd." -#~ msgstr "Kun asetettu, annetaan pppd:lle valitsin 'refuse-mschap'" - -#~ msgid "When checked the 'lock' option is passed to pppd" -#~ msgstr "Kun asetettu, annetaan pppd:lle valitsin 'lock'" - -#~ msgid "When checked the 'require-mppc' option is passed to pppd" -#~ msgstr "Kun asetettu, annetaan pppd:lle valitsin 'require-mppc'" - -#~ msgid "" -#~ "When checked this sets the pppd 'debug' option and adds some extra " -#~ "information from the NetworkManager plugin" -#~ msgstr "" -#~ "Kun asetettu, annetaan pppd:lle valtsin 'debug' ja NetworkManagerin " -#~ "liitännäisestä kerätään joitakin lisätietoja" - -#~ msgid "When checked this sets the pppd 'noipdefault' option" -#~ msgstr "Kun asetettu, tämä asettaa pppd:lle valitsimen 'nopidefault'" - -#~ msgid "When checked this sets the pppd 'usepeerdns' option" -#~ msgstr "Kun asetettu, tämä asettaa pppd:lle valitsimen 'usepeerdns'" - -#~ msgid "" -#~ "When this check box is cleared the \"noauth\" option is passed to pppd." -#~ msgstr "Kun rastia ei ole, annetaan pppd:lle valitsin 'noauth'." - -#~ msgid "_Access point name:" -#~ msgstr "_APN:" - -#~ msgid "_Device address:" -#~ msgstr "_Laiteosoite:" - -#~ msgid "_Hardware RTS/CTS" -#~ msgstr "_Laitetason RTS/CTS" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "Tuo tallennettu määrittely..." - -#~ msgid "_Modem connection" -#~ msgstr "_Modeemiyhteys" - -#~ msgid "_Only use VPN connection for these addresses:" -#~ msgstr "_Käytä VPN-yhteyttä seuraaville osoitteille:" - -#~ msgid "_Packet type:" -#~ msgstr "_Pakettityyppi:" - -#~ msgid "_Peer DNS through tunnel" -#~ msgstr "_Yhteyden DNS-asetukset tunnelin kautta" - -#~ msgid "_Require MPPC compression" -#~ msgstr "_Vaadi MPPC-pakkaus" - -#~ msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -#~ msgstr "pppd-tunneli (PPTP, BTGPRS, Dialup)" - -#~ msgid "Name" -#~ msgstr "Nimi" - -#~ msgid "PPTP Server" -#~ msgstr "PPTP-palvelin" - -#~ msgid "Telephone Number" -#~ msgstr "Puhelinnumero" - -#~ msgid "Bluetooth Address" -#~ msgstr "Bluetooth-osoite" - -#~ msgid "Bluetooth Channel" -#~ msgstr "Bluetooth-kanava" - -#~ msgid "GPRS APN" -#~ msgstr "GPRS APN" - -#~ msgid "GPRS IP" -#~ msgstr "GPRS-IP-osoite" - -#~ msgid "GPRS Context No." -#~ msgstr "GPRS-kontekstin numero" - -#~ msgid "GPRS Packet Type" -#~ msgstr "GPRS pakettityyppi" - -#~ msgid "Use CTS/RTS flow control" -#~ msgstr "Käytä CTS/RTS-vuonohjausta" - -#~ msgid "Connect via a modem" -#~ msgstr "Yhdistä modeemin avulla" - -#~ msgid "Require IP to be provided" -#~ msgstr "Vaadi annettu IP" - -#~ msgid "Use Peer DNS" -#~ msgstr "Käytä saatua DNS-määrittelyä" - -#~ msgid "Use 128 bit MPPE encryption" -#~ msgstr "Käytä 128-bittistä MPPE-salausta" - -#~ msgid "Enable stateful MPPE" -#~ msgstr "Käytä tilallista MPPE:tä" - -#~ msgid "Do not use deflate compression" -#~ msgstr "Älä käytä deflate-pakkausta" - -#~ msgid "Do not use BSD compression" -#~ msgstr "Älä käytä BSD-pakkausta" - -#~ msgid "Exclusive device access by pppd" -#~ msgstr "Varaa laite pppd:n käyttöön" - -#~ msgid "Authenticate remote peer" -#~ msgstr "Todenna VPN-yhteys" - -#~ msgid "Refuse EAP" -#~ msgstr "Kiellä EAP" - -#~ msgid "Refuse CHAP" -#~ msgstr "Kiellä CHAP" - -#~ msgid "Maximum transmit unit (in bytes)" -#~ msgstr "Suurin lähetysyksikkö MTU (tavuina)" - -#~ msgid "Maximum receive unit (in bytes)" -#~ msgstr "Suurin vastaanottoyksikkö MRU (tavuina)" - -#~ msgid "Number of failed LCP echos to cause disconnect" -#~ msgstr "Epäonnistuneiden LCP ECHO-viestien määrä, joka katkaisee yhteyden" - -#~ msgid "Interval (in seconds) at which to issue LCP echos" -#~ msgstr "LCP ECHO-viestien väli sekunteina" - -#~ msgid "Interval (in milliseconds) to wait before connecting." -#~ msgstr "Ennen yhteyden avausta odotettava aika millisekuntena." - -#~ msgid "Custom PPP options" -#~ msgstr "Omat PPP-valitsimet" - -#~ msgid "Use Peer DNS over the Tunnel" -#~ msgstr "Käytä yhteyden DNS-asetuksia tunnelissa" - -#~ msgid "Specific networks available" -#~ msgstr "Halutut verkot ovat saatavilla" - -#~ msgid "Limit to specific networks" -#~ msgstr "Rajaa haluttuihin verkkoihin" - -#~ msgid "The following '%s' connection will be created:" -#~ msgstr "Seuraava \"%s\"-yhteys luodaan:" - -#~ msgid "\t%s: %s\n" -#~ msgstr "\t%s: %s\n" - -#~ msgid "The connection details can be changed using the \"Back\" button." -#~ msgstr "Yhteyden yksityiskohtia voi muuttaa valitsemalla \"Takaisin\"." - -#~ msgid "Select file to import" -#~ msgstr "Valitse tuotava tiedosto" - -#~ msgid "Save as..." -#~ msgstr "Tallenna nimellä..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Tiedosto \"%s\" on jo olemassa." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Haluatko korvata sen tiedostolla jota olet tallentamassa?" - -#~ msgid "auth-chap-window" -#~ msgstr "auth-chap-ikkuna" - -#~ msgid "auth-mschapv2-window" -#~ msgstr "auth-mschapv2-ikkuna" - -#~ msgid "auth-none-window" -#~ msgstr "auth-none-ikkuna" - -#~ msgid "Connection Name" -#~ msgstr "Yhteyden nimi" - -#~ msgid "Telephone number to dial" -#~ msgstr "Käytettävä puhelinnumero" - -#~ msgid "Certificate password:" -#~ msgstr "Varmennettu salasana:" - -#~ msgid "OpenVPN Client" -#~ msgstr "OpenVPN-asiakas" - -#~ msgid "Connection Type: X.509 Certificates" -#~ msgstr "Yhteyden tyyppi: X.509-varmenteet" - -#~ msgid "Cert: %s" -#~ msgstr "Varmenne: %s" - -#~ msgid "Key: %s" -#~ msgstr "Avain: %s" - -#~ msgid "Connection Type: Shared Key" -#~ msgstr "Yhteyden tyyppi: jaettu avain" - -#~ msgid "Shared Key: %s" -#~ msgstr "Jaettu avain: %s" - -#~ msgid "Local IP: %s" -#~ msgstr "Oma IP-osoite: %s" - -#~ msgid "Remote IP: %s" -#~ msgstr "Palvelimen IP-osoite: %s" - -#~ msgid "Connection Type: Password" -#~ msgstr "Yhteyden tyyppi: Salasana" - -#~ msgid "Username: %s" -#~ msgstr "Käyttäjätunnus: %s" - -#~ msgid "Connection Type: X.509 with Password Authentication" -#~ msgstr "Yhteyden tyyppi: X.509 salasanalla todennuksella" - -#~ msgid "Remote: %s" -#~ msgstr "Palvelin: %s" - -#~ msgid "TUN" -#~ msgstr "TUN" - -#~ msgid "Protocol: %s" -#~ msgstr "Protokolla: %s" - -#~ msgid "TCP" -#~ msgstr "TCP" - -#~ msgid "UDP" -#~ msgstr "UDP" - -#~ msgid "Routes: %s" -#~ msgstr "Reitit: %s" - -#~ msgid "Use LZO Compression: %s" -#~ msgstr "Käytä LZO-pakkausta: %s" - -#~ msgid "Yes" -#~ msgstr "Kyllä" - -#~ msgid "No" -#~ msgstr "Ei" - -#~ msgid "Cipher: %s" -#~ msgstr "Salausmenetelmä: %s" - -#~ msgid "TLS auth: %s %s" -#~ msgstr "TLS-todentaminen: %s %s" - -#~ msgid "Cannot import settings" -#~ msgstr "Asetuksia ei voi tuoda" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN-asetustiedosto \"%s\" ei sisällä kelvollisia tietoja." - -#~ msgid "Select CA to use" -#~ msgstr "Valitse käytettävä CA" - -#~ msgid "Select certificate to use" -#~ msgstr "Valitse käytettävä varmenne" - -#~ msgid "Select key to use" -#~ msgstr "Valitse käytettävä avain" - -#~ msgid "Select shared key to use" -#~ msgstr "Valitse käytettävä jaettu avain" - -#~ msgid "Select TA to use" -#~ msgstr "Valitse käytettävä TA" - -#~ msgid "Failed to export configuration" -#~ msgstr "Asetuksia ei voitu viedä" - -#~ msgid "Failed to save file %s" -#~ msgstr "Tiedostoa \"%s\" ei voitu tallentaa" - -#~ msgid "0" -#~ msgstr "0" - -#~ msgid "1" -#~ msgstr "1" - -#~ msgid "Optional Information" -#~ msgstr "Lisätietoja" - -#~ msgid "Required Information" -#~ msgstr "Vaaditut tiedot" - -#~ msgid "CA file:" -#~ msgstr "CA-tiedosto:" - -#~ msgid "Certificate:" -#~ msgstr "Varmenne:" - -#~ msgid "Direction:" -#~ msgstr "Suunta:" - -#~ msgid "Key:" -#~ msgstr "Avain:" - -#~ msgid "Local IP:" -#~ msgstr "Paikallinen IP-osoite:" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Syötä järjestelmän ylläpitäjältä saamasi tiedot alla oleviin kohtiin. Älä " -#~ "syötä tähän salasanaasi, sillä se kysytään vasta otettaessa yhteyttä." - -#~ msgid "" -#~ "Please note that the file you import is not an OpenVPN configuration " -#~ "file. Ask your administrator for the file." -#~ msgstr "" -#~ "Huomaa, ettei tuotava tiedosto ole OpenVPN-asetustiedosto. Kysy " -#~ "ylläpitäjältäsi oikeaa tiedostoa." - -#~ msgid "Shared Key:" -#~ msgstr "Jaettu avain:" - -#~ msgid "Shared key" -#~ msgstr "Jaettu avain" - -#~ msgid "Use TAP device" -#~ msgstr "Käytä TAP-laitetta" - -#~ msgid "Use TLS auth:" -#~ msgstr "Käytä TLS-todentamista:" - -#~ msgid "Use cipher:" -#~ msgstr "Käytä salausmenetelmää:" - -#~ msgid "X.509" -#~ msgstr "X.509" - -#~ msgid "" -#~ "X.509 Certificates\n" -#~ "Pre-shared key\n" -#~ "Password Authentication\n" -#~ "X.509 with Password Authentication" -#~ msgstr "" -#~ "X.509-varmenteet\n" -#~ "Jaettu avain\n" -#~ "Salasanalla todentaminen\n" -#~ "X.509 salasanatodennuksella" - -#~ msgid "none" -#~ msgstr "ei mitään" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "VPN-kirjautuminen epäonnistui, koska käyttäjätunnusta ja salasanaa ei " -#~ "hyväsytty, tai varmenteen salasana oli väärin." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "VPN-kirjautuminen epäonnistui, koska VPN-ohjelmaa ei voitu käynnistää." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "VPN-kirjatuminen epäonnistui, koska VPN-ohjelma ei saanut yhteyttä VPN-" -#~ "palvelimeen." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "VPN-kirjautuminen epäonnistui, koska VPN-asetuksten valinnat olivat " -#~ "virheelliset." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "VPN-kirjautumien epäonnstui, koska VPN-ohjelma sai epäyhteensopivat " -#~ "asetukset VPN-palvelimelta." diff --git a/vpn-daemons/pptp/po/fr.po b/vpn-daemons/pptp/po/fr.po deleted file mode 100644 index 900817b210..0000000000 --- a/vpn-daemons/pptp/po/fr.po +++ /dev/null @@ -1,178 +0,0 @@ -# French translation of NetworkManager-pptp. -# Copyright (C) 2007 Free Software Foundation, Inc. -# This file is distributed under the same license as the evolution package. -# -# Jonathan Ernst , 2007. -# Robert-André Mauchin , 2007-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-15 20:17+0200\n" -"PO-Revision-Date: 2008-08-13 11:40+0200\n" -"Last-Translator: Robert-André Mauchin \n" -"Language-Team: GNOME French Team \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n>1;\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Mot de passe _secondaire :" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Nom d'utilisateur :" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domaine :" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Mot de passe :" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Se connecter _anonymement" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Se connecter en _tant que :" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Se souvenir des mots de passe pour cette session" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Enregistrer les mots de passe dans le trousseau" - -#: ../auth-dialog/main.c:168 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Vous devez vous authentifier pour accéder au réseau privé virtuel (VPN) « %" -"s »." - -#: ../auth-dialog/main.c:169 -msgid "Authenticate VPN" -msgstr "Authentifier le VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Ajoute, supprime et modifie des connexions VPN PPTP" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "Gestionnaire de connexions VPN PPTP" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Selon la disponibilité (par défaut)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128-bit (le plus sécurisé)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40-bit (le moins sécurisé)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Authentification" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Écho" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Général" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Facultatif" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Sécurité et compression" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "A_vancé..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Permettre la compression de données _BSD" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Permettre la compression de données _Deflate" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Permettre le _chiffrement avec état" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Permettre les méthodes d'authentification suivantes :" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Par défaut" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "Domaine :" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "Envoyer les pa_quets d'écho PPP" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "Utiliser la compression d'en-_têtes TCP" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Utiliser le chiffrement _Point-to-Point (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "Nom d'utilisateur :" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "_Passerelle :" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "_Sécurité :" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Protocole de tunnel Point-to-Point (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Compatible avec Microsoft et d'autres serveurs VPN PPTP." diff --git a/vpn-daemons/pptp/po/gl.po b/vpn-daemons/pptp/po/gl.po deleted file mode 100644 index edda05a569..0000000000 --- a/vpn-daemons/pptp/po/gl.po +++ /dev/null @@ -1,582 +0,0 @@ -# translation of gl.po to Galego -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Ignacio Casal Quinteiro , 2007. -msgid "" -msgstr "" -"Project-Id-Version: gl\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-07 09:56+0100\n" -"PO-Revision-Date: 2007-02-07 09:55+0100\n" -"Last-Translator: Ignacio Casal Quinteiro \n" -"Language-Team: Galego \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "Tipo de autenticación:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "_Lembrar para esta sesión" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_Gardar no anel" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "Necesita autenticarse para acceder a '%s'." - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "Autenticar conexión" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"Información de autenticación\n" -"\n" -"A conexión '%s' podería necesitar algunha forma de autenticación.\n" -"\n" -"Seleccione o tipo de autenticación e proporcione as credenciais necesarias " -"embaixo:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "Autenticación requerida" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "Tipo de _autenticación:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Password:" -msgstr "_Contrasinal:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "Nome _remoto:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:268 -msgid "_Username:" -msgstr "Nome de _usuario:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:15 -msgid "auth-chap-window" -msgstr "auth-chap-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:16 -msgid "auth-mschapv2-window" -msgstr "auth-mschapv2-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:17 -msgid "auth-none-window" -msgstr "auth-none-window" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "Contrasinal _secundario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:270 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:355 -msgid "Connect _anonymously" -msgstr "Conectar como _anónimo" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect as _user:" -msgstr "Conectar como _usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "_Lembrar o contrasinal para esta sesión" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_Gardar contrasinal no anel" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Engadir, eliminar, e editar conexión VPN" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "Xestor de conexión VPN (PPP xenérico)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "Compresión" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Connection Name" -msgstr "Nome da conexión" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Delays and TImeouts" -msgstr "Retardos e expriracións" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "Encryption" -msgstr "Cifrado" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "IP Options" -msgstr "Opcións IP" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Packet Parameters" -msgstr "Parámetros de paquetes" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "exemplo: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "" -"Unha lista de opcións extra para pppd tal como as teclearía na liña de " -"comandos" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow BSD Compression" -msgstr "Permitir compresión BSD" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Allow Deflate compression" -msgstr "Permitir compresión Deflate" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "Authenticate Peer" -msgstr "Autenticar compañeiro" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Authentication" -msgstr "Autenticación" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "Compresión e cifrado" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "Conexión" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Debug Output" -msgstr "Depurar saída" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "Desconectar tras este número de solicitudes LCP falladas" - -#: ../properties/nm-ppp-dialog.glade.h:18 -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "Activar MPPE de estados" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Exclusive device access (UUCP-style lock)" -msgstr "Acceso exclusivo ao dispositivo (bloque tipo UUCP)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Find Device" -msgstr "Procurar dispositivo" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"Por razóns de seguridade, as opcións introducidas na caixa de enriba " -"compróbanse contra unha lista de opcións dispoñibles antes de establecer " -"unha conexión. Actualmente non hai conexión na lista." - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "GPRS Options" -msgstr "Opcións GPRS" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Hardware RTS/CTS" -msgstr "Hardware RTS/CTS" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "Host name or IP address of the PPTP server" -msgstr "Nome do host ou enderezo IP do servidor PPTP" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" -"Se non está permitida a compresión BSD, pásase a opción 'nobsdcomp' a pppd" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" -"Se a compresión Deflate non está permitida, pásase a opción 'nodefate' a pppd" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "Maximum Receive Unit" -msgstr "Unidade de recepción máxima" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "Maximum Transmit Unit" -msgstr "Unidade de transmisión máxima" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "Modem Connection" -msgstr "Conexión por módem" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "PPP Options" -msgstr "Opcións PPP" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Peer DNS through tunnel" -msgstr "DNS do compañeiro a través do túnel" - -#: ../properties/nm-ppp-dialog.glade.h:32 -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "Rexeitar CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:33 -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "Rexeitar EAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse MS CHAP" -msgstr "Rexeitar MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Require 128 bit MPPE encryption" -msgstr "Requerir cifrado MPPE de 128 bits" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require Explicit IP Addr" -msgstr "Requerir enderezo IP explícito" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPC Compression" -msgstr "Requerir compresión MPPC" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require MPPE encryption" -msgstr "Requerir cifrado MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "Requerir conexión de rede existente" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "Enrutado" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "Opcións de serie" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "" -"Punto de acceso GPRS do proveedor de servizos da configuración do dispositivo" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "Enderezo IP do proveedor de servizos" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telephone number to dial" -msgstr "Número de teléfono que marcar" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"Este é o nome empregado para identificar esta conexión de rede,\n" -"por exemplo: \"VPN do campus\" ou \"Rede corporativa\"" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "Tempo en segundos entre solicitudes de eco" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Type:" -msgstr "Tipo:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Usar DNS do compañeiro" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "Cando esta caixa está marcada, pásase a opción \"refuse-chap\" a pppd." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "Cando esta caixa está marcada, pásase a opción \"refuse-eap\" a pppd." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "" -"Cando esta caixa está marcada, pásase a opción \"refuse-mschap\" a pppd." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "Cando esta caixa está marcada, pásase a opción 'lock' a pppd" - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "Cando esta caixa está marcada, pásase a opción 'require-mppc' a pppd" - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" -"Cando esta caixa está marcada, pásase a opción 'debug' e engade algunha " -"información extra do complemento de NetworkManager" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "Cando esta caixa está marcada, establécese a opción 'noipdefault'" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "Cando esta caixa está marcada, establécese a opción 'usepeerdns'" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "Cando esta caixa non está marcada, pásase a opción \"noauth\" a pppd." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access Point Name:" -msgstr "Nome do punto de _acceso:" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Channel:" -msgstr "_Canle:" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Context Num" -msgstr "_Número de contexto" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Custom PPP options:" -msgstr "Opcións PPP _personalizadas:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Device Address:" -msgstr "En_derezo do dispositivo:" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Gateway:" -msgstr "_Pasarela:" - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_IP Address:" -msgstr "Enderezo _IP:" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Import Saved Configuration..." -msgstr "_Importar configuración gardada..." - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Only use VPN connection for these addresses" -msgstr "_Soamente empregar a conexión VPN para estes enderezos" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Packet Type" -msgstr "Tipo de _paquete" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Telephone Number:" -msgstr "Número de _teléfono:" - -#: ../properties/nm-ppp-dialog.glade.h:70 -msgid "connect-delay" -msgstr "retardo de conexión" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "túnel pppd (PPTP, BTGPRS, Dialup)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "Nome" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "Servidor PPTP" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "Número de teléfono" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "Enderezo Bluetooth" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "Canle de Bluetooth" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "Nº de contexto GPRS" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "Tipo de paquete GPRS" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "Usar control de fluxo CTS/RTS" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "Conectar por módem" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "Requerir que se proporcione unha IP" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "Usar cifrado MPPE" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "Usar cifrado MPPE de 128 bits" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "Usar compresión MPPC" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "Non usar compresión 'deflate'" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "Non usar compresión BSD" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "Acceso exclusivo ao dispositivo por pppd" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "Autenticar compañeiro remoto" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "Rexeitar MSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "Unidade máxima de transmisión (en bytes)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "Unidade máxima de recepción (en bytes)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "Número de ecos LCP fallidos para desconectar" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "Intervalo (en segundos) no cal enviar ecos LCP" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "Intervalo (en milisengundos) que se agardará tras conectar." - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "Opcións PPP personalizadas" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "Usar DNS do compañeiro sobre o túnel" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "Redes específicas dispoñibles" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "Limitar a redes específicas" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "Crearase a seguinte conexión '%s':" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "Os detalles da conexión pódense modificar mediante o botón \"Atrás\"." - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "Seleccione o ficheiro para importar" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "Gardar como..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Xa existe un ficheiro chamado \"%s\"." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Desexa reemprazalo co ficheiro que está gardando?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "A conexión VPN fallou" diff --git a/vpn-daemons/pptp/po/he.po b/vpn-daemons/pptp/po/he.po deleted file mode 100644 index d85cdc9bb5..0000000000 --- a/vpn-daemons/pptp/po/he.po +++ /dev/null @@ -1,558 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Yair Hershkovitz, 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: 1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-17 11:40+0000\n" -"PO-Revision-Date: 2008-02-17 03:56+0000\n" -"Last-Translator: Yair Hershkovitz \n" -"Language-Team: he\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "סוג אימות:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "_זכור עבור הפעלה זו" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_שמור בקבוצת המפתחות" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "" - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "אמת חיבור" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "נדרש אימות" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "_סוג אימות:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_סיסמה:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "שם _מרוחק:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "שם _משתמש:" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "סיסמה _משנית:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_מתחם:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "התחבר כ_אנונימי" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "התחבר כ_משתמש:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "_זכור את הסיסמה עבור הפעלה זו" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_שמור את הסיסמה בקבוצת המפתחות" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "הוסף, הסר וערוך חיבורי VPN" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "מנהל חיבורי VPN ‏(PPP כללי)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "כיווץ" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Delays & Timeouts" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Encryption" -msgstr "הצפנה" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "IP Options" -msgstr "אפשרויות IP" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "Packet Parameters" -msgstr "אפשרויות חבילה" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Example: 172.16.0.0/16 10.11.12.0/24" -msgstr "דוגמה: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "רשימה של אפשרויות נוספות עבור pppd כפי שהן נרשמות בשורת הפקודה" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "Allow B_SD Compression" -msgstr "אפשר כיווץ _BSD" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow _Deflate compression" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Authentication" -msgstr "אימות" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "C_hannel:" -msgstr "_ערוץ:" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Co_nnect delay:" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "כיווץ והצפנה" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "חיבור" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Connection na_me:" -msgstr "_שם חיבור:" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Context _number:" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:18 -msgid "Custom _PPP options:" -msgstr "אפשרויות _PPP מותאמות:" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Debug _output" -msgstr "_פלט ניפוי" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "E_xclusive device access (UUCP-style lock)" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "Enable stateful _MPPE" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Find Device" -msgstr "חפש התקן" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "GPRS Options" -msgstr "אפשרויות GPRS" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "Host name or IP address of the PPTP server" -msgstr "שם מארח או כתובת IP של שרת ה-PPTP" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "IP a_ddress:" -msgstr "כתובת _IP:" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "אם כיווץ BSD אינו מורשה האפשרות 'nobsdcomp' מועברת ל-pppd" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "Maximum Receive Unit" -msgstr "גודל יחידת קבלה מקסימאלי" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Maximum Transmit Unit" -msgstr "גודל יחידת שליחה מקסימאלי" - -#: ../properties/nm-ppp-dialog.glade.h:32 -msgid "PPP Options" -msgstr "אפשרויות PPP" - -#: ../properties/nm-ppp-dialog.glade.h:33 -msgid "Refuse C_HAP" -msgstr "דחה C_HAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse _EAP" -msgstr "דחה _EAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Refuse _MS CHAP" -msgstr "דחה _MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require 128 bit M_PPE encryption" -msgstr "דרוש הצפנת M_PPE ‏128 סיבית" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPE _encryption" -msgstr "דרוש הצפנת _MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require explicit IP _address" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "ניתוב" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "אפשרויות חיבור טורי" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "כתובת IP של ספק השירות" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telep_hone number:" -msgstr "מספר ט_לפון:" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "הזמן בשניות בין בקשות הד" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Typ_e:" -msgstr "_סוג:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -msgid "Use peer _DNS" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "כאשר מסומן האפשרות \"refuse-chap\" מועברת ל-pppd." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "כאשר מסומן האפשרות \"refuse-eap\" מועברת ל-pppd." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "כאשר מסומן האפשרות \"refuse-mschap\" מועברת ל-pppd." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "כאשר מסומן האפשרות \"lock\" מועברת ל-pppd." - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "כאשר מסומן האפשרות \"require-mppc\" מועברת ל-pppd." - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "כאשר מסומן האפשרות \"noipdefault\" מועברת ל-pppd." - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "כאשר מסומן האפשרות \"usepeerdns\" מועברת ל-pppd." - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "כאשר מסומן האפשרות \"noauth\" מועברת ל-pppd." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access point name:" -msgstr "שם _נקודת גישה:" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Authenticate peer" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Device address:" -msgstr "_כתובת התקן:" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Gateway:" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Hardware RTS/CTS" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Import Saved Configuration..." -msgstr "_יבא הגדרות שמורות..." - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_Modem connection" -msgstr "חיבור _מודם" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Only use VPN connection for these addresses:" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Packet type:" -msgstr "_סוג חבילה:" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Peer DNS through tunnel" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Require MPPC compression" -msgstr "דרוש כיווץ _MPPC" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "שם" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "שרת PPTP" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "מספר טלפון" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "כתובת Bluetooth" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "ערוץ Bluetooth" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "התחבר בעזרת מודם" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "" - -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "השתמש בהצפנת MPPE" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "השתמש בהצפנת MPPE 128bit" - -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "השתמש בהצפנת MPPC" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "אל תשתמש בכיווץ BSD" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "" - -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "דחה EAP" - -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "דחה CHAP" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "דחה NSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "גודל יחידת שליחה מקסימאלי (בבתים)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "גודל יחידת קבלה מקסימאלי (בבתים)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "" - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "אפשרויות PPP מותאמות" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "חיבור ה-'%s' הבא יווצר:" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "" - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "בחר קובץ ליבוא" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "שמור בשם..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "קובץ בשם \"%s\" כבר קיים" - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "האם להחליפו בקובץ שאתה מנסה לשמור?" - -#: ../src/nm-ppp-starter.c:141 -msgid "VPN Connection failed" -msgstr "חיבור VPN נכשל" diff --git a/vpn-daemons/pptp/po/hu.po b/vpn-daemons/pptp/po/hu.po deleted file mode 100644 index e96b2cc703..0000000000 --- a/vpn-daemons/pptp/po/hu.po +++ /dev/null @@ -1,176 +0,0 @@ -# Hungarian translation of NetworkManager-pptp -# Copyright (C) 2006, 2007, 2008, Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager-pptp package. -# -# Gabor Kelemen , 2006, 2007, 2008. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-12 11:38+0000\n" -"PO-Revision-Date: 2008-09-25 22:41+0200\n" -"Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Jelszó _még egyszer:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Felhasználónév:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Tartomány:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Jelszó:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Kapcsolódás _névtelenül" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Csatlakozás _mint:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "Jelszó meg_jegyzése erre a munkamenetre" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "Jelszavak mentése a k_ulcstartóra" - -#: ../auth-dialog/main.c:168 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Azonosítania kell magát a(z) „%s” virtuális magánhálózat eléréséhez." - -#: ../auth-dialog/main.c:169 -msgid "Authenticate VPN" -msgstr "VPN hitelesítés" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "PPTP VPN kapcsolatok hozzáadása, szerkesztése és eltávolítása" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN kapcsolatkezelő" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Mind elérhető (alapértelmezett)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128 bites (legbiztonságosabb)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40 bites (kevésbé biztonságos)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Hitelesítés" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Visszhang" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Általános" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Opcionális" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Biztonság és tömörítés" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "S_peciális…" - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "B_SD tömörítés engedélyezése" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "_Deflate tömörítés engedélyezése" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Állap_ottartó tömörítés engedélyezése" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "A következő hitelesítési módszerek engedélyezése:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Alapértelmezett" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "Tartomány:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "PPP _visszhangcsomagok küldése" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "TPC _fejléctömörítés használata" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "_Ponttól pontig (MPPE) titkosítás használata" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "Felhasználónév:" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "Á_tjáró:" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "Bi_ztonság:" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Ponttól pontig alagutazási protokoll (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Kompatibilis a Microsoft és más PPTP VPN kiszolgálókkal." - diff --git a/vpn-daemons/pptp/po/it.po b/vpn-daemons/pptp/po/it.po deleted file mode 100644 index 1d6fb49427..0000000000 --- a/vpn-daemons/pptp/po/it.po +++ /dev/null @@ -1,175 +0,0 @@ -# Italian translation of NetworkManager-PPTP. -# Copyright (C) 2008 THE NetworkManager-PPTP'S COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager-PPTP package. -# Francesco Marletta , 2006-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-OpenVPN 0.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-17 04:41+0000\n" -"PO-Revision-Date: 2008-09-17 12:28-0400\n" -"Last-Translator: Francesco Marletta \n" -"Language-Team: italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Password _secondaria:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Nome _utente:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Password:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Connessione _anonima" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Connesione come _utente:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Ricorda le password per questa sessione" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Salva le password nel portachiavi" - -#: ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"È necessario autenticarsi per accedere alla Rete Privata Virtuale '%s'." - -#: ../auth-dialog/main.c:141 -msgid "Authenticate VPN" -msgstr "Autenticazione VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Aggiunge, rimuove e modifica connessioni VPN PPTP" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "Gestore connessioni VPN PPTP" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Tutti i disponibili (predefinito)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128-bit (più sicuro)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40-bit (meno sicuro)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Autenticazione" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Eco" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Generale" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Opzionale" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Sicurezza e compressione" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "A_vanzate..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Consentire compressione dati _BSD" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Consentire compressione dati _Deflate" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Consentire cifratura con st_ato" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Consentire i seguenti metodi di autenticazione:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Predefinito" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "Dominio:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "Inviare pacchetti _eco PPP" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "Usare compressione _intestazioni TCP" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Usare cifratura _Point-to-Point (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "Nome utente:" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "_Sicurezza:" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Point-to-Point Tunneling Protocol (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Compatibile con i server Microsoft e altri server VPN PPTP." diff --git a/vpn-daemons/pptp/po/ja.po b/vpn-daemons/pptp/po/ja.po deleted file mode 100644 index b33147c7c6..0000000000 --- a/vpn-daemons/pptp/po/ja.po +++ /dev/null @@ -1,616 +0,0 @@ -# Japanese message catalog for NetworkManager-pptp -# Copyright (C) 2006 THE NetworkManager-pptp's COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager-openvpn package. -# Satoru SATOH , 2006, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp trunk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-23 00:35+0900\n" -"PO-Revision-Date: 2007-07-23 01:39+0900\n" -"Last-Translator: Satoru SATOH \n" -"Language-Team: Japanese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "認証タイプ:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "このセッションを記憶する(_R)" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "キーリングに保存する(_S)" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "'%s' にアクセスするには認証が必要です。" - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "接続認証" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "認証情報\n\n" -"接続 '%s' には何らかの形の認証が必要な場合があります。\n\n" -"適切な認証タイプを選択し、下の必要な信用証明をご入力下さい:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "認証が必要です" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "認証タイプ(_A):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "パスワード(_P):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "リモート名(_R):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "ユーザ名(_U):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:15 -msgid "auth-chap-window" -msgstr "CHAP 認証" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:16 -msgid "auth-mschapv2-window" -msgstr "MS CHAP v2 認証" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:17 -msgid "auth-none-window" -msgstr "認証 (なし)" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "第二パスワード(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "ドメイン(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "匿名で接続(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "ユーザで接続(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "このセッションのパスワードを記憶する(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "パスワードをキーリングに保存する(_S)" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN 接続を追加、削除または編集" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "VPN 接続マネージャ (PPP 一般)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "圧縮" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Delays & Timeouts" -msgstr "遅延とタイムアウト" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Encryption" -msgstr "暗号化" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "IP Options" -msgstr "IP オプション" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "Packet Parameters" -msgstr "パケットパラメータ" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Example: 172.16.0.0/16 10.11.12.0/24" -msgstr "例: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "コマンド行で入力する ppd へのその他のオプションのリスト" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "Allow B_SD Compression" -msgstr "BSD 圧縮を有効にする (_S)" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow _Deflate compression" -msgstr "デフレート圧縮を有効にする (_D)" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Authentication" -msgstr "認証" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "C_hannel:" -msgstr "チャンネル(_H):" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Co_nnect delay:" -msgstr "接続遅延(_N):" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "圧縮と暗号" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "接続" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Connection na_me:" -msgstr "接続名(_M):" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Context _number:" -msgstr "コンテキスト番号(_N):" - -#: ../properties/nm-ppp-dialog.glade.h:18 -msgid "Custom _PPP options:" -msgstr "カスタム PPP オプション(_P):" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Debug _output" -msgstr "デバッグ出力(_O)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "LCP echo 要求がこの回数だけ失敗すると切断する" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "E_xclusive device access (UUCP-style lock)" -msgstr "排他的なデバイスアクセス (UUCP スタイルのロック)(_X)" - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "Enable stateful _MPPE" -msgstr "ステートフル MPPE を有効にする (_M)" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Find Device" -msgstr "デバイス検索" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "セキュリティ上の理由から、上のボックスに入力したオプションは、" -"接続を確立する前に可能なオプションのリストについてチェックされます。" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "GPRS Options" -msgstr "GPRS オプション" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "Host name or IP address of the PPTP server" -msgstr "PPTP サーバのホスト名か IP アドレス" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "IP a_ddress:" -msgstr "IP アドレス(_D):" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "BSD 圧縮が利用できない場合は 'nobsdcomp' オプションが pppd に渡されます。" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "デフレート圧縮が利用できない場合は 'nobsdcomp' オプションが pppd に渡されます。" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "Maximum Receive Unit" -msgstr "最大受信単位" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Maximum Transmit Unit" -msgstr "最大伝送単位" - -#: ../properties/nm-ppp-dialog.glade.h:32 -msgid "PPP Options" -msgstr "PPP オプション" - -#: ../properties/nm-ppp-dialog.glade.h:33 -msgid "Refuse C_HAP" -msgstr "CHAP を拒否(_H)" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse _EAP" -msgstr "EAP を拒否(_E)" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Refuse _MS CHAP" -msgstr "MS CHAP を拒否(_M)" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require 128 bit M_PPE encryption" -msgstr "128 bit MPPE 暗号が必要 (_P)" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPE _encryption" -msgstr "MPPE 暗号が必要 (_E)" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require explicit IP _address" -msgstr "明示的な IP アドレスが必要(_A)" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "既存のネットワーク接続が必要" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "ルーティング" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "シリアルオプション" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "デバイス設定からのサービスプロバイダ GPRS アクセスポイント" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "サービスプロバイダ IP アドレス" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telep_hone number:" -msgstr "電話番号(_H):" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"例えば \"キャンパス VPN\" や \"社内ネットワーク\" といった、この" -"ネットワーク接続を識別するためのわかりやすい名前です。" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "echo 要求の時間間隔 (秒)" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Typ_e:" -msgstr "タイプ(_E):" - -#: ../properties/nm-ppp-dialog.glade.h:49 -msgid "Use peer _DNS" -msgstr "ピーア DNS を使用 (_D)" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "チェックすると \"refuse-chap\" オプションが pppd に渡されます" - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "チェックすると \"refuse-eap\" オプションが pppd に渡されます" - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "チェックすると \"refuse-mschap\" オプションが pppd に渡されます" - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "チェックすると \"lock\" オプションが pppd に渡されます" - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "チェックすると \"require-mppc\" オプションが pppd に渡されます" - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "チェックすると pppd の 'debug' オプションが有効となり、NetworkManager " -"プラグインからの詳細な情報が得られます。" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "チェックすると pppd の 'noipdefault' オプションが有効となります" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "チェックすると pppd の 'usepeerdns' オプションが有効となります" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "チェックすると \"noauth\" オプションが pppd に渡されます" - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access point name:" -msgstr "アクセスポイント名(_A):" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Authenticate peer" -msgstr "ピーア認証(_A)" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Device address:" -msgstr "デバイスアドレス(_D):" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Gateway:" -msgstr "ゲートウェイ(_G):" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Hardware RTS/CTS" -msgstr "ハードウェア RTS/CTS (_H)" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Import Saved Configuration..." -msgstr "保存されている設定をインポート(_I)..." - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_Modem connection" -msgstr "モデム接続(_M)" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Only use VPN connection for these addresses:" -msgstr "これらのアドレスについてのみ VPN 接続を使用(_O):" - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Packet type:" -msgstr "パケットタイプ(_P):" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Peer DNS through tunnel" -msgstr "トンネルを介したピーア DNS (_P)" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Require MPPC compression" -msgstr "MPPC 圧縮が必要(_R)" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "pppd トンネル (PPTP, BTGPRS, ダイアルアップ)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "名前" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "PPTP サーバ" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "電話番号" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "Bluetooth アドレス" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "Bluetooth チャンネル" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "GPRS コンテキスト番号" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "GPRS パケットタイプ" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "CTS/RTS フロー制御を使用" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "モデム経由で接続" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "提供される IP が必要" - -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "ピーア DNS を使用" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "MPPE 暗号を使用" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "128 bit MPPE 暗号を使用" - -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "ステートフル MPPE を有効にする" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "MPPC 圧縮を使用" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "デフレート圧縮を使用しない" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "BSD 圧縮を使用しない" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "pppd による排他的なデバイスアクセス" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "リモートピーアを認証" - -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "EAP を拒否" - -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "CHAP を拒否" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "MS CHAP を拒否" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "最大伝送単位 (Byte)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "最大受信単位 (Byte)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "切断する、失敗した LCP echo の回数" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "LCP echo を発行する時間間隔 (秒)" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "接続までの待ち時間 (ミリ秒)" - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "カスタム PPP オプション" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "トンネル上でピーア DNS を使用" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "利用可能な特定のネットワーク" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "特定のネットワークに限定" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "次の '%s' 接続を作成します:" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "接続の詳細は\"戻る\"ボタンで戻って変更できます。" - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "インポートするファイルを選択" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "別名で保存..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "ファイル \"%s\" は既にあります。" - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "保存しようとしているファイルで上書きしますか?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "VPN 接続に失敗" - -#~ msgid "Tunnel via pppd" -#~ msgstr "pppd 経由でトンネル" - -#~ msgid "Bluetooth options" -#~ msgstr "Bluetooth オプション" - -#~ msgid "Connection Name" -#~ msgstr "接続名" - -#~ msgid "Dial-up options" -#~ msgstr "ダイアルアップオプション" - -#~ msgid "PPTP options" -#~ msgstr "PPTP オプション" - -#~ msgid "Required Information" -#~ msgstr "必須情報" - -#~ msgid "Routing options" -#~ msgstr "ルーティングオプション" - -#~ msgid "MPPC Compression" -#~ msgstr "MPPC 圧縮" - -#~ msgid "MPPE encryption" -#~ msgstr "MPPE 暗号" - -#~ msgid "Numeric Tweaks" -#~ msgstr "数値微調整" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "システム管理者が提供した情報を下に入力してください。接続時にきかれるまでは" -#~ "パスワードは入力しないでください。" - -#~ msgid "Show on connection on menu" -#~ msgstr "メニューの接続に表示" diff --git a/vpn-daemons/pptp/po/ka.po b/vpn-daemons/pptp/po/ka.po deleted file mode 100644 index f2ab808759..0000000000 --- a/vpn-daemons/pptp/po/ka.po +++ /dev/null @@ -1,658 +0,0 @@ -# translation of NetworkManager-pptp.HEAD.po to Georgian -# Malkhaz Barkalaya მალზახ ბარკალაია , 2007. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-02 03:30+0000\n" -"PO-Revision-Date: 2007-03-07 01:12+0100\n" -"Last-Translator: Vladimer Sichinava ვლადიმერ სიჭინავა \n" -"Language-Team: Georgian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "აუთენტიფიკაციის ტიპი:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "ამ სესიისთვის დამახსოვ_რება" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_შევინახოთ გასაღებების აწმში" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "" -"'%s' ხელმისაწვდომი გახდება " -"აუთენტიფიკაციის შემდეგ." - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "შეერთების აუთენტიფიკაცია" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"აუთენტიფიკაციის ინფორმაცია\n" -"\n" -"შეერთება '%s' შეიძლება ითხოვდეს რაიმე ფორმის აუთენტიფიკაციას.\n" -"\n" -"მიუთითეთ აუთენტიფიკაციის ტიპი და შეიყვანეთ შესაბამისი მონაცემები:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "საჭიროა აუთენტიფიკაცია" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "_აუთენტიფიკაციის ტიპი:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Password:" -msgstr "_პაროლი:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "_სერვერის სახელი:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:268 -msgid "_Username:" -msgstr "_მომხმარებელი:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:15 -msgid "auth-chap-window" -msgstr "auth-chap-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:16 -msgid "auth-mschapv2-window" -msgstr "auth-mschapv2-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:17 -msgid "auth-none-window" -msgstr "auth-none-window" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "_მეორადი პაროლი:" - -#: ../auth-dialog/gnome-two-password-dialog.c:270 -msgid "_Domain:" -msgstr "_დომენი:" - -#: ../auth-dialog/gnome-two-password-dialog.c:355 -msgid "Connect _anonymously" -msgstr "_ანონიმური დაკავშირება" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect as _user:" -msgstr "" -"_სახელი, რომლითაც " -"ვუკავშირდებით:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "" -"მიმდინარე სესიის პაროლის " -"დამახსოვრება" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_გასაღების შენახვა აცმაში" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "" -"VPN-შეერთების დამატება, მოხსნა " -"და რედაქტირება" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "VPN შეერთებების მენეჯერი (PPP generic)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "კუმშვა" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Connection Name" -msgstr "შეერთების სახელი" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Delays and TImeouts" -msgstr "" -"დაყოვნებები და ლოდინის " -"დრო" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "Encryption" -msgstr "შიფრვა" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "IP Options" -msgstr "IP პარამეტრები" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Packet Parameters" -msgstr "პაკეტ-პარამეტრები" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "მაგალითი: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "" -"pppd-ს დამატებითი პარამეტრები, " -"რომელიც აიკრიფება კონსოლში" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow BSD Compression" -msgstr "BSD კუმშვის დაშვება" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Allow Deflate compression" -msgstr "Deflate კუმშვის დაშვება" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "Authenticate Peer" -msgstr "მეკავშირის აუთენტიფიცირება" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Authentication" -msgstr "აუთენტიფიკაცია" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "კუმშვა და შიფრვა" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "შეერთება" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Debug Output" -msgstr "გამართვის გამონატანი" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "" -"LCP ექო-მოთხოვნების " -"შეცდომების რაოდენობა, " -"საკმარისი გათიშვისათვის " - -#: ../properties/nm-ppp-dialog.glade.h:18 -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "MPPE-ს გააქტიურება" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Exclusive device access (UUCP-style lock)" -msgstr "" -"ექსკლუზიური დაშვება " -"მოწყობილობასთან (UUCP-სტილის " -"ბლოკირება)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Find Device" -msgstr "მოწყობილობის ძებნა" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"უსაფრთხოების მოსაზრებით " -"კავშირის დამყარებამდე " -"ხდება თქვენს მიერ შეყვანილი " -"პარამეტრების შეჯერება " -"დაშვებული პარამეტრების " -"სიასთან. ამჟამად სია " -"ცარიელია." - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "GPRS Options" -msgstr "GPRS პარამეტრები" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Hardware RTS/CTS" -msgstr "აპარატურული RTS/CTS" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "Host name or IP address of the PPTP server" -msgstr "" -"ჰოსტ-სერვერის სახელი ან PPTP " -"სერვერის IP-მისამართი" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" -"თუ BSD-კუმშვა დაუშვებელია, " -"პარამეტრი 'nobsdcomp' გადაეცემა pppd-ს" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" -"თუ Deflate-კუმშვა დაუშვებელია, " -"პარამეტრი 'nodefate' გადაეცემა pppd-ს" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "Maximum Receive Unit" -msgstr "მიღების მაქსიმალური ერთეული" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "Maximum Transmit Unit" -msgstr "" -"გადაცემის მაქსიმალური " -"ერთეული" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "Modem Connection" -msgstr "მოდემით შეერთება" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "PPP Options" -msgstr "PPP პარამეტრები" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Peer DNS through tunnel" -msgstr "Peer DNS ტუნელინგის მეშვეობით" - -#: ../properties/nm-ppp-dialog.glade.h:32 -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "CHAP-ის უარყოფა" - -#: ../properties/nm-ppp-dialog.glade.h:33 -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "EAP-ის უარყოფა" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse MS CHAP" -msgstr "MS CHAP-ის უარყოფა" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Require 128 bit MPPE encryption" -msgstr "საჭიროა 128-ბიტიანი MPPE-შიფრვა" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require Explicit IP Addr" -msgstr "საჭიროა ზუსტი IP-მისამართი" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPC Compression" -msgstr "საჭიროა MPPC-შიფრვა" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require MPPE encryption" -msgstr "საჭიროა MPPE-შიფრვა" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "" -"საჭიროა დამყარებული " -"შეერთება" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "მარშრუტიზაცია" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "სერიული პარამეტრები" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "" -"სერვის-პროვაიდერის GPRS " -"აქსეს-პოინტი მოწყობილობის " -"config-იდან" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "" -"სერვის-პროვაიდერის " -"IP-მისამართი" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telephone number to dial" -msgstr "ტელეფონის ნომერი" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"სახელი ამ შეერთების " -"იდენტიფიცირებისათვის, მაგ.: " -"\"Campus VPN\" ან \"Corporate Network\"" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "" -"ექო-მოთხოვნებს შორის დრო, " -"წამი" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Type:" -msgstr "ტიპი:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Peer DNS-ის გამოყენება" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "" -"როცა მონიშნულია \"refuse-chap\", " -"პარამეტრი გადაეცემა pppd-ს." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "" -"როცა მონიშნულია \"refuse-eap\", " -"პარამეტრი გადაეცემა pppd-ს." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "" -"როცა მონიშნულია \"refuse- mschap\", " -"პარამეტრი გადაეცემა pppd-ს." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "როცა მონიშნულია \"lock\", პარამეტრი გადაეცემა pppd-ს." - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "" -"როცა მონიშნულია \"require-mppc\", " -"პარამეტრი გადაეცემა pppd-ს." - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" -"ამის მონიშვნა რთავს pppd 'debug' " -"პარამეტრს და გადასცემს " -"გარკვეულ დამატებით " -"ინფორმაციას NetworkManager " -"პლაგინიდან" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "" -"ამის მონიშვნა რთავს pppd 'noipdefault' " -"პარამეტრს" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "" -"ამის მონიშვნა რთავს pppd " -"'usepeerdns'პარამეტრს" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "" -"თუ არ არის მონიშნული, \"noauth\" " -"პარამეტრი გადაეცემა pppd-ს." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access Point Name:" -msgstr "_აქსეს-პოინტის სახელი:" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Channel:" -msgstr "_არხი:" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Context Num" -msgstr "_კონტექსტ ნომერი" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Custom PPP options:" -msgstr "_PPP პარამეტრების დაყენება:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Device Address:" -msgstr "_მოწყობილობის მისამართი:" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Gateway:" -msgstr "_კარიბჭე:" - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_IP Address:" -msgstr "_IP მისამართი:" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Import Saved Configuration..." -msgstr "" -"_შენახული კონფიგურაციის " -"იმპორტი..." - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Only use VPN connection for these addresses" -msgstr "" -"_ამ მისამართებისათვის " -"მხოლოდ VPN-შეერთება" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Packet Type" -msgstr "_პაკეტის ტიპი" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Telephone Number:" -msgstr "_ტელეფონის ნომერი:" - -#: ../properties/nm-ppp-dialog.glade.h:70 -msgid "connect-delay" -msgstr "დაკავშირების-დაყოვნება" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "pppd არხი (PPTP, BTGPRS, Dialup)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "სახელი" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "PPTP სერვერი" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "ტელეფონის ნომერი" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr " ბლუთუსის მისამართი" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr " ბლუთუსის არხი" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "GPRS კონტექსტ-ნომერი" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "GPRS-პაკეტის ტიპი" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "CTS/RTS-ნაკადის კონტროლი" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "შეერთება მოდემით" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "მიუთითეთ IP" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "MPPE-შიფრვა" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "128-ბიტიანი MPPE-შიფრვა" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "MPPC-კუმშვის გამოყენება" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "deflate-კუმშვის აკრძალვა" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "BSD-კუმშვის აკრძალვა" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "" -"ექსკლუზიური pppd-დაშვება " -"მოწყობილობასთან" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "" -"დაშორებული მომხმარებლის " -"ავთენტიფიკაცია" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "MSCHAP-ის უარყოფა" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "" -"გადაცემის მაქსიმალური " -"ერთეული (ბაიტებში)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "" -"მიღების მაქსიმალური " -"ერთეული (ბაიტებში)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "" -"წარუმატებელი LPC-ექოების " -"რაოდენობა გათიშვისათვის" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "" -"ინტერვალი LPC-ექოებს შორის, " -"წამი" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "" -"დაყოვნება (მილიწამი) " -"შეერთების წინ." - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "PPP პარამეტრების დაყენება" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "" -"Peer DNS-ის გამოყენება " -"ტუნელინგის შემთხვევაში" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "" -"სპეციფიური ხელმისაწვდომი " -"ქსელები" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "" -"სპეციფიური ქსელების " -"შეზღუდვა" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "მყარდება შეერთება '%s':" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "" -"\"Back\"ღილაკით შეიძლება " -"შეერთების რეაქტირება" - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "" -"მიუთითეთ ფაილი " -"იმპორტისათვის" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "შეინახე როგორც..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "ფაილი \"%s\" უკვე არსებობს." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "შევცვალოთ თქვენი ფაილით?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "VPN-შეერთებას დაენძრა" - diff --git a/vpn-daemons/pptp/po/ko.po b/vpn-daemons/pptp/po/ko.po deleted file mode 100644 index f23953906f..0000000000 --- a/vpn-daemons/pptp/po/ko.po +++ /dev/null @@ -1,587 +0,0 @@ -# GNOME Korea translation of nm-pptp. -# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Young-Ho Cha , 2007. -# Namhyung Kim , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: nm-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-03 05:08+0000\n" -"PO-Revision-Date: 2007-12-24 18:16+0900\n" -"Last-Translator: Namhyung Kim \n" -"Language-Team: GNOME Korea \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "인증 형식:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "이 세션에서 기억(_R)" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "키링에 저장(_S)" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "'%s'에 접근할 때 인증이 필요합니다." - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "연결 인증" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"인증 정보\n" -"\n" -"연결 '%s'에 몇몇 인증 형식이 필요합니다.\n" -"\n" -"아래에서 적당한 인증 방법을 선택하고, 필요한 인증서를 준비하십시오:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "인증 필요" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "인증 형식(_A):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "암호(_P):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "원격 이름(_R):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "사용자 이름(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "보조 암호(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "도메인(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "익명으로 연결(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "사용자로 연결(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "이 세션에서 암호 기억(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "키링에 암호 저장(_S)" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN 연결 더하기, 지우기, 편집" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "VPN 연결 관리자 (일반 PPP)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "압축" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Delays & Timeouts" -msgstr "지연과 시간제한" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Encryption" -msgstr "암호화" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "IP Options" -msgstr "IP 옵션" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "Packet Parameters" -msgstr "패킷 매개 변수" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Example: 172.16.0.0/16 10.11.12.0/24" -msgstr "예: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "명령행에서 입력할 수 있는 pppd의 기타 옵션 목록" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "Allow B_SD Compression" -msgstr "BSD 압축 허용(_S)" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow _Deflate compression" -msgstr "Deflate 압축 허용(_D)" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Authentication" -msgstr "인증" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "C_hannel:" -msgstr "채널(_C):" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Co_nnect delay:" -msgstr "연결 지연(_N):" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "압축 및 암호화" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "연결" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Connection na_me:" -msgstr "연결 이름(_M):" - -# FIXME -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Context _number:" -msgstr "컨텍스트 번호(_N):" - -#: ../properties/nm-ppp-dialog.glade.h:18 -msgid "Custom _PPP options:" -msgstr "사용자 지정 PPP 옵션(_P):" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Debug _output" -msgstr "디버그 출력(_O)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "LCP echo 요청 실패후 연결 끊기" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "E_xclusive device access (UUCP-style lock)" -msgstr "배타적 장치 접근 (UUCP 형식 잠금)" - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "Enable stateful _MPPE" -msgstr "상태 기반(stateful) MPPE 사용(_M)" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Find Device" -msgstr "장치 찾기" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"보안적인 이유로, 입력된 옵션은 연결되기 전에 허용된 옵션목록에 대해 검사하게 " -"됩니다. 현재 목록에 그런 옵션이 없습니다." - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "GPRS Options" -msgstr "GPRS 옵션" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "Host name or IP address of the PPTP server" -msgstr "PPTP 서버의 호스트 이름 또는 IP 주소" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "IP a_ddress:" -msgstr "IP 주소(_D):" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "BSD 압축이 허용되어 있지 않으면, 'nobsdcomp'옵션이 pppd에 설정됩니다" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" -"Deflate 압축이 허용되어 있지 않으면, 'nodefate'옵션이 pppd에 설정됩니다" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "Maximum Receive Unit" -msgstr "최대 수신 단위" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Maximum Transmit Unit" -msgstr "최대 전송 단위" - -#: ../properties/nm-ppp-dialog.glade.h:32 -msgid "PPP Options" -msgstr "PPP 옵션" - -#: ../properties/nm-ppp-dialog.glade.h:33 -msgid "Refuse C_HAP" -msgstr "CHAP 거부(_H)" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse _EAP" -msgstr "EAP 거부(_E)" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Refuse _MS CHAP" -msgstr "MS CHAP 거부(_M)" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require 128 bit M_PPE encryption" -msgstr "128비트 MPPE 암호화 필요(_P)" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPE _encryption" -msgstr "MPPE 암호화 필요(_E)" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require explicit IP _address" -msgstr "수동 IP주소 입력 필요(_A)" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "기존의 네트워크 연결 필요" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "라우팅" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "시리얼 옵션" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "장치 설정의 서비스 제공업자 GPRS 접근 지점" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "서비스 제공업자 IP 주소" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telep_hone number:" -msgstr "전화 번호(_H):" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"이러한 이름들은 네트워크 연결을 구분할 이름입니다.\n" -"예, \"학교 VPN\", \"회사 네트워크\"" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "echo 요청 사이의 시간 (초단위)" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Typ_e:" -msgstr "형식(_E):" - -#: ../properties/nm-ppp-dialog.glade.h:49 -msgid "Use peer _DNS" -msgstr "Peer DNS 사용(_D)" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "pppd에 \"refuse-chap\" 옵션을 설정합니다." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "pppd에 \"refuse-eap\" 옵션을 설정합니다." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "pppd에 \"refuse-mschap\" 옵션을 설정합니다." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "pppd에 'lock' 옵션을 설정합니다." - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "pppd에 'require-mppc' 옵션을 설정합니다." - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" -"pppd에 'debug'옵션을 설정해서, NetworkManager 플러그인에 더 많은 정보를 볼 " -"수 있게 합니다." - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "pppd에 'noipdefault'옵션을 설정합니다" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "pppd에 'usepeerdns'옵션을 설정합니다" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "이 체크박스를 설정하지 않으면, pppd에 \"noauth\"옵션이 설정됩니다." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access point name:" -msgstr "접속 지점 이름(_A):" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Authenticate peer" -msgstr "peer 인증(_A)" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Device address:" -msgstr "장치 주소(_D):" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Gateway:" -msgstr "게이트웨이(_G):" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Hardware RTS/CTS" -msgstr "하드웨어 RTS/CTS(_H)" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Import Saved Configuration..." -msgstr "저장된 설정 가져오기(_I)..." - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_Modem connection" -msgstr "모뎀 연결(_M)" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Only use VPN connection for these addresses:" -msgstr "이 주소에는 VPN 연결 만 사용(_O):" - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Packet type:" -msgstr "패킷 형식(_P):" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Peer DNS through tunnel" -msgstr "터널을 통한 Peer DNS(_P)" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Require MPPC compression" -msgstr "MPPC 압축 필요(_R)" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "pppd 터널 (PPTD, BTGPRS, 전화걸기)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "이름" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "PPTP 서버" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "전화번호" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "블루투스 주소" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "블루투스 채널" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "GPRS 컨텍스트 번호" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "GPRS 패킷 형식" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "CTS/RTS 흐름제어 사용" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "모뎀으로 연결" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "IP 필요" - -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Peer DNS 사용" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "MPPE 암호화 사용" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "128비트 MPPE 암호화 사용" - -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "상태기반 MPPE 사용" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "MPPC 압축 사용" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "Deflate 압축 사용 안함" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "BSD 압축 사용 안함" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "pppd에서만 장치 사용" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "원격 peer 인증" - -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "EAP 거부" - -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "CHAP 거부" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "MSCHAP 거부" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "최대 전송 단위 (바이트)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "최대 수신 단위 (바이트)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "연결을 종료시킬 LCP 반향 실패 횟수" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "LCP 반향 발생 간격(초단위)" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "연결 전 대기 간격 (밀리초)." - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "PPP 추가 옵션" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "터널상에서 Peer DNS 사용" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "지정한 네트워크 사용 가능" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "지정된 네트워크에 제한" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "다음 '%s' 연결이 만들어집니다:" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "\"뒤로\" 단추를 눌러서 연결 설정을 바꿀 수 있습니다." - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "가져올 파일 선택" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "다른 이름으로 저장..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "\"%s\" 파일이 이미 있습니다." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "이를 저장할 파일로 바꾸겠습니까?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "VPN 연결 실패" - -msgid "auth-chap-window" -msgstr "auth-chap-window" - -msgid "auth-mschapv2-window" -msgstr "auth-mschapv2-window" - -msgid "auth-none-window" -msgstr "auth-none-window" - -msgid "Connection Name" -msgstr "연결 이름" - -msgid "Telephone number to dial" -msgstr "전화걸 번호" diff --git a/vpn-daemons/pptp/po/lt.po b/vpn-daemons/pptp/po/lt.po deleted file mode 100644 index fb1847bb2b..0000000000 --- a/vpn-daemons/pptp/po/lt.po +++ /dev/null @@ -1,178 +0,0 @@ -# Lithuanian translation of NetworkManager-pptp. -# Copyright (C) 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager package. -# Žygimantas Beručka , 2008. -# -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 00:10+0300\n" -"PO-Revision-Date: 2008-09-25 00:17+0300\n" -"Last-Translator: Žygimantas Beručka \n" -"Language-Team: Lithuanian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Antrinis slaptažodis:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Naudotojo vardas:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "S_ritis:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Slaptažodis:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Jungtis an_onimiškai" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Prisijungti kaip na_udotojas:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Atsiminti slaptažodžius šiam seansui" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "Iš_saugoti slaptažodžius raktinėje" - -#: ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Norint gauti prieigą prie Virtualiojo Privačiojo Tinklo „%s“, reikia " -"nustatyti jūsų tapatybę." - -#: ../auth-dialog/main.c:141 -msgid "Authenticate VPN" -msgstr "Nustatyti tapatybę VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Pridėti, šalinti ir taisyti PPTP VPN ryšius" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN ryšių valdyklė" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Visi prieinami (numatytasis)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128-bit (saugiausia)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40-bit (mažiau saugu)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Tapatybės nustatymas" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Aidas" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Bendra" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Neprivaloma" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Saugumas ir glaudinimas" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "Išsa_miau..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Leisti _BSD duomenų glaudinimą" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Leisti _Deflate duomenų glaudinimą" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Leisti _atmenųjį šifravimą" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Leisti šiuos tapatybės nustatymo metodus:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Numatytasis" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "Sritis:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "Siųsti PPP _aido paketus" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "Naudoti TCP _antraštės glaudinimą" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Naudoti _PPP šifravimą (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "Naudotojo vardas:" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "Š_liuzas:" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "_Saugumas:" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "PPP tuneliavimo protokolas (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Suderinama su Microsoft ir kitais PPTP VPN serveriais." diff --git a/vpn-daemons/pptp/po/mk.po b/vpn-daemons/pptp/po/mk.po deleted file mode 100644 index 4e9ca60050..0000000000 --- a/vpn-daemons/pptp/po/mk.po +++ /dev/null @@ -1,574 +0,0 @@ -# translation of NetworkManager-pptp.HEAD.po to Macedonian -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Jovan Naumovski , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-12 03:25+0000\n" -"PO-Revision-Date: 2007-01-12 20:55+0100\n" -"Last-Translator: Jovan Naumovski \n" -"Language-Team: Macedonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "Тип на автентикација" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "_Запомни за оваа сесија" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_Зачувај во приврзок" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "Треба да се автентицирате за да пристапите кон „%s“" - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "Автентицирај врска" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"Информации за автентикација\n" -"\n" -"Врската „%s“ може да бара некаков вид на автентикација.\n" -"\n" -"Ве молам, одберете го соодветниот вид на автентикација и обезбедете потребните " -"детали подолу:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "Потребна е автентикација" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "_Тип на автентикација:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Password:" -msgstr "_Лозинка:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "Име на _оддалечен хост:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:268 -msgid "_Username:" -msgstr "_Корисничко име:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:15 -msgid "auth-chap-window" -msgstr "auth-chap-прозорец" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:16 -msgid "auth-mschapv2-window" -msgstr "auth-mschapv2-прозорец" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:17 -msgid "auth-none-window" -msgstr "auth-none-прозорец" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "_Втора лозинка:" - -#: ../auth-dialog/gnome-two-password-dialog.c:270 -msgid "_Domain:" -msgstr "_Домен:" - -#: ../auth-dialog/gnome-two-password-dialog.c:355 -msgid "Connect _anonymously" -msgstr "Поврзи се _анонимно" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect as _user:" -msgstr "Поврзи се како _корисник:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "_Запомни ја лозинката за оваа сесија" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_Зачувај ја лозинката во приврзок" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Додавајте, отстранувајте и уредувајте ВПМ врски" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "Менаџер на ВМП врски (PPP Generic)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "Компресија" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Connection Name" -msgstr "Име на врска" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Delays and TImeouts" -msgstr "Задоцнувања и паузи" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "Encryption" -msgstr "Енкрипција" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "IP Options" -msgstr "IP опции" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Packet Parameters" -msgstr "Параметри на пакетите" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "пример: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "Листа со додатни опции ако pppd е внесен преку командната линија" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow BSD Compression" -msgstr "Дозволи BSD компресија" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Allow Deflate compression" -msgstr "Дозволи Deflate компресија" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "Authenticate Peer" -msgstr "Автентицирај го серверот" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Authentication" -msgstr "Автентикација" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "Компресија и енкрипција" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "Врска" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Debug Output" -msgstr "Излезни податоци за дебагирање" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "Исклучи се ако толку многу LCP ехо побарувања не успеат" - -#: ../properties/nm-ppp-dialog.glade.h:18 -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "Овозможи „stateful“ MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Exclusive device access (UUCP-style lock)" -msgstr "Ексклузивен пристап до уредот (заклучување од стилот на UUCP)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Find Device" -msgstr "Најди уред" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"Поради безбедносни причини, опциите внесени во полето погоре се чекирани " -"во листа со дозволени опции пред да се воспостави врската. Тековно" -"нема опции во листата." - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "GPRS Options" -msgstr "GPRS опции" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Hardware RTS/CTS" -msgstr "Хардверски RTS/CTS" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "Host name or IP address of the PPTP server" -msgstr "Име на хост или IP адреса на PPTP серверот" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "Ако BSD компресијата не е дозволена, „nobsdcom“ опцијата е дадена на pppd" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "Ако „Deflate“ опцијата не е дозволена, „nodefate“ опцијата е дадена на pppd" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "Maximum Receive Unit" -msgstr "Максимална примачка единица" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "Maximum Transmit Unit" -msgstr "Максимална трансмисиона единица" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "Modem Connection" -msgstr "Модемска врска" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "PPP Options" -msgstr "PPP опции" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Peer DNS through tunnel" -msgstr "DNS на peer преку тунел" - -#: ../properties/nm-ppp-dialog.glade.h:32 -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "Одбиј CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:33 -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "Одбиј EAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse MS CHAP" -msgstr "Одбиј MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Require 128 bit MPPE encryption" -msgstr "Барај 128 bit MPPE енкрипција" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require Explicit IP Addr" -msgstr "Барај експлицитна IP адреса" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPC Compression" -msgstr "Барај MPPC компресија" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require MPPE encryption" -msgstr "Барај MPPE енкрипција" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "Бара постоечка мрежна врска" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "Рутирање" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "Опции за сериски порти" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "Сервис провајдери на GPRS пристапни точки од конфигурацијата на уредот" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "IP адреса на сервис провајдерот" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telephone number to dial" -msgstr "Телефонски број за бирање" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"Ова е пријателското име кое ќе биде користено за идентификација на оваа мрежна " -"врска, \n" -"пр. \"ВПМ на универзитетот\" или \"Корпорациска мрежа\"" -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "Време во секунти помеѓу echo барањата" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Type:" -msgstr "Тип:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Користи DNS на peer" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "Кога е чекирано \"refuse-chap\" опцијата е дадена на pppd." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "Кога е чекирано \"refuse-eap\" опцијата е дадена на pppd." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "Кога е чекирано \"refuse-mschap\" опцијата е дадена на pppd." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "Кога е чекирано 'lock' опцијата е дадена на pppd." - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "Кога е чекирано 'require-mppc' опцијата е дадена на pppd." - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "Кога е чекирано, ова ја поставува опцијата за дебагирање и додава" -"додатни информации од приклучокот „NetworkManager“" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "Кога е чекирано, ова ја поставува опцијата 'noipdefault' на pppd" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "Кога е чекирано, ова ја поставува опцијата 'usepeerdns' на pppd" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "Кога не е чекирано ова поле, \"noauth\" опцијата е дадена на pppd." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access Point Name:" -msgstr "Име на _пристапна точка:" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Channel:" -msgstr "_Канал:" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Context Num" -msgstr "Број на _содржина" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Custom PPP options:" -msgstr "_Прилагодени PPP опции:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Device Address:" -msgstr "Адреса на _уред:" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Gateway:" -msgstr "_Премин:" - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_IP Address:" -msgstr "_IP адреса:" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Import Saved Configuration..." -msgstr "_Увези зачувана конфигурација..." - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Only use VPN connection for these addresses" -msgstr "_Користи само VPN врска за овие адреси" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Packet Type" -msgstr "Тип на _пакет" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Telephone Number:" -msgstr "_Телефонски број:" - -#: ../properties/nm-ppp-dialog.glade.h:70 -msgid "connect-delay" -msgstr "задоцнување-на-врска" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "pppd тунел (PPTP, BTGPRS, Dialup)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "Име" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "PPTP сервер" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "Телефонски број" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "Bluetooth адреса" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "Bluetooth канал" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "Број на содржина на GPRS " - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "Тип на GPRS пакети" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "Користи CTS/RTS контрола на текот" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "Поврзи се преку модем" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "Барај IP адреса" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "Користи MPPE енкрипција" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "Користи 128-битна MPPE енкрипција" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "Користи MPPC компресија" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "Не користи deflate компресија" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "Не користи BSD компресија" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "Привилегиран пристап на уредот од pppd" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "Автентицирај го оддалечениот компјутер" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "Одбиј MSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "Максимална трансмисиона единица (во бајти)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "Максимална примачка единица (во бајти)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "Бројот на неуспешни LCP echo-a кои ќе предизвикаат исклучување" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "Интервал (во секунди) во кој ќе се прават LCP echo-а" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "Интервал (во милисекунди) за чекање пред исклучување" - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "Прилагодени PPP опции" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "Користи DNS за peer преку тунелот" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "Достапни се одредени мрежи" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "Ограничи се на одредени мрежи" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "Следната „%s“ врска ќе биде креирана:" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "Деталите за врската можат да бидат променети со користење на копчето \"Back\"" - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "Одберете датотека за увезување" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "Зачувај како..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Датотеката со името \"%s\" веќе постои." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Дали сакате да го замените со она кое го зачувувате?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "ВПМ врската не успеа" - diff --git a/vpn-daemons/pptp/po/nb.po b/vpn-daemons/pptp/po/nb.po deleted file mode 100644 index 00f91b8d24..0000000000 --- a/vpn-daemons/pptp/po/nb.po +++ /dev/null @@ -1,558 +0,0 @@ -# Norwegian bokmål translation of NetworkManager's pptp support. -# Copyright (C) 2006-2007 Kjartan Maraas -# This file is distributed under the same license as the NetworkManager package. -# Kjartan Maraas , 2006-2007. -# -msgid "" -msgstr "" -"Project-Id-Version: pptp xx\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-02 14:46+0100\n" -"PO-Revision-Date: 2007-11-02 14:48+0100\n" -"Last-Translator: Kjartan Maraas \n" -"Language-Team: Norwegian Bokmål \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "Type autentisering:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "Husk fo_r denne sesjonen" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_Lagre på nøkkelring" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "Du må autentisere deg for å få tilgang til «%s»." - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "Autentiser tilkobling" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "Autentisering kreves" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "Type _autentisering:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Passord:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "Ekste_rnt navn:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "Br_ukernavn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Sekundært passord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domene:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Koble til _anonymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Koble til som br_uker:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "_Husk passordet for denne sesjonen" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_Lagre passord i nøkkelring" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Legg til, fjern og regiger VPN-tilkoblinger" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "Håndtering av VPN-tilkobling (vanlig PPP)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "Komprimerin" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Delays & Timeouts" -msgstr "Pauser og tidsavbrudd" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Encryption" -msgstr "Kryptering" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "IP Options" -msgstr "IP-alternativer" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "Packet Parameters" -msgstr "Pakkeparametere" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Example: 172.16.0.0/16 10.11.12.0/24" -msgstr "Eksempel: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "Allow B_SD Compression" -msgstr "Tillat B_SD-komprimering" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow _Deflate compression" -msgstr "Tillat _deflate-komprimering" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Authentication" -msgstr "Autentisering" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "C_hannel:" -msgstr "_Kanal:" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Co_nnect delay:" -msgstr "Co_nnect-delay:" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "Komprimering & Kryptering" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "Tilkobling:" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Connection na_me:" -msgstr "Tilkoblings_navn:" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Context _number:" -msgstr "Kontekst_nummer:" - -#: ../properties/nm-ppp-dialog.glade.h:18 -msgid "Custom _PPP options:" -msgstr "Egendefinerte _PPP-flagg:" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Debug _output" -msgstr "Feilsøkings_utskrift" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "E_xclusive device access (UUCP-style lock)" -msgstr "E_kslusiv aksess til enheten (UUCP-type lås)" - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "Enable stateful _MPPE" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Find Device" -msgstr "Finn enhet" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "GPRS Options" -msgstr "GPRS-alternativer" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "Host name or IP address of the PPTP server" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "IP a_ddress:" -msgstr "IP-a_dresse:" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "Maximum Receive Unit" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Maximum Transmit Unit" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:32 -msgid "PPP Options" -msgstr "PPP-alternativer" - -#: ../properties/nm-ppp-dialog.glade.h:33 -msgid "Refuse C_HAP" -msgstr "Nekt C_HAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse _EAP" -msgstr "Nekt _EAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Refuse _MS CHAP" -msgstr "Nekt _MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require 128 bit M_PPE encryption" -msgstr "Krev 128-bit M_PPE-kryptering" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPE _encryption" -msgstr "Krev MPPE-krypt_ering" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require explicit IP _address" -msgstr "Krev eksplisitt IP-_adresse" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "Krever eksisterende nettverkstilkobling" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "Ruting" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "Alternativer for seriellport" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "IP-adresse for tjenestetilbyder" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telep_hone number:" -msgstr "Tele_fonnummer:" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "Tid i sekunder mellom ekko-forespørsler" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Typ_e:" -msgstr "Typ_e:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -msgid "Use peer _DNS" -msgstr "Bruk peer-_DNS" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access point name:" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Authenticate peer" -msgstr "_Autentiser peer" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Device address:" -msgstr "En_hetsadresse:" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Hardware RTS/CTS" -msgstr "RTS/_CTS i maskinvare" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Import Saved Configuration..." -msgstr "_Importer lagret konfigurasjon..." - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_Modem connection" -msgstr "_Modemtilkobling" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Only use VPN connection for these addresses:" -msgstr "K_un bruk VPN-tilkoblingen for disse adressene" - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Packet type:" -msgstr "_Pakketype:" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Peer DNS through tunnel" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Require MPPC compression" -msgstr "K_rev MPPC-komprimering" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "pppd-tunnel (PPTP, BTGPRS, oppringt)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "Navn" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "PPTP-tjener" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "Telefonnummer" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "Bluetooth-adresse" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "Bluetooth-kanal" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "GPRS kontekstnr" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "GPRS pakketype" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "Bruk CTS/RTS-flytkontroll" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "Koble til via modem" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "Krev at IP oppgis" - -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Bruk peer-DNS" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "Bruk MPPE-kryptering" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "Bruk 128-bit MPPE-kryptering" - -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "Bruk MPPC-komprimering" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "Ikke bruk «deflate»-komprimering" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "Ikke bruk BSD-komprimering" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "Ekslusiv aksess til enheten for pppd" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "Autentiser ekstern peer" - -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "Ikke tillat EAP" - -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "Ikke tillat CHAP" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "Ikke tillat MSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "Maksimal overføringsenhet (i byte)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "Maksimal enhet for mottak (i byte)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "" - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "Egendefinerte PPP-flagg" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "Følgende «%s»-tilkobling vil bli opprettet:" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "Tilkoblingsdetaljene kan endres med «Tilbake»-knappen." - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "Velg fil som skal importeres" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "Lagre som..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "En fil med navn «%s» eksisterer allerede." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Vil du erstatte den med filen du lagrer nå?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "VPN-tilkobling feilet" diff --git a/vpn-daemons/pptp/po/nl.po b/vpn-daemons/pptp/po/nl.po deleted file mode 100644 index cc7a6c855a..0000000000 --- a/vpn-daemons/pptp/po/nl.po +++ /dev/null @@ -1,178 +0,0 @@ -# Dutch translation of NetworkManager-pptp -# -# This file is distributed under the same license as the NetworkManager -# package. -# -# Tino Meinen , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager PPTP\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-15 10:17+0200\n" -"PO-Revision-Date: 2008-09-14 18:07+0200\n" -"Last-Translator: Tino Meinen \n" -"Language-Team: Dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Secondair wachtwoord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Gebruikersnaam:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domein:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Wachtwoord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "A_noniem verbinden" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Verbinden als _gebruiker:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Wachtwoorden gedurende deze sessie onthouden" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "Wachtwoorden in de sleutelbos op_slaan" - -#: ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"U moet u aanmelden om toegang te krijgen tot het Virtual Private Network ‘%" -"s’." - -#: ../auth-dialog/main.c:141 -msgid "Authenticate VPN" -msgstr "VPN aanmeldingscontrole" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "PPTP VPN-verbindingen toevoegen, verwijderen en bewerken" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN-verbindingsmanager" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Alle beschikbare (Standaard)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128-bit (meest veilig)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40-bit (minder veilig)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Aanmeldingscontrole" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Echo" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Algemeen" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Facultatief" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Beveiliging en compressie" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "_Geavanceerd…" - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "_BSD-datacompressie toestaan" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "_Deflate-datacompressie toestaan" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "_Stateful encryption toestaan" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "De volgende aanmeldingscontrolemethodes toestaan:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Standaard" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "Domein:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "PPP _Echo-pakketten versturen" - -# toepassen/gebruiken -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "TCP-_headercompressie toepassen" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "_Point-to-Point versleuteling (MPPE) toepassen" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "Gebruikersnaam:" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "_Beveiliging:" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Point-to-Point Tunneling Protocol (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Compatible met Microsoft en andere PPTP VPN-servers." diff --git a/vpn-daemons/pptp/po/pa.po b/vpn-daemons/pptp/po/pa.po deleted file mode 100644 index 9b7edb823e..0000000000 --- a/vpn-daemons/pptp/po/pa.po +++ /dev/null @@ -1,583 +0,0 @@ -# translation of NetworkManager-pptp.HEAD.po to Punjabi -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# A S Alam , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-03 18:38+0000\n" -"PO-Revision-Date: 2007-02-04 09:24+0530\n" -"Last-Translator: A S Alam \n" -"Language-Team: Punjabi \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "ਪਰਮਾਣਕਿਤਾ ਕਿਸਮ:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "ਇਹ ਸ਼ੈਸ਼ਨ ਲਈ ਯਾਦ ਰੱਖੋ(_R)" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "ਛੱਲੇ 'ਚ ਸੰਭਾਲੋ(_S)" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "'%s' ਦੀ ਵਰਤੋਂ ਲਈ ਤੁਹਾਨੂੰ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ।" - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "ਪਰਮਾਣਿਤ ਕੁਨੈਕਸ਼ਨ" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"ਪਰਮਾਣਕਿਤਾ ਜਾਣਕਾਰੀ\n" -"\n" -"ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਕਿਸੇ ਕਿਸਮ ਦੀ ਪਰਮਾਣਕਿਤਾ ਚਾਹੀਦੀ ਹੈ। " -"\n" -"\n" -"ਢੁਕਵੀਂ ਪਰਮਾਣਕਿਤਾ ਕਿਸਮ ਚੁਣੋ ਅਤੇ ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "ਪਰਮਾਣਕਿਤਾ ਚਾਹੀਦੀ ਹੈ" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "ਪਰਮਾਣਕਿਤਾ ਕਿਸਮ(_A):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Password:" -msgstr "ਗੁਪਤ-ਕੋਡ(_P):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "ਰਿਮੋਟ ਨਾਂ(_R):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:268 -msgid "_Username:" -msgstr "ਉਪਭੋਗੀ ਨਾਂ(_U):" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:15 -msgid "auth-chap-window" -msgstr "auth-chap-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:16 -msgid "auth-mschapv2-window" -msgstr "auth-mschapv2-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:17 -msgid "auth-none-window" -msgstr "auth-none-window" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "ਸੈਕੰਡਰੀ ਗੁਪਤ-ਕੋਡ(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:270 -msgid "_Domain:" -msgstr "ਡੋਮੇਨ(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:355 -msgid "Connect _anonymously" -msgstr "ਅਗਿਆਤ ਵਾਂਗ ਜੁੜੋ(_a)" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect as _user:" -msgstr "ਉਪਭੋਗੀ ਵਾਂਗ ਜੁੜੋ(_u):" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "ਇਹ ਸ਼ੈਸ਼ਨ ਲਈ ਗੁਪਤ-ਕੋਡ ਸੰਭਾਲੋ(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "ਛੱਲੇ 'ਚ ਗੁਪਤ-ਕੋਡ ਸੰਭਾਲੋ(_S)" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਿਲ, ਹਟਾਓ ਜਾਂ ਸੋਧ" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ (PPP ਸਧਾਰਨ)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "ਨਪੀੜਨ" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Connection Name" -msgstr "ਕੁਨੈਕਸ਼ਨ ਨਾਂ" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Delays and TImeouts" -msgstr "ਡੀਲੇਅ ਅਤੇ ਅੰਤਰਾਲ" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "Encryption" -msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "IP Options" -msgstr "IP ਚੋਣਾਂ" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Packet Parameters" -msgstr "ਪੈਕਟ ਪੈਰਾਮੀਟਰ" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "ਜਿਵੇਂ: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "" -"pppd ਲਈ ਵਾਧੂ ਚੋਣਾਂ ਦੀ ਲਿਸਟ ਹੈ, ਜੋ ਕਿ ਕਮਾਂਡ ਲਾਇਨ ਉੱਤੇ ਲਿਖੀਆਂ " -"ਜਾਣਗੀਆਂ" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow BSD Compression" -msgstr "BSD ਨਪੀੜਨ ਮਨਜ਼ੂਰ" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Allow Deflate compression" -msgstr "Deflate ਨਪੀੜਨ ਮਨਜ਼ੂਰ" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "Authenticate Peer" -msgstr "ਪਰਮਾਣਿਤ ਪੀਅਰ" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Authentication" -msgstr "ਪਰਮਾਣਕਿਤਾ" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "ਨਪੀੜਨ ਅਤੇ ਇੰਕ੍ਰਿਪਸ਼ਨ" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "ਕੁਨੈਕਸ਼ਨ" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Debug Output" -msgstr "ਡੀਬੱਗ ਆਉਟਪੁੱਟ" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "ਇਸ ਤੋਂ ਬਾਅਦ ਕੁਨੈਕਸ਼ਨ ਖਤਮ, ਕਿਉਂਕਿ ਕਈ LCP ਈਚੋ ਬੇਨਤੀਆਂ ਫੇਲ੍ਹ" - -#: ../properties/nm-ppp-dialog.glade.h:18 -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "stateful MPPE ਯੋਗ" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Exclusive device access (UUCP-style lock)" -msgstr "ਖਾਸ ਜੰਤਰ ਵਰਤੋਂ (UUCP-ਸ਼ੈਲੀ ਵਰਤੋਂ)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Find Device" -msgstr "ਜੰਤਰ ਖੋਜ" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"ਸੁਰੱਖਿਆ ਕਾਰਨਾਂ ਕਰਕੇ, ਉੱਤੇ ਦਿੱਤੇ ਬਕਸੇ ਵਿੱਚ ਦਿੱਤੀਆਂ ਚੋਣਾਂ ਨੂੰ " -"ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਮਨਜ਼ੂਰ ਚੋਣਾਂ ਦੀ ਲਿਸਟ ਨਾਲ ਚੈੱਕ " -"ਕੀਤਾ ਜਾਵੇਗਾ। ਇਸ ਸਮੇਂ ਲਿਸਟ 'ਚ ਕੋਈ ਚੋਣ ਨਹੀਂ ਹੈ।" - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "GPRS Options" -msgstr "GPRS ਚੋਣਾਂ" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Hardware RTS/CTS" -msgstr "ਜੰਤਰ RTS/CTS" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "Host name or IP address of the PPTP server" -msgstr "PPTP ਸਰਵਰ ਦਾ ਮੇਜ਼ਬਾਨ ਨਾਂ ਜਾਂ IP ਸਿਰਨਾਵਾਂ" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" -"ਜੇ BSD ਨਪੀੜਨ ਦੀ ਮਨਜ਼ੂਰੀ ਨਾ ਹੋਵੇ ਤਾਂ 'nobsdcomp' ਚੋਣ pppd ਨੂੰ ਦਿੱਤੀ " -"ਜਾਵੇਗੀ" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" -"ਜੇ Deflate ਨਪੀੜਨ ਦੀ ਮਨਜ਼ੂਰੀ ਨਾ ਹੋਵੇ ਤਾਂ 'nodefate' ਚੋਣ pppd ਨੂੰ ਦਿੱਤੀ " -"ਜਾਵੇਗੀ" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "Maximum Receive Unit" -msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਪ੍ਰਾਪਤ ਇਕਾਈ" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "Maximum Transmit Unit" -msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਭੇਜਣ ਇਕਾਈ" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "Modem Connection" -msgstr "ਮਾਡਮ ਕੁਨੈਕਸ਼ਨ" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "PPP Options" -msgstr "PPP ਚੋਣਾਂ" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Peer DNS through tunnel" -msgstr "ਟਨਲ ਰਾਹੀਂ ਪੀਅਰ DNS" - -#: ../properties/nm-ppp-dialog.glade.h:32 -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "CHAP ਇਨਕਾਰ" - -#: ../properties/nm-ppp-dialog.glade.h:33 -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "EAP ਇਨਕਾਰ" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse MS CHAP" -msgstr "MS CHAP ਇਨਕਾਰ" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Require 128 bit MPPE encryption" -msgstr "128 ਬਿੱਟ MPPE ਇੰਕ੍ਰਿਪਸ਼ਨ ਲੋੜੀਦੀ" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require Explicit IP Addr" -msgstr "ਖਾਸ IP ਸਿਰਨਾਵਾਂ ਚਾਹੀਦਾ" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPC Compression" -msgstr "MPPC ਨਪੀੜਨ ਲੋੜੀਦੀ" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require MPPE encryption" -msgstr "MPPE ਇੰਕ੍ਰਿਪਸ਼ਨ ਲੋੜੀਦੀ" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "ਮੌਜੂਦਾ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਲੋੜੀਦਾ ਹੈ" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "ਰੂਟਿੰਗ" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "ਸੀਰੀਅਲ ਚੋਣਾਂ" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "ਜੰਤਰ ਸੰਰਚਨਾ ਤੋਂ ਸੇਵਾ ਦੇਣ ਵਾਲੇ GPRS ਵਰਤੋਂ ਬਿੰਦੂ" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "ਸੇਵਾ ਦੇਣ ਵਾਲਾ IP ਸਿਰਨਾਵਾਂ" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telephone number to dial" -msgstr "ਡਾਇਲ ਕਰਨ ਵਾਸਤੇ ਟੈਲੀਫੋਨ ਨੰਬਰ" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"ਇਹ ਸੌਖਾ ਨਾਂ, ਜੋ ਕਿ ਇਹ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਦੀ ਪਛਾਣ ਲਈ ਵਰਤਿਆ " -"ਜਾਵੇਗਾ,\n" -"ਜਿਵੇਂ ਕਿ \"ਕੈਂਪ VPN\" ਜਾਂ \"ਕਾਰਪੋਰੇਟ ਨੈੱਟਵਰਕ\" ਆਦਿ" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "ਈਚੋ ਬੇਨਤੀ ਵਿੱਚ ਸਮਾਂ ਸਕਿੰਟਾਂ 'ਚ" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Type:" -msgstr "ਕਿਸਮ:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "ਪੀਅਰ DNS ਵਰਤੋਂ" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "ਜਦੋਂ ਚੋਣ ਕੀਤੀ ਤਾਂ \"refuse-chap\" ਚੋਣ pppd ਨੂੰ ਦਿੱਤੀ ਜਾਵੇਗੀ" - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "ਜਦੋਂ ਚੋਣ ਕੀਤੀ ਤਾਂ \"refuse-eap\" ਚੋਣ pppd ਨੂੰ ਦਿੱਤੀ ਜਾਵੇਗੀ" - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "ਜਦੋਂ ਚੋਣ ਕੀਤੀ ਤਾਂ \"refuse-mschap\" ਚੋਣ pppd ਨੂੰ ਦਿੱਤੀ ਜਾਵੇਗੀ" - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "ਜਦੋਂ ਚੋਣ ਕੀਤੀ ਤਾਂ 'lock' ਚੋਣ pppd ਨੂੰ ਦਿੱਤੀ ਜਾਵੇਗੀ" - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "ਜਦੋਂ ਚੋਣ ਕੀਤੀ ਤਾਂ 'require-mppc' ਚੋਣ pppd ਨੂੰ ਦਿੱਤੀ ਜਾਵੇਗੀ" - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" -"ਜਦੋਂ ਇਹ ਚੋਣ ਕੀਤੀ ਤਾਂ pppd ਲਈ 'debug' ਚੋਣ ਕੀਤੀ ਜਾਵੇਗੀ ਅਤੇ " -"ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਪਲੱਗਇਨ ਤੋਂ ਕੁਝ ਹੋਰ ਜਾਣਕਾਰੀ ਜੋੜੀ ਜਾਵੇਗੀ।" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "ਜਦੋਂ ਚੋਣ ਕੀਤੀ ਤਾਂ pppd 'noipdefault' ਚੋਣ ਸੈੱਟ ਕੀਤੀ ਜਾਵੇਗੀ" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "ਜਦੋਂ ਚੋਣ ਕੀਤੀ ਤਾਂ pppd 'usepeerdns' ਚੋਣ ਸੈੱਟ ਕੀਤੀ ਜਾਵੇਗੀ" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "ਜਦੋਂ ਇਹ ਚੋਣ ਕੀਤੀ ਤਾਂ \"noauth\" ਚੋਣ pppd ਨੂੰ ਭੇਜੀ ਜਾਵੇਗੀ।" - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access Point Name:" -msgstr "ਪਹੁੰਚ ਬਿੰਦੂ ਨਾਂ(_A):" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Channel:" -msgstr "ਚੈਨਲ(_C):" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Context Num" -msgstr "ਪਰਸੰਗ ਗਿਣਤੀ(_C)" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Custom PPP options:" -msgstr "ਕਸਟਮ PPP ਚੋਣਾਂ(_C):" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Device Address:" -msgstr "ਜੰਤਰ ਸਿਰਨਾਵਾਂ(_D):" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Gateway:" -msgstr "ਗੇਟਵੇ(_G):" - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_IP Address:" -msgstr "_IP ਸਿਰਨਾਵਾਂ:" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Import Saved Configuration..." -msgstr "ਸੰਭਾਲੀ ਸੰਰਚਨਾ ਆਯਾਤ(_I)..." - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Only use VPN connection for these addresses" -msgstr "ਇਹ ਸਿਰਨਾਵਿਆਂ ਲਈ ਸਿਰਫ਼ VPN ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_O)" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Packet Type" -msgstr "ਪੈਕਟ ਕਿਸਮ(_P)" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Telephone Number:" -msgstr "ਟੈਲੀਫੋਨ ਨੰਬਰ(_T):" - -#: ../properties/nm-ppp-dialog.glade.h:70 -msgid "connect-delay" -msgstr "ਕੁਨੈਕਟ-ਡੀਲੇਅ" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "pppd ਟਨਲ (PPTP, BTGPRS, ਡਾਇਲਅੱਪ)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "ਨਾਂ" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "PPTP ਸਰਵਰ" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "ਟੈਲੀਫੋਨ ਨੰਬਰ" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "ਬਲਿਊਟੁੱਥ ਸਿਰਨਾਵਾਂ" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "ਬਲਿਊਟੁੱਥ ਚੈਨਲ" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "GPRS ਪਾਠ ਨੰਬਰ" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "GPRS ਪੈਕਟ ਕਿਸਮ" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "CTS/RTS ਵਹਾ (ਫਲੋ) ਕੰਟਰੋਲ ਵਰਤੋਂ" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "ਇੱਕ ਮਾਡਮ ਰਾਹੀਂ ਜੁੜੋ" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "ਦੇਣ ਲਈ IP ਚਾਹੀਦਾ" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "MPPE ਇੰਕ੍ਰਿਪਸ਼ਨ ਵਰਤੋਂ" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "128 ਬਿੱਟ MPPE ਇੰਕ੍ਰਿਪਸ਼ਨ ਵਰਤੋਂ" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "MPPC ਨਪੀੜਨ ਵਰਤੋਂ" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "deflate ਨਪੀੜਨ ਨਾ ਵਰਤੋਂ" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "BSD ਨਪੀੜਨ ਨਾ ਵਰਤੋਂ" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "pppd ਵਲੋਂ ਖਾਸ ਜੰਤਰ ਵਰਤੋਂ" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "ਪਰਮਾਣਿਤ ਰਿਮੋਟ ਪੀਅਰ" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "MSCHAP ਇਨਕਾਰ" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਭੇਜਣ ਇਕਾਈ (ਬਾਈਟ 'ਚ)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਪ੍ਰਾਪਤ ਇਕਾਈ (ਬਾਈਟ 'ਚ)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੋਈਆਂ LCP ਈਚੋ ਦੀ ਗਿਣਤੀ" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "LCP ਈਚੋ ਭੇਜਣ ਲਈ ਅੰਤਰਾਲ (ਸਕਿੰਟਾਂ 'ਚ)" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "ਜੁੜਨ ਤੋਂ ਪਹਿਲਾਂ ਉਡੀਕ ਅੰਤਰਾਲ (ਮਿਲੀ-ਸਕਿੰਟਾਂ 'ਚ) ਹੈ।" - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "ਪਸੰਦੀਦਾ PPP ਚੋਣਾਂ" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "ਟਨਲ ਉੱਤੇ ਪੀਅਰ DNS ਵਰਤੋਂ" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "ਖਾਸ ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "ਖਾਸ ਨੈੱਟਵਰਕਾਂ ਲਈ ਲਿਮਟ" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "ਅੱਗੇ ਦਿੱਤਾ '%s' ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾਵੇਗਾ:" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "ਕੁਨੈਕਸ਼ਨ ਵੇਰਵੇ ਨੂੰ \"ਪਿੱਛੇ\" ਬਟਨ ਰਾਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ।" - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "ਆਯਾਤ ਕਰਨ ਲਈ ਫਾਇਲ ਚੁਣੋ" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "ਇੰਝ ਸੰਭਾਲੋ..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "\"%s\" ਨਾਂ ਨਾਲ ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।" - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਆਪਣੇ ਵਲੋਂ ਸੰਭਾਲੀ ਜਾਣ ਵਾਲੀ ਨਾਲ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ" - diff --git a/vpn-daemons/pptp/po/pl.po b/vpn-daemons/pptp/po/pl.po deleted file mode 100644 index a7913fe0fd..0000000000 --- a/vpn-daemons/pptp/po/pl.po +++ /dev/null @@ -1,567 +0,0 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Polish translation of networkmanager-pptp. -# Copyright (C) 2008 Aviary.pl -# This file is distributed under the same license as the networkmanager-pptp package. -# Tomasz Dominikowski , 2008. -msgid "" -msgstr "" -"Project-Id-Version: networkmanager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-19 20:19+0100\n" -"PO-Revision-Date: 2008-11-19 20:20+0100\n" -"Last-Translator: Tomasz Dominikowski \n" -"Language-Team: Aviary.pl \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Hasło _dodatkowe:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Nazwa _użytkownika:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domena:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Hasło:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Połączenie _anonimowe" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Połączenie jako _użytkownik:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Zapamiętanie hasła na czas tej sesji" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "Z_apamiętanie hasła w bazie kluczy" - -#: ../auth-dialog/main.c:62 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Aby uzyskać dostęp do wirtualnej sieci prywatnej \"%s\", należy dokonać uwierzytelnienia." - -#: ../auth-dialog/main.c:63 -msgid "Authenticate VPN" -msgstr "Uwierzytelnianie VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Dodawanie, usuwanie i modyfikowanie połączeń PPTP VPN" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "Menedżer połączeń PPTP VPN" - -#: ../properties/advanced-dialog.c:144 -msgid "All Available (Default)" -msgstr "Wszystkie dostępne (domyślnie)" - -#: ../properties/advanced-dialog.c:148 -msgid "128-bit (most secure)" -msgstr "128-bit (najbardziej bezpieczna)" - -#: ../properties/advanced-dialog.c:157 -msgid "40-bit (less secure)" -msgstr "40-bit (mniej bezpieczna)" - -#: ../properties/advanced-dialog.c:228 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:234 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:240 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:246 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Uwierzytelnianie" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Echo" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Ogólne" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Opcjonalne" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Zabezpieczenia i kompresja" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "Zaa_wansowane..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Kompresja danych _BSD" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Kompresja danych _Deflate" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Szyfrowanie st_ateful" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Zezwolenie na następujące metody uwierzytelniania:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Domyślne" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "NT Domain:" -msgstr "Domena NT:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Password:" -msgstr "Hasło:" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Send PPP _echo packets" -msgstr "Wysyłanie pakietów _echo PPP" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Show password" -msgstr "Wyświetlanie hasła" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "Use TCP _header compression" -msgstr "Kompresja _nagłówków TCP" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Szyfrowanie _Point-to-Point (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "User name:" -msgstr "Nazwa użytkownika:" - -#: ../properties/nm-pptp-dialog.glade.h:19 -msgid "_Gateway:" -msgstr "_Brama:" - -#: ../properties/nm-pptp-dialog.glade.h:20 -msgid "_Security:" -msgstr "Za_bezpieczenia:" - -#: ../properties/nm-pptp.c:50 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Protokół tunelowania Point-to-Point (PPTP)" - -#: ../properties/nm-pptp.c:51 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Kompatybilny z serwerami Microsoft i innymi serwerami VPN PPTP." - -#~ msgid "Authentication Type:" -#~ msgstr "Typ uwierzytelniania:" -#~ msgid "_Remember for this session" -#~ msgstr "_Zapamiętaj hasło w tej sesji" -#~ msgid "_Save in keyring" -#~ msgstr "Z_apamiętaj hasło" -#~ msgid "Authenticate Connection" -#~ msgstr "Uwierzytelnienie połączenia" -#~ msgid "" -#~ "Authentication Information\n" -#~ "\n" -#~ "The connection '%s' may need some form of authentication.\n" -#~ "\n" -#~ "Please select an appropriate authentication type and provide the " -#~ "necessary credentials below:\n" -#~ msgstr "" -#~ "Informacje o uwierzytelnianiu\n" -#~ "\n" -#~ "Połączenie '%s' może wymagać uwierzytelniania.\n" -#~ "\n" -#~ "Proszę wybrać odpowiednią metodę i podać odpowiednie dane poniżej:\n" -#~ msgid "Authentication Required" -#~ msgstr "Wymagane uwierzytelnienie" -#~ msgid "_Authentication Type:" -#~ msgstr "_Typ uwierzytelniania" -#~ msgid "_Remote name:" -#~ msgstr "Nazwa _użytkownika:" -#~ msgid "VPN Connection Manager (PPP generic)" -#~ msgstr "Połączenia VPN (PPP)" -#~ msgid "00:00:00:00" -#~ msgstr "00:00:00:00" -#~ msgid "Delays & Timeouts" -#~ msgstr "Opóźnienia i czas wygaśnięcia" -#~ msgid "Packet Parameters" -#~ msgstr "Parametry pakietów" -#~ msgid "Example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "przykład: 172.16.0.0/16 10.11.12.0/24" -#~ msgid "" -#~ "A list of extra options to pppd as would be typed on the command line" -#~ msgstr "" -#~ "Lista dodatkowych opcji pppd przekazywanych bezpośrednio do polecenia" -#~ msgid "Allow B_SD Compression" -#~ msgstr "Zezwól na kompresję _BSD" -#~ msgid "C_hannel:" -#~ msgstr "_Kanał:" -#~ msgid "Co_nnect delay:" -#~ msgstr "_Opóźnienie połączenia:" -#~ msgid "Compression & Encryption" -#~ msgstr "Kompresja i szyfrowanie" -#~ msgid "Connection" -#~ msgstr "Połączenie" -#~ msgid "Connection na_me:" -#~ msgstr "_Nazwa połączenia" -#~ msgid "Context _number:" -#~ msgstr "N_umer kontekstu:" -#~ msgid "Custom _PPP options:" -#~ msgstr "_Inne opcje PPP:" -#~ msgid "Debug _output" -#~ msgstr "Informacje de_bug" -#~ msgid "Disconnect after this many LCP echo requests fail" -#~ msgstr "Rozłącz po danej ilości błędów żądań LCP echo" -#~ msgid "E_xclusive device access (UUCP-style lock)" -#~ msgstr "_Wyłączny dostęp do urządzenia (blokada UUCP)" -#~ msgid "Enable stateful _MPPE" -#~ msgstr "Włącz stateful _MPPE" -#~ msgid "Find Device" -#~ msgstr "Znajdź urządzenie" -#~ msgid "" -#~ "For security reasons, options entered in the box above are checked " -#~ "against a list of allowed options before a connection is established. " -#~ "Currently there are no options on the list." -#~ msgstr "" -#~ "Z powodów bezpieczeństwa, przed połączeniem, wyżej podane opcje " -#~ "sprawdzane są z listę dozwolonych opcji. Obecnie brak opcji na tej liście." -#~ msgid "GPRS Options" -#~ msgstr "Opcje GPRS" -#~ msgid "Host name or IP address of the PPTP server" -#~ msgstr "Nazwa lub adres IP serwera PPTP" -#~ msgid "IP a_ddress:" -#~ msgstr "Adres I_P:" -#~ msgid "" -#~ "If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -#~ msgstr "" -#~ "Gdy kompresja BSD jest wyłączona, do pppd przekazywana jest opcja " -#~ "'nobsdcomp'" -#~ msgid "" -#~ "If Deflate compression is not allowed the 'nodefate' option is passed to " -#~ "pppd" -#~ msgstr "" -#~ "Gdy kompresja deflate jest wyłączona, do pppd przekazywana jest opcja " -#~ "'nodeflate'" -#~ msgid "Maximum Receive Unit" -#~ msgstr "Maksymalna jednostka odbioru" -#~ msgid "Maximum Transmit Unit" -#~ msgstr "Maksymalna jednostka transmisji" -#~ msgid "PPP Options" -#~ msgstr "Opcje PPP" -#~ msgid "Refuse C_HAP" -#~ msgstr "Odrzuć C_HAP" -#~ msgid "Refuse _EAP" -#~ msgstr "Odrzuć _EAP" -#~ msgid "Refuse _MS CHAP" -#~ msgstr "Odrzuć _MS CHAP" -#~ msgid "Require 128 bit M_PPE encryption" -#~ msgstr "Wymagaj 128 bitowego szyfrowania M_PPE" -#~ msgid "Require MPPE _encryption" -#~ msgstr "Wymagaj szyfrowania MPP_E" -#~ msgid "Require explicit IP _address" -#~ msgstr "Wymagaj jawnego _adresu IP" -#~ msgid "Requires existing network connection" -#~ msgstr "Wymaga istniejącego połączenia sieciowego" -#~ msgid "Routing" -#~ msgstr "Routing" -#~ msgid "Serial Options" -#~ msgstr "Opcje szeregowe" -#~ msgid "Service providers GPRS access point from device config" -#~ msgstr "Punkt dostępowy GPRS dostawcy usług z konfiguracji urządzenia" -#~ msgid "Service providers IP address" -#~ msgstr "Adres UP dostawcy usług" -#~ msgid "Telep_hone number:" -#~ msgstr "Numer t_elefonu:" -#~ msgid "" -#~ "This is the friendly name that will be used to identify this network " -#~ "connection, \n" -#~ "e.g. \"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Nazwa identyfikująca połączenie do sieci prywatnej. \n" -#~ "Np. \"VPN kampusu\" lub \"Sieć firmowa\"" -#~ msgid "Time in seconds between echo requests" -#~ msgstr "Czas w sekundach pomiędzy żadaniami echo" -#~ msgid "Typ_e:" -#~ msgstr "_Typ:" -#~ msgid "Use peer _DNS" -#~ msgstr "Użyj Peer _DNS" -#~ msgid "When checked the \"refuse-chap\" option is passed to pppd." -#~ msgstr "Gdy włączone, do pppd przekazywana jest opcja 'refuse-chap'" -#~ msgid "When checked the \"refuse-eap\" option is passed to pppd." -#~ msgstr "Gdy włączone, do pppd przekazywana jest opcja 'refuse-eap'" -#~ msgid "When checked the \"refuse-mschap\" option is passed to pppd." -#~ msgstr "Gdy włączone, do pppd przekazywana jest opcja 'refuse-mschap'" -#~ msgid "When checked the 'lock' option is passed to pppd" -#~ msgstr "Gdy włączone, do pppd przekazywana jest opcja 'lock'" -#~ msgid "When checked the 'require-mppc' option is passed to pppd" -#~ msgstr "Gdy włączone, do pppd przekazywana jest opcja 'require-mppc'" -#~ msgid "" -#~ "When checked this sets the pppd 'debug' option and adds some extra " -#~ "information from the NetworkManager plugin" -#~ msgstr "" -#~ "Gdy włączone, ustawiana jest opcja 'debug' pppd i dodawane sa informacje " -#~ "z wtyczki NetworkManagera" -#~ msgid "When checked this sets the pppd 'noipdefault' option" -#~ msgstr "Gdy włączone, ustawiana jest opcja 'noipdefault' pppd" -#~ msgid "When checked this sets the pppd 'usepeerdns' option" -#~ msgstr "Gdy włączone, ustawiana jest opcja 'usepeerdns' pppd" -#~ msgid "" -#~ "When this check box is cleared the \"noauth\" option is passed to pppd." -#~ msgstr "Gdy włączone, do pppd przekazywana jest opcja 'noauth'" -#~ msgid "_Access point name:" -#~ msgstr "Nazwa punktu _dostępowego:" -#~ msgid "_Device address:" -#~ msgstr "_Adres urządzenia:" -#~ msgid "_Hardware RTS/CTS" -#~ msgstr "_Sprzętowe RTS/CTS" -#~ msgid "_Import Saved Configuration..." -#~ msgstr "_Importuj konfigurację..." -#~ msgid "_Modem connection" -#~ msgstr "Połączenie _modemowe" -#~ msgid "_Only use VPN connection for these addresses:" -#~ msgstr "_Używaj połączeń VPN tylko dla tych adresów:" -#~ msgid "_Packet type:" -#~ msgstr "Typ p_akietu" -#~ msgid "_Peer DNS through tunnel" -#~ msgstr "_Peer DNS poprzez tunel" -#~ msgid "_Require MPPC compression" -#~ msgstr "_Wymagaj kompresji MPPC" -#~ msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -#~ msgstr "tunel ppd (PPTP, BTGPRS, Dialup)" -#~ msgid "Name" -#~ msgstr "Nazwa" -#~ msgid "PPTP Server" -#~ msgstr "Serwer PPTP" -#~ msgid "Telephone Number" -#~ msgstr "Numer telefonu" -#~ msgid "Bluetooth Address" -#~ msgstr "Adres bluetooth" -#~ msgid "Bluetooth Channel" -#~ msgstr "Kanał bluetooth" -#~ msgid "GPRS APN" -#~ msgstr "GPRS APN" -#~ msgid "GPRS IP" -#~ msgstr "GPRS IP" -#~ msgid "GPRS Context No." -#~ msgstr "Nr kontekstu GPRS" -#~ msgid "GPRS Packet Type" -#~ msgstr "Typ pakietu GPRS" -#~ msgid "Use CTS/RTS flow control" -#~ msgstr "Używa kontroli przepływu CTS/RTS" -#~ msgid "Connect via a modem" -#~ msgstr "Połącz poprzez modem" -#~ msgid "Require IP to be provided" -#~ msgstr "Wymaga podania IP" -#~ msgid "Use Peer DNS" -#~ msgstr "Użyj Peer DNS" -#~ msgid "Use 128 bit MPPE encryption" -#~ msgstr "Używa 128 bitowego szyfrowania MPPE" -#~ msgid "Enable stateful MPPE" -#~ msgstr "Włącz stateful MPPE" -#~ msgid "Do not use deflate compression" -#~ msgstr "Nie używa kompresji deflate" -#~ msgid "Do not use BSD compression" -#~ msgstr "Nie używa kompresji BSD" -#~ msgid "Exclusive device access by pppd" -#~ msgstr "Wyłączny dostęp do urządzenia dla pppd" -#~ msgid "Authenticate remote peer" -#~ msgstr "Uwierzytelnianie zdalnego klienta" -#~ msgid "Refuse EAP" -#~ msgstr "Odrzuć EAP" -#~ msgid "Refuse CHAP" -#~ msgstr "Odrzuć CHAP" -#~ msgid "Maximum transmit unit (in bytes)" -#~ msgstr "Maksymalna jednostka transmisji (w bajtach)" -#~ msgid "Maximum receive unit (in bytes)" -#~ msgstr "Maksymalna jednostka odbioru (w bajtach)" -#~ msgid "Number of failed LCP echos to cause disconnect" -#~ msgstr "Ilość nieudanych żądań LCP echo, po których nastąpi rozłączenie" -#~ msgid "Interval (in seconds) at which to issue LCP echos" -#~ msgstr "Interwał (w sekundach) wysyłania żądań LCP echo" -#~ msgid "Interval (in milliseconds) to wait before connecting." -#~ msgstr "Czas oczekiwania (w milisekundach) przed połączeniem" -#~ msgid "Custom PPP options" -#~ msgstr "Inne opcje PPP" -#~ msgid "Use Peer DNS over the Tunnel" -#~ msgstr "Użyj Peer DNS poprzez tunel" -#~ msgid "Specific networks available" -#~ msgstr "Dostępne określone sieci" -#~ msgid "Limit to specific networks" -#~ msgstr "Ogranicz do określonych sieci" -#~ msgid "The following '%s' connection will be created:" -#~ msgstr "Utworzone zostanie poniższe połączenie %s:" -#~ msgid "\t%s: %s\n" -#~ msgstr "\t%s: %s\n" -#~ msgid "The connection details can be changed using the \"Back\" button." -#~ msgstr "Szczegóły połączenia można zmienić za pomocą przycisku \"Wstecz\"." -#~ msgid "Select file to import" -#~ msgstr "Plik do zaimportowania" -#~ msgid "Save as..." -#~ msgstr "Zapisz jako..." -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Plik \"%s\" już istnieje." -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Czy nadpisać go zapisywanym plikiem?" -#~ msgid "auth-chap-window" -#~ msgstr "auth-chap-window" -#~ msgid "auth-mschapv2-window" -#~ msgstr "auth-mschapv2-window" -#~ msgid "auth-none-window" -#~ msgstr "auth-none-window" -#~ msgid "Connection Name" -#~ msgstr "Nazwa połączenia" -#~ msgid "Telephone number to dial" -#~ msgstr "Numer telefonu do wybrania" - -#, fuzzy -#~ msgid "Cert: %s" -#~ msgstr "Nazwa: %s" - -#, fuzzy -#~ msgid "Key: %s" -#~ msgstr "Nazwa: %s" - -#, fuzzy -#~ msgid "Remote IP: %s" -#~ msgstr "Trasy: %s" - -#, fuzzy -#~ msgid "Connection Type: Password" -#~ msgstr "Hasło _dodatkowe:" -#~ msgid "Username: %s" -#~ msgstr "Nazwa użytkownika: %s" - -#, fuzzy -#~ msgid "Remote: %s" -#~ msgstr "Trasy: %s" -#~ msgid "Routes: %s" -#~ msgstr "Trasy: %s" - -#, fuzzy -#~ msgid "Cipher: %s" -#~ msgstr "Nazwa: %s" -#~ msgid "Cannot import settings" -#~ msgstr "Nie można zaimportować ustawień" -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "Plik ustawień VPN '%s' nie zawiera poprawnych danych." - -#, fuzzy -#~ msgid "Select certificate to use" -#~ msgstr "Plik do zaimportowania" - -#, fuzzy -#~ msgid "Select key to use" -#~ msgstr "Plik do zaimportowania" -#~ msgid "Failed to export configuration" -#~ msgstr "Eksport konfiguracji nie powiódł się." -#~ msgid "Failed to save file %s" -#~ msgstr "Zapis pliku %s zakończony niepowodzeniem" - -#, fuzzy -#~ msgid "Optional Information" -#~ msgstr "Informacje _dodatkowe" -#~ msgid "Required Information" -#~ msgstr "Informacje wymagane" -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Proszę podać poniżej informacje dostarczone przez administratora. Hasło " -#~ "należy podać później, podczas łączenia." - -#, fuzzy -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted " -#~ "or the certificate password was wrong." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu błędnego użytkownika i " -#~ "hasła." -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu niemożności uruchomienia " -#~ "programu VPN." -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu braku połączenia z " -#~ "serwerem VPN." -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu błędnych opcji " -#~ "konfiguracyjnych." -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu otrzymania od serwera " -#~ "VPN błędnej konfiguracji." -#~ msgid "_Group Password:" -#~ msgstr "Hasło _grupy:" -#~ msgid "Compatible Cisco VPN client (vpnc)" -#~ msgstr "Klient kompatybilny z Cisco VPN (vpnc)" -#~ msgid "Gateway: %s" -#~ msgstr "Brama: %s" -#~ msgid "Group Name: %s" -#~ msgstr "Nazwa grupy: %s" -#~ msgid "Domain: %s" -#~ msgstr "Domena: %s" -#~ msgid "TCP tunneling not supported" -#~ msgstr "Tunelowanie TCP nie jest obsługiwane" -#~ msgid "" -#~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled " -#~ "through TCP which is currently not supported in the vpnc software.\n" -#~ "\n" -#~ "The connection can still be created, with TCP tunneling disabled, however " -#~ "it may not work as expected." -#~ msgstr "" -#~ "Plik ustawień VPN '%s' określa, że ruch VPN ma być tunelowany poprzez " -#~ "TCP. Opcja nie jest jednak obsługiwana przez program vpnc\n" -#~ "\n" -#~ "Połączenie z wyłączonym tunelowaniem TCP może nie działać poprawnie." -#~ msgid "G_roup Name:" -#~ msgstr "Nazwa g_rupy:" -#~ msgid "Override _user name" -#~ msgstr "Wymuś _nazwę użytkownika" -#~ msgid "Use _domain for authentication" -#~ msgstr "Użyj _domeny do uwierzytelniania" - diff --git a/vpn-daemons/pptp/po/pt.po b/vpn-daemons/pptp/po/pt.po deleted file mode 100644 index 5fef40cb2d..0000000000 --- a/vpn-daemons/pptp/po/pt.po +++ /dev/null @@ -1,585 +0,0 @@ -# NetworkManager-pptp's Portuguese translation. -# Copyright © 2007 NetworkManager-pptp -# This file is distributed under the same license as the NetworkManager-pptp package. -# Duarte Loreto , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: 2.18\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-08 20:46+0000\n" -"PO-Revision-Date: 2007-02-08 18:50+0000\n" -"Last-Translator: Duarte Loreto \n" -"Language-Team: Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "Tipo de Autenticação:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "_Recordar durante esta sessão" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_Gravar no chaveiro" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "Tem de se autenticar para aceder a '%s'." - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "Autenticar a Ligação" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"Informação de Autenticação\n" -"\n" -"A ligação '%s' poderá necessitar de alguma forma de autenticação.\n" -"\n" -"Seleccione o tipo de autenticação apropriado e forneça abaixo as credenciais " -"necessárias:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "Autenticação Requerida" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "Tipo de _Autenticação:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Password:" -msgstr "_Senha:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "Nome _remoto:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:268 -msgid "_Username:" -msgstr "_Utilizador:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:15 -msgid "auth-chap-window" -msgstr "auth-chap-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:16 -msgid "auth-mschapv2-window" -msgstr "auth-mschapv2-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:17 -msgid "auth-none-window" -msgstr "auth-none-window" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "Sen_ha Secundária:" - -#: ../auth-dialog/gnome-two-password-dialog.c:270 -msgid "_Domain:" -msgstr "_Domínio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:355 -msgid "Connect _anonymously" -msgstr "Ligar-se _anonimamente" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect as _user:" -msgstr "Ligar-se como o _utilizador:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "_Recordar a senha durante esta sessão" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_Gravar a senha no chaveiro" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Adicionar, Remover e Editar Ligações VPN" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "Gestor de Ligações VPN (genérico PPP)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "Compressão" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Connection Name" -msgstr "Nome da Ligação" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Delays and TImeouts" -msgstr "Atrasos e Expirações" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "Encryption" -msgstr "Encriptação" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "IP Options" -msgstr "Opções IP" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Packet Parameters" -msgstr "Parâmetros de Pacote" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "exemplo: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "" -"Uma lista de opções extra para o pppd tal como seriam introduzidas na linha " -"de comandos" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow BSD Compression" -msgstr "Permitir Compressão BSD" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Allow Deflate compression" -msgstr "Permitir Compressão Deflate" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "Authenticate Peer" -msgstr "Autenticar o outro Ponto" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Authentication" -msgstr "Autenticação" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "Compressão & Encriptação" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "Ligação" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Debug Output" -msgstr "Resultados da Depuração" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "Desligar após este número de falhas de pedidos LCP echo" - -#: ../properties/nm-ppp-dialog.glade.h:18 -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "Activar MPPE com estado" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Exclusive device access (UUCP-style lock)" -msgstr "Acesso exclusivo ao dispositivo (exclusividade estilo UUCP)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Find Device" -msgstr "Procurar Dispositivo" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"Por motivos de segurança, as opções introduzidas na caixa acima são " -"verificadas contra uma lista de opções permitidas antes de se estabelecer a " -"ligação. De momento não existem opções nessa lista." - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "GPRS Options" -msgstr "Opções GPRS" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Hardware RTS/CTS" -msgstr "RTS/CTS por Equipamento" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "Host name or IP address of the PPTP server" -msgstr "Nome da máquina ou endereço IP do servidor PPTP" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" -"Se compressão BSD não for permitida será passada ao pppd a opção 'nobsdcomp'" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" -"Se compressão Deflate não for permitida será passada ao pppd a opção " -"'nodeflate'" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "Maximum Receive Unit" -msgstr "Unidade Máxima de Recepção" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "Maximum Transmit Unit" -msgstr "Únidade Máxima de Transferência" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "Modem Connection" -msgstr "Ligação do Modem" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "PPP Options" -msgstr "Opções PPP" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Peer DNS through tunnel" -msgstr "DNS a Parceiro através de túnel" - -#: ../properties/nm-ppp-dialog.glade.h:32 -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "Recusar CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:33 -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "Recusar EAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse MS CHAP" -msgstr "Recusar MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Require 128 bit MPPE encryption" -msgstr "Requerer encriptação 128 bit MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require Explicit IP Addr" -msgstr "Requerer Endereço IP Explícito" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPC Compression" -msgstr "Requerer Compressão MPPC" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require MPPE encryption" -msgstr "Requer encriptação MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "Requerer ligação de rede existente" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "Routeamento" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "Opções Série" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "" -"Ponto de acesso GPRS do fornecedor de serviço pela configuração do " -"dispositivo" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "Endereço IP do fornecedor de servidor" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telephone number to dial" -msgstr "Número de telefone a marcar" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"Este é o nome utilizado para identificar esta ligação à rede privada, \n" -"por. ex. \"VPN da Universidade\" ou \"Rede da Empresa\"" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "Tempo em segundos entre pedidos echo" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Type:" -msgstr "Tipo:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Utilizar o DNS do Parceiro" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "Quando seleccionada a opção \"refuse-chap\" é passada ao pppd." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "Quando seleccionada a opção \"refuse-eap\" é passada ao pppd." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "Quando seleccionada a opção \"refuse-mschap\" é passada ao pppd." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "Quando seleccionada a opção 'lock' é passada ao pppd" - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "Quando seleccionada a opção 'require-mppc' é passada ao pppd" - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" -"Quando seleccionada define a opção 'debug' do pppd e adiciona alguma " -"informação extra do plugin NetworkManager" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "Quando seleccionada define a opção pppd 'noipdefault'" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "Quando seleccionada define a opção pppd 'usepeerdns'" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "" -"Quando esta caixa de selecção está limpa é passada a opção \"noauth\" ao " -"pppd." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access Point Name:" -msgstr "Nome do Ponto de _Acesso:" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Channel:" -msgstr "_Canal:" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Context Num" -msgstr "Núm de _Contexto" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Custom PPP options:" -msgstr "_Opções personalizadas PPP:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Device Address:" -msgstr "Endereço do _Dispositivo:" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_IP Address:" -msgstr "Endereço _IP:" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Import Saved Configuration..." -msgstr "_Importar a Configuração Gravada..." - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Only use VPN connection for these addresses" -msgstr "_Apenas utilizar a ligação VPN para estes endereços" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Packet Type" -msgstr "Tipo de _Pacote" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Telephone Number:" -msgstr "Número de _Telefone:" - -#: ../properties/nm-ppp-dialog.glade.h:70 -msgid "connect-delay" -msgstr "atraso-ligação" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "túnel pppd (PPTP, BTGPRS, Dialup)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "Nome" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "Servidor PPTP" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "Número de Telefone" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "Endereço Bluetooth" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "Canal Bluetooth" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "APN GPRS" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "IP GPRS" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "Nº de Contexto GPRS" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "Tipo de Pacote GPRS" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "Utilizar controlo de fluxo CTS/RTS" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "Ligar-se através de um modem" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "Requerer que seja fornecido um IP" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "Utilizar encriptação MPPE" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "Utilizar encriptação 128 bit MPPE" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "utilizar compressão MPPC" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "Não utilizar compressão deflate" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "Não utilizar compressão BSD" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "Acesso exclusivo ao dispositivo pelo pppd" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "Autenticar o parceiro remoto" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "Recusar MSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "Unidade máxima de transmissão (em bytes)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "Unidade máxima de recepção (em bytes)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "Número de LCP echos falhados para terminar a ligação" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "Intervalo (em segundos) entre envios de LCP echos" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "Intervalo (em milisegundos) para aguardar antes de se ligar." - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "Opções PPP personalizadas" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "Utilizar o DNS do Parceiro através do Túnel" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "Redes específicas disponíveis" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "Limitar a redes específicas" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "Será criada a seguinte ligação '%s':" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "" -"Os detalhes da ligação podem ser alterados utilizando o botão \"Retroceder\"." - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "Seleccionar o ficheiro a importar" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "Gravar como..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Já existe um ficheiro denominado \"%s\"." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Deseja substituí-lo pelo que está a gravar?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "Falhou a ligação VPN" diff --git a/vpn-daemons/pptp/po/pt_BR.po b/vpn-daemons/pptp/po/pt_BR.po deleted file mode 100644 index 37824ec85a..0000000000 --- a/vpn-daemons/pptp/po/pt_BR.po +++ /dev/null @@ -1,186 +0,0 @@ -# Brazilian Portuguese translation of NetworkManager-pptp. -# Copyright (C) 2007-2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager-pptp package. -# Raphael Higino , 2007. -# Luiz Armesto , 2007. -# Fabrício Godoy , 2008. -# Vladimir Melo , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-07 08:53-0500\n" -"PO-Revision-Date: 2008-11-01 14:43-0200\n" -"Last-Translator: Fabrício Godoy \n" -"Language-Team: Brazilian Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Senha secundária:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Nome de _usuário:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domínio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Senha:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Conectar _anonimamente" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Conectar como _usuário:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Lembrar senhas para esta sessão" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Salvar senhas no chaveiro" - -#: ../auth-dialog/main.c:62 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Você precisa autenticar-se para acessar a Rede Particular Virtual \"%s\"." - -#: ../auth-dialog/main.c:63 -msgid "Authenticate VPN" -msgstr "Autenticar VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Adicione, remova e edite conexões PPTP VPN" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "Gerenciador de Conexões PPTP VPN" - -#: ../properties/advanced-dialog.c:144 -msgid "All Available (Default)" -msgstr "Todas disponíveis (padrão)" - -#: ../properties/advanced-dialog.c:148 -msgid "128-bit (most secure)" -msgstr "128 bits (mais seguro)" - -#: ../properties/advanced-dialog.c:157 -msgid "40-bit (less secure)" -msgstr "40 bits (menos seguro)" - -#: ../properties/advanced-dialog.c:228 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:234 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:240 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:246 -msgid "MSCHAPv2" -msgstr "MSCHAP v.2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Autenticação" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Eco" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Geral" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Opcional" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Segurança e compressão" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "A_vançado..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Permitir compressão de dados _BSD" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Permitir compressão de dados _Deflate" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Permitir criptogr_afia com monitoração de estado" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Permitir os seguintes métodos de autenticação:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Padrão" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "NT Domain:" -msgstr "Domínio NT:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Password:" -msgstr "Senha:" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Send PPP _echo packets" -msgstr "Enviar pacotes PPP de _eco" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Show password" -msgstr "Mostrar senha" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "Use TCP _header compression" -msgstr "Usar compressão de cabeçal_ho TCP" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Usar criptografia _ponto a ponto (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "User name:" -msgstr "Nome de usuário:" - -#: ../properties/nm-pptp-dialog.glade.h:19 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-pptp-dialog.glade.h:20 -msgid "_Security:" -msgstr "_Segurança:" - -#: ../properties/nm-pptp.c:50 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Protocolo de Encapsulamento Ponto a Ponto (PPTP)" - -#: ../properties/nm-pptp.c:51 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Compatível com servidores Microsoft e outros PPTP VPN." diff --git a/vpn-daemons/pptp/po/ru.po b/vpn-daemons/pptp/po/ru.po deleted file mode 100644 index 52be288b0f..0000000000 --- a/vpn-daemons/pptp/po/ru.po +++ /dev/null @@ -1,176 +0,0 @@ -# translation of ru.po to Russian -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager package. -# -# Leonid Kanter , 2007, 2008. -msgid "" -msgstr "" -"Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-14 17:22+0300\n" -"PO-Revision-Date: 2008-08-14 17:23+0300\n" -"Last-Translator: Leonid Kanter \n" -"Language-Team: Russian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Вторичный пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "П_ользователь:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Домен:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Подключиться _анонимно" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Подключиться как _пользователь:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Запомнить пароль для этого сеанса" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Сохранить пароль на брелоке" - -#: ../auth-dialog/main.c:168 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Необходима аутентификация для доступа к виртуальной частной сети «%s».." - -#: ../auth-dialog/main.c:169 -msgid "Authenticate VPN" -msgstr "Аутентификация VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Добавить, удалить или изменить PPTP VPN соединения" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "Менеджер соединений PPTP VPN" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Любое доступное (по умолчанию)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128 бит (самое защищёное)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40 бит (менее защищённое)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Аутентификация" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Эхо" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Общие" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Дополнительные" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Шифрование и сжатие" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "_Дополнительно..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Включить компрессию _BSD" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Включить компрессию _Deflate" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Включить _Stateful Encryption" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Разешить следующие методы аутентификации:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "По умолчанию" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "Домен:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "Посылать _эхо-пакеты PPP" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "Использовать сжатие _заголовков TCP" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Использовать шифрование _MPPE" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "Имя пользователя:" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "_Шлюз:" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "_Шифрование:" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Point-to-Point Tunneling Protocol (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Совместим с серверами Microsoft и другими серверами PPTP VPN." - diff --git a/vpn-daemons/pptp/po/sv.po b/vpn-daemons/pptp/po/sv.po deleted file mode 100644 index d841e43bfd..0000000000 --- a/vpn-daemons/pptp/po/sv.po +++ /dev/null @@ -1,592 +0,0 @@ -# Swedish messages for NetworkManager. -# Copyright (C) 2004-2008 Free Software Foundation, Inc. -# Daniel Nylander , 2006, 2007, 2008. -# Christian Rose , 2004, 2005, 2006. -# -# $Id: sv.po,v 1.6 2006/12/05 06:26:57 dnylande Exp $ -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-16 19:23+0200\n" -"PO-Revision-Date: 2008-10-16 19:23+0100\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Sekundärt lösenord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Användarnamn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domän:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Lösenord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Anslut anon_ymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Anslut som _användare:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Kom ihåg lösenord för denna session" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Spara lösenord i nyckelring" - -#: ../auth-dialog/main.c:62 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Du måsta autentisera dig för att komma åt det virtuella privata nätverket \"%s\"." - -#: ../auth-dialog/main.c:63 -msgid "Authenticate VPN" -msgstr "Autentisera VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "Lägg till, ta bort och redigera PPTP VPN-anslutningar" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN-anslutningshanterare" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "Alla tillgängliga (Standard)" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128-bitar (säkrast)" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40-bitar (mindre säkert)" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "Autentisering" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "Eko" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "Allmänt" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "Valfritt" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "Säkerhet och komprimering" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "A_vancerat..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "Tillåt _BSD-datakomprimering" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "Tillåt _Deflate-datakomprimering" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "Tillåt t_illståndsbaserad kryptering" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "Tillåt följande autentiseringsmetoder:" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "Standard" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "NT Domain:" -msgstr "NT-domän:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Password:" -msgstr "Lösenord:" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Send PPP _echo packets" -msgstr "Skicka PPP-_ekopaket" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Show password" -msgstr "Visa lösenordet" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "Use TCP _header compression" -msgstr "Använd komprimering av TCP-_huvud" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "Använd _Point-to-Point-kryptering (MPPE)" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "User name:" -msgstr "Användarnamn:" - -#: ../properties/nm-pptp-dialog.glade.h:19 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-pptp-dialog.glade.h:20 -msgid "_Security:" -msgstr "_Säkerhet:" - -#: ../properties/nm-pptp.c:50 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "Point-to-Point Tunneling Protocol (PPTP)" - -#: ../properties/nm-pptp.c:51 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "Kompatibel med Microsoft och andra PPTP VPN-servrar." - -#~ msgid "gtk-cancel" -#~ msgstr "Avbryt" -#~ msgid "gtk-ok" -#~ msgstr "OK" -#~ msgid "Authentication Type:" -#~ msgstr "Autentiseringstyp:" -#~ msgid "_Remember for this session" -#~ msgstr "_Kom ihåg för denna session" -#~ msgid "_Save in keyring" -#~ msgstr "_Spara i nyckelring" -#~ msgid "Authenticate Connection" -#~ msgstr "Autentisera anslutning" -#~ msgid "" -#~ "Authentication Information\n" -#~ "\n" -#~ "The connection '%s' may need some form of authentication.\n" -#~ "\n" -#~ "Please select an appropriate authentication type and provide the " -#~ "necessary credentials below:\n" -#~ msgstr "" -#~ "Autentiseringsinformation\n" -#~ "\n" -#~ "Anslutningen \"%s\" kan behöva någon form av autentisering.\n" -#~ "\n" -#~ "Välj en lämplig autentiseringstyp och tillhandahåll nödvändig information " -#~ "nedan:\n" -#~ msgid "Authentication Required" -#~ msgstr "Autentisering krävs" -#~ msgid "_Authentication Type:" -#~ msgstr "_Autentiseringstyp:" -#~ msgid "_Remote name:" -#~ msgstr "_Fjärrnamn:" -#~ msgid "VPN Connection Manager (PPP generic)" -#~ msgstr "VPN-anslutningshanterare (allmän PPP)" -#~ msgid "00:00:00:00" -#~ msgstr "00:00:00:00" -#~ msgid "Delays & Timeouts" -#~ msgstr "Fördröjningar och tidsgränser" -#~ msgid "Packet Parameters" -#~ msgstr "Paketparametrar" -#~ msgid "Example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "Exempel: 172.16.0.0/16 10.11.12.0/24" -#~ msgid "" -#~ "A list of extra options to pppd as would be typed on the command line" -#~ msgstr "" -#~ "En lista på extra flaggor till pppd som de matats in på kommandoraden" -#~ msgid "C_hannel:" -#~ msgstr "Ka_nal:" -#~ msgid "Co_nnect delay:" -#~ msgstr "Anslu_tningsfördröjning:" -#~ msgid "Compression & Encryption" -#~ msgstr "Komprimering & kryptering" -#~ msgid "Connection" -#~ msgstr "Anslutning" -#~ msgid "Connection na_me:" -#~ msgstr "Anslutningsna_mn:" -#~ msgid "Context _number:" -#~ msgstr "_Sammanhangsnr:" -#~ msgid "Custom _PPP options:" -#~ msgstr "Anpassade _PPP-flaggor:" -#~ msgid "Debug _output" -#~ msgstr "Felsöknings_utdata" -#~ msgid "Disconnect after this many LCP echo requests fail" -#~ msgstr "Koppla från när så här många LCP echo-begäranden misslyckats" -#~ msgid "E_xclusive device access (UUCP-style lock)" -#~ msgstr "E_xklusiv enhetsåtkomst (lås i UUCP-stil)" -#~ msgid "Enable stateful _MPPE" -#~ msgstr "Aktivera \"stateful _MPPE\"" -#~ msgid "Find Device" -#~ msgstr "Sök enhet" -#~ msgid "" -#~ "For security reasons, options entered in the box above are checked " -#~ "against a list of allowed options before a connection is established. " -#~ "Currently there are no options on the list." -#~ msgstr "" -#~ "Av säkerhetsskäl kommer flaggor som matats in i rutan ovanför att " -#~ "kontrolleras mot en lista av tillåtna flaggor innan en anslutning " -#~ "etableras. För närvarande finns det inga flaggor i listan." -#~ msgid "GPRS Options" -#~ msgstr "GPRS-alternativ" -#~ msgid "Host name or IP address of the PPTP server" -#~ msgstr "Värdnamn eller IP-adress till PPTP-servern" -#~ msgid "IP a_ddress:" -#~ msgstr "IP-a_dress:" -#~ msgid "" -#~ "If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -#~ msgstr "" -#~ "Om BSD-komprimering inte tillåts kommer flaggan \"nobsdcomp\" att skickas " -#~ "till pppd" -#~ msgid "" -#~ "If Deflate compression is not allowed the 'nodefate' option is passed to " -#~ "pppd" -#~ msgstr "" -#~ "Om Deflate-komprimering inte tillåts kommer flaggan \"nodeflate\" att " -#~ "skickas till pppd" -#~ msgid "Maximum Receive Unit" -#~ msgstr "Största mottagningsenhet" -#~ msgid "Maximum Transmit Unit" -#~ msgstr "Största överföringsenhet" -#~ msgid "PPP Options" -#~ msgstr "PPP-alternativ" -#~ msgid "Refuse C_HAP" -#~ msgstr "Vägra C_HAP" -#~ msgid "Refuse _EAP" -#~ msgstr "Vägra _EAP" -#~ msgid "Refuse _MS CHAP" -#~ msgstr "Vägra _MS CHAP" -#~ msgid "Require 128 bit M_PPE encryption" -#~ msgstr "Kräv 128-bitars M_PPE-kryptering" -#~ msgid "Require MPPE _encryption" -#~ msgstr "Kräv MPPE-_kryptering" -#~ msgid "Require explicit IP _address" -#~ msgstr "Kräv explicit IP-_adress" -#~ msgid "Requires existing network connection" -#~ msgstr "Kräver en existerande nätverksanslutning" -#~ msgid "Routing" -#~ msgstr "Routing" -#~ msgid "Serial Options" -#~ msgstr "Seriealternativ" -#~ msgid "Service providers GPRS access point from device config" -#~ msgstr "GPRS-accesspunkt för tjänsteleverantörer från enhetskonfiguration" -#~ msgid "Service providers IP address" -#~ msgstr "IP-adress för tjänsteleverantörer" -#~ msgid "Telep_hone number:" -#~ msgstr "Tele_fonnummer:" -#~ msgid "" -#~ "This is the friendly name that will be used to identify this network " -#~ "connection, \n" -#~ "e.g. \"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Detta är det namn som kommer att användas för att identifiera detta " -#~ "nätverk, \n" -#~ "t.ex. \"Campus-VPN\" eller \"Företagsnätverket\"" -#~ msgid "Time in seconds between echo requests" -#~ msgstr "Tid i sekunder mellan echo-begäranden" -#~ msgid "Typ_e:" -#~ msgstr "Ty_p:" -#~ msgid "Use peer _DNS" -#~ msgstr "Använd fjärr-_DNS" -#~ msgid "When checked the \"refuse-chap\" option is passed to pppd." -#~ msgstr "" -#~ "När denna är kryssad kommer flaggan \"refuse-chap\" att skickas till pppd." -#~ msgid "When checked the \"refuse-eap\" option is passed to pppd." -#~ msgstr "" -#~ "När denna är kryssad kommer flaggan \"refuse-eap\" att skickas till pppd." -#~ msgid "When checked the \"refuse-mschap\" option is passed to pppd." -#~ msgstr "" -#~ "När denna är kryssad kommer flaggan \"refuse-mschap\" att skickas till " -#~ "pppd." -#~ msgid "When checked the 'lock' option is passed to pppd" -#~ msgstr "När denna är kryssad kommer flaggan \"lock\" att skickas till pppd." -#~ msgid "When checked the 'require-mppc' option is passed to pppd" -#~ msgstr "" -#~ "När denna är kryssad kommer flaggan \"require-mppc\" att skickas till " -#~ "pppd." -#~ msgid "" -#~ "When checked this sets the pppd 'debug' option and adds some extra " -#~ "information from the NetworkManager plugin" -#~ msgstr "" -#~ "När denna är kryssad ställs pppd-flaggan \"debug\" in och lägger till " -#~ "extra information från insticksmodulen NetworkManager" -#~ msgid "When checked this sets the pppd 'noipdefault' option" -#~ msgstr "När denna är kryssad ställs pppd-flaggan \"noipdefault\" in" -#~ msgid "When checked this sets the pppd 'usepeerdns' option" -#~ msgstr "När denna är kryssad ställs pppd-flaggan \"usepeerdns\" in" -#~ msgid "" -#~ "When this check box is cleared the \"noauth\" option is passed to pppd." -#~ msgstr "" -#~ "När denna inte är kryssad kommer flaggan \"noauth\" att skickas till pppd." -#~ msgid "_Access point name:" -#~ msgstr "Namn på _accesspunkt:" -#~ msgid "_Device address:" -#~ msgstr "_Enhetsadress:" -#~ msgid "_Hardware RTS/CTS" -#~ msgstr "_Hårdvaru-RTS/CTS" -#~ msgid "_Import Saved Configuration..." -#~ msgstr "_Importera sparad konfiguration..." -#~ msgid "_Modem connection" -#~ msgstr "_Modemanslutning" -#~ msgid "_Only use VPN connection for these addresses:" -#~ msgstr "Använd _endast VPN-anslutning för dessa adresser:" -#~ msgid "_Packet type:" -#~ msgstr "_Pakettyp:" -#~ msgid "_Peer DNS through tunnel" -#~ msgstr "_Fjärr-DNS genom tunnel" -#~ msgid "_Require MPPC compression" -#~ msgstr "_Kräv MPPC-komprimering" -#~ msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -#~ msgstr "pppd-tunnel (PPTP, BTGPRS, Uppringd)" -#~ msgid "Name" -#~ msgstr "Namn" -#~ msgid "PPTP Server" -#~ msgstr "PPTP-server" -#~ msgid "Telephone Number" -#~ msgstr "Telefonnummer" -#~ msgid "Bluetooth Address" -#~ msgstr "Bluetooth-adress" -#~ msgid "Bluetooth Channel" -#~ msgstr "Bluetooth-kanal" -#~ msgid "GPRS APN" -#~ msgstr "GPRS APN" -#~ msgid "GPRS IP" -#~ msgstr "GPRS-IP" -#~ msgid "GPRS Context No." -#~ msgstr "GPRS-sammanhangsnr" -#~ msgid "GPRS Packet Type" -#~ msgstr "GPRS-pakettyp" -#~ msgid "Use CTS/RTS flow control" -#~ msgstr "Använd CTS/RTS-flödeskontroll" -#~ msgid "Connect via a modem" -#~ msgstr "Anslut via ett modem" -#~ msgid "Require IP to be provided" -#~ msgstr "Kräv att IP tillhandahålls" -#~ msgid "Use Peer DNS" -#~ msgstr "Använd fjärr-DNS" -#~ msgid "Use MPPE encryption" -#~ msgstr "Använd MPPE-kryptering" -#~ msgid "Use 128 bit MPPE encryption" -#~ msgstr "Använd 128-bitars MPPE-kryptering" -#~ msgid "Enable stateful MPPE" -#~ msgstr "Aktivera \"stateful MPPE\"" -#~ msgid "Do not use deflate compression" -#~ msgstr "Använd inte Deflate-komprimering" -#~ msgid "Do not use BSD compression" -#~ msgstr "Använd inte BSD-komprimering" -#~ msgid "Exclusive device access by pppd" -#~ msgstr "Exklusiv enhetsåtkomst för pppd" -#~ msgid "Authenticate remote peer" -#~ msgstr "Autentisera fjärrpart" -#~ msgid "Refuse EAP" -#~ msgstr "Vägra EAP" -#~ msgid "Refuse CHAP" -#~ msgstr "Vägra CHAP" -#~ msgid "Maximum transmit unit (in bytes)" -#~ msgstr "Maximal överföringsenhet (i byte)" -#~ msgid "Maximum receive unit (in bytes)" -#~ msgstr "Maximal mottagningsenhet (i byte)" -#~ msgid "Number of failed LCP echos to cause disconnect" -#~ msgstr "Antal misslyckade LCP-ekon som orsakar frånkoppling" -#~ msgid "Interval (in seconds) at which to issue LCP echos" -#~ msgstr "Intervall (i sekunder) som LCP-ekon ska göras" -#~ msgid "Interval (in milliseconds) to wait before connecting." -#~ msgstr "Intervall (i millisekunder) att vänta före anslutning." -#~ msgid "Custom PPP options" -#~ msgstr "Anpassade PPP-flaggor" -#~ msgid "Use Peer DNS over the Tunnel" -#~ msgstr "Använd fjärr-DNS över tunneln" -#~ msgid "Specific networks available" -#~ msgstr "Specifika tillgängliga nätverk" -#~ msgid "Limit to specific networks" -#~ msgstr "Begränsa till specifika nätverk" -#~ msgid "The following '%s' connection will be created:" -#~ msgstr "Följande \"%s\"-anslutning kommer att skapas:" -#~ msgid "\t%s: %s\n" -#~ msgstr "\t%s: %s\n" -#~ msgid "The connection details can be changed using the \"Back\" button." -#~ msgstr "" -#~ "Anslutningsdetaljerna kan ändras genom att använda knappen \"Bakåt\"." -#~ msgid "Select file to import" -#~ msgstr "Välj fil att importera" -#~ msgid "Save as..." -#~ msgstr "Spara som..." -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "En fil med namnet \"%s\" finns redan." -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Vill du ersätta den med den du håller på att spara?" -#~ msgid "auth-chap-window" -#~ msgstr "auth-chap-window" -#~ msgid "auth-mschapv2-window" -#~ msgstr "auth-mschapv2-window" -#~ msgid "auth-none-window" -#~ msgstr "auth-none-window" -#~ msgid "Connection Name" -#~ msgstr "Anslutningsnamn" -#~ msgid "Require Explicit IP Addr" -#~ msgstr "Kräv explicit ip-addr" -#~ msgid "Telephone number to dial" -#~ msgstr "Telefonnummer att ringa" -#~ msgid "_Channel:" -#~ msgstr "_Kanal:" -#~ msgid "_IP Address:" -#~ msgstr "_Ip-adress:" -#~ msgid "Tunnel via pppd" -#~ msgstr "Tunnla via pppd" -#~ msgid "Bluetooth options" -#~ msgstr "Bluetooth-alternativ" -#~ msgid "Dial-up options" -#~ msgstr "Uppringningsalternativ" -#~ msgid "GPRS options" -#~ msgstr "GPRS-alternativ" -#~ msgid "PPTP options" -#~ msgstr "PPTP-alternativ" -#~ msgid "Required Information" -#~ msgstr "Nödvändig information" -#~ msgid "Routing options" -#~ msgstr "Routingalternativ" -#~ msgid "Connection Type:" -#~ msgstr "Anslutningstyp:" -#~ msgid "MPPE encryption" -#~ msgstr "MPPE-kryptering" -#~ msgid "Numeric Tweaks" -#~ msgstr "Numeriska justeringar" -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Ange den information som har tillhandahållits av din systemadministratör " -#~ "nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det " -#~ "när du ansluter." -#~ msgid "Show on connection on menu" -#~ msgstr "Visa på anslutning på meny" -#~ msgid "" -#~ "_Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "_Namn som används för att identifiera anslutningen till det privata " -#~ "nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\"" -#~ msgid "Remember password for this session" -#~ msgstr "Kom ihåg lösenordet för denna session" -#~ msgid "Save password in keyring" -#~ msgstr "Spara lösenordet i nyckelring" -#~ msgid "Bluetooth options" -#~ msgstr "Bluetooth-alternativ" -#~ msgid "Dial-up options" -#~ msgstr "Uppringningsalternativ" -#~ msgid "PPTP options" -#~ msgstr "PPTP-alternativ" -#~ msgid "Gateway:" -#~ msgstr "Gateway:" -#~ msgid "Only use VPN connection for these addresses" -#~ msgstr "Använd endast VPN-anslutning för dessa adresser" -#~ msgid "Group Name:" -#~ msgstr "Gruppnamn:" -#~ msgid "Override user name" -#~ msgstr "Åsidosätt användarnamn" -#~ msgid "Use domain for authentication" -#~ msgstr "Använd domän för autentisering" -#~ msgid "_Import..." -#~ msgstr "_Importera..." -#~ msgid "Compatible Cisco VPN client (vpnc)" -#~ msgstr "Kompatibel Cisco VPN-klient (vpnc)" -#~ msgid "\tUsername: %s\n" -#~ msgstr "\tAnvändarnamn: %s\n" -#~ msgid "\tDomain: %s\n" -#~ msgstr "\tDomän: %s\n" -#~ msgid "" -#~ "The following vpnc VPN connection will be created:\n" -#~ "\n" -#~ "\tName: %s\n" -#~ "\n" -#~ "\tGateway: %s\n" -#~ "\tGroup Name: %s\n" -#~ "%s%s%s\n" -#~ "The connection details can be changed using the \"Edit\" button.\n" -#~ msgstr "" -#~ "Följande vpnc-VPN-anslutning kommer att skapas:\n" -#~ "\n" -#~ "\tNamn: %s\n" -#~ "\n" -#~ "\tGateway: %s\n" -#~ "\tGruppnamn: %s\n" -#~ "%s%s%s\n" -#~ "Anslutningsdetaljerna kan ändras genom att använda knappen \"Redigera\".\n" -#~ msgid "TCP tunneling not supported" -#~ msgstr "TCP-tunnling stöds inte" -#~ msgid "" -#~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled " -#~ "through TCP which is currently not supported in the vpnc software.\n" -#~ "\n" -#~ "The connection can still be created, with TCP tunneling disabled, however " -#~ "it may not work as expected." -#~ msgstr "" -#~ "VPN-inställningsfilen \"%s\" anger att VPN-trafiken ska tunnlas genom TCP " -#~ "vilket för tillfället inte stöds i vpnc-programvaran.\n" -#~ "\n" -#~ "Anslutningen kan fortfarande skapas, med inaktiverad TCP-tunnling, men " -#~ "det kanske inte fungerar som väntat." -#~ msgid "Cannot import settings" -#~ msgstr "Kan inte importera inställningar" -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN-inställningsfilen \"%s\" innehåller inte giltiga data." -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom användarnamnet och lösenordet inte " -#~ "accepterades." -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde startas." -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde ansluta " -#~ "till VPN-servern." -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-konfigurationsalternativen var " -#~ "ogiltiga." -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-programmet mottog en ogiltig " -#~ "konfiguration från VPN-servern." - diff --git a/vpn-daemons/pptp/po/th.po b/vpn-daemons/pptp/po/th.po deleted file mode 100644 index 12e70784f3..0000000000 --- a/vpn-daemons/pptp/po/th.po +++ /dev/null @@ -1,573 +0,0 @@ -# Thai translation of NetworkManager-ppp_vpn. -# Copyright (C) 2007 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager-ppp_vpn package. -# Theppitak Karoonboonyanan , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-ppp_vpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-30 10:19+0700\n" -"PO-Revision-Date: 2007-01-30 12:01+0700\n" -"Last-Translator: Theppitak Karoonboonyanan \n" -"Language-Team: Thai \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "รูปแบบการยืนยันตัวบุคคล:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "_จำไว้สำหรับใช้ในวาระนี้" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_บันทึกลงในพวงกุญแจ" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "คุณจะต้องยืนยันตัวบุคคลเพื่อเข้าใช้ '%s'" - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "ยืนยันตัวบุคคลสำหรับการเชื่อมต่อ" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"ข้อมูลการยืนยันตัวบุคคล\n" -"\n" -"การเชื่อมต่อ '%s' อาจต้องการการยืนยันตัวบุคคลรูปแบบใดรูปแบบหนึ่ง\n" -"\n" -"กรุณาเลือกรูปแบบการยืนยันตัวบุคคลที่เหมาะสม และป้อนข้อมูลรหัสลับที่จำเป็นด้านล่างนี้:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "จำเป็นต้องยืนยันตัวบุคคล" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "รูปแ_บบการยืนยันตัวบุคคล:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Password:" -msgstr "_รหัสผ่าน:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "ชื่อที่ฝั่งโ_น้น:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:268 -msgid "_Username:" -msgstr "_ชื่อผู้ใช้:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:15 -msgid "auth-chap-window" -msgstr "auth-chap-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:16 -msgid "auth-mschapv2-window" -msgstr "auth-mschapv2-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:17 -msgid "auth-none-window" -msgstr "auth-none-window" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "รหัสผ่านที่_สอง:" - -#: ../auth-dialog/gnome-two-password-dialog.c:270 -msgid "_Domain:" -msgstr "โ_ดเมน:" - -#: ../auth-dialog/gnome-two-password-dialog.c:355 -msgid "Connect _anonymously" -msgstr "เชื่อมต่อแบบ_นิรนาม" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect as _user:" -msgstr "เชื่อมต่อในนาม_ผู้ใช้:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "_จำรหัสผ่านสำหรับใช้ในวาระนี้" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_บันทึกรหัสผ่านลงในพวงกุญแจ" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "เพิ่ม, ลบ และแก้ไข การเชื่อมต่อ VPN" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "เครื่องมือจัดการการเชื่อมต่อ VPN (ทั่วไป)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "การบีบอัด" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Connection Name" -msgstr "ชื่อการเชื่อมต่อ" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Delays and TImeouts" -msgstr "การหน่วงเวลาและกำหนดเวลาคอย" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "Encryption" -msgstr "การเข้ารหัสลับ" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "IP Options" -msgstr "ตัวเลือกเกี่ยวกับ IP" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Packet Parameters" -msgstr "พารามิเตอร์ของแพ็กเก็ต" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "ตัวอย่าง: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "รายการตัวเลือกเพิ่มเติมสำหรับ pppd ตามที่จะส่งในบรรทัดคำสั่ง" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow BSD Compression" -msgstr "เปิดใช้การบีบอัดแบบ BSD" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Allow Deflate compression" -msgstr "เปิดใช้การบีบอัดแบบ Deflate" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "Authenticate Peer" -msgstr "ยืนยันเอกลักษณ์ของอีกฝ่าย" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Authentication" -msgstr "การยืนยันตัวบุคคล" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "การบีบอัด & การเข้ารหัสลับ" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "การเชื่อมต่อ" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Debug Output" -msgstr "เขียนข้อมูลดีบั๊ก" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "ตัดการเชื่อมต่อหลังจากที่การร้องขอ LCP echo ล้มเหลวเป็นจำนวนครั้งเท่านี้" - -#: ../properties/nm-ppp-dialog.glade.h:18 -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "เปิดใช้ MPPE แบบ stateful" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Exclusive device access (UUCP-style lock)" -msgstr "เข้าใช้อุปกรณ์แบบเอกสิทธิ์ (ล็อคในแบบ UUCP)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Find Device" -msgstr "ตรวจหาอุปกรณ์" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"ด้วยเหตุผลด้านความปลอดภัย ตัวเลือกที่ป้อนในกล่องด้านบนนี้ จะถูกตรวจสอบกับรายการตัวเลือกที่อนุญาต " -"ก่อนจะเริ่มเชื่อมต่อ ขณะนี้ยังไม่มีตัวเลือกในรายการดังกล่าว" - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "GPRS Options" -msgstr "ตัวเลือก GPRS" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Hardware RTS/CTS" -msgstr "RTS/CTS แบบฮาร์ดแวร์" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "Host name or IP address of the PPTP server" -msgstr "ชื่อโฮสต์หรือที่อยู่ IP ของเซิร์ฟเวอร์ PPTP" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "ถ้าไม่เลือกเปิดใช้การบีบอัดแบบ BSD จะส่งตัวเลือก 'nobsdcomp' ให้กับ pppd" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "ถ้าไม่เลือกเปิดใช้การบีบอัดแบบ Deflate จะส่งตัวเลือก 'nodeflate' ให้กับ pppd" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "Maximum Receive Unit" -msgstr "หน่วยของการรับข้อมูลสูงสุด (Maximum Receive Unit)" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "Maximum Transmit Unit" -msgstr "หน่วยของการส่งข้อมูลสูงสุด (Maximum Transmit Unit)" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "Modem Connection" -msgstr "เชื่อมต่อด้วยโมเด็ม" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "PPP Options" -msgstr "ตัวเลือก PPP" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Peer DNS through tunnel" -msgstr "ใช้ DNS จากอีกฝั่งผ่าน tunnel" - -#: ../properties/nm-ppp-dialog.glade.h:32 -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "ปฏิเสธ CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:33 -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "ปฏิเสธ EAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse MS CHAP" -msgstr "ปฏิเสธ MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Require 128 bit MPPE encryption" -msgstr "ต้องใช้การเข้ารหัสลับ MPPE 128 บิต" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require Explicit IP Addr" -msgstr "ต้องการที่อยู่ IP แบบชัดแจ้ง" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPC Compression" -msgstr "ต้องใช้การบีบอัด MPPC" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require MPPE encryption" -msgstr "ต้องใช้การเข้ารหัสลับ MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "ต้องมีการเชื่อมต่อเครือข่ายอยู่ก่อนแล้ว" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "การกำหนดเส้นทาง" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "ตัวเลือกพอร์ตอนุกรม" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "access point สำหรับ GPRS ของผู้ให้บริการ ตามค่าตั้งของอุปกรณ์" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "ที่อยู่ IP ของผู้ให้บริการ" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telephone number to dial" -msgstr "หมายเลขโทรศัพท์ที่จะหมุน" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"นี่คือชื่อที่จำง่ายซึ่งจะใช้เรียกการเชื่อมต่อไปยังเครือข่ายนี้\n" -"เช่น \"VPN มหาวิทยาลัย\" หรือ \"เครือข่ายบริษัท\"" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "ช่วงเวลาเป็นวินาทีระหว่างการร้องขอ echo แต่ละครั้ง" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Type:" -msgstr "ชนิด:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "ใช้ข้อมูล DNS จากอีกฝั่ง" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "เมื่อกาเลือก จะส่งตัวเลือก \"refuse-chap\" ให้กับ pppd" - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "เมื่อกาเลือก จะส่งตัวเลือก \"refuse-eap\" ให้กับ pppd" - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "เมื่อกาเลือก จะส่งตัวเลือก \"refuse-mschap\" ให้กับ pppd" - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "เมื่อกาเลือก จะส่งตัวเลือก 'lock' ให้กับ pppd" - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "เมื่อกาเลือก จะส่งตัวเลือก 'require-mppc' ให้กับ pppd" - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" -"เมื่อกาเลือก จะกำหนดตัวเลือก 'debug' ให้กับ pppd และเพิ่มเติมข้อมูลจากปลั๊กอินของ " -"NetworkManager" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "เมื่อกาเลือก จะกำหนดตัวเลือก 'noipdefault' ให้กับ pppd" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "เมื่อกาเลือก จะกำหนดตัวเลือก 'usepeerdns' ให้กับ pppd" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "เมื่อไม่กาเลือก จะส่งตัวเลือก \"noauth\" ให้กับ pppd" - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access Point Name:" -msgstr "ชื่อ _Access Point:" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Channel:" -msgstr "_ช่องสัญญาณ:" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Context Num" -msgstr "หมายเลข _Context" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Custom PPP options:" -msgstr "ตัวเลือก PPP _กำหนดเอง:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Device Address:" -msgstr "ที่อยู่_อุปกรณ์:" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Gateway:" -msgstr "เ_กตเวย์:" - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_IP Address:" -msgstr "ที่อยู่ _IP:" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Import Saved Configuration..." -msgstr "_นำเข้าค่าตั้งที่บันทึกไว้..." - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Only use VPN connection for these addresses" -msgstr "ใ_ช้การเชื่อมต่อ VPN กับที่อยู่เหล่านี้เท่านั้น" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Packet Type" -msgstr "ชนิดแ_พ็กเก็ต" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Telephone Number:" -msgstr "หมายเลขโ_ทรศัพท์:" - -#: ../properties/nm-ppp-dialog.glade.h:70 -msgid "connect-delay" -msgstr "connect-delay" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "pppd tunnel (PPTP, BTGPRS, Dialup)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "ชื่อ" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "เซิร์ฟเวอร์ PPTP" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "หมายเลขโทรศัพท์" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "ที่อยู่บลูทูธ" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "ช่องสัญญาณบลูทูธ" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "APN ของ GPRS" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "IP ของ GPRS" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "หมายเลข Context ของ GPRS" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "ชนิดแพ็กเก็ต GPRS" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "ใช้การควบคุมกระแสด้วย CTS/RTS" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "เชื่อมต่อผ่านโมเด็ม" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "ต้องมีการกำหนด IP มาให้" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "ใช้การเข้ารหัสลับ MPPE" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "ใช้การเข้ารหัสลับ MPPE 128 บิต" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "ใช้การบีบอัด MPPC" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "ไม่ใช้การบีบอัดแบบ deflate" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "ไม่ใช้การบีบอัดแบบ BSD" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "ให้ pppd เข้าใช้อุปกรณ์แบบเอกสิทธิ์" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "ยืนยันเอกลักษณ์ของเครื่องอีกฝั่ง" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "ปฏิเสธ MSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "หน่วยของการส่งข้อมูลสูงสุด (เป็นไบต์)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "หน่วยของการรับข้อมูลสูงสุด (เป็นไบต์)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "จำนวนครั้งของ LCP echo ที่ล้มเหลว ก่อนจะตัดการเชื่อมต่อ" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "ช่วงเวลา (เป็นวินาที) ระหว่างการส่ง LCP echo แต่ละครั้ง" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "ช่วงเวลา (เป็นมิลลิวินาที) ที่จะคอยก่อนเชื่อมต่อ" - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "ตัวเลือก PPP กำหนดเอง" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "ใช้ DNS จากอีกฝั่งผ่าน tunnel" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "เครือข่ายจำเพาะที่มี" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "จำกัดการใช้งานที่เครือข่ายจำเพาะเท่านั้น" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "จะสร้างการเชื่อมต่อ '%s' ต่อไปนี้:" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "สามารถเปลี่ยนแปลงรายละเอียดการเชื่อมต่อได้ โด้ใช้ปุ่ม \"ย้อนกลับ\"" - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "เลือกแฟ้มที่จะนำเข้า" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "บันทึกเป็น..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "มีแฟ้มชื่อ \"%s\" อยู่ก่อนแล้ว" - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "คุณต้องการเขียนทับแฟ้มนี้ด้วยข้อมูลที่กำลังจะบันทึกหรือไม่?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "การเชื่อมต่อ VPN ล้มเหลว" diff --git a/vpn-daemons/pptp/po/uk.po b/vpn-daemons/pptp/po/uk.po deleted file mode 100644 index 5e18928c90..0000000000 --- a/vpn-daemons/pptp/po/uk.po +++ /dev/null @@ -1,576 +0,0 @@ -# Ukrainian translation of NetworkManager pptp -# Copyright (C) Free Software Foundation, 2005 -# This file is distributed under the same license as the NetworkManager package. -# Maxim Dziumanenko , 2005-2007 -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-16 17:16+0200\n" -"PO-Revision-Date: 2007-02-16 03:32+0200\n" -"Last-Translator: Maxim Dziumanenko \n" -"Language-Team: Ukrainian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "Тип автентифікації:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "Па_м'ятати для цього сеансу" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "З_берегти у в'язці паролів" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "Для доступу до мережі '%s' потрібна автентифікація." - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "Автентифікація з'єднання'" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"Інформація про автентифікацію\n" -"\n" -"З'єднання '%s' вимагає певної форми автентифікації.\n" -"\n" -"Виберіть тип автентифікації та вкажіть необхідні параметри:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "Потрібна автентифікація" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "Тип _автентифікації:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:272 -msgid "_Password:" -msgstr "_Пароль:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "_Віддалена адреса IP:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:268 -msgid "_Username:" -msgstr "_Ім'я:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:15 -msgid "auth-chap-window" -msgstr "auth-chap-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:16 -msgid "auth-mschapv2-window" -msgstr "auth-mschapv2-window" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:17 -msgid "auth-none-window" -msgstr "auth-none-window" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "_Вторинний пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:270 -msgid "_Domain:" -msgstr "_Домен" - -#: ../auth-dialog/gnome-two-password-dialog.c:355 -msgid "Connect _anonymously" -msgstr "З'єднуватись _анонімно" - -#: ../auth-dialog/gnome-two-password-dialog.c:360 -msgid "Connect as _user:" -msgstr "З'єднуватись як _користувач:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "Па_м'ятати пароль для цього сеансу" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "З_берегти пароль у в'язці паролів" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Додавання, видалення та редагування з'єднань типу VPN" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "Менеджер з'єднань VPN (загальний PPP)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "Стиснення" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Connection Name" -msgstr "Назва з'єднання" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Delays and TImeouts" -msgstr "Затримки та таймаути" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "Encryption" -msgstr "Шифрування" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "IP Options" -msgstr "Параметри IP" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Packet Parameters" -msgstr "Параметри пакету" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "приклад: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "Список додаткових параметрів pppd, у вигляді у якому вони б вводились у командному рядку" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow BSD Compression" -msgstr "Увімкнути стиснення BSD" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Allow Deflate compression" -msgstr "Увімкнути стиснення Deflate" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "Authenticate Peer" -msgstr "Автентифікація рівного" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Authentication" -msgstr "Автентифікація" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "Стиснення та шифрування" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "З'єднання" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Debug Output" -msgstr "Параметри налагодження" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "Вимикати після великої кількості помилок при запитах LCP" - -#: ../properties/nm-ppp-dialog.glade.h:18 -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "Увімкнути MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Exclusive device access (UUCP-style lock)" -msgstr "Ексклюзивна адреса пристрою (блокування у стилі UUCP)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Find Device" -msgstr "Пошук пристрою" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"З міркувань безпеки, перед встановленням з'єднання параметри, введені у наведеному вище текстовому полі, звіряються зі " -"списком дозволених параметрів. Наразі у списку немає значень." - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "GPRS Options" -msgstr "Параметри GPRS" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Hardware RTS/CTS" -msgstr "Апаратний контроль RTS/CTS" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "Host name or IP address of the PPTP server" -msgstr "Назва вузла або адреса IP сервера PPTP" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" -"Якщо стиснення типу BSD не допускається, програмі pppd передається параметр 'nobsdcomp'" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" -"Якщо стиснення типу BSD не допускається, програмі pppd передається параметр 'nodefate'" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "Maximum Receive Unit" -msgstr "Максимальна одиниця прийому (MRU)" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "Maximum Transmit Unit" -msgstr "Максимальна одиниця передачі (MTU)" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "Modem Connection" -msgstr "Модемне з'єднання" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "PPP Options" -msgstr "Параметри PPP" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Peer DNS through tunnel" -msgstr "Передавати DNS крізь тунель" - -#: ../properties/nm-ppp-dialog.glade.h:32 -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "Не допускати CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:33 -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "Не допускати EAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse MS CHAP" -msgstr "Не допускати MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Require 128 bit MPPE encryption" -msgstr "Вимагається 128-бітне шифрування MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require Explicit IP Addr" -msgstr "Вимагається явне вказування адреси IP" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPC Compression" -msgstr "Використовувати стиснення MPPC" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require MPPE encryption" -msgstr "Потрібне шифрування типу MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "Потрібне існуюче мережне з'єднання'" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "Маршрутизація" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "Параметри послідовного порту" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "Точка доступу постачальника послуг GPRS з конфігурації пристрою" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "Адреса IP постачальник послуг" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telephone number to dial" -msgstr "Телефонний номер" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"_Назва, що використовується для ідентифікації з'єднання з приватною мережею, " -"наприклад \"Campus VPN\" чи \"Corporate Network\"" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "Час у секундах між запитами" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Type:" -msgstr "Тип:" - -#: ../properties/nm-ppp-dialog.glade.h:49 -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Використовувати Peer DNS" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "Якщо відмічено, програмі pppd передається параметр \"refuse-chap\"." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "Якщо відмічено, програмі pppd передається параметр \"refuse-eap\"." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "Якщо відмічено, програмі pppd передається параметр \"refuse-mschap\"." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "Якщо відмічено, програмі pppd передається параметр \"lock\"." - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "Якщо відмічено, програмі pppd передається параметр \"require-mppc\"." - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "Якщо відмічено, програмі pppd передається параметр \"debug\" та додається додаткова інформація від модуля NetworkManager." - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "Якщо відмічено, програмі pppd передається параметр \"noipdefault\"." - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "Якщо відмічено, програмі pppd передається параметр \"usepeerdns\"." - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "Якщо відмічено, програмі pppd передається параметр \"noauth\"." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access Point Name:" -msgstr "Назва _точки доступу:" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Channel:" -msgstr "_Канал:" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Context Num" -msgstr "Номер _контексту" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Custom PPP options:" -msgstr "_Інші параметри PPP:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Device Address:" -msgstr "Адреса _пристрою:" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Gateway:" -msgstr "_Шлюз:" - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_IP Address:" -msgstr "Адреса _IP:" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Import Saved Configuration..." -msgstr "_Імпорт збереженої конфігурації..." - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Only use VPN connection for these addresses" -msgstr "Використовувати VPN _лише для цих адрес" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Packet Type" -msgstr "Тип _пакетів" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Telephone Number:" -msgstr "Номер _телефону:" - -#: ../properties/nm-ppp-dialog.glade.h:70 -msgid "connect-delay" -msgstr "connect-delay" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "pppd tunnel (PPTP, BTGPRS, Dialup)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "Назва" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "Сервер PPTP" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "Номер телефону" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "Адреса Bluetooth" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "Канал Bluetooth" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "Номер контексту GPRS" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "Тип пакетів GPRS" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "Контроль потоку через CTS/RTS" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "З'єднуватись через модем" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "Вимагати надання IP" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "Використовувати шифрування MPPE" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "128-бітне шифрування MPPE" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "Використовувати шифрування MPPC" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "Не використовувати стиснення deflate" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "Не використовувати стиснення BSD" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "Ексклюзивний доступ pppd до пристрою" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "Автентифікація віддаленої сторони" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "Не приймати MSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "Максимальна одиниця передачі MTU (у байтах)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "Максимальна одиниця прийому MRU (у байтах)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "Кількість помилок у LCP-запитах для розриву з'єднання" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "Інтервал (у секундах) з яким видаються LCP-запити" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "Інтервал очікування (у мілісекундах) перед з'єднанням." - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "Інші параметри PPP" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "Використовувати Peer DNS через Tunnel" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "Доступні певні мережі" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "Обмеження певними мережами" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "Буде створено наступне з'єднання '%s':" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "Подробиці про з'єднання можна змінити кнопкою \"Назад\"." - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "Виберіть файл для імпорту" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "Зберегти як..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Файл з назвою \"%s\" вже існує." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Замінити його?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "Помилка з'єднання VPN" - diff --git a/vpn-daemons/pptp/po/vi.po b/vpn-daemons/pptp/po/vi.po deleted file mode 100644 index cbf2fe535f..0000000000 --- a/vpn-daemons/pptp/po/vi.po +++ /dev/null @@ -1,575 +0,0 @@ -# Vietnamese translation for Network Manager PPTP. -# Copyright © 2008 Free Software Foundation, Inc. -# Clytie Siddall , 2006-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-27 03:58+0100\n" -"PO-Revision-Date: 2008-06-06 14:48+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.7b3\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "Kiểu xác thực:" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "Nhớ cho _buổi hợp này" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "_Lưu vào vòng khoá" - -#: ../auth-dialog-general/main.c:48 -#: ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "Bạn cần phải xác thực để truy cập đến « %s »." - -#: ../auth-dialog-general/main.c:51 -#: ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "Xác thực kết nối" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"Thông tin xác thực\n" -"\n" -"Kết nối « %s » có thể yêu cầu xác thực kiểu nào.\n" -"\n" -"Hãy chọn một kiểu xác thực thích hợp và cung cấp thông tin đòi hỏi bên dưới:\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "Đòi hỏi xác thực" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "Kiểu _xác thực:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Mật khẩu :" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "Tê_n ở xa:" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Tên người dùng:" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Mật khẩu _phụ :" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Miền:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Kết nối nặc d_anh" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Kết nối _với tư cách người dùng:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "Nhớ mật khẩu cho _buổi hợp này" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "_Lưu mật khẩu vào vòng khoá" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Thêm, Bỏ và Sửa kết nối VPN" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "Bộ Quản Lý Kết Nối VPN (PPP giống loài)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "00:00:00:00" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "Nén" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Delays & Timeouts" -msgstr "Khoảng đợi và Thời hạn" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Encryption" -msgstr "Mật mã" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "IP Options" -msgstr "Tùy chọn IP" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "Packet Parameters" -msgstr "Tham số Gói tin" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Example: 172.16.0.0/16 10.11.12.0/24" -msgstr "v.d.: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "Danh sách các tùy chọn bổ sung tới pppd, như được gõ vào dòng lệnh" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "Allow B_SD Compression" -msgstr "Cho phép nén kiểu B_SD" - -#: ../properties/nm-ppp-dialog.glade.h:10 -msgid "Allow _Deflate compression" -msgstr "Cho phép nén kiểu _Deflate" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Authentication" -msgstr "Xác thực" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "C_hannel:" -msgstr "Kên_h:" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Co_nnect delay:" -msgstr "Khoả_ng đợi kết nối:" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "Nén và Mật mã" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "Kết nối" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Connection na_me:" -msgstr "Tên _kết nối:" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Context _number:" -msgstr "Số _ngữ cảnh:" - -#: ../properties/nm-ppp-dialog.glade.h:18 -msgid "Custom _PPP options:" -msgstr "Tùy chọn _PPP tự chọn:" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Debug _output" -msgstr "Kết _xuất gỡ lỗi:" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "Ngắt kết nối sau số này các yêu cầu vọng LCP không thành công" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "E_xclusive device access (UUCP-style lock)" -msgstr "Truy cập đến thiết bị dành riêng (khoá kiểu _UUCP)" - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "Enable stateful _MPPE" -msgstr "Bật _MPPE có tình trạng" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Find Device" -msgstr "Tìm thiết bị" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" -"Vì ly do bảo mật, các tùy chọn được nhập vào hộp bên trên được kiểm tra so với danh sách các tùy chọn được phép, trước khi thiết lập kết nối. Hiện thời không có tùy chọn nằm trong danh sách đó." - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "GPRS Options" -msgstr "Tùy chọn GPRS" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "Host name or IP address of the PPTP server" -msgstr "Tên máy hay địa chỉ IP của máy phục vụ PPTP" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "IP a_ddress:" -msgstr "Địa chỉ _IP:" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" -"Nếu không cho phép nén kiểu BSD, tùy chọn « nobsdcomp » được gửi qua cho pppd" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" -"Nếu không cho phép nén kiểu Deflate, tùy chọn « nodefate » được gửi qua cho " -"pppd" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "Maximum Receive Unit" -msgstr "Đơn vị nhận tối đa" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Maximum Transmit Unit" -msgstr "Đơn vị truyền tối đa" - -#: ../properties/nm-ppp-dialog.glade.h:32 -msgid "PPP Options" -msgstr "Tùy chọn PPP" - -#: ../properties/nm-ppp-dialog.glade.h:33 -msgid "Refuse C_HAP" -msgstr "Từ chối C_HAP" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse _EAP" -msgstr "Từ chối _EAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Refuse _MS CHAP" -msgstr "Từ chối _MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require 128 bit M_PPE encryption" -msgstr "Đòi hỏi mật mã M_PPE 128 bit" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPE _encryption" -msgstr "Đòi hỏi _mật mã MPPE" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require explicit IP _address" -msgstr "Đòi hỏi đị_a chỉ IP xác định" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "Đòi hỏi kết nối mạng đang chạy" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "Định tuyến" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "Tùy chọn Nối tiếp" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "Điểm truy cập GPRS của nhà cung cấp dịch vụ, từ cấu hình thiết bị" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "Địa chỉ IP của nhà cung cấp dịch vụ" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telep_hone number:" -msgstr "Số điện t_hoại:" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" -"Đân là tên dễ nhớ sẽ được dùng để nhận diện kết nối mạng này\n" -" v.d. « VPN đại học » hay « Mạng công ty »." - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "Thời gian theo giây giữa hai yêu cầu vọng" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Typ_e:" -msgstr "Kiể_u :" - -#: ../properties/nm-ppp-dialog.glade.h:49 -msgid "Use peer _DNS" -msgstr "_Dùng DNS ngang hàng" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "Khi bật, tùy chọn « refuse-chap » được gửi qua cho pppd." - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "Khi bật, tùy chọn « refuse-eap » được gửi qua cho pppd." - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "Khi bật, tùy chọn « refuse-mschap » được gửi qua cho pppd." - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "Khi bật, tùy chọn « lock » được gửi qua cho pppd." - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "Khi bật, tùy chọn « require-mppc » được gửi qua cho pppd." - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" -"Khi bật, có đặt tùy chọn « debug » (gỡ lỗi) của pppd, cũng thêm thông tin từ phần bổ sung NetworkManager" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "" -"Khi bật, có đặt tùy chọn « noipdefault » (không có mặc định IP) của pppd" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "" -"Khi bật, có đặt tùy chọn « usepeerdns » (dùng DNS ngang hàng) của pppd" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "Khi tắt, tùy chọn « noauth » (không xác thực) được gửi qua cho pppd." - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access point name:" -msgstr "Tên điểm t_ruy cập:" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Authenticate peer" -msgstr "Xác thực ng_ang hàng" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Device address:" -msgstr "Địa chỉ thiết _bị:" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Gateway:" -msgstr "Cổn_g ra:" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Hardware RTS/CTS" -msgstr "RTS/CTS p_hần cứng" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Import Saved Configuration..." -msgstr "_Nhập cấu hình đã lưu..." - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_Modem connection" -msgstr "Kết nối bộ điều giả_i" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Only use VPN connection for these addresses:" -msgstr "Chỉ dùng kết nối VPN ch_o những địa chỉ này:" - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Packet type:" -msgstr "K_iểu gói tin:" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Peer DNS through tunnel" -msgstr "DNS ngang hàng _qua đường hầm" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Require MPPC compression" -msgstr "Đòi hỏi nén _MPPC" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "Đường hầm pppd (PPTP, BTGPRS, Quay số)" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "Tên" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "Máy phục vụ PPTP" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "Số điện thoại" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "Địa chỉ Bluetooth" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "Kênh Bluetooth" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "APN GPRS" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "IP GPRS" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "Số ngữ cảnh GPRS" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "Kiểu gói tin GPRS" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "Dùng điều khiển luồng CTS/RTS" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "Kết nối bằng bộ điều giải" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "Đòi hỏi cung cấp địa chỉ IP" - -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "Dùng DNS ngang hàng" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "Dùng mật mã MPPE" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "Dùng mật mã MPPE 128 bit" - -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "Bật MPPE có tình trạng" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "Nén bằng MPPC" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "Không nén kiểu Deflate" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "Không nén kiểu BSD" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "Chỉ pppd truy cập đến thiết bị" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "Xác thực ngang hàng từ xa" - -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "Từ chối EAP" - -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "Từ chối CHAP" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "Từ chối MSCHAP" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "Đơn vị truyền tối đa (theo byte)" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "Đơn vị nhận tối đa (theo byte)" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "Số các lần vọng LCP không thành công để gây ra ngắt kết nối" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "Khoảng thời gian (theo giây) giữa hai lần làm vọng LCP" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "Khoảng thời gian (theo mili-giây) cần đợi trước khi kết nối." - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "Tùy chọn ppp tự chọn" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "Dùng DNS ngang hàng qua Đường hầm" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "Các mạng xác định sẵn sàng" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "Hạn chế các mạng xác định" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "Kết nối « %s » theo đây sẽ được tạo :" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "\t%s: %s\n" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "Chi tiết kết nối có thể được sửa đổi bằng nút « Lùi »." - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "Chọn tập tin cần nhập vào" - -#: ../properties/vpnui_impl.c:462 -#. printf ("in impl_export\n"); -msgid "Save as..." -msgstr "Lưu dạng..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Một tập tin tên « %s » đã có." - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Bạn có muốn thay thế nó bằng tập tin đang lưu không?" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "Lỗi kết nối VPN" diff --git a/vpn-daemons/pptp/po/zh_CN.po b/vpn-daemons/pptp/po/zh_CN.po deleted file mode 100644 index 327805cd57..0000000000 --- a/vpn-daemons/pptp/po/zh_CN.po +++ /dev/null @@ -1,564 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-pptp HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-27 03:58+0100\n" -"PO-Revision-Date: 2006-07-16 18:13+0800\n" -"Last-Translator: Funda Wang \n" -"Language-Team: zh_CN \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:792 -msgid "Authentication Type:" -msgstr "身份验证类型：" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:857 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:11 -msgid "_Remember for this session" -msgstr "本次会话记住(_R)" - -#: ../auth-dialog-general/gnome-generic-auth-dialog.c:859 -#: ../auth-dialog-general/nm-ppp-auth.glade.h:13 -msgid "_Save in keyring" -msgstr "在密钥环中保存(_S)" - -#: ../auth-dialog-general/main.c:48 ../auth-dialog/main.c:140 -#, c-format -msgid "You need to authenticate to access '%s'." -msgstr "您需要进行身份验证才能访问“%s”。" - -#: ../auth-dialog-general/main.c:51 ../auth-dialog/main.c:141 -msgid "Authenticate Connection" -msgstr "身份验证连接" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:2 -#, no-c-format -msgid "" -"Authentication Information\n" -"\n" -"The connection '%s' may need some form of authentication.\n" -"\n" -"Please select an appropriate authentication type and provide the necessary " -"credentials below:\n" -msgstr "" -"身份验证信息\n" -"\n" -"连接“%s”可能需要某种形式的身份验证。\n" -"\n" -"请在下面选择适当的身份验证类型，并提供必要的信息：\n" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:8 -msgid "Authentication Required" -msgstr "需要身份验证" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:9 -msgid "_Authentication Type:" -msgstr "身份验证连接(_A)：" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:10 -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "密码(_P)：" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:12 -msgid "_Remote name:" -msgstr "远程名称(_U)：" - -#: ../auth-dialog-general/nm-ppp-auth.glade.h:14 -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "用户名(_U)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "次要密码(_S)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "域(_D)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "匿名连接(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "以用户连接(_U)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember password for this session" -msgstr "本次会话记住密码(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save password in keyring" -msgstr "在密钥环中保存密码(_S)" - -#: ../nm-ppp.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "添加、删除及编辑 VPN 连接" - -#: ../nm-ppp.desktop.in.h:2 -msgid "VPN Connection Manager (PPP generic)" -msgstr "VPN 连接管理器(通用 PPP)" - -#: ../properties/nm-ppp-dialog.glade.h:1 -msgid "00:00:00:00" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:2 -msgid "Compression" -msgstr "压缩" - -#: ../properties/nm-ppp-dialog.glade.h:3 -msgid "Delays & Timeouts" -msgstr "延迟和超时" - -#: ../properties/nm-ppp-dialog.glade.h:4 -msgid "Encryption" -msgstr "加密" - -#: ../properties/nm-ppp-dialog.glade.h:5 -msgid "IP Options" -msgstr "IP 选项" - -#: ../properties/nm-ppp-dialog.glade.h:6 -msgid "Packet Parameters" -msgstr "包选项" - -#: ../properties/nm-ppp-dialog.glade.h:7 -msgid "Example: 172.16.0.0/16 10.11.12.0/24" -msgstr "如：172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-ppp-dialog.glade.h:8 -msgid "A list of extra options to pppd as would be typed on the command line" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:9 -msgid "Allow B_SD Compression" -msgstr "允许 B_SD 压缩" - -#: ../properties/nm-ppp-dialog.glade.h:10 -#, fuzzy -msgid "Allow _Deflate compression" -msgstr "不使用 BSD 压缩" - -#: ../properties/nm-ppp-dialog.glade.h:11 -msgid "Authentication" -msgstr "身份验证" - -#: ../properties/nm-ppp-dialog.glade.h:12 -msgid "C_hannel:" -msgstr "频道(_H)：" - -#: ../properties/nm-ppp-dialog.glade.h:13 -msgid "Co_nnect delay:" -msgstr "连接延迟(_N)：" - -#: ../properties/nm-ppp-dialog.glade.h:14 -msgid "Compression & Encryption" -msgstr "压缩和加密" - -#: ../properties/nm-ppp-dialog.glade.h:15 -msgid "Connection" -msgstr "连接" - -#: ../properties/nm-ppp-dialog.glade.h:16 -msgid "Connection na_me:" -msgstr "连接名称(_M)：" - -#: ../properties/nm-ppp-dialog.glade.h:17 -msgid "Context _number:" -msgstr "环境号码(_N)：" - -#: ../properties/nm-ppp-dialog.glade.h:18 -msgid "Custom _PPP options:" -msgstr "自定义 PPP 选项(_P)：" - -#: ../properties/nm-ppp-dialog.glade.h:19 -msgid "Debug _output" -msgstr "调试输出(_O)" - -#: ../properties/nm-ppp-dialog.glade.h:20 -msgid "Disconnect after this many LCP echo requests fail" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:21 -msgid "E_xclusive device access (UUCP-style lock)" -msgstr "独占设备访问(UUCP 风格锁定)(_X)" - -#: ../properties/nm-ppp-dialog.glade.h:22 -msgid "Enable stateful _MPPE" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:23 -msgid "Find Device" -msgstr "查找设备" - -#: ../properties/nm-ppp-dialog.glade.h:24 -msgid "" -"For security reasons, options entered in the box above are checked against a " -"list of allowed options before a connection is established. Currently there " -"are no options on the list." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:25 -msgid "GPRS Options" -msgstr "GPRS 选项" - -#: ../properties/nm-ppp-dialog.glade.h:26 -msgid "Host name or IP address of the PPTP server" -msgstr "此 PPTP 服务器的主机名或 IP 地址" - -#: ../properties/nm-ppp-dialog.glade.h:27 -msgid "IP a_ddress:" -msgstr "IP 地址(_D)：" - -#: ../properties/nm-ppp-dialog.glade.h:28 -msgid "" -"If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:29 -msgid "" -"If Deflate compression is not allowed the 'nodefate' option is passed to pppd" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:30 -msgid "Maximum Receive Unit" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:31 -msgid "Maximum Transmit Unit" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:32 -msgid "PPP Options" -msgstr "PPP 选项" - -#: ../properties/nm-ppp-dialog.glade.h:33 -msgid "Refuse C_HAP" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:34 -msgid "Refuse _EAP" -msgstr "拒绝 _EAP" - -#: ../properties/nm-ppp-dialog.glade.h:35 -msgid "Refuse _MS CHAP" -msgstr "拒绝 _MS CHAP" - -#: ../properties/nm-ppp-dialog.glade.h:36 -msgid "Require 128 bit M_PPE encryption" -msgstr "需要 128 位 MPPE 加密(_P)" - -#: ../properties/nm-ppp-dialog.glade.h:37 -msgid "Require MPPE _encryption" -msgstr "使用 MPPE 加密(_E)" - -#: ../properties/nm-ppp-dialog.glade.h:38 -msgid "Require explicit IP _address" -msgstr "需要显式 IP 地址(_A)" - -#: ../properties/nm-ppp-dialog.glade.h:39 -msgid "Requires existing network connection" -msgstr "需要已有的网络连接" - -#: ../properties/nm-ppp-dialog.glade.h:40 -msgid "Routing" -msgstr "路由" - -#: ../properties/nm-ppp-dialog.glade.h:41 -msgid "Serial Options" -msgstr "串行选项" - -#: ../properties/nm-ppp-dialog.glade.h:42 -msgid "Service providers GPRS access point from device config" -msgstr "设备配置的服务提供商 GPRS 访问点" - -#: ../properties/nm-ppp-dialog.glade.h:43 -msgid "Service providers IP address" -msgstr "服务提供商 IP 地址" - -#: ../properties/nm-ppp-dialog.glade.h:44 -msgid "Telep_hone number:" -msgstr "电话号码(_H)：" - -#: ../properties/nm-ppp-dialog.glade.h:45 -msgid "" -"This is the friendly name that will be used to identify this network " -"connection, \n" -"e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:47 -msgid "Time in seconds between echo requests" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:48 -msgid "Typ_e:" -msgstr "类型(_E)：" - -#: ../properties/nm-ppp-dialog.glade.h:49 -msgid "Use peer _DNS" -msgstr "使用对端 _DNS" - -#: ../properties/nm-ppp-dialog.glade.h:50 -msgid "When checked the \"refuse-chap\" option is passed to pppd." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:51 -msgid "When checked the \"refuse-eap\" option is passed to pppd." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:52 -msgid "When checked the \"refuse-mschap\" option is passed to pppd." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:53 -msgid "When checked the 'lock' option is passed to pppd" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:54 -msgid "When checked the 'require-mppc' option is passed to pppd" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:55 -msgid "" -"When checked this sets the pppd 'debug' option and adds some extra " -"information from the NetworkManager plugin" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:56 -msgid "When checked this sets the pppd 'noipdefault' option" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:57 -msgid "When checked this sets the pppd 'usepeerdns' option" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:58 -msgid "When this check box is cleared the \"noauth\" option is passed to pppd." -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:59 -msgid "_Access point name:" -msgstr "接入点名称(_A)：" - -#: ../properties/nm-ppp-dialog.glade.h:60 -msgid "_Authenticate peer" -msgstr "身份验证端(_A)" - -#: ../properties/nm-ppp-dialog.glade.h:61 -msgid "_Device address:" -msgstr "设备地址(_D)：" - -#: ../properties/nm-ppp-dialog.glade.h:62 -msgid "_Gateway:" -msgstr "网关(_G)：" - -#: ../properties/nm-ppp-dialog.glade.h:63 -msgid "_Hardware RTS/CTS" -msgstr "硬件 RTS/CTS(_H)" - -#: ../properties/nm-ppp-dialog.glade.h:64 -msgid "_Import Saved Configuration..." -msgstr "导入保存的配置(_I)..." - -#: ../properties/nm-ppp-dialog.glade.h:65 -msgid "_Modem connection" -msgstr "调制解调器连接(_M)" - -#: ../properties/nm-ppp-dialog.glade.h:66 -msgid "_Only use VPN connection for these addresses:" -msgstr "只对这些地址使用 VPN 连接(_O)：" - -#: ../properties/nm-ppp-dialog.glade.h:67 -msgid "_Packet type:" -msgstr "包类型(_P)：" - -#: ../properties/nm-ppp-dialog.glade.h:68 -msgid "_Peer DNS through tunnel" -msgstr "" - -#: ../properties/nm-ppp-dialog.glade.h:69 -msgid "_Require MPPC compression" -msgstr "需要 MPPC 压缩(_R)" - -#: ../properties/nm-ppp-properties.c:45 -msgid "pppd tunnel (PPTP, BTGPRS, Dialup)" -msgstr "" - -#: ../properties/nm-ppp-properties.c:134 -msgid "Name" -msgstr "名称" - -#: ../properties/nm-ppp-properties.c:146 -msgid "PPTP Server" -msgstr "PPTP 服务器" - -#: ../properties/nm-ppp-properties.c:151 -msgid "Telephone Number" -msgstr "电话号码" - -#: ../properties/nm-ppp-properties.c:156 -msgid "Bluetooth Address" -msgstr "蓝牙地址" - -#: ../properties/nm-ppp-properties.c:161 -msgid "Bluetooth Channel" -msgstr "蓝牙频道" - -#: ../properties/nm-ppp-properties.c:166 -msgid "GPRS APN" -msgstr "GPRS APN" - -#: ../properties/nm-ppp-properties.c:171 -msgid "GPRS IP" -msgstr "GPRS IP" - -#: ../properties/nm-ppp-properties.c:176 -msgid "GPRS Context No." -msgstr "GPRS 环境编号" - -#: ../properties/nm-ppp-properties.c:181 -msgid "GPRS Packet Type" -msgstr "GPRS 包类型" - -#: ../properties/nm-ppp-properties.c:186 -msgid "Use CTS/RTS flow control" -msgstr "使用 CTS/RTS 流控制" - -#: ../properties/nm-ppp-properties.c:191 -msgid "Connect via a modem" -msgstr "通过调制解调器连接" - -#: ../properties/nm-ppp-properties.c:196 -msgid "Require IP to be provided" -msgstr "需要提供 IP" - -#: ../properties/nm-ppp-properties.c:201 -msgid "Use Peer DNS" -msgstr "使用对端 DNS" - -#: ../properties/nm-ppp-properties.c:206 -msgid "Use MPPE encryption" -msgstr "使用 MPPE 加密" - -#: ../properties/nm-ppp-properties.c:211 -msgid "Use 128 bit MPPE encryption" -msgstr "使用 128 位 MPPE 加密" - -#: ../properties/nm-ppp-properties.c:216 -msgid "Enable stateful MPPE" -msgstr "" - -#: ../properties/nm-ppp-properties.c:221 -msgid "Use MPPC compression" -msgstr "使用 MPPC 压缩" - -#: ../properties/nm-ppp-properties.c:226 -msgid "Do not use deflate compression" -msgstr "" - -#: ../properties/nm-ppp-properties.c:231 -msgid "Do not use BSD compression" -msgstr "不使用 BSD 压缩" - -#: ../properties/nm-ppp-properties.c:236 -msgid "Exclusive device access by pppd" -msgstr "" - -#: ../properties/nm-ppp-properties.c:241 -msgid "Authenticate remote peer" -msgstr "" - -#: ../properties/nm-ppp-properties.c:246 -msgid "Refuse EAP" -msgstr "" - -#: ../properties/nm-ppp-properties.c:251 -msgid "Refuse CHAP" -msgstr "" - -#: ../properties/nm-ppp-properties.c:256 -msgid "Refuse MSCHAP" -msgstr "" - -#: ../properties/nm-ppp-properties.c:261 -msgid "Maximum transmit unit (in bytes)" -msgstr "" - -#: ../properties/nm-ppp-properties.c:266 -msgid "Maximum receive unit (in bytes)" -msgstr "" - -#: ../properties/nm-ppp-properties.c:271 -msgid "Number of failed LCP echos to cause disconnect" -msgstr "" - -#: ../properties/nm-ppp-properties.c:276 -msgid "Interval (in seconds) at which to issue LCP echos" -msgstr "" - -#: ../properties/nm-ppp-properties.c:281 -msgid "Interval (in milliseconds) to wait before connecting." -msgstr "" - -#: ../properties/nm-ppp-properties.c:286 -msgid "Custom PPP options" -msgstr "" - -#: ../properties/nm-ppp-properties.c:296 -msgid "Use Peer DNS over the Tunnel" -msgstr "" - -#: ../properties/nm-ppp-properties.c:302 -msgid "Specific networks available" -msgstr "" - -#: ../properties/nm-ppp-properties.c:308 -msgid "Limit to specific networks" -msgstr "" - -#: ../properties/vpnui_impl.c:229 -#, c-format -msgid "The following '%s' connection will be created:" -msgstr "" - -#: ../properties/vpnui_impl.c:242 -#, c-format -msgid "\t%s: %s\n" -msgstr "" - -#: ../properties/vpnui_impl.c:245 -msgid "The connection details can be changed using the \"Back\" button." -msgstr "" - -#: ../properties/vpnui_impl.c:317 -msgid "Select file to import" -msgstr "选择要导入的文件" - -#. printf ("in impl_export\n"); -#: ../properties/vpnui_impl.c:462 -msgid "Save as..." -msgstr "另存为..." - -#: ../properties/vpnui_impl.c:491 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "名为“%s”的文件已经存在。" - -#: ../properties/vpnui_impl.c:494 -msgid "Do you want to replace it with the one you are saving?" -msgstr "您是否想要将其替换为您正在保存的文件？" - -#: ../src/nm-ppp-starter.c:140 -msgid "VPN Connection failed" -msgstr "VPN 连接失败" diff --git a/vpn-daemons/pptp/po/zh_HK.po b/vpn-daemons/pptp/po/zh_HK.po deleted file mode 100644 index 4260bb8f3d..0000000000 --- a/vpn-daemons/pptp/po/zh_HK.po +++ /dev/null @@ -1,173 +0,0 @@ -# Chinese (Hong Kong) translation of Network Manager. -# Copyright (C) 2005 Free Software Foundation, Inc. -# Chao-Hsiung Liao , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: Network Manager-pptp 0.7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-21 20:14+0800\n" -"PO-Revision-Date: 2008-08-22 20:07+0800\n" -"Last-Translator: Chao-Hsiung Liao \n" -"Language-Team: Chinese (Hong Kong) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "第二密碼(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "使用者名稱(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "網域(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "密碼(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "匿名連線(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "以此使用者連線(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "在這個作業階段記住密碼(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "在密碼匙圈中儲存密碼(_S)" - -#: ../auth-dialog/main.c:168 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "你需要通過驗證才能存取虛擬私有網絡「%s」。" - -#: ../auth-dialog/main.c:169 -msgid "Authenticate VPN" -msgstr "驗證 VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "加入、移除與編輯 PPTP VPN 連線" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN 連線管理程式" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "所有可用的（預設值）" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128-位元（最安全）" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40-位元（較不安全）" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "驗證" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "回應" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "一般" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "選擇性" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "安全性與壓縮" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "進階(_V)..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "允許 _BSD 資料壓縮" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "允許 _Deflate 資料壓縮" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "允許可設定狀態加密(_A)" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "允許下列驗證方法：" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "預設值" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "網域:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "傳送 PPP _echo 封包" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "使用 TCP 標頭壓縮(_H)" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "使用點對點加密[MPPE](_P)" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "使用者名稱:" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "通訊閘(_G):" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "安全性(_S):" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "點對點穿隧通訊協定 (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "兼容於 Microsoft 與其他 PPTP VPN 伺服器。" - diff --git a/vpn-daemons/pptp/po/zh_TW.po b/vpn-daemons/pptp/po/zh_TW.po deleted file mode 100644 index 4a11beb7a4..0000000000 --- a/vpn-daemons/pptp/po/zh_TW.po +++ /dev/null @@ -1,173 +0,0 @@ -# Traditional Chinese translation of Network Manager. -# Copyright (C) 2005 Free Software Foundation, Inc. -# Chao-Hsiung Liao , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: Network Manager-pptp 0.7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-21 20:14+0800\n" -"PO-Revision-Date: 2008-08-21 15:37+0800\n" -"Last-Translator: Chao-Hsiung Liao \n" -"Language-Team: Chinese/Traditional \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "第二密碼(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "使用者名稱(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "網域(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "密碼(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "匿名連線(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "以此使用者連線(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "在這個作業階段記住密碼(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "在鑰匙圈中儲存密碼(_S)" - -#: ../auth-dialog/main.c:168 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "您需要通過驗證才能存取虛擬私有網路「%s」。" - -#: ../auth-dialog/main.c:169 -msgid "Authenticate VPN" -msgstr "驗證 VPN" - -#: ../nm-pptp.desktop.in.h:1 -msgid "Add, Remove, and Edit PPTP VPN Connections" -msgstr "加入、移除與編輯 PPTP VPN 連線" - -#: ../nm-pptp.desktop.in.h:2 -msgid "PPTP VPN Connection Manager" -msgstr "PPTP VPN 連線管理程式" - -#: ../properties/advanced-dialog.c:147 -msgid "All Available (Default)" -msgstr "所有可用的（預設值）" - -#: ../properties/advanced-dialog.c:151 -msgid "128-bit (most secure)" -msgstr "128-位元（最安全）" - -#: ../properties/advanced-dialog.c:160 -msgid "40-bit (less secure)" -msgstr "40-位元（較不安全）" - -#: ../properties/advanced-dialog.c:231 -msgid "PAP" -msgstr "PAP" - -#: ../properties/advanced-dialog.c:237 -msgid "CHAP" -msgstr "CHAP" - -#: ../properties/advanced-dialog.c:243 -msgid "MSCHAP" -msgstr "MSCHAP" - -#: ../properties/advanced-dialog.c:249 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: ../properties/nm-pptp-dialog.glade.h:1 -msgid "Authentication" -msgstr "驗證" - -#: ../properties/nm-pptp-dialog.glade.h:2 -msgid "Echo" -msgstr "回應" - -#: ../properties/nm-pptp-dialog.glade.h:3 -msgid "General" -msgstr "一般" - -#: ../properties/nm-pptp-dialog.glade.h:4 -msgid "Optional" -msgstr "選擇性" - -#: ../properties/nm-pptp-dialog.glade.h:5 -msgid "Security and Compression" -msgstr "安全性與壓縮" - -#: ../properties/nm-pptp-dialog.glade.h:6 -msgid "Ad_vanced..." -msgstr "進階(_V)..." - -#: ../properties/nm-pptp-dialog.glade.h:7 -msgid "Allow _BSD data compression" -msgstr "允許 _BSD 資料壓縮" - -#: ../properties/nm-pptp-dialog.glade.h:8 -msgid "Allow _Deflate data compression" -msgstr "允許 _Deflate 資料壓縮" - -#: ../properties/nm-pptp-dialog.glade.h:9 -msgid "Allow st_ateful encryption" -msgstr "允許可設定狀態加密(_A)" - -#: ../properties/nm-pptp-dialog.glade.h:10 -msgid "Allow the following authentication methods:" -msgstr "允許下列驗證方法：" - -#: ../properties/nm-pptp-dialog.glade.h:11 -msgid "Default" -msgstr "預設值" - -#: ../properties/nm-pptp-dialog.glade.h:12 -msgid "Domain:" -msgstr "網域:" - -#: ../properties/nm-pptp-dialog.glade.h:13 -msgid "Send PPP _echo packets" -msgstr "傳送 PPP _echo 封包" - -#: ../properties/nm-pptp-dialog.glade.h:14 -msgid "Use TCP _header compression" -msgstr "使用 TCP 標頭壓縮(_H)" - -#: ../properties/nm-pptp-dialog.glade.h:15 -msgid "Use _Point-to-Point encryption (MPPE)" -msgstr "使用點對點加密[MPPE](_P)" - -#: ../properties/nm-pptp-dialog.glade.h:16 -msgid "User name:" -msgstr "使用者名稱:" - -#: ../properties/nm-pptp-dialog.glade.h:17 -msgid "_Gateway:" -msgstr "通訊閘(_G):" - -#: ../properties/nm-pptp-dialog.glade.h:18 -msgid "_Security:" -msgstr "安全性(_S):" - -#: ../properties/nm-pptp.c:49 -msgid "Point-to-Point Tunneling Protocol (PPTP)" -msgstr "點對點穿隧通訊協定 (PPTP)" - -#: ../properties/nm-pptp.c:50 -msgid "Compatible with Microsoft and other PPTP VPN servers." -msgstr "相容於 Microsoft 與其他 PPTP VPN 伺服器。" - diff --git a/vpn-daemons/pptp/properties/.cvsignore b/vpn-daemons/pptp/properties/.cvsignore deleted file mode 100644 index b9195bb896..0000000000 --- a/vpn-daemons/pptp/properties/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile.in -Makefile -.libs -.deps diff --git a/vpn-daemons/pptp/properties/Makefile.am b/vpn-daemons/pptp/properties/Makefile.am deleted file mode 100644 index ec20add984..0000000000 --- a/vpn-daemons/pptp/properties/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -plugindir = $(libdir)/NetworkManager -plugin_LTLIBRARIES = libnm-pptp-properties.la - -libnm_pptp_properties_la_SOURCES = \ - nm-pptp.c \ - nm-pptp.h \ - advanced-dialog.c \ - advanced-dialog.h \ - import-export.c \ - import-export.h - -gladedir = $(datadir)/gnome-vpn-properties/pptp -glade_DATA = nm-pptp-dialog.glade - -libnm_pptp_properties_la_CFLAGS = \ - $(GLADE_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(LIBGNOMEUI_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ - $(NM_UTILS_CFLAGS) \ - -DICONDIR=\""$(datadir)/pixmaps"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" - -libnm_pptp_properties_la_LIBADD = \ - $(GLADE_LIBS) \ - $(GTK_LIBS) \ - $(GCONF_LIBS) \ - $(LIBGNOMEUI_LIBS) \ - $(top_builddir)/common-gnome/libnm-pptp-common-gnome.la \ - $(NM_UTILS_LIBS) - -libnm_pptp_properties_la_LDFLAGS = \ - -avoid-version - -CLEANFILES = *.bak *.gladep *~ - -EXTRA_DIST = \ - $(glade_DATA) diff --git a/vpn-daemons/pptp/properties/advanced-dialog.c b/vpn-daemons/pptp/properties/advanced-dialog.c deleted file mode 100644 index dfd43df686..0000000000 --- a/vpn-daemons/pptp/properties/advanced-dialog.c +++ /dev/null @@ -1,453 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * - * Copyright (C) 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include "advanced-dialog.h" -#include "nm-pptp.h" -#include "../src/nm-pptp-service.h" - -#define COL_NAME 0 -#define COL_VALUE 1 -#define COL_TAG 2 - -#define TAG_PAP 0 -#define TAG_CHAP 1 -#define TAG_MSCHAP 2 -#define TAG_MSCHAPV2 3 -#define TAG_EAP 4 - -static const char *advanced_keys[] = { - NM_PPTP_KEY_REFUSE_EAP, - NM_PPTP_KEY_REFUSE_PAP, - NM_PPTP_KEY_REFUSE_CHAP, - NM_PPTP_KEY_REFUSE_MSCHAP, - NM_PPTP_KEY_REFUSE_MSCHAPV2, - NM_PPTP_KEY_REQUIRE_MPPE, - NM_PPTP_KEY_REQUIRE_MPPE_40, - NM_PPTP_KEY_REQUIRE_MPPE_128, - NM_PPTP_KEY_MPPE_STATEFUL, - NM_PPTP_KEY_NOBSDCOMP, - NM_PPTP_KEY_NODEFLATE, - NM_PPTP_KEY_NO_VJ_COMP, - NM_PPTP_KEY_LCP_ECHO_FAILURE, - NM_PPTP_KEY_LCP_ECHO_INTERVAL, - NULL -}; - -static void -copy_values (const char *key, const char *value, gpointer user_data) -{ - GHashTable *hash = (GHashTable *) user_data; - const char **i; - - for (i = &advanced_keys[0]; *i; i++) { - if (strcmp (key, *i)) - continue; - g_hash_table_insert (hash, g_strdup (key), g_strdup (value)); - } -} - -GHashTable * -advanced_dialog_new_hash_from_connection (NMConnection *connection, - GError **error) -{ - GHashTable *hash; - NMSettingVPN *s_vpn; - - hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - nm_setting_vpn_foreach_data_item (s_vpn, copy_values, hash); - return hash; -} - -static void -mppe_toggled_cb (GtkWidget *check, gpointer user_data) -{ - GladeXML *xml = (GladeXML *) user_data; - GtkWidget *widget; - gboolean use_mppe; - - use_mppe = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)); - - widget = glade_xml_get_widget (xml, "ppp_mppe_security_label"); - gtk_widget_set_sensitive (widget, use_mppe); - - widget = glade_xml_get_widget (xml, "ppp_mppe_security_combo"); - if (!use_mppe) - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); /* default */ - gtk_widget_set_sensitive (widget, use_mppe); - - widget = glade_xml_get_widget (xml, "ppp_allow_stateful_mppe"); - if (!use_mppe) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - gtk_widget_set_sensitive (widget, use_mppe); -} - -#define SEC_INDEX_DEFAULT 0 -#define SEC_INDEX_MPPE_128 1 -#define SEC_INDEX_MPPE_40 2 - -static void -setup_security_combo (GladeXML *xml, GHashTable *hash) -{ - GtkWidget *widget; - GtkListStore *store; - GtkTreeIter iter; - int active = -1; - const char *value; - - g_return_if_fail (xml != NULL); - g_return_if_fail (hash != NULL); - - widget = glade_xml_get_widget (xml, "ppp_mppe_security_combo"); - - store = gtk_list_store_new (1, G_TYPE_STRING); - - /* Default (allow use of all encryption types that both server and client support) */ - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("All Available (Default)"), -1); - - /* MPPE-128 */ - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("128-bit (most secure)"), -1); - if (active < 0) { - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REQUIRE_MPPE_128); - if (value && !strcmp (value, "yes")) - active = SEC_INDEX_MPPE_128; - } - - /* MPPE-40 */ - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("40-bit (less secure)"), -1); - if (active < 0) { - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REQUIRE_MPPE_40); - if (value && !strcmp (value, "yes")) - active = SEC_INDEX_MPPE_40; - } - - gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); - g_object_unref (store); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? SEC_INDEX_DEFAULT : active); -} - -static void -check_toggled_cb (GtkCellRendererToggle *cell, gchar *path_str, gpointer user_data) -{ - GladeXML *xml = GLADE_XML (user_data); - GtkWidget *widget; - GtkTreePath *path = gtk_tree_path_new_from_string (path_str); - GtkTreeModel *model; - GtkTreeIter iter; - gboolean toggle_item; - - widget = glade_xml_get_widget (xml, "ppp_auth_methods"); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); - - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, COL_VALUE, &toggle_item, -1); - - toggle_item ^= 1; - - /* set new value */ - gtk_list_store_set (GTK_LIST_STORE (model), &iter, COL_VALUE, toggle_item, -1); - - gtk_tree_path_free (path); -} - -static void -auth_methods_setup (GladeXML *xml, GHashTable *hash) -{ - GtkWidget *widget; - GtkListStore *store; - GtkTreeIter iter; - const char *value; - gboolean allowed; - gboolean use_mppe = FALSE; - GtkCellRendererToggle *check_renderer; - GtkCellRenderer *text_renderer; - GtkTreeViewColumn *column; - gint offset; - - store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_UINT); - - /* Check for MPPE */ - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REQUIRE_MPPE); - if (value && !strcmp (value, "yes")) - use_mppe = TRUE; - - /* Or MPPE-128 */ - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REQUIRE_MPPE_128); - if (value && !strcmp (value, "yes")) - use_mppe = TRUE; - - /* Or MPPE-40 */ - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REQUIRE_MPPE_40); - if (value && !strcmp (value, "yes")) - use_mppe = TRUE; - - /* PAP */ - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REFUSE_PAP); - allowed = (value && !strcmp (value, "yes")) ? FALSE : TRUE; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, COL_NAME, _("PAP"), COL_VALUE, allowed, COL_TAG, TAG_PAP, -1); - - /* CHAP */ - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REFUSE_CHAP); - allowed = (value && !strcmp (value, "yes")) ? FALSE : TRUE; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, COL_NAME, _("CHAP"), COL_VALUE, allowed, COL_TAG, TAG_CHAP, -1); - - /* MSCHAP */ - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REFUSE_MSCHAP); - allowed = (value && !strcmp (value, "yes")) ? FALSE : TRUE; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, COL_NAME, _("MSCHAP"), COL_VALUE, allowed, COL_TAG, TAG_MSCHAP, -1); - - /* MSCHAPv2 */ - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REFUSE_MSCHAPV2); - allowed = (value && !strcmp (value, "yes")) ? FALSE : TRUE; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, COL_NAME, _("MSCHAPv2"), COL_VALUE, allowed, COL_TAG, TAG_MSCHAPV2, -1); - - /* EAP */ - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REFUSE_EAP); - allowed = (value && !strcmp (value, "yes")) ? FALSE : TRUE; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, COL_NAME, _("EAP"), COL_VALUE, allowed, COL_TAG, TAG_EAP, -1); - - /* Set up the tree view */ - widget = glade_xml_get_widget (xml, "ppp_auth_methods"); - gtk_tree_view_set_model (GTK_TREE_VIEW (widget), GTK_TREE_MODEL (store)); - - check_renderer = GTK_CELL_RENDERER_TOGGLE (gtk_cell_renderer_toggle_new ()); - g_signal_connect (check_renderer, "toggled", G_CALLBACK (check_toggled_cb), xml); - - offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget), - -1, "", GTK_CELL_RENDERER (check_renderer), - "active", COL_VALUE, - NULL); - column = gtk_tree_view_get_column (GTK_TREE_VIEW (widget), offset - 1); - gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column), GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 30); - gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE); - - text_renderer = gtk_cell_renderer_text_new (); - offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget), - -1, "", text_renderer, - "text", COL_NAME, - NULL); - column = gtk_tree_view_get_column (GTK_TREE_VIEW (widget), offset - 1); - gtk_tree_view_column_set_expand (GTK_TREE_VIEW_COLUMN (column), TRUE); -} - -GtkWidget * -advanced_dialog_new (GHashTable *hash) -{ - GladeXML *xml; - GtkWidget *dialog = NULL; - char *glade_file = NULL; - GtkWidget *widget; - const char *value; - - g_return_val_if_fail (hash != NULL, NULL); - - glade_file = g_strdup_printf ("%s/%s", GLADEDIR, "nm-pptp-dialog.glade"); - xml = glade_xml_new (glade_file, "pptp-advanced-dialog", GETTEXT_PACKAGE); - if (xml == NULL) - goto out; - - dialog = glade_xml_get_widget (xml, "pptp-advanced-dialog"); - if (!dialog) { - g_object_unref (G_OBJECT (xml)); - goto out; - } - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - - g_object_set_data_full (G_OBJECT (dialog), "glade-xml", - xml, (GDestroyNotify) g_object_unref); - - setup_security_combo (xml, hash); - - widget = glade_xml_get_widget (xml, "ppp_use_mppe"); - g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (mppe_toggled_cb), xml); - - value = g_hash_table_lookup (hash, NM_PPTP_KEY_REQUIRE_MPPE); - if (value && !strcmp (value, "yes")) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - mppe_toggled_cb (widget, xml); - - widget = glade_xml_get_widget (xml, "ppp_allow_stateful_mppe"); - value = g_hash_table_lookup (hash, NM_PPTP_KEY_MPPE_STATEFUL); - if (value && !strcmp (value, "yes")) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - - widget = glade_xml_get_widget (xml, "ppp_allow_bsdcomp"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - value = g_hash_table_lookup (hash, NM_PPTP_KEY_NOBSDCOMP); - if (value && !strcmp (value, "yes")) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - - widget = glade_xml_get_widget (xml, "ppp_allow_deflate"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - value = g_hash_table_lookup (hash, NM_PPTP_KEY_NODEFLATE); - if (value && !strcmp (value, "yes")) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - - widget = glade_xml_get_widget (xml, "ppp_usevj"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - value = g_hash_table_lookup (hash, NM_PPTP_KEY_NO_VJ_COMP); - if (value && !strcmp (value, "yes")) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - - widget = glade_xml_get_widget (xml, "ppp_send_echo_packets"); - value = g_hash_table_lookup (hash, NM_PPTP_KEY_LCP_ECHO_INTERVAL); - if (value && strlen (value)) { - long int tmp_int; - - errno = 0; - tmp_int = strtol (value, NULL, 10); - if (errno == 0 && tmp_int > 0) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - } - - auth_methods_setup (xml, hash); - -out: - g_free (glade_file); - return dialog; -} - -GHashTable * -advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error) -{ - GHashTable *hash; - GtkWidget *widget; - GladeXML *xml; - GtkTreeModel *model; - GtkTreeIter iter; - gboolean valid; - - g_return_val_if_fail (dialog != NULL, NULL); - if (error) - g_return_val_if_fail (*error == NULL, NULL); - - xml = g_object_get_data (G_OBJECT (dialog), "glade-xml"); - g_return_val_if_fail (xml != NULL, NULL); - - hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - - widget = glade_xml_get_widget (xml, "ppp_use_mppe"); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { - - widget = glade_xml_get_widget (xml, "ppp_mppe_security_combo"); - switch (gtk_combo_box_get_active (GTK_COMBO_BOX (widget))) { - case SEC_INDEX_MPPE_128: - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_REQUIRE_MPPE_128), g_strdup ("yes")); - break; - case SEC_INDEX_MPPE_40: - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_REQUIRE_MPPE_40), g_strdup ("yes")); - break; - default: - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_REQUIRE_MPPE), g_strdup ("yes")); - break; - } - - widget = glade_xml_get_widget (xml, "ppp_allow_stateful_mppe"); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_MPPE_STATEFUL), g_strdup ("yes")); - } - - widget = glade_xml_get_widget (xml, "ppp_allow_bsdcomp"); - if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_NOBSDCOMP), g_strdup ("yes")); - - widget = glade_xml_get_widget (xml, "ppp_allow_deflate"); - if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_NODEFLATE), g_strdup ("yes")); - - widget = glade_xml_get_widget (xml, "ppp_usevj"); - if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_NO_VJ_COMP), g_strdup ("yes")); - - widget = glade_xml_get_widget (xml, "ppp_send_echo_packets"); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_LCP_ECHO_FAILURE), g_strdup_printf ("%d", 5)); - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_LCP_ECHO_INTERVAL), g_strdup_printf ("%d", 30)); - } - - widget = glade_xml_get_widget (xml, "ppp_auth_methods"); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); - valid = gtk_tree_model_get_iter_first (model, &iter); - while (valid) { - gboolean allowed; - guint32 tag; - - gtk_tree_model_get (model, &iter, COL_VALUE, &allowed, COL_TAG, &tag, -1); - switch (tag) { - case TAG_PAP: - if (!allowed) - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_REFUSE_PAP), g_strdup ("yes")); - break; - case TAG_CHAP: - if (!allowed) - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_REFUSE_CHAP), g_strdup ("yes")); - break; - case TAG_MSCHAP: - if (!allowed) - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_REFUSE_MSCHAP), g_strdup ("yes")); - break; - case TAG_MSCHAPV2: - if (!allowed) - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_REFUSE_MSCHAPV2), g_strdup ("yes")); - break; - case TAG_EAP: - if (!allowed) - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_REFUSE_EAP), g_strdup ("yes")); - break; - default: - break; - } - - valid = gtk_tree_model_iter_next (model, &iter); - } - - return hash; -} - diff --git a/vpn-daemons/pptp/properties/advanced-dialog.h b/vpn-daemons/pptp/properties/advanced-dialog.h deleted file mode 100644 index 6752e11f65..0000000000 --- a/vpn-daemons/pptp/properties/advanced-dialog.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * - * Copyright (C) 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifndef _AUTH_HELPERS_H_ -#define _AUTH_HELPERS_H_ - -#include -#include -#include - -#include - -GtkWidget *advanced_dialog_new (GHashTable *hash); - -GHashTable *advanced_dialog_new_hash_from_connection (NMConnection *connection, GError **error); - -GHashTable *advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error); - -#endif diff --git a/vpn-daemons/pptp/properties/import-export.c b/vpn-daemons/pptp/properties/import-export.c deleted file mode 100644 index 356a6de5c3..0000000000 --- a/vpn-daemons/pptp/properties/import-export.c +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * - * Copyright (C) 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -#include "import-export.h" -#include "nm-pptp.h" -#include "../src/nm-pptp-service.h" - -NMConnection * -do_import (const char *path, char **lines, GError **error) -{ - return NULL; -} - -gboolean -do_export (const char *path, NMConnection *connection, GError **error) -{ - return FALSE; -} - - - diff --git a/vpn-daemons/pptp/properties/import-export.h b/vpn-daemons/pptp/properties/import-export.h deleted file mode 100644 index 1c5fbc9f1f..0000000000 --- a/vpn-daemons/pptp/properties/import-export.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * - * Copyright (C) 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifndef _IMPORT_EXPORT_H_ -#define _IMPORT_EXPORT_H_ - -#include -#include - -NMConnection *do_import (const char *path, char **lines, GError **error); - -gboolean do_export (const char *path, NMConnection *connection, GError **error); - -#endif diff --git a/vpn-daemons/pptp/properties/nm-pptp-dialog.glade b/vpn-daemons/pptp/properties/nm-pptp-dialog.glade deleted file mode 100644 index 59e184e8d1..0000000000 --- a/vpn-daemons/pptp/properties/nm-pptp-dialog.glade +++ /dev/null @@ -1,586 +0,0 @@ - - - - - - window1 - - - True - 12 - 16 - - - True - 6 - - - True - 0 - <b>General</b> - True - - - False - False - - - - - True - 12 - - - True - 2 - 12 - 6 - - - True - True - - - 1 - 2 - - - - - - True - 0 - _Gateway: - True - gateway_entry - - - GTK_SHRINK | GTK_FILL - - - - - - - - 1 - - - - - False - - - - - True - 6 - - - True - 0 - <b>Optional</b> - True - - - False - False - - - - - True - 12 - - - True - 4 - 2 - 12 - 6 - - - - - - True - True - - - 1 - 2 - 3 - 4 - - - - - - True - 0 - NT Domain: - - - 3 - 4 - GTK_SHRINK | GTK_FILL - - - - - - True - True - Show password - 0 - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - False - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Password: - - - 1 - 2 - GTK_SHRINK | GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - 0 - User name: - - - GTK_SHRINK | GTK_FILL - - - - - - - - 1 - - - - - False - False - 1 - - - - - True - 1 - 0 - - - True - True - 0 - - - True - 6 - - - True - gtk-preferences - - - False - False - - - - - True - Ad_vanced... - True - True - - - False - False - 1 - - - - - - - - - False - False - GTK_PACK_END - 2 - - - - - - - 5 - GTK_WIN_POS_CENTER_ON_PARENT - True - stock-preferences - GDK_WINDOW_TYPE_HINT_DIALOG - True - False - - - True - 2 - - - True - 5 - 18 - - - True - 6 - - - True - 0 - <b>Authentication</b> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - 0 - Allow the following authentication methods: - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - - - - 1 - - - - - - - False - 1 - - - - - False - - - - - True - 6 - - - True - 0 - <b>Security and Compression</b> - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - 6 - - - True - True - Use _Point-to-Point encryption (MPPE) - True - 0 - True - - - False - False - - - - - True - 12 - - - True - 6 - - - True - 12 - - - True - 0 - _Security: - True - ppp_mppe_security_combo - - - False - - - - - True - Default - - - False - 1 - - - - - - - True - True - Allow st_ateful encryption - True - 0 - True - - - False - False - 1 - - - - - - - 1 - - - - - False - False - - - - - True - True - Allow _BSD data compression - True - 0 - True - - - False - False - 1 - - - - - True - True - Allow _Deflate data compression - True - 0 - True - - - False - False - 2 - - - - - True - True - Use TCP _header compression - True - 0 - True - - - False - False - 3 - - - - - - - False - 1 - - - - - False - 1 - - - - - True - 6 - - - True - 0 - <b>Echo</b> - True - - - False - False - - - - - True - 12 - - - True - True - Send PPP _echo packets - True - 0 - True - - - - - 1 - - - - - False - 2 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - gtk-cancel - True - -6 - - - - - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff --git a/vpn-daemons/pptp/properties/nm-pptp.c b/vpn-daemons/pptp/properties/nm-pptp.c deleted file mode 100644 index 62d5d484e8..0000000000 --- a/vpn-daemons/pptp/properties/nm-pptp.c +++ /dev/null @@ -1,726 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * nm-pptp.c : GNOME UI dialogs for configuring PPTP VPN connections - * - * Copyright (C) 2008 Dan Williams, - * Based on work by David Zeuthen, - * - * 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. - * - **************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#define NM_VPN_API_SUBJECT_TO_CHANGE - -#include -#include -#include -#include - -#include "../src/nm-pptp-service.h" -#include "../common-gnome/keyring-helpers.h" -#include "nm-pptp.h" -#include "import-export.h" -#include "advanced-dialog.h" - -#define PPTP_PLUGIN_NAME _("Point-to-Point Tunneling Protocol (PPTP)") -#define PPTP_PLUGIN_DESC _("Compatible with Microsoft and other PPTP VPN servers.") -#define PPTP_PLUGIN_SERVICE NM_DBUS_SERVICE_PPTP - - -typedef void (*ChangedCallback) (GtkWidget *widget, gpointer user_data); - -/************** plugin class **************/ - -static void pptp_plugin_ui_interface_init (NMVpnPluginUiInterface *iface_class); - -G_DEFINE_TYPE_EXTENDED (PptpPluginUi, pptp_plugin_ui, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_INTERFACE, - pptp_plugin_ui_interface_init)) - -/************** UI widget class **************/ - -static void pptp_plugin_ui_widget_interface_init (NMVpnPluginUiWidgetInterface *iface_class); - -G_DEFINE_TYPE_EXTENDED (PptpPluginUiWidget, pptp_plugin_ui_widget, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, - pptp_plugin_ui_widget_interface_init)) - -#define PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PPTP_TYPE_PLUGIN_UI_WIDGET, PptpPluginUiWidgetPrivate)) - -typedef struct { - GladeXML *xml; - GtkWidget *widget; - GtkSizeGroup *group; - GtkWindowGroup *window_group; - gboolean window_added; - GHashTable *advanced; -} PptpPluginUiWidgetPrivate; - - -GQuark -pptp_plugin_ui_error_quark (void) -{ - static GQuark error_quark = 0; - - if (G_UNLIKELY (error_quark == 0)) - error_quark = g_quark_from_static_string ("pptp-plugin-ui-error-quark"); - - return error_quark; -} - -/* This should really be standard. */ -#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } - -GType -pptp_plugin_ui_error_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = { - /* Unknown error. */ - ENUM_ENTRY (PPTP_PLUGIN_UI_ERROR_UNKNOWN, "UnknownError"), - /* The connection was missing invalid. */ - ENUM_ENTRY (PPTP_PLUGIN_UI_ERROR_INVALID_CONNECTION, "InvalidConnection"), - /* The specified property was invalid. */ - ENUM_ENTRY (PPTP_PLUGIN_UI_ERROR_INVALID_PROPERTY, "InvalidProperty"), - /* The specified property was missing and is required. */ - ENUM_ENTRY (PPTP_PLUGIN_UI_ERROR_MISSING_PROPERTY, "MissingProperty"), - /* The file to import could not be read. */ - ENUM_ENTRY (PPTP_PLUGIN_UI_ERROR_FILE_NOT_READABLE, "FileNotReadable"), - /* The file to import could was not an PPTP client file. */ - ENUM_ENTRY (PPTP_PLUGIN_UI_ERROR_FILE_NOT_PPTP, "FileNotPPTP"), - { 0, 0, 0 } - }; - etype = g_enum_register_static ("PptpPluginUiError", values); - } - return etype; -} - -static gboolean -check_validity (PptpPluginUiWidget *self, GError **error) -{ - PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GtkWidget *widget; - const char *str; - - widget = glade_xml_get_widget (priv->xml, "gateway_entry"); - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (!str || !strlen (str)) { - g_set_error (error, - PPTP_PLUGIN_UI_ERROR, - PPTP_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_PPTP_KEY_GATEWAY); - return FALSE; - } - - return TRUE; -} - -static void -stuff_changed_cb (GtkWidget *widget, gpointer user_data) -{ - g_signal_emit_by_name (PPTP_PLUGIN_UI_WIDGET (user_data), "changed"); -} - -static void -advanced_dialog_close_cb (GtkWidget *dialog, gpointer user_data) -{ - gtk_widget_hide (dialog); - /* gtk_widget_destroy() will remove the window from the window group */ - gtk_widget_destroy (dialog); -} - -static void -advanced_dialog_response_cb (GtkWidget *dialog, gint response, gpointer user_data) -{ - PptpPluginUiWidget *self = PPTP_PLUGIN_UI_WIDGET (user_data); - PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GError *error = NULL; - - if (response != GTK_RESPONSE_OK) { - advanced_dialog_close_cb (dialog, self); - return; - } - - if (priv->advanced) - g_hash_table_destroy (priv->advanced); - priv->advanced = advanced_dialog_new_hash_from_dialog (dialog, &error); - if (!priv->advanced) { - g_message ("%s: error reading advanced settings: %s", __func__, error->message); - g_error_free (error); - } - advanced_dialog_close_cb (dialog, self); - - stuff_changed_cb (NULL, self); -} - -static void -advanced_button_clicked_cb (GtkWidget *button, gpointer user_data) -{ - PptpPluginUiWidget *self = PPTP_PLUGIN_UI_WIDGET (user_data); - PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GtkWidget *dialog, *toplevel; - - toplevel = gtk_widget_get_toplevel (priv->widget); - g_return_if_fail (GTK_WIDGET_TOPLEVEL (toplevel)); - - dialog = advanced_dialog_new (priv->advanced); - if (!dialog) { - g_warning ("%s: failed to create the Advanced dialog!", __func__); - return; - } - - gtk_window_group_add_window (priv->window_group, GTK_WINDOW (dialog)); - if (!priv->window_added) { - gtk_window_group_add_window (priv->window_group, GTK_WINDOW (toplevel)); - priv->window_added = TRUE; - } - - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel)); - g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (advanced_dialog_response_cb), self); - g_signal_connect (G_OBJECT (dialog), "close", G_CALLBACK (advanced_dialog_close_cb), self); - - gtk_widget_show_all (dialog); -} - -static void -show_toggled_cb (GtkCheckButton *button, PptpPluginUiWidget *self) -{ - PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GtkWidget *widget; - gboolean visible; - - visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); - - widget = glade_xml_get_widget (priv->xml, "user_password_entry"); - g_assert (widget); - gtk_entry_set_visibility (GTK_ENTRY (widget), visible); -} - -static GtkWidget * -fill_password (GladeXML *xml, - const char *widget_name, - NMConnection *connection, - const char *password_type) -{ - GtkWidget *widget = NULL; - gchar *password = NULL; - - widget = glade_xml_get_widget (xml, widget_name); - g_assert (widget); - - if (!connection) - return widget; - - password = NULL; - - if (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM) { - NMSettingVPN *s_vpn; - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - if (s_vpn) { - const gchar *tmp = NULL; - - tmp = nm_setting_vpn_get_secret (s_vpn, password_type); - if (tmp) - password = gnome_keyring_memory_strdup (tmp); - } - } else { - NMSettingConnection *s_con = NULL; - gboolean unused; - const char *uuid; - - s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); - uuid = nm_setting_connection_get_uuid (s_con); - password = keyring_helpers_lookup_secret (uuid, - password_type, - &unused); - } - - if (password) { - gtk_entry_set_text (GTK_ENTRY (widget), password); - gnome_keyring_memory_free (password); - } - - return widget; -} - -static void -fill_vpn_passwords (GladeXML *xml, - GtkSizeGroup *group, - NMConnection *connection, - ChangedCallback changed_cb, - gpointer user_data) -{ - GtkWidget *w = NULL; - - w = fill_password (xml, "user_password_entry", connection, NM_PPTP_KEY_PASSWORD); - if (w) { - gtk_size_group_add_widget (group, w); - g_signal_connect (w, "changed", G_CALLBACK (changed_cb), user_data); - } else { - g_error ("No user_password_entry in glade file!"); - } -} - -static gboolean -init_plugin_ui (PptpPluginUiWidget *self, NMConnection *connection, GError **error) -{ - PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - NMSettingVPN *s_vpn; - GtkWidget *widget; - const char *value; - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - - priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - - widget = glade_xml_get_widget (priv->xml, "gateway_entry"); - if (!widget) - return FALSE; - gtk_size_group_add_widget (priv->group, widget); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_GATEWAY); - if (value && strlen (value)) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - widget = glade_xml_get_widget (priv->xml, "user_entry"); - if (!widget) - return FALSE; - gtk_size_group_add_widget (priv->group, widget); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_USER); - if (value && strlen (value)) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - widget = glade_xml_get_widget (priv->xml, "domain_entry"); - if (!widget) - return FALSE; - gtk_size_group_add_widget (priv->group, widget); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_DOMAIN); - if (value && strlen (value)) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - widget = glade_xml_get_widget (priv->xml, "advanced_button"); - g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (advanced_button_clicked_cb), self); - - widget = glade_xml_get_widget (priv->xml, "show_passwords_checkbutton"); - g_return_val_if_fail (widget != NULL, FALSE); - g_signal_connect (G_OBJECT (widget), "toggled", - (GCallback) show_toggled_cb, - self); - - fill_vpn_passwords (priv->xml, priv->group, connection, stuff_changed_cb, self); - - return TRUE; -} - -static GObject * -get_widget (NMVpnPluginUiWidgetInterface *iface) -{ - PptpPluginUiWidget *self = PPTP_PLUGIN_UI_WIDGET (iface); - PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - - return G_OBJECT (priv->widget); -} - -static void -hash_copy_advanced (gpointer key, gpointer data, gpointer user_data) -{ - NMSettingVPN *s_vpn = NM_SETTING_VPN (user_data); - - nm_setting_vpn_add_data_item (s_vpn, (const char *) key, (const char *) data); -} - -static gboolean -update_connection (NMVpnPluginUiWidgetInterface *iface, - NMConnection *connection, - GError **error) -{ - PptpPluginUiWidget *self = PPTP_PLUGIN_UI_WIDGET (iface); - PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - NMSettingVPN *s_vpn; - GtkWidget *widget; - const char *str; - gboolean valid = FALSE; - - if (!check_validity (self, error)) - return FALSE; - - s_vpn = NM_SETTING_VPN (nm_setting_vpn_new ()); - g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_PPTP, NULL); - - /* Gateway */ - widget = glade_xml_get_widget (priv->xml, "gateway_entry"); - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) - nm_setting_vpn_add_data_item (s_vpn, NM_PPTP_KEY_GATEWAY, str); - - /* Username */ - widget = glade_xml_get_widget (priv->xml, "user_entry"); - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) - nm_setting_vpn_add_data_item (s_vpn, NM_PPTP_KEY_USER, str); - - /* Domain */ - widget = glade_xml_get_widget (priv->xml, "domain_entry"); - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) - nm_setting_vpn_add_data_item (s_vpn, NM_PPTP_KEY_DOMAIN, str); - - if (priv->advanced) - g_hash_table_foreach (priv->advanced, hash_copy_advanced, s_vpn); - - nm_connection_add_setting (connection, NM_SETTING (s_vpn)); - valid = TRUE; - - return valid; -} - -static gboolean -save_secrets (NMVpnPluginUiWidgetInterface *iface, - NMConnection *connection, - GError **error) -{ - PptpPluginUiWidget *self = PPTP_PLUGIN_UI_WIDGET (iface); - PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GnomeKeyringResult ret; - NMSettingConnection *s_con; - GtkWidget *widget; - const char *str, *uuid, *id; - - s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); - if (!s_con) { - g_set_error (error, - PPTP_PLUGIN_UI_ERROR, - PPTP_PLUGIN_UI_ERROR_INVALID_CONNECTION, - "missing 'connection' setting"); - return FALSE; - } - - id = nm_setting_connection_get_id (s_con); - uuid = nm_setting_connection_get_uuid (s_con); - - widget = glade_xml_get_widget (priv->xml, "user_password_entry"); - g_assert (widget); - str = gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) { - ret = keyring_helpers_save_secret (uuid, id, NULL, NM_PPTP_KEY_PASSWORD, str); - if (ret != GNOME_KEYRING_RESULT_OK) - g_warning ("%s: failed to save user password to keyring.", __func__); - } else - keyring_helpers_delete_secret (uuid, NM_PPTP_KEY_PASSWORD); - - return TRUE; -} - -static NMVpnPluginUiWidgetInterface * -nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error) -{ - NMVpnPluginUiWidgetInterface *object; - PptpPluginUiWidgetPrivate *priv; - char *glade_file; - - if (error) - g_return_val_if_fail (*error == NULL, NULL); - - object = NM_VPN_PLUGIN_UI_WIDGET_INTERFACE (g_object_new (PPTP_TYPE_PLUGIN_UI_WIDGET, NULL)); - if (!object) { - g_set_error (error, PPTP_PLUGIN_UI_ERROR, 0, "could not create pptp object"); - return NULL; - } - - priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (object); - - glade_file = g_strdup_printf ("%s/%s", GLADEDIR, "nm-pptp-dialog.glade"); - priv->xml = glade_xml_new (glade_file, "pptp-vbox", GETTEXT_PACKAGE); - if (priv->xml == NULL) { - g_set_error (error, PPTP_PLUGIN_UI_ERROR, 0, - "could not load required resources at %s", glade_file); - g_free (glade_file); - g_object_unref (object); - return NULL; - } - g_free (glade_file); - - priv->widget = glade_xml_get_widget (priv->xml, "pptp-vbox"); - if (!priv->widget) { - g_set_error (error, PPTP_PLUGIN_UI_ERROR, 0, "could not load UI widget"); - g_object_unref (object); - return NULL; - } - g_object_ref_sink (priv->widget); - - priv->window_group = gtk_window_group_new (); - - if (!init_plugin_ui (PPTP_PLUGIN_UI_WIDGET (object), connection, error)) { - g_object_unref (object); - return NULL; - } - - priv->advanced = advanced_dialog_new_hash_from_connection (connection, error); - if (!priv->advanced) { - g_object_unref (object); - return NULL; - } - - return object; -} - -static void -dispose (GObject *object) -{ - PptpPluginUiWidget *plugin = PPTP_PLUGIN_UI_WIDGET (object); - PptpPluginUiWidgetPrivate *priv = PPTP_PLUGIN_UI_WIDGET_GET_PRIVATE (plugin); - - if (priv->group) - g_object_unref (priv->group); - - if (priv->window_group) - g_object_unref (priv->window_group); - - if (priv->widget) - g_object_unref (priv->widget); - - if (priv->xml) - g_object_unref (priv->xml); - - if (priv->advanced) - g_hash_table_destroy (priv->advanced); - - G_OBJECT_CLASS (pptp_plugin_ui_widget_parent_class)->dispose (object); -} - -static void -pptp_plugin_ui_widget_class_init (PptpPluginUiWidgetClass *req_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (req_class); - - g_type_class_add_private (req_class, sizeof (PptpPluginUiWidgetPrivate)); - - object_class->dispose = dispose; -} - -static void -pptp_plugin_ui_widget_init (PptpPluginUiWidget *plugin) -{ -} - -static void -pptp_plugin_ui_widget_interface_init (NMVpnPluginUiWidgetInterface *iface_class) -{ - /* interface implementation */ - iface_class->get_widget = get_widget; - iface_class->update_connection = update_connection; - iface_class->save_secrets = save_secrets; -} - -static gboolean -delete_connection (NMVpnPluginUiInterface *iface, - NMConnection *connection, - GError **error) -{ - NMSettingConnection *s_con = NULL; - const char *uuid; - - /* Remove any secrets in the keyring associated with this connection's UUID */ - s_con = (NMSettingConnection *) nm_connection_get_setting (connection, - NM_TYPE_SETTING_CONNECTION); - if (!s_con) { - g_set_error (error, - PPTP_PLUGIN_UI_ERROR, - PPTP_PLUGIN_UI_ERROR_INVALID_CONNECTION, - "missing 'connection' setting"); - return FALSE; - } - - uuid = nm_setting_connection_get_uuid (s_con); - keyring_helpers_delete_secret (uuid, NM_PPTP_KEY_PASSWORD); - - return TRUE; -} - -static NMConnection * -import (NMVpnPluginUiInterface *iface, const char *path, GError **error) -{ - NMConnection *connection = NULL; - char *contents = NULL; - char **lines = NULL; - char *ext; - - ext = strrchr (path, '.'); - if (!ext) { - g_set_error (error, - PPTP_PLUGIN_UI_ERROR, - PPTP_PLUGIN_UI_ERROR_FILE_NOT_PPTP, - "unknown PPTP file extension"); - goto out; - } - - if (strcmp (ext, ".conf") && strcmp (ext, ".cnf")) { - g_set_error (error, - PPTP_PLUGIN_UI_ERROR, - PPTP_PLUGIN_UI_ERROR_FILE_NOT_PPTP, - "unknown PPTP file extension"); - goto out; - } - - if (!g_file_get_contents (path, &contents, NULL, error)) - return NULL; - - lines = g_strsplit_set (contents, "\r\n", 0); - if (g_strv_length (lines) <= 1) { - g_set_error (error, - PPTP_PLUGIN_UI_ERROR, - PPTP_PLUGIN_UI_ERROR_FILE_NOT_READABLE, - "not a valid PPTP configuration file"); - goto out; - } - - connection = do_import (path, lines, error); - -out: - if (lines) - g_strfreev (lines); - g_free (contents); - return connection; -} - -static gboolean -export (NMVpnPluginUiInterface *iface, - const char *path, - NMConnection *connection, - GError **error) -{ - return do_export (path, connection, error); -} - -static char * -get_suggested_name (NMVpnPluginUiInterface *iface, NMConnection *connection) -{ - NMSettingConnection *s_con; - const char *id; - - g_return_val_if_fail (connection != NULL, NULL); - - s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); - g_return_val_if_fail (s_con != NULL, NULL); - - id = nm_setting_connection_get_id (s_con); - g_return_val_if_fail (id != NULL, NULL); - - return g_strdup_printf ("%s (pptp).conf", id); -} - -static guint32 -get_capabilities (NMVpnPluginUiInterface *iface) -{ - return (NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT | NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT); -} - -static NMVpnPluginUiWidgetInterface * -ui_factory (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error) -{ - return nm_vpn_plugin_ui_widget_interface_new (connection, error); -} - -static void -get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) -{ - switch (prop_id) { - case NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: - g_value_set_string (value, PPTP_PLUGIN_NAME); - break; - case NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: - g_value_set_string (value, PPTP_PLUGIN_DESC); - break; - case NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: - g_value_set_string (value, PPTP_PLUGIN_SERVICE); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -pptp_plugin_ui_class_init (PptpPluginUiClass *req_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (req_class); - - object_class->get_property = get_property; - - g_object_class_override_property (object_class, - NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME, - NM_VPN_PLUGIN_UI_INTERFACE_NAME); - - g_object_class_override_property (object_class, - NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC, - NM_VPN_PLUGIN_UI_INTERFACE_DESC); - - g_object_class_override_property (object_class, - NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE, - NM_VPN_PLUGIN_UI_INTERFACE_SERVICE); -} - -static void -pptp_plugin_ui_init (PptpPluginUi *plugin) -{ -} - -static void -pptp_plugin_ui_interface_init (NMVpnPluginUiInterface *iface_class) -{ - /* interface implementation */ - iface_class->ui_factory = ui_factory; - iface_class->get_capabilities = get_capabilities; - iface_class->import = import; - iface_class->export = export; - iface_class->get_suggested_name = get_suggested_name; - iface_class->delete_connection = delete_connection; -} - - -G_MODULE_EXPORT NMVpnPluginUiInterface * -nm_vpn_plugin_ui_factory (GError **error) -{ - if (error) - g_return_val_if_fail (*error == NULL, NULL); - - return NM_VPN_PLUGIN_UI_INTERFACE (g_object_new (PPTP_TYPE_PLUGIN_UI, NULL)); -} - diff --git a/vpn-daemons/pptp/properties/nm-pptp.h b/vpn-daemons/pptp/properties/nm-pptp.h deleted file mode 100644 index 49b4a4a767..0000000000 --- a/vpn-daemons/pptp/properties/nm-pptp.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * nm-pptp.h : GNOME UI dialogs for configuring pptp VPN connections - * - * Copyright (C) 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifndef _NM_PPTP_H_ -#define _NM_PPTP_H_ - -#include - -typedef enum -{ - PPTP_PLUGIN_UI_ERROR_UNKNOWN = 0, - PPTP_PLUGIN_UI_ERROR_INVALID_CONNECTION, - PPTP_PLUGIN_UI_ERROR_INVALID_PROPERTY, - PPTP_PLUGIN_UI_ERROR_MISSING_PROPERTY, - PPTP_PLUGIN_UI_ERROR_FILE_NOT_READABLE, - PPTP_PLUGIN_UI_ERROR_FILE_NOT_PPTP -} PptpPluginUiError; - -#define PPTP_TYPE_PLUGIN_UI_ERROR (pptp_plugin_ui_error_get_type ()) -GType pptp_plugin_ui_error_get_type (void); - -#define PPTP_PLUGIN_UI_ERROR (pptp_plugin_ui_error_quark ()) -GQuark pptp_plugin_ui_error_quark (void); - - -#define PPTP_TYPE_PLUGIN_UI (pptp_plugin_ui_get_type ()) -#define PPTP_PLUGIN_UI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PPTP_TYPE_PLUGIN_UI, PptpPluginUi)) -#define PPTP_PLUGIN_UI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PPTP_TYPE_PLUGIN_UI, PptpPluginUiClass)) -#define PPTP_IS_PLUGIN_UI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PPTP_TYPE_PLUGIN_UI)) -#define PPTP_IS_PLUGIN_UI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), PPTP_TYPE_PLUGIN_UI)) -#define PPTP_PLUGIN_UI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PPTP_TYPE_PLUGIN_UI, PptpPluginUiClass)) - -typedef struct _PptpPluginUi PptpPluginUi; -typedef struct _PptpPluginUiClass PptpPluginUiClass; - -struct _PptpPluginUi { - GObject parent; -}; - -struct _PptpPluginUiClass { - GObjectClass parent; -}; - -GType pptp_plugin_ui_get_type (void); - - -#define PPTP_TYPE_PLUGIN_UI_WIDGET (pptp_plugin_ui_widget_get_type ()) -#define PPTP_PLUGIN_UI_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PPTP_TYPE_PLUGIN_UI_WIDGET, PptpPluginUiWidget)) -#define PPTP_PLUGIN_UI_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PPTP_TYPE_PLUGIN_UI_WIDGET, PptpPluginUiWidgetClass)) -#define PPTP_IS_PLUGIN_UI_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PPTP_TYPE_PLUGIN_UI_WIDGET)) -#define PPTP_IS_PLUGIN_UI_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), PPTP_TYPE_PLUGIN_UI_WIDGET)) -#define PPTP_PLUGIN_UI_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PPTP_TYPE_PLUGIN_UI_WIDGET, PptpPluginUiWidgetClass)) - -typedef struct _PptpPluginUiWidget PptpPluginUiWidget; -typedef struct _PptpPluginUiWidgetClass PptpPluginUiWidgetClass; - -struct _PptpPluginUiWidget { - GObject parent; -}; - -struct _PptpPluginUiWidgetClass { - GObjectClass parent; -}; - -GType pptp_plugin_ui_widget_get_type (void); - -#endif /* _NM_PPTP_H_ */ - diff --git a/vpn-daemons/pptp/src/.cvsignore b/vpn-daemons/pptp/src/.cvsignore deleted file mode 100644 index 9cedb42398..0000000000 --- a/vpn-daemons/pptp/src/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -Makefile.in -Makefile -nm-ppp-starter -nm-pppd-plugin.so -nm-pptp-service -.libs -.deps diff --git a/vpn-daemons/pptp/src/Makefile.am b/vpn-daemons/pptp/src/Makefile.am deleted file mode 100644 index 8bbbcc542a..0000000000 --- a/vpn-daemons/pptp/src/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -INCLUDES = -I${top_srcdir} - -AM_CPPFLAGS = \ - $(DBUS_GLIB_CFLAGS) \ - $(GTHREAD_CFLAGS) \ - $(NM_UTILS_CFLAGS) \ - -DDBUS_API_SUBJECT_TO_CHANGE \ - -DG_DISABLE_DEPRECATED \ - -DBINDIR=\"$(bindir)\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DNM_VERSION="\"$(VERSION)\"" \ - -DLIBDIR=\""$(libdir)"\" \ - -DLIBEXECDIR=\""$(libexecdir)"\" \ - -DLOCALSTATEDIR=\""$(localstatedir)"\" \ - -DDATADIR=\"$(datadir)\" \ - -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" - -libexec_PROGRAMS = nm-pptp-service - -nm_pptp_service_SOURCES = \ - nm-pptp-service.c \ - nm-pptp-service.h - -nm-pptp-pppd-service-glue.h: $(top_srcdir)/src/nm-pptp-pppd-service.xml - dbus-binding-tool --prefix=nm_pptp_pppd_service --mode=glib-server --output=$@ $< - -nm_pptp_service_LDADD = \ - $(DBUS_GLIB_LIBS) \ - $(GTHREAD_LIBS) \ - $(NM_UTILS_LIBS) - -pppd_plugindir = $(PPPD_PLUGIN_DIR) -pppd_plugin_LTLIBRARIES = nm-pptp-pppd-plugin.la - -nm_pptp_pppd_plugin_la_SOURCES = \ - nm-pptp-pppd-plugin.c \ - nm-ppp-status.h - -nm_pptp_pppd_plugin_la_CPPFLAGS = \ - $(DBUS_GLIB_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(NM_UTILS_CFLAGS) - -nm_pptp_pppd_plugin_la_LDFLAGS = -module -avoid-version - -nm_pptp_pppd_plugin_la_LIBADD = \ - $(DBUS_GLIB_LIBS) \ - $(GLIB_LIBS) \ - $(NM_UTILS_LIBS) - -BUILT_SOURCES = nm-pptp-pppd-service-glue.h - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = nm-pptp-pppd-service.xml - diff --git a/vpn-daemons/pptp/src/nm-ppp-status.h b/vpn-daemons/pptp/src/nm-ppp-status.h deleted file mode 100644 index 9e46e542c7..0000000000 --- a/vpn-daemons/pptp/src/nm-ppp-status.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef NM_PPP_STATUS_H -#define NM_PPP_STATUS_H - -typedef enum { - NM_PPP_STATUS_UNKNOWN, - - NM_PPP_STATUS_DEAD, - NM_PPP_STATUS_INITIALIZE, - NM_PPP_STATUS_SERIALCONN, - NM_PPP_STATUS_DORMANT, - NM_PPP_STATUS_ESTABLISH, - NM_PPP_STATUS_AUTHENTICATE, - NM_PPP_STATUS_CALLBACK, - NM_PPP_STATUS_NETWORK, - NM_PPP_STATUS_RUNNING, - NM_PPP_STATUS_TERMINATE, - NM_PPP_STATUS_DISCONNECT, - NM_PPP_STATUS_HOLDOFF, - NM_PPP_STATUS_MASTER -} NMPPPStatus; - -#endif /* NM_PPP_STATUS_H */ diff --git a/vpn-daemons/pptp/src/nm-pptp-pppd-plugin.c b/vpn-daemons/pptp/src/nm-pptp-pppd-plugin.c deleted file mode 100644 index 2f10072ec8..0000000000 --- a/vpn-daemons/pptp/src/nm-pptp-pppd-plugin.c +++ /dev/null @@ -1,324 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* nm-pptp-service - pptp (and other pppd) integration with NetworkManager - * - * (C) 2007 - 2008 Novell, Inc. - * (C) 2008 Red Hat, Inc. - * - * 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. - * - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "nm-pptp-service.h" -#include "nm-ppp-status.h" - -#include - -int plugin_init (void); - -char pppd_version[] = VERSION; - -static DBusGProxy *proxy = NULL; - -static void -nm_phasechange (void *data, int arg) -{ - NMPPPStatus ppp_status = NM_PPP_STATUS_UNKNOWN; - char *ppp_phase; - - g_return_if_fail (DBUS_IS_G_PROXY (proxy)); - - switch (arg) { - case PHASE_DEAD: - ppp_status = NM_PPP_STATUS_DEAD; - ppp_phase = "dead"; - break; - case PHASE_INITIALIZE: - ppp_status = NM_PPP_STATUS_INITIALIZE; - ppp_phase = "initialize"; - break; - case PHASE_SERIALCONN: - ppp_status = NM_PPP_STATUS_SERIALCONN; - ppp_phase = "serial connection"; - break; - case PHASE_DORMANT: - ppp_status = NM_PPP_STATUS_DORMANT; - ppp_phase = "dormant"; - break; - case PHASE_ESTABLISH: - ppp_status = NM_PPP_STATUS_ESTABLISH; - ppp_phase = "establish"; - break; - case PHASE_AUTHENTICATE: - ppp_status = NM_PPP_STATUS_AUTHENTICATE; - ppp_phase = "authenticate"; - break; - case PHASE_CALLBACK: - ppp_status = NM_PPP_STATUS_CALLBACK; - ppp_phase = "callback"; - break; - case PHASE_NETWORK: - ppp_status = NM_PPP_STATUS_NETWORK; - ppp_phase = "network"; - break; - case PHASE_RUNNING: - ppp_status = NM_PPP_STATUS_RUNNING; - ppp_phase = "running"; - break; - case PHASE_TERMINATE: - ppp_status = NM_PPP_STATUS_TERMINATE; - ppp_phase = "terminate"; - break; - case PHASE_DISCONNECT: - ppp_status = NM_PPP_STATUS_DISCONNECT; - ppp_phase = "disconnect"; - break; - case PHASE_HOLDOFF: - ppp_status = NM_PPP_STATUS_HOLDOFF; - ppp_phase = "holdoff"; - break; - case PHASE_MASTER: - ppp_status = NM_PPP_STATUS_MASTER; - ppp_phase = "master"; - break; - - default: - ppp_phase = "unknown"; - break; - } - - if (ppp_status != NM_PPP_STATUS_UNKNOWN) { - dbus_g_proxy_call_no_reply (proxy, "SetState", - G_TYPE_UINT, ppp_status, - G_TYPE_INVALID, - G_TYPE_INVALID); - } -} - -static GValue * -str_to_gvalue (const char *str) -{ - GValue *val; - - val = g_slice_new0 (GValue); - g_value_init (val, G_TYPE_STRING); - g_value_set_string (val, str); - - return val; -} - -static GValue * -uint_to_gvalue (guint32 i) -{ - GValue *val; - - val = g_slice_new0 (GValue); - g_value_init (val, G_TYPE_UINT); - g_value_set_uint (val, i); - - return val; -} - -static void -value_destroy (gpointer data) -{ - GValue *val = (GValue *) data; - - g_value_unset (val); - g_slice_free (GValue, val); -} - -static void -nm_ip_up (void *data, int arg) -{ - guint32 pppd_made_up_address = htonl (0x0a404040 + ifunit); - ipcp_options opts = ipcp_gotoptions[0]; - ipcp_options peer_opts = ipcp_hisoptions[0]; - GHashTable *hash; - GArray *array; - GValue *val; - - g_return_if_fail (DBUS_IS_G_PROXY (proxy)); - - if (!opts.ouraddr) { - g_warning ("Didn't receive an internal IP from pppd"); - return; - } - - hash = g_hash_table_new_full (g_str_hash, g_str_equal, - NULL, value_destroy); - - g_hash_table_insert (hash, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, - str_to_gvalue (ifname)); - - /* Prefer the peer options remote address first, _unless_ pppd made the - * address up, at which point prefer the local options remote address, - * and if that's not right, use the made-up address as a last resort. - */ - if (peer_opts.hisaddr && (peer_opts.hisaddr != pppd_made_up_address)) { - g_hash_table_insert (hash, NM_VPN_PLUGIN_IP4_CONFIG_PTP, - uint_to_gvalue (peer_opts.hisaddr)); - } else if (opts.hisaddr) { - g_hash_table_insert (hash, NM_VPN_PLUGIN_IP4_CONFIG_PTP, - uint_to_gvalue (opts.hisaddr)); - } else if (peer_opts.hisaddr == pppd_made_up_address) { - /* As a last resort, use the made-up address */ - g_hash_table_insert (hash, NM_VPN_PLUGIN_IP4_CONFIG_PTP, - uint_to_gvalue (peer_opts.hisaddr)); - } - - g_hash_table_insert (hash, NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, - uint_to_gvalue (opts.ouraddr)); - - g_hash_table_insert (hash, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, uint_to_gvalue (32)); - - if (opts.dnsaddr[0] || opts.dnsaddr[1]) { - array = g_array_new (FALSE, FALSE, sizeof (guint32)); - - if (opts.dnsaddr[0]) - g_array_append_val (array, opts.dnsaddr[0]); - if (opts.dnsaddr[1]) - g_array_append_val (array, opts.dnsaddr[1]); - - val = g_slice_new0 (GValue); - g_value_init (val, DBUS_TYPE_G_UINT_ARRAY); - g_value_set_boxed (val, array); - - g_hash_table_insert (hash, NM_VPN_PLUGIN_IP4_CONFIG_DNS, val); - } - - dbus_g_proxy_call_no_reply (proxy, "SetIp4Config", - DBUS_TYPE_G_MAP_OF_VARIANT, hash, G_TYPE_INVALID, - G_TYPE_INVALID); - - g_hash_table_destroy (hash); -} - -static int -get_chap_check() -{ - return 1; -} - -static int -get_pap_check() -{ - return 1; -} - -static int -get_credentials (char *username, char *password) -{ - char *my_username; - char *my_password; - size_t len; - GError *err = NULL; - - if (username && !password) { - /* pppd is checking pap support; return 1 for supported */ - return 1; - } - - g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), -1); - - my_username = my_password = NULL; - dbus_g_proxy_call (proxy, "NeedSecrets", &err, - G_TYPE_INVALID, - G_TYPE_STRING, &my_username, - G_TYPE_STRING, &my_password, - G_TYPE_INVALID); - - if (err) { - g_warning ("Could not get secrets: %s", err->message); - g_error_free (err); - return -1; - } - - if (my_username) { - len = strlen (my_username) + 1; - len = len < MAXNAMELEN ? len : MAXNAMELEN; - - strncpy (username, my_username, len); - username[len - 1] = '\0'; - - g_free (my_username); - } - - if (my_password) { - len = strlen (my_password) + 1; - len = len < MAXSECRETLEN ? len : MAXSECRETLEN; - - strncpy (password, my_password, len); - password[len - 1] = '\0'; - - g_free (my_password); - } - - return 1; -} - -static void -nm_exit_notify (void *data, int arg) -{ - g_return_if_fail (DBUS_IS_G_PROXY (proxy)); - - g_object_unref (proxy); - proxy = NULL; -} - -int -plugin_init (void) -{ - DBusGConnection *bus; - GError *err = NULL; - - g_type_init (); - - bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err); - if (!bus) { - g_warning ("Couldn't connect to system bus: %s", err->message); - g_error_free (err); - return -1; - } - - proxy = dbus_g_proxy_new_for_name (bus, - NM_DBUS_SERVICE_PPTP_PPP, - NM_DBUS_PATH_PPTP_PPP, - NM_DBUS_INTERFACE_PPTP_PPP); - - dbus_g_connection_unref (bus); - - chap_passwd_hook = get_credentials; - chap_check_hook = get_chap_check; - pap_passwd_hook = get_credentials; - pap_check_hook = get_pap_check; - - add_notifier (&phasechange, nm_phasechange, NULL); - add_notifier (&ip_up_notifier, nm_ip_up, NULL); - add_notifier (&exitnotify, nm_exit_notify, proxy); - - return 0; -} diff --git a/vpn-daemons/pptp/src/nm-pptp-pppd-service.xml b/vpn-daemons/pptp/src/nm-pptp-pppd-service.xml deleted file mode 100644 index cc4bfaaf78..0000000000 --- a/vpn-daemons/pptp/src/nm-pptp-pppd-service.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/vpn-daemons/pptp/src/nm-pptp-service.c b/vpn-daemons/pptp/src/nm-pptp-service.c deleted file mode 100644 index 3a3124e302..0000000000 --- a/vpn-daemons/pptp/src/nm-pptp-service.c +++ /dev/null @@ -1,1219 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* nm-pptp-service - PPTP VPN integration with NetworkManager - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2008 Red Hat, Inc. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#ifndef aligned_u64 -#define aligned_u64 unsigned long long __attribute__((aligned(8))) -#endif -#include - -#include -#include - -#include "nm-pptp-service.h" -#include "nm-ppp-status.h" - -/********************************************************/ -/* ppp plugin <-> pptp-service object */ -/********************************************************/ - -/* Have to have a separate objec to handle ppp plugin requests since - * dbus-glib doesn't allow multiple interfaces registed on one GObject. - */ - -#define NM_TYPE_PPTP_PPP_SERVICE (nm_pptp_ppp_service_get_type ()) -#define NM_PPTP_PPP_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_PPTP_PPP_SERVICE, NMPptpPppService)) -#define NM_PPTP_PPP_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_PPTP_PPP_SERVICE, NMPptpPppServiceClass)) -#define NM_IS_PPTP_PPP_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_PPTP_PPP_SERVICE)) -#define NM_IS_PPTP_PPP_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_PPTP_PPP_SERVICE)) -#define NM_PPTP_PPP_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_PPTP_PPP_SERVICE, NMPptpPppServiceClass)) - -typedef struct { - GObject parent; -} NMPptpPppService; - -typedef struct { - GObjectClass parent; - - /* Signals */ - void (*plugin_alive) (NMPptpPppService *self); - void (*ppp_state) (NMPptpPppService *self, guint32 state); - void (*ip4_config) (NMPptpPppService *self, GHashTable *config_hash); -} NMPptpPppServiceClass; - -GType nm_pptp_ppp_service_get_type (void); - -G_DEFINE_TYPE (NMPptpPppService, nm_pptp_ppp_service, G_TYPE_OBJECT) - -static gboolean impl_pptp_service_need_secrets (NMPptpPppService *self, - char **out_username, - char **out_password, - GError **err); - -static gboolean impl_pptp_service_set_state (NMPptpPppService *self, - guint32 state, - GError **err); - -static gboolean impl_pptp_service_set_ip4_config (NMPptpPppService *self, - GHashTable *config, - GError **err); - -#include "nm-pptp-pppd-service-glue.h" - - -#define NM_PPTP_PPP_SERVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_PPTP_PPP_SERVICE, NMPptpPppServicePrivate)) - -typedef struct { - char username[100]; - char domain[100]; - char password[100]; -} NMPptpPppServicePrivate; - -enum { - PLUGIN_ALIVE, - PPP_STATE, - IP4_CONFIG, - - LAST_SIGNAL -}; -static guint signals[LAST_SIGNAL] = { 0 }; - -NMPptpPppService * -nm_pptp_ppp_service_new (void) -{ - DBusGConnection *connection; - DBusGProxy *proxy; - GError *error = NULL; - gboolean success = FALSE; - guint request_name_result; - GObject *object; - - object = g_object_new (NM_TYPE_PPTP_PPP_SERVICE, NULL); - - dbus_connection_set_change_sigpipe (TRUE); - - connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - if (!connection) { - nm_warning ("Could not get the system bus. Make sure " - "the message bus daemon is running! Message: %s", - error->message); - g_error_free (error); - g_object_unref (object); - return NULL; - } - - proxy = dbus_g_proxy_new_for_name (connection, - "org.freedesktop.DBus", - "/org/freedesktop/DBus", - "org.freedesktop.DBus"); - - if (dbus_g_proxy_call (proxy, "RequestName", &error, - G_TYPE_STRING, NM_DBUS_SERVICE_PPTP_PPP, - G_TYPE_UINT, 0, - G_TYPE_INVALID, - G_TYPE_UINT, &request_name_result, - G_TYPE_INVALID)) { - dbus_g_connection_register_g_object (connection, NM_DBUS_PATH_PPTP_PPP, object); - success = TRUE; - } else { - nm_warning ("Could not register D-Bus service name. Message: %s", error->message); - g_error_free (error); - g_object_unref (object); - object = NULL; - } - - g_object_unref (proxy); - return (NMPptpPppService *) object; -} - -static void -nm_pptp_ppp_service_init (NMPptpPppService *self) -{ -} - -static void -finalize (GObject *object) -{ - NMPptpPppServicePrivate *priv = NM_PPTP_PPP_SERVICE_GET_PRIVATE (object); - - /* Get rid of the cached username and password */ - memset (priv->username, 0, sizeof (priv->username)); - memset (priv->domain, 0, sizeof (priv->domain)); - memset (priv->password, 0, sizeof (priv->password)); -} - -static void -nm_pptp_ppp_service_class_init (NMPptpPppServiceClass *service_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (service_class); - - g_type_class_add_private (service_class, sizeof (NMPptpPppServicePrivate)); - - /* virtual methods */ - object_class->finalize = finalize; - - /* Signals */ - signals[PLUGIN_ALIVE] = - g_signal_new ("plugin-alive", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMPptpPppServiceClass, plugin_alive), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - signals[PPP_STATE] = - g_signal_new ("ppp-state", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMPptpPppServiceClass, ppp_state), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, - G_TYPE_NONE, 1, G_TYPE_UINT); - - signals[IP4_CONFIG] = - g_signal_new ("ip4-config", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMPptpPppServiceClass, ip4_config), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); - - dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (service_class), - &dbus_glib_nm_pptp_pppd_service_object_info); -} - -static gboolean -nm_pptp_ppp_service_cache_credentials (NMPptpPppService *self, - NMConnection *connection, - GError **error) -{ - NMPptpPppServicePrivate *priv = NM_PPTP_PPP_SERVICE_GET_PRIVATE (self); - NMSettingVPN *s_vpn; - const char *username, *password, *domain; - - g_return_val_if_fail (self != NULL, FALSE); - g_return_val_if_fail (connection != NULL, FALSE); - - memset (priv->username, 0, sizeof (priv->username)); - memset (priv->domain, 0, sizeof (priv->domain)); - memset (priv->password, 0, sizeof (priv->password)); - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - if (!s_vpn) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "%s", - "Could not find secrets (connection invalid, no vpn setting)."); - return FALSE; - } - - /* Username; try PPTP specific username first, then generic username */ - username = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_USER); - if (username && strlen (username)) { - /* FIXME: This check makes about 0 sense. */ - if (!username || !strlen (username)) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "%s", - "Invalid VPN username."); - return FALSE; - } - } else { - username = nm_setting_vpn_get_user_name (s_vpn); - if (!username || !strlen (username)) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "%s", - "Missing VPN username."); - return FALSE; - } - } - - password = nm_setting_vpn_get_secret (s_vpn, NM_PPTP_KEY_PASSWORD); - if (!password || !strlen (password)) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "%s", - "Missing or invalid VPN password."); - return FALSE; - } - - domain = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_DOMAIN); - if (domain && strlen (domain)) - memcpy (priv->domain, domain, strlen (domain)); - - memcpy (priv->username, username, strlen (username)); - memcpy (priv->password, password, strlen (password)); - return TRUE; -} - -static gboolean -impl_pptp_service_need_secrets (NMPptpPppService *self, - char **out_username, - char **out_password, - GError **error) -{ - NMPptpPppServicePrivate *priv = NM_PPTP_PPP_SERVICE_GET_PRIVATE (self); - - g_signal_emit (G_OBJECT (self), signals[PLUGIN_ALIVE], 0); - - if (!strlen (priv->username) || !strlen (priv->password)) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "%s", - "No cached credentials."); - goto error; - } - - /* Success */ - if (strlen (priv->domain)) - *out_username = g_strdup_printf ("%s\\\\%s", priv->domain, priv->username); - else - *out_username = g_strdup (priv->username); - *out_password = g_strdup (priv->password); - return TRUE; - -error: - return FALSE; -} - -static gboolean -impl_pptp_service_set_state (NMPptpPppService *self, - guint32 pppd_state, - GError **err) -{ - g_signal_emit (G_OBJECT (self), signals[PLUGIN_ALIVE], 0); - g_signal_emit (G_OBJECT (self), signals[PPP_STATE], 0, pppd_state); - return TRUE; -} - -static gboolean -impl_pptp_service_set_ip4_config (NMPptpPppService *self, - GHashTable *config_hash, - GError **err) -{ - nm_info ("PPTP service (IP Config Get) reply received."); - g_signal_emit (G_OBJECT (self), signals[PLUGIN_ALIVE], 0); - - /* Just forward the pppd plugin config up to our superclass; no need to modify it */ - g_signal_emit (G_OBJECT (self), signals[IP4_CONFIG], 0, config_hash); - - return TRUE; -} - - -/********************************************************/ -/* The VPN plugin service */ -/********************************************************/ - -G_DEFINE_TYPE (NMPptpPlugin, nm_pptp_plugin, NM_TYPE_VPN_PLUGIN) - -typedef struct { - GPid pid; - guint32 ppp_timeout_handler; - NMPptpPppService *service; - NMConnection *connection; -} NMPptpPluginPrivate; - -#define NM_PPTP_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_PPTP_PLUGIN, NMPptpPluginPrivate)) - -#define NM_PPTP_PPPD_PLUGIN PLUGINDIR "/nm-pptp-pppd-plugin.so" -#define NM_PPTP_WAIT_PPPD 10000 /* 10 seconds */ -#define PPTP_SERVICE_SECRET_TRIES "pptp-service-secret-tries" - -typedef struct { - const char *name; - GType type; - gboolean required; -} ValidProperty; - -static ValidProperty valid_properties[] = { - { NM_PPTP_KEY_GATEWAY, G_TYPE_STRING, TRUE }, - { NM_PPTP_KEY_USER, G_TYPE_STRING, FALSE }, - { NM_PPTP_KEY_DOMAIN, G_TYPE_STRING, FALSE }, - { NM_PPTP_KEY_REFUSE_EAP, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_REFUSE_PAP, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_REFUSE_CHAP, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_REFUSE_MSCHAP, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_REFUSE_MSCHAPV2, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_REQUIRE_MPPE, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_REQUIRE_MPPE_40, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_REQUIRE_MPPE_128, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_MPPE_STATEFUL, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_NOBSDCOMP, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_NODEFLATE, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_NO_VJ_COMP, G_TYPE_BOOLEAN, FALSE }, - { NM_PPTP_KEY_LCP_ECHO_FAILURE, G_TYPE_UINT, FALSE }, - { NM_PPTP_KEY_LCP_ECHO_INTERVAL, G_TYPE_UINT, FALSE }, - { NULL, G_TYPE_NONE, FALSE } -}; - -static ValidProperty valid_secrets[] = { - { NM_PPTP_KEY_PASSWORD, G_TYPE_STRING, FALSE }, - { NULL, G_TYPE_NONE, FALSE } -}; - -static gboolean -validate_gateway (const char *gateway) -{ - const char *p = gateway; - - if (!gateway || !strlen (gateway)) - return FALSE; - - /* Ensure it's a valid DNS name or IP address */ - p = gateway; - while (*p) { - if (!isalnum (*p) && (*p != '-') && (*p != '.')) - return FALSE; - p++; - } - return TRUE; -} - -typedef struct ValidateInfo { - ValidProperty *table; - GError **error; - gboolean have_items; -} ValidateInfo; - -static void -validate_one_property (const char *key, const char *value, gpointer user_data) -{ - ValidateInfo *info = (ValidateInfo *) user_data; - int i; - - if (*(info->error)) - return; - - info->have_items = TRUE; - - /* 'name' is the setting name; always allowed but unused */ - if (!strcmp (key, NM_SETTING_NAME)) - return; - - for (i = 0; info->table[i].name; i++) { - ValidProperty prop = info->table[i]; - long int tmp; - - if (strcmp (prop.name, key)) - continue; - - switch (prop.type) { - case G_TYPE_STRING: - if ( !strcmp (prop.name, NM_PPTP_KEY_GATEWAY) - && !validate_gateway (value)) { - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "invalid gateway '%s'", - key); - return; - } - return; /* valid */ - case G_TYPE_UINT: - errno = 0; - tmp = strtol (value, NULL, 10); - if (errno == 0) - return; /* valid */ - - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "invalid integer property '%s'", - key); - break; - case G_TYPE_BOOLEAN: - if (!strcmp (value, "yes") || !strcmp (value, "no")) - return; /* valid */ - - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "invalid boolean property '%s' (not yes or no)", - key); - break; - default: - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "unhandled property '%s' type %s", - key, g_type_name (prop.type)); - break; - } - } - - /* Did not find the property from valid_properties or the type did not match */ - if (!info->table[i].name) { - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "property '%s' invalid or not supported", - key); - } -} - -static gboolean -nm_pptp_properties_validate (NMSettingVPN *s_vpn, - GError **error) -{ - ValidateInfo info = { &valid_properties[0], error, FALSE }; - int i; - - nm_setting_vpn_foreach_data_item (s_vpn, validate_one_property, &info); - if (!info.have_items) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "%s", - "No VPN configuration options."); - return FALSE; - } - - if (*error) - return FALSE; - - /* Ensure required properties exist */ - for (i = 0; valid_properties[i].name; i++) { - ValidProperty prop = valid_properties[i]; - const char *value; - - if (!prop.required) - continue; - - value = nm_setting_vpn_get_data_item (s_vpn, prop.name); - if (!value || !strlen (value)) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Missing required option '%s'.", - prop.name); - return FALSE; - } - } - - return TRUE; -} - -static gboolean -nm_pptp_secrets_validate (NMSettingVPN *s_vpn, GError **error) -{ - ValidateInfo info = { &valid_secrets[0], error, FALSE }; - - nm_setting_vpn_foreach_secret (s_vpn, validate_one_property, &info); - if (!info.have_items) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "%s", - "No VPN secrets!"); - return FALSE; - } - - return *error ? FALSE : TRUE; -} - -static void -pppd_watch_cb (GPid pid, gint status, gpointer user_data) -{ - NMPptpPlugin *plugin = NM_PPTP_PLUGIN (user_data); - NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (plugin); - guint error = 0; - - if (WIFEXITED (status)) { - error = WEXITSTATUS (status); - if (error != 0) - nm_warning ("pppd exited with error code %d", error); - } - else if (WIFSTOPPED (status)) - nm_warning ("pppd stopped unexpectedly with signal %d", WSTOPSIG (status)); - else if (WIFSIGNALED (status)) - nm_warning ("pppd died with signal %d", WTERMSIG (status)); - else - nm_warning ("pppd died from an unknown cause"); - - /* Reap child if needed. */ - waitpid (priv->pid, NULL, WNOHANG); - priv->pid = 0; - - /* Must be after data->state is set since signals use data->state */ - switch (error) { - case 16: - /* hangup */ - // FIXME: better failure reason - nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED); - break; - case 2: - /* Couldn't log in due to bad user/pass */ - nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED); - break; - case 1: - /* Other error (couldn't bind to address, etc) */ - nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED); - break; - default: - break; - } - - nm_vpn_plugin_set_state (NM_VPN_PLUGIN (plugin), NM_VPN_SERVICE_STATE_STOPPED); -} - -static inline const char * -nm_find_pppd (void) -{ - static const char *pppd_binary_paths[] = - { - "/sbin/pppd", - "/usr/sbin/pppd", - "/usr/local/sbin/pppd", - NULL - }; - - const char **pppd_binary = pppd_binary_paths; - - while (*pppd_binary != NULL) { - if (g_file_test (*pppd_binary, G_FILE_TEST_EXISTS)) - break; - pppd_binary++; - } - - return *pppd_binary; -} - -static inline const char * -nm_find_pptp (void) -{ - static const char *pptp_binary_paths[] = - { - "/sbin/pptp", - "/usr/sbin/pptp", - "/usr/local/sbin/pptp", - NULL - }; - - const char **pptp_binary = pptp_binary_paths; - - while (*pptp_binary != NULL) { - if (g_file_test (*pptp_binary, G_FILE_TEST_EXISTS)) - break; - pptp_binary++; - } - - return *pptp_binary; -} - -static gboolean -pppd_timed_out (gpointer user_data) -{ - NMPptpPlugin *plugin = NM_PPTP_PLUGIN (user_data); - - nm_warning ("Looks like pppd didn't initialize our dbus module"); - nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT); - - return FALSE; -} - -static void -free_pppd_args (GPtrArray *args) -{ - int i; - - if (!args) - return; - - for (i = 0; i < args->len; i++) - g_free (g_ptr_array_index (args, i)); - g_ptr_array_free (args, TRUE); -} - -static GPtrArray * -construct_pppd_args (NMPptpPlugin *plugin, - NMSettingVPN *s_vpn, - const char *pppd, - GError **error) -{ - NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (plugin); - NMPptpPppServicePrivate *service_priv = NULL; - GPtrArray *args = NULL; - const char *value, *pptp_binary; - char *ipparam, *tmp; - - pptp_binary = nm_find_pptp (); - if (!pptp_binary) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED, - "%s", - "Could not find pptp client binary."); - return FALSE; - } - - args = g_ptr_array_new (); - g_ptr_array_add (args, (gpointer) g_strdup (pppd)); - - /* PPTP options */ - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_GATEWAY); - if (!value || !strlen (value)) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "%s", - "Missing VPN gateway."); - goto error; - } - - ipparam = g_strdup_printf ("nm-pptp-service-%d", getpid ()); - - g_ptr_array_add (args, (gpointer) g_strdup ("pty")); - tmp = g_strdup_printf ("%s %s --nolaunchpppd --logstring %s", pptp_binary, value, ipparam); - g_ptr_array_add (args, (gpointer) tmp); - - if (getenv ("NM_PPP_DEBUG")) - g_ptr_array_add (args, (gpointer) g_strdup ("debug")); - - /* PPP options */ - g_ptr_array_add (args, (gpointer) g_strdup ("ipparam")); - g_ptr_array_add (args, (gpointer) ipparam); - - g_ptr_array_add (args, (gpointer) g_strdup ("nodetach")); - g_ptr_array_add (args, (gpointer) g_strdup ("lock")); - g_ptr_array_add (args, (gpointer) g_strdup ("usepeerdns")); - g_ptr_array_add (args, (gpointer) g_strdup ("noipdefault")); - g_ptr_array_add (args, (gpointer) g_strdup ("nodefaultroute")); - - if (priv->service) - service_priv = NM_PPTP_PPP_SERVICE_GET_PRIVATE (priv->service); - if (service_priv && strlen (service_priv->username)) { - g_ptr_array_add (args, (gpointer) g_strdup ("user")); - g_ptr_array_add (args, (gpointer) g_strdup (service_priv->username)); - } - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REFUSE_EAP); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("refuse-eap")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REFUSE_PAP); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("refuse-pap")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REFUSE_CHAP); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("refuse-chap")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REFUSE_MSCHAP); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("refuse-mschap")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REFUSE_MSCHAPV2); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("refuse-mschap-v2")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REQUIRE_MPPE); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("require-mppe")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REQUIRE_MPPE_40); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("require-mppe-40")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REQUIRE_MPPE_128); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("require-mppe-128")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_MPPE_STATEFUL); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("mppe-stateful")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_NOBSDCOMP); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("nobsdcomp")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_NODEFLATE); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("nodeflate")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_NO_VJ_COMP); - if (value && !strcmp (value, "yes")) - g_ptr_array_add (args, (gpointer) g_strdup ("novj")); - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_LCP_ECHO_FAILURE); - if (value && strlen (value)) { - long int tmp_int; - - /* Convert to integer and then back to string for security's sake - * because strtol ignores some leading and trailing characters. - */ - errno = 0; - tmp_int = strtol (value, NULL, 10); - if (errno == 0) { - g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-failure")); - g_ptr_array_add (args, (gpointer) g_strdup_printf ("%ld", tmp_int)); - } else { - nm_warning ("failed to convert lcp-echo-failure value '%s'", value); - } - } else { - g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-failure")); - g_ptr_array_add (args, (gpointer) g_strdup ("0")); - } - - value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_LCP_ECHO_INTERVAL); - if (value && strlen (value)) { - long int tmp_int; - - /* Convert to integer and then back to string for security's sake - * because strtol ignores some leading and trailing characters. - */ - errno = 0; - tmp_int = strtol (value, NULL, 10); - if (errno == 0) { - g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-interval")); - g_ptr_array_add (args, (gpointer) g_strdup_printf ("%ld", tmp_int)); - } else { - nm_warning ("failed to convert lcp-echo-interval value '%s'", value); - } - } else { - g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-interval")); - g_ptr_array_add (args, (gpointer) g_strdup ("0")); - } - - g_ptr_array_add (args, (gpointer) g_strdup ("plugin")); - g_ptr_array_add (args, (gpointer) g_strdup (NM_PPTP_PPPD_PLUGIN)); - - g_ptr_array_add (args, NULL); - - return args; - -error: - free_pppd_args (args); - return FALSE; -} - -static gboolean -nm_pptp_start_pppd_binary (NMPptpPlugin *plugin, - NMSettingVPN *s_vpn, - GError **error) -{ - NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (plugin); - GPid pid; - const char *pppd_binary; - GPtrArray *pppd_argv; - - pppd_binary = nm_find_pppd (); - if (!pppd_binary) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED, - "%s", - "Could not find the pppd binary."); - return FALSE; - } - - pppd_argv = construct_pppd_args (plugin, s_vpn, pppd_binary, error); - if (!pppd_argv) - return FALSE; - - if (!g_spawn_async (NULL, (char **) pppd_argv->pdata, NULL, - G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, error)) { - g_ptr_array_free (pppd_argv, TRUE); - return FALSE; - } - free_pppd_args (pppd_argv); - - nm_info ("pppd started with pid %d", pid); - - NM_PPTP_PLUGIN_GET_PRIVATE (plugin)->pid = pid; - g_child_watch_add (pid, pppd_watch_cb, plugin); - - priv->ppp_timeout_handler = g_timeout_add (NM_PPTP_WAIT_PPPD, pppd_timed_out, plugin); - - return TRUE; -} - -static void -remove_timeout_handler (NMPptpPlugin *plugin) -{ - NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (plugin); - - if (priv->ppp_timeout_handler) { - g_source_remove (priv->ppp_timeout_handler); - priv->ppp_timeout_handler = 0; - } -} - -static void -service_plugin_alive_cb (NMPptpPppService *service, - NMPptpPlugin *plugin) -{ - remove_timeout_handler (plugin); -} - -static void -service_ppp_state_cb (NMPptpPppService *service, - guint32 ppp_state, - NMPptpPlugin *plugin) -{ - NMVPNServiceState plugin_state = nm_vpn_plugin_get_state (NM_VPN_PLUGIN (plugin)); - - switch (ppp_state) { - case NM_PPP_STATUS_DEAD: - case NM_PPP_STATUS_DISCONNECT: - if (plugin_state == NM_VPN_SERVICE_STATE_STARTED) - nm_vpn_plugin_disconnect (NM_VPN_PLUGIN (plugin), NULL); - else if (plugin_state == NM_VPN_SERVICE_STATE_STARTING) - nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED); - break; - default: - break; - } -} - -static void -nm_gvalue_destroy (gpointer data) -{ - g_value_unset ((GValue *) data); - g_slice_free (GValue, data); -} - -static GValue * -nm_gvalue_dup (const GValue *value) -{ - GValue *dup; - - dup = g_slice_new0 (GValue); - g_value_init (dup, G_VALUE_TYPE (value)); - g_value_copy (value, dup); - - return dup; -} - -static void -copy_hash (gpointer key, gpointer value, gpointer user_data) -{ - g_hash_table_insert ((GHashTable *) user_data, g_strdup (key), nm_gvalue_dup ((GValue *) value)); -} - -static GValue * -get_pptp_gw_address_as_gvalue (NMConnection *connection) -{ - NMSettingVPN *s_vpn; - const char *tmp; - GValue *value; - struct in_addr addr; - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - if (!s_vpn) { - nm_warning ("couldn't get VPN setting"); - return NULL; - } - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_GATEWAY); - if (!tmp || !strlen (tmp)) { - nm_warning ("couldn't get PPTP VPN gateway IP address"); - return NULL; - } - - errno = 0; - if (inet_pton (AF_INET, tmp, &addr) <= 0) { - nm_warning ("couldn't convert PPTP VPN gateway IP address '%s' (%d)", tmp, errno); - return NULL; - } - - value = g_slice_new0 (GValue); - g_value_init (value, G_TYPE_UINT); - g_value_set_uint (value, (guint32) addr.s_addr); - - return value; -} - -static void -service_ip4_config_cb (NMPptpPppService *service, - GHashTable *config_hash, - NMPptpPlugin *plugin) -{ - NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (plugin); - GHashTable *hash; - GValue *value; - - hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, nm_gvalue_destroy); - g_hash_table_foreach (config_hash, copy_hash, hash); - - /* Insert the external VPN gateway into the table, which the pppd plugin - * simply doesn't know about. - */ - value = get_pptp_gw_address_as_gvalue (priv->connection); - if (value) - g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_GATEWAY), value); - - nm_vpn_plugin_set_ip4_config (NM_VPN_PLUGIN (plugin), hash); - - g_hash_table_destroy (hash); -} - -static gboolean -real_connect (NMVPNPlugin *plugin, - NMConnection *connection, - GError **error) -{ - NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (plugin); - NMSettingVPN *s_vpn; - - s_vpn = NM_SETTING_VPN (nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN)); - g_assert (s_vpn); - - if (!nm_pptp_properties_validate (s_vpn, error)) - return FALSE; - - if (!nm_pptp_secrets_validate (s_vpn, error)) - return FALSE; - - /* Start our pppd plugin helper service */ - if (priv->service) - g_object_unref (priv->service); - if (priv->connection) { - g_object_unref (priv->connection); - priv->connection = NULL; - } - - priv->service = nm_pptp_ppp_service_new (); - if (!priv->service) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED, - "%s", - "Could not start pppd plugin helper service."); - return FALSE; - } - - priv->connection = g_object_ref (connection); - - g_signal_connect (G_OBJECT (priv->service), "plugin-alive", G_CALLBACK (service_plugin_alive_cb), plugin); - g_signal_connect (G_OBJECT (priv->service), "ppp-state", G_CALLBACK (service_ppp_state_cb), plugin); - g_signal_connect (G_OBJECT (priv->service), "ip4-config", G_CALLBACK (service_ip4_config_cb), plugin); - - /* Cache the username and password so we can relay the secrets to the pppd - * plugin when it asks for them. - */ - if (!nm_pptp_ppp_service_cache_credentials (priv->service, connection, error)) - return FALSE; - - if (!nm_pptp_start_pppd_binary (NM_PPTP_PLUGIN (plugin), s_vpn, error)) - return FALSE; - - return TRUE; -} - -static gboolean -real_need_secrets (NMVPNPlugin *plugin, - NMConnection *connection, - char **setting_name, - GError **error) -{ - NMSettingVPN *s_vpn; - - g_return_val_if_fail (NM_IS_VPN_PLUGIN (plugin), FALSE); - g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); - - s_vpn = NM_SETTING_VPN (nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN)); - - if (!nm_setting_vpn_get_secret (s_vpn, NM_PPTP_KEY_PASSWORD)) { - *setting_name = NM_SETTING_VPN_SETTING_NAME; - return TRUE; - } - - return FALSE; -} - -static gboolean -ensure_killed (gpointer data) -{ - int pid = GPOINTER_TO_INT (data); - - if (kill (pid, 0) == 0) - kill (pid, SIGKILL); - - return FALSE; -} - -static gboolean -real_disconnect (NMVPNPlugin *plugin, - GError **err) -{ - NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (plugin); - - if (priv->pid) { - if (kill (priv->pid, SIGTERM) == 0) - g_timeout_add (2000, ensure_killed, GINT_TO_POINTER (priv->pid)); - else - kill (priv->pid, SIGKILL); - - nm_info ("Terminated ppp daemon with PID %d.", priv->pid); - priv->pid = 0; - } - - if (priv->connection) { - g_object_unref (priv->connection); - priv->connection = NULL; - } - - if (priv->service) { - g_object_unref (priv->service); - priv->service = NULL; - } - - return TRUE; -} - -static void -state_changed_cb (GObject *object, NMVPNServiceState state, gpointer user_data) -{ - NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (object); - - switch (state) { - case NM_VPN_SERVICE_STATE_STARTED: - remove_timeout_handler (NM_PPTP_PLUGIN (object)); - break; - case NM_VPN_SERVICE_STATE_UNKNOWN: - case NM_VPN_SERVICE_STATE_INIT: - case NM_VPN_SERVICE_STATE_SHUTDOWN: - case NM_VPN_SERVICE_STATE_STOPPING: - case NM_VPN_SERVICE_STATE_STOPPED: - remove_timeout_handler (NM_PPTP_PLUGIN (object)); - if (priv->connection) { - g_object_unref (priv->connection); - priv->connection = NULL; - } - if (priv->service) { - g_object_unref (priv->service); - priv->service = NULL; - } - break; - default: - break; - } -} - -static void -dispose (GObject *object) -{ - NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (object); - - if (priv->connection) - g_object_unref (priv->connection); - - if (priv->service) - g_object_unref (priv->service); - - G_OBJECT_CLASS (nm_pptp_plugin_parent_class)->dispose (object); -} - -static void -nm_pptp_plugin_init (NMPptpPlugin *plugin) -{ -} - -static void -nm_pptp_plugin_class_init (NMPptpPluginClass *pptp_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (pptp_class); - NMVPNPluginClass *parent_class = NM_VPN_PLUGIN_CLASS (pptp_class); - - g_type_class_add_private (object_class, sizeof (NMPptpPluginPrivate)); - - /* virtual methods */ - object_class->dispose = dispose; - parent_class->connect = real_connect; - parent_class->need_secrets = real_need_secrets; - parent_class->disconnect = real_disconnect; -} - -NMPptpPlugin * -nm_pptp_plugin_new (void) -{ - NMPptpPlugin *plugin; - - plugin = g_object_new (NM_TYPE_PPTP_PLUGIN, - NM_VPN_PLUGIN_DBUS_SERVICE_NAME, - NM_DBUS_SERVICE_PPTP, - NULL); - if (plugin) - g_signal_connect (G_OBJECT (plugin), "state-changed", G_CALLBACK (state_changed_cb), NULL); - return plugin; -} - -static void -quit_mainloop (NMPptpPlugin *plugin, gpointer user_data) -{ - g_main_loop_quit ((GMainLoop *) user_data); -} - -int -main (int argc, char *argv[]) -{ - NMPptpPlugin *plugin; - GMainLoop *main_loop; - - g_type_init (); - - plugin = nm_pptp_plugin_new (); - if (!plugin) - exit (EXIT_FAILURE); - - main_loop = g_main_loop_new (NULL, FALSE); - - g_signal_connect (plugin, "quit", - G_CALLBACK (quit_mainloop), - main_loop); - - g_main_loop_run (main_loop); - - g_main_loop_unref (main_loop); - g_object_unref (plugin); - - exit (EXIT_SUCCESS); -} diff --git a/vpn-daemons/pptp/src/nm-pptp-service.h b/vpn-daemons/pptp/src/nm-pptp-service.h deleted file mode 100644 index dc1880caa4..0000000000 --- a/vpn-daemons/pptp/src/nm-pptp-service.h +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* nm-pptp-service - PPTP VPN integration with NetworkManager - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2008 Red Hat, Inc. - */ - -#ifndef NM_PPTP_PLUGIN_H -#define NM_PPTP_PLUGIN_H - -#include -#include -#include - -#define NM_TYPE_PPTP_PLUGIN (nm_pptp_plugin_get_type ()) -#define NM_PPTP_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_PPTP_PLUGIN, NMPptpPlugin)) -#define NM_PPTP_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_PPTP_PLUGIN, NMPptpPluginClass)) -#define NM_IS_PPTP_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_PPTP_PLUGIN)) -#define NM_IS_PPTP_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_PPTP_PLUGIN)) -#define NM_PPTP_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_PPTP_PLUGIN, NMPptpPluginClass)) - -/* For the pppd plugin <-> VPN plugin service */ -#define DBUS_TYPE_G_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)) - -#define NM_DBUS_SERVICE_PPTP_PPP "org.freedesktop.NetworkManager.pptp-ppp" -#define NM_DBUS_PATH_PPTP_PPP "/org/freedesktop/NetworkManager/pptp/ppp" -#define NM_DBUS_INTERFACE_PPTP_PPP "org.freedesktop.NetworkManager.pptp.ppp" - - -/* For the NM <-> VPN plugin service */ -#define NM_DBUS_SERVICE_PPTP "org.freedesktop.NetworkManager.pptp" -#define NM_DBUS_INTERFACE_PPTP "org.freedesktop.NetworkManager.pptp" -#define NM_DBUS_PATH_PPTP "/org/freedesktop/NetworkManager/pptp" - -#define NM_PPTP_KEY_GATEWAY "gateway" -#define NM_PPTP_KEY_USER "user" -#define NM_PPTP_KEY_PASSWORD "password" -#define NM_PPTP_KEY_DOMAIN "domain" -#define NM_PPTP_KEY_REFUSE_EAP "refuse-eap" -#define NM_PPTP_KEY_REFUSE_PAP "refuse-pap" -#define NM_PPTP_KEY_REFUSE_CHAP "refuse-chap" -#define NM_PPTP_KEY_REFUSE_MSCHAP "refuse-mschap" -#define NM_PPTP_KEY_REFUSE_MSCHAPV2 "refuse-mschapv2" -#define NM_PPTP_KEY_REQUIRE_MPPE "require-mppe" -#define NM_PPTP_KEY_REQUIRE_MPPE_40 "require-mppe-40" -#define NM_PPTP_KEY_REQUIRE_MPPE_128 "require-mppe-128" -#define NM_PPTP_KEY_MPPE_STATEFUL "mppe-stateful" -#define NM_PPTP_KEY_NOBSDCOMP "nobsdcomp" -#define NM_PPTP_KEY_NODEFLATE "nodeflate" -#define NM_PPTP_KEY_NO_VJ_COMP "no-vj-comp" -#define NM_PPTP_KEY_LCP_ECHO_FAILURE "lcp-echo-failure" -#define NM_PPTP_KEY_LCP_ECHO_INTERVAL "lcp-echo-interval" - - -typedef struct { - NMVPNPlugin parent; -} NMPptpPlugin; - -typedef struct { - NMVPNPluginClass parent; -} NMPptpPluginClass; - -GType nm_pptp_plugin_get_type (void); - -NMPptpPlugin *nm_pptp_plugin_new (void); - -#endif /* NM_PPTP_PLUGIN_H */ diff --git a/vpn-daemons/vpnc/.cvsignore b/vpn-daemons/vpnc/.cvsignore deleted file mode 100644 index f9cb8cd4e7..0000000000 --- a/vpn-daemons/vpnc/.cvsignore +++ /dev/null @@ -1,32 +0,0 @@ -Makefile -Makefile.in -NetworkManager-vpnc*.tar.gz -aclocal.m4 -autom4te.cache -compile -configure -config.guess -config.h.in -config.h -config.log -config.status -config.sub -depcomp -install-sh -intltool-extract.in -intltool-extract -intltool-merge.in -intltool-merge -intltool-update.in -intltool-update -libtool -ltmain.sh -missing -mkinstalldirs -nm-vpnc.desktop -nm-vpnc-service -nm-vpnc-service-vpnc-helper -nm-vpnc-service.name -stamp-h1 -COPYING -INSTALL diff --git a/vpn-daemons/vpnc/AUTHORS b/vpn-daemons/vpnc/AUTHORS deleted file mode 100644 index a360736ea9..0000000000 --- a/vpn-daemons/vpnc/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -Dan Williams -David Zeuthen - diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog deleted file mode 100644 index a0f00a60f6..0000000000 --- a/vpn-daemons/vpnc/ChangeLog +++ /dev/null @@ -1,692 +0,0 @@ -2008-12-05 Dan Williams - - * auth-dialog/gnome-two-password-dialog.c - auth-dialog/gnome-two-password-dialog.h - - Simplify to only what the VPN plugin actually needs - - * auth-dialog/main.c - - (find_connection_path): split out into separate function - - (get_secrets): be more intelligent about requesting password when - the password type cannot be found in the VPN details; use new VPN - password dialog stuff - - (get_connection_info): rename from get_password_types(); get - connection name too - - (main): don't require a connection name too; it's pointless - - * properties/nm-vpnc.c - - (init_one_pw_combo): if the password was found, but the password type - wasn't, default to saving the password in the keyring. Otherwise - if both the type and the password couldn't be found, default to - always asking for it. - - (init_plugin_ui): get VPN passwords before setting up the type combos - -2008-11-14 Dan Williams - - * src/nm-vpnc-service.c - properties/nm-vpnc.c - - Switch default NAT Traversal mode back to Cisco UDP until the plugin - natively supports more vendors (bgo #512675) - -2008-11-14 Dan Williams - - Add password types to better support OTP/token use-cases, and for people - who want to be asked every time for one or both passwords (bgo #346547). - Heavily based on a patch from Mathieu Trudel-Lapierre - - * common-gnome/keyring-helpers.c - common-gnome/keyring-helpers.h - - (keyring_helpers_get_one_secret): accessor to get just one secret - - * auth-dialog/gnome-two-password-dialog.c - auth-dialog/gnome-two-password-dialog.h - - (gnome_two_password_dialog_focus_password, - gnome_two_password_dialog_focus_password_secondary): add functions to - focus specific password entries - - * auth-dialog/Makefile.am - auth-dialog/main.c - - Retrieve password types from GConf, and handle them correctly when - asking the user for passwords - - * properties/nm-vpnc-dialog.glade - properties/nm-vpnc.c - - Add combo boxes for both passwords with options for saving, asking, - or not requiring the password - - (fill_vpn_passwords): handle passwords individually - - (pw_type_changed_helper): disable the password entry when the user - picks "Not Required" or "Always Ask" - - (init_one_pw_combo, init_plugin_ui): set up password combos - - (handle_one_pw_type, update_connection): save password type - - (save_one_password): handle saving/clearing passwords based on what - each password's type is - - * src/nm-vpnc-service.c - src/nm-vpnc-service.h - - (validate_one_property): ignore password type properties - - (nm_vpnc_config_write, write_one_property): don't write secrets if - they aren't used - - (real_need_secrets): only ask for secrets when needed - -2008-11-03 Dan Williams - - Patch from Carlos Martín Nieto (and me) (bgo #547582) - - * properties/nm-vpnc.c - - (import, fill_vpn_passwords): import passwords too - - (decrypt_cisco_key, child_stdout_data_cb, decrypt_child_finished_cb): - call out to cisco-decrypt if present to de-obfuscate the group - password - -2008-10-26 Dan Williams - - * properties/nm-vpnc.c - - Update for setting accessor changes - -2008-10-09 Dan Williams - - * properties/nm-vpnc.c - - (update_connection): only set DPD timeout if it was something other - than the default value - -2008-09-09 Dan Williams - - * common-gnome/keyring-helpers.c - common-gnome/keyring-helpers.h - - Add defines for secret tags in the keyring - - (keyring_helpers_delete_secret): delete a secret from the keyring for - a given connection UUID - - (keyring_helpers_save_secret): vpn service is always going to be - vpnc's - - * auth-dialog/main.c - - (get_secrets): use secret tag #defines; vpn service will always be - vpnc's - - * properties/nm-vpnc.c - properties/nm-vpnc.h - - (fill_vpn_passwords): fill secrets in the UI if the connection is - system-scope - - (update_connection): fill secrets if the connection is system-scope - so they can be saved with the system settings service - - (save_secrets, delete_connection): implement - -2008-09-03 Dan Williams - - * common-gnome/Makefile.am - common-gnome/keyring-helpers.c - common-gnome/keyring-helpers.h - Makefile.am - - Split out keyring read/write routines to common library - - * configure.in - - Don't require libgnomeui anymore - - * auth-dialog/main.c - - (get_secrets): use common keyring helpers - - (main): remove usage of libgnomeui - - * auth-dialog/gnome-two-password-dialog.c - - (gnome_two_password_dialog_get_password, - gnome_two_password_dialog_get_password_secondary): use gnome-keyring - secure memory - - * properties/nm-vpnc.c - properties/nm-vpnc-dialog.glade - properties/Makefile.am - - Grab VPN passwords from the keyring if available and allow them to - be edited - -2008-08-28 Dan Williams - - * auth-dialog/main.c - - (get_secrets): don't gtk_widget_show_all() because that exposes - widgets that were supposed to be hidden - - (main): don't segfault on missing passwords (like hitting Cancel) - -2008-08-26 Dan Williams - - * auth-dialog/main.c - - Convert to connection UUIDs (requires NM svn 4013 or later) - - General cleanups - -2008-08-11 Dan Williams - - Update to match NM svn3924 vpn setting changes; verify options better; - return more informative errors on VPN launch failures. - -2008-08-06 Dan Williams - - * src/nm-vpnc-service-vpnc-helper.c - - (get_routes): fixup for NM route metric changes - - * properties/nm-vpnc.c - - (get_routes, export): fixup for NM route metric changes - -2008-07-27 Dan Williams - - Patch from Michael Biebl - - * Move service to $LIBEXECDIR, remove unneeded compilation flags, move - properties plugin to $LIBDIR/NetworkManager - -2008-07-17 Tambet Ingo - - * properties/nm-vpnc.c (vpnc_plugin_ui_class_init): Don't add empty - private data to the class, it produces a runtime warning. - -2008-07-07 Dan Williams - - * src/nm-vpnc-service-vpnc-helper.c - properties/nm-vpnc.c - - Use IPv4 address prefixes rather than netmasks (requires svn3812) - -2008-07-03 Dan Williams - - * nm-vpnc-service.name.in - Makefile.am - - Remove paths from .name file (requires applet r776 or later) to fix - issues with multilib and magic path substitution in glibc - -2008-06-20 Dan Williams - - Update for changes to the plugin API - - * properties/nm-vpnc.c - properties/nm-vpnc.h - - Add error enum - - (check_validity): set the error - - (init_plugin_ui): emit the 'changed' signal whenever a UI widget - changes - - (update_connection): return validity - -2008-06-17 Dan Williams - - * Convert to new NM VPN UI plugin format - * Remove vpnc 0.3.x options - * Handle Dead Peer Detection option - * Handle NAT Traversal option - - Requires a NetworkManager of at least the SVN revision before this commit. - -2008-06-06 Dan Williams - - Patch from Tambet Ingo - - * src/nm-vpnc-service-vpnc-helper.c - - (main, get_routes): send routes too - -2008-05-22 Tambet Ingo - - * src/nm-vpnc-service.c (real_disconnect): If sending SIGTERM succeeds, - add a timeout to make sure it gets killed. If it fails, send SIGKILL - immediately. - -2008-05-01 Dan Williams - - * src/nm-vpnc-service.c - - (validate_one_property): allow the 'name' property - -2008-04-27 Dan Williams - - * properties/Makefile.am - - Avoid versioning properties plugin (gnome.org #529836) - -2008-04-10 Dan Williams - - * vpn-daemons/vpnc/auth-dialog/main.c - - Fix for new location of keyring passwords - -2008-04-10 Tambet Ingo - - * auth-dialog/main.c (main): Add the '-i' argument the applet now sends. - -2008-03-06 Dan Williams - - * src/nm-vpnc-service-vpnc-helper.c - - (main): pass the MTU in the returned option hash table - -2007-12-31 Christopher Aillon - - * src/nm-vpnc-service.h: - * src/nm-vpnc-service.c: - - Support Cisco UDP Encapsulation in vpnc >= 0.4 (#420925) - -2007-12-11 Dan Williams - - Patches from Casey Harkins - - * properties/nm-vpnc.c - - (impl_fill_connection): duplicate hash table keys as required - -2007-12-05 Dan Williams - - Patch from Denis Leroy - - * properties/nm-vpnc.c - - (import_from_file): allow import of incomplete .pcf files - (gnome.org #498758, rh #241774) - -2007-12-05 Dan Williams - - * properties/nm-vpnc.c - - (impl_get_widget): be more robust about bad connections - -2007-11-15 Dan Williams - - * properties/nm-vpnc.c - - Fixup for NMSettingConnection 'name' -> 'id' changes - -2007-11-07 Dan Williams - - * auth-dialog/main.c - properties/nm-vpnc.c - src/nm-vpnc-service.c - - Fix for new NMSetting API changes - -2007-10-26 Dan Williams - - * properties/nm-vpnc.c - - (impl_get_object): use a glade root, and ensure widget is referenced - correctly - -2007-10-10 Dan Williams - - * src/nm-vpnc-service.c - - (validate_one_property): print message about what properties fail - validation - - (real_connect, nm_vpnc_config_write): use default username from VPN - setting if no Xauth username is provided in custom properties - -2007-09-27 Dan Williams - - * auth-dialog/main.c - - Rework password storage to match the GConf semantics of nm-applet - better. Also, use generic secrets, not keyring network passwords. - Keyring network passwords are inappropriate for our usage here. - -2007-09-27 Dan Williams - - * src/nm-vpnc-service.c - - (nm_vpnc_config_write): turn back on various options that the vpnc - plugin had before that are used with vpnc 0.3.x - -2007-09-27 Dan Williams - - * src/nm-vpnc-service-vpnc-helper.c - - (addr_list_to_gvalue): list should contain straight guint32s, not - GValues containing guint32s - - (main): For Cisco/vpnc, the IP4 PTP address needs to be the same as - the internal IP4 address - -2007-09-27 Dan Williams - - * src/nm-vpnc-service.c - - (real_connect): close vpnc's stdin so it can actually go ahead and - connect - -2007-09-27 Dan Williams - - * src/nm-vpnc-service-helper.c - - (str_to_gvalue, addr_to_gvalue): ensure the GValues are zeroed when - allocated so that they can be assigned a type later - - (addr_list_to_gvalue): use a GArray rather than a GSList, dbus-glib - seems ignorant of GSLists with G_TYPE_UINT elements - -2007-09-26 Dan Williams - - * src/nm-vpnc-service.c - - (real_need_secrets, nm_vpnc_plugin_class_init): implement need_secrets - -2007-09-26 Tambet Ingo - - * src/nm-vpnc-service.c (real_connect): The arguments have changed, update. - -2007-09-12 Tambet Ingo - - * src/nm-vpnc-service.[ch]: Rewrite. Derive from NMVPNPlugin. - - * src/nm-vpnc-service-vpnc-helper.c: Rewrite using dbus-glib. - - * auth-dialog/main.c: Populate the properties hash with the passwords. - - * properties/nm-vpnc.c: The VPN connection properties are all hash tables now. - - * src/nm-utils.[ch]: Remove. Use the same things from libnm-util. - - * configure.in: Check libnm_glib module as well now that we use NMVPNPlugin. - -2007-08-15 Tambet Ingo - - * nm-vpnc-service.name.in: Use upper-case macro names as that's what the - sed script from Makefile is trying to replace. - - * src/Makefile.am: Link to $NM_UTILS_LIBS. - - * configure.in: Update required NetworkManager version to 0.7.0. - Clean up the double-check to NetworkManager.pc. - -2007-08-14 Dan Williams - - * src/nm-openvpn-service.c - - Handle NM_VPN_STATE_* -> NM_VPN_SERVICE_STATE_* and NMVPNState -> - NMVPNServiceState renames - -2007-07-26 Dan Williams - - Patch from Andreas Hanke - - * configure.in - acinclude.m4 - Makefile.am - - remove broken usage of AS_AC_EXPAND (#413323) - -2007-06-21 Christopher Aillon - - * nm-vpnc-service.name.in: - Make the properties library path multilib friendly (#447577) - -2007-06-11 Christopher Aillon - - * properties/nm-vpnc-dialog.glade: - Fix casing of the disable NAT checkbox - -2007-04-04 Dan Williams - - Patch from Denis Leroy - * src/nm-vpnc-service.c - properties/nm-vpnc.c - properties/nm-vpnc-dialog.glade - - Add config options for NAT keepalive, NAT Traversal, and Weak DES - -2007-04-02 Dan Williams - - Patch from Christian Persch - * properties/nm-vpnc-dialog.glade - - HIGify (gnome.org #423753) - - * src/nm-vpnc.c - - Remove unused expander code too - -2007-02-23 Dan Williams - - Patch from Olaf Telshörner - - * src/nm-vpnc-service.c - - Add /usr/local/sbin/vpnc to the search list - -2007-02-20 Dan Williams - - Patch from Jon Nettleton - - * properties/nm-vpnc-dialog.glade - - Reduce size of vpnc configuration dialog (Gnome.org #408819) - -2007-01-30 Dan Williams - - * configure.in - src/Makefile.am - - Add configure bits to pick up libnm-util - - * src/nm-vpnc-service.c - - Convert to new dict-based IP4Config signal format - -2006-12-07 Dan Williams - - Patch from Christian Persch - - * auth-dialog/gnome-two-password-dialog.c - - HIG-ify (Gnome.org #383124) - -2006-12-07 Dan Williams - - Patch from Christian Persch - - * auth-dialog/main.c - - Fix memleak by unrefing the GnomeProgram instance (Gnome.org #383123) - -2006-12-04 Dan Williams - - * src/nm-vpnc-service.c - - (nm_vpnc_config_options_validate): allow the - "NAT-Keepalive packet interval" option to pass validation - -2006-10-30 Tambet Ingo - - * properties/Makefile.am: Include new files pcf-file.[ch] in build. - Add NetworkManager to CFLAGS and LDADD. - - * properties/pcf-file.c: Implement. - - * properties/pcf-file.h: Ditto. - - * properties/nm-vpnc.c (import_from_file): Rewrite using new Cisco PCF - file parser instead of using GKeyFile (which has slightly different - semantics). - - * src/Makefile.am: Add NetworkManager to CFLAGS and LDADD. - - * src/nm-vpnc-service.c: Remove the leading NetworkManager directory - from NM includes since the NM pkg-config file already adds that. - - * src/nm-vpnc-service-vpnc-helper.c: Ditto. - -2006-06-19 Satoru SATOH - - * configure.in (ALL_LINGUAS): Added ja (Japanese). - -2006-05-21 Dan Williams - - * src/nm-vpnc-service.c - - Better rekey patch; honor user-specified interval but default - to 2 hours if unspecified - -2006-05-21 Dan Williams - - * configure.in: bump version to 0.7.0 to match NM HEAD - -2006-04-10 Robert Love - - * properties/nm-vpnc.c: Report error if writing out of exported - configuration fails. The silent treatment might work for me and my - wife, but not for failed I/O. - -2006-03-29 Robert Love - - * src/nm-vpnc-service.c: New eigth argument to DBUS VPN method, the - per-route MSS. Cisco does not care about the MSS, so we send zero. - -2006-03-20 Dan Williams - - * configure.in: Bump release to 0.6 - -2006-03-08 Christopher Aillon - - * nm-vpnc.desktop.in: Use NoDisplay=true (fixes 333854) - -2006-01-23 Robert Love - - * properties/nm-vpnc-dialog.glade: Add (back) 'Optional Information' - label for GtkExpander. Use new-style Glade (separate label, not a - property of the GtkExpander). - -2006-01-05 Tim Niemueller - - * configure.in: Explicitly set AUX_DIR to . to prevent autoconf from - searching (and finding) install-sh in ../.., which lead to - problems. - -2005-11-04 Robert Love - - * auth-dialog/gnome-two-password-dialog.c: Embarrassing bug! Make sure - we g_free() these things in the right order. Fix c/o JPR. (Novell - bug #121884). - -2005-10-27 Christopher Aillon - - * src/nm-vpn-service.c: Only signal the bus that state - changed if old_state != new_state - -2005-10-17 Christopher Aillon - - * configure.in: Bump version to 0.5.0 - -2005-10-12 Robert Love - - * src/nm-vpn-service.c: remove a bunch of unused variables - and labels. Also, ifdef-out a function whose only caller - is ifdef'ed out. - -2005-10-07 Christopher Aillon - - * nm-vpnc.desktop.in: use a category for the desktop entry. - (Patch from: Rodrigo Moya ) - -2005-08-18 David Zeuthen - - * configure.in: Require NetworkManager-devel >= 0.4.1. Bump version - to 0.3. - -2005-08-14 Christopher Aillon - - * src/nm-vpn-service.c: Use UDP Encapsulation, to allow - multiple VPN connections from the same network - -2005-08-12 Robert Love - - * configure.in: add 'sv' translation - -2005-06-29 David Zeuthen - - * configure.in: Bump version to 0.2 - -2005-06-29 David Zeuthen - - * Makefile.am: Install gnome-mime-application-x-cisco-vpn-settings.png - - * gnome-mime-application-x-cisco-vpn-settings.png: New file - icon - by Diana Fong - -2005-06-23 David Zeuthen - - * src/nm-vpnc-service.c (vpnc_watch_cb): Some users report even - greater success with sleep (2) rather than sleep (1)... - -2005-06-23 David Zeuthen - - * auth-dialog/main.c (main): Print two newlines when the passwords - are dumped and wait for the parent to tell us on stdin to die. - -2005-06-23 David Zeuthen - - * properties/nm-vpnc.c (import_from_file): Allow "Description=" to be - the empty string (reported by Bill Moss ). - -2005-06-17 David Zeuthen - - * configure.in, Makefile.am: Various fixes such that 'make distcheck' - actually succeeds - -2005-06-17 David Zeuthen - - * properties/nm-vpnc.c: Add new NM_VPN_API_SUBJECT_TO_CHANGE so we - can include nm-vpn-ui-interface.h. - (import_from_file): New function - (import_button_clicked): Actually Implement this function - (impl_can_export): New function - (impl_import_file): New function - (export_to_file): New function - (impl_export): New function - (impl_get_object): Add function pointers for can_export, import_file - and export - - * nm-vpnc.desktop.in: New file - - * configure.in: Add AC_PROG_INTLTOOL - - * Makefile.am: Add rules for building the .desktop file - -2005-06-16 David Zeuthen - - * Makefile.am (dbusservicedir): Adjust to use $(sysconfdir) - - * configure.in: Don't do the DBUS_SYS_DIR thing since it's always - at $(sysconfdir)/dbus-1/system.d - -2005-06-16 David Zeuthen - - * properties/nm-vpnc.c: Include w_use_domain and w_domain - (impl_get_widget): Reset w_domain, w_use_domain - (impl_get_properties): Also pass Domain option if applicable - (impl_is_valid): Add validation code for Domain - (use_domain_toggled): New function - (impl_get_confirmation_details): Also put out info about Domain if - applicable - (impl_get_object): Get w_domain, w_use_domain widgets and set - up event listeners for them - - * properties/nm-vpnc-dialog.glade: Added the Domain optional - setting - -2005-06-12 David Zeuthen - - * doc/example-vpnc-system-wide-connection.sh: New file - - * properties/nm-vpnc-dialog.glade: New file - - * properties/nm-vpnc.c: New file - - * properties/Makefile.am: New file - - * auth-dialog/Makefile.am: New file - - * auth-dialog/gnome-two-password-dialog.[ch]: New files, based - on gnome-password-dialog.[ch] from libgnomeui - - * auth-dialog/main.c: New file - - * po/POTFILES.in, po/ChangeLog, da.po: New files - - * Makefile.am: Add src, auth-dialog, propertes and po - - * autogen.sh: New file - - * configure.in: New file - - * acinclude.m4: New file - - * README: New file - - * NEWS: New file - - * ChangeLog: New file - - * AUTHORS: New file - - * nm-vpnc-service.name.in: Based on nm-vpnc-service.name. Reworked - to sport multiple sections and have the paths to the auth-dialog - binary and properties shared object - - * nm-vpnc-service.name: Deleted and replaced by - nm-vpnc-service.name.in - - * nm-vpnc-service.conf: Rename from org.freedesktop.vpn to - org.freedesktop.NetworkManager.vpnc - - * src/nm-vpnc-service.h: Rename from org.freedesktop.vpn to - org.freedesktop.NetworkManager.vpnc (New file) - - * src/nm-vpnc-service.c: Use the system-installed - NetworkManager.h instead. Setup i18n. (New file) - (nm_vpnc_config_write): Rework to cope with passwords being - an array. - (nm_vpnc_config_options_validate): Add "Xauth username" to list - of allowed options - (nm_vpnc_dbus_handle_start_vpn): Passwords is now an array. - - * src/nm-vpnc-service-vpnc-helper.c: Use the system-installed - NetworkManager.h instead (New file) - - * nm-vpn-service.[ch], nm-vpn-service-vpnc-helper.c: Moved in src - - * src/nm-utils.[ch]: For now, a local copy duplicated from utils/ in - the NM project diff --git a/vpn-daemons/vpnc/Makefile.am b/vpn-daemons/vpnc/Makefile.am deleted file mode 100644 index b66fab31d4..0000000000 --- a/vpn-daemons/vpnc/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -AUTOMAKE_OPTIONS = foreign - -if WITH_GNOME -SUBDIRS = src common-gnome auth-dialog properties po -else -SUBDIRS = src -endif - -dbusservicedir = $(sysconfdir)/dbus-1/system.d -dbusservice_DATA = nm-vpnc-service.conf - -nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN -nmvpnservice_DATA = nm-vpnc-service.name - -if WITH_GNOME -desktopdir = $(datadir)/applications -desktop_in_files = nm-vpnc.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - -icondir = $(datadir)/icons/hicolor/48x48/apps -icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png -endif - -nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in - sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@ - -EXTRA_DIST = nm-vpnc-service.name.in \ - $(dbusservice_DATA) \ - $(desktop_in_files) \ - $(icon_DATA) \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in - -CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~ -DISTCLEANFILES = intltool-extract intltool-merge intltool-update diff --git a/vpn-daemons/vpnc/NEWS b/vpn-daemons/vpnc/NEWS deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/vpn-daemons/vpnc/README b/vpn-daemons/vpnc/README deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/vpn-daemons/vpnc/auth-dialog/.cvsignore b/vpn-daemons/vpnc/auth-dialog/.cvsignore deleted file mode 100644 index 9470bec570..0000000000 --- a/vpn-daemons/vpnc/auth-dialog/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile.in -Makefile -nm-vpnc-auth-dialog diff --git a/vpn-daemons/vpnc/auth-dialog/Makefile.am b/vpn-daemons/vpnc/auth-dialog/Makefile.am deleted file mode 100644 index 3c0537439f..0000000000 --- a/vpn-daemons/vpnc/auth-dialog/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -INCLUDES = -I${top_srcdir} - -libexec_PROGRAMS = nm-vpnc-auth-dialog - -nm_vpnc_auth_dialog_CPPFLAGS = \ - $(NM_UTILS_CFLAGS) \ - $(GTHREAD_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ - -DICONDIR=\""$(datadir)/pixmaps"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DBINDIR=\""$(bindir)"\" \ - -DDBUS_API_SUBJECT_TO_CHANGE \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" - -nm_vpnc_auth_dialog_SOURCES = \ - main.c \ - gnome-two-password-dialog.c \ - gnome-two-password-dialog.h - -nm_vpnc_auth_dialog_LDADD = \ - $(GTK_LIBS) \ - $(GCONF_LIBS) \ - $(top_builddir)/common-gnome/libnm-vpnc-common-gnome.la - -CLEANFILES = *~ - diff --git a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c b/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c deleted file mode 100644 index 7ea6fb86f4..0000000000 --- a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c +++ /dev/null @@ -1,523 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* gnome-password-dialog.c - A use password prompting dialog widget. - - Copyright (C) 1999, 2000 Eazel, Inc. - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the ree Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Authors: Ramiro Estrugo -*/ - -#include -#include "gnome-two-password-dialog.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "src/nm-vpnc-service.h" - -G_DEFINE_TYPE (VpnPasswordDialog, vpn_password_dialog, GTK_TYPE_DIALOG) - -#define VPN_PASSWORD_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ - VPN_TYPE_PASSWORD_DIALOG, \ - VpnPasswordDialogPrivate)) - -typedef struct { - /* Attributes */ - gboolean show_password; - gboolean show_password_secondary; - - /* TODO: */ - gboolean remember; - char *remember_label_text; - - /* Internal widgetry and flags */ - GtkWidget *password_entry; - GtkWidget *password_entry_secondary; - GtkWidget *show_passwords_checkbox; - - GtkWidget *table_alignment; - GtkWidget *table; - GtkSizeGroup *group; - - GtkWidget *remember_session_button; - GtkWidget *remember_forever_button; - - char *secondary_password_label; -} VpnPasswordDialogPrivate; - -/* VpnPasswordDialogClass methods */ -static void vpn_password_dialog_class_init (VpnPasswordDialogClass *password_dialog_class); -static void vpn_password_dialog_init (VpnPasswordDialog *password_dialog); - -/* GtkDialog callbacks */ -static void dialog_show_callback (GtkWidget *widget, gpointer callback_data); -static void dialog_close_callback (GtkWidget *widget, gpointer callback_data); - -static void -finalize (GObject *object) -{ - VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (object); - - g_object_unref (priv->password_entry); - g_object_unref (priv->password_entry_secondary); - g_object_unref (priv->group); - - g_free (priv->remember_label_text); - g_free (priv->secondary_password_label); - - G_OBJECT_CLASS (vpn_password_dialog_parent_class)->finalize (object); -} - -static void -vpn_password_dialog_class_init (VpnPasswordDialogClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (object_class, sizeof (VpnPasswordDialogPrivate)); - - object_class->finalize = finalize; -} - -static void -vpn_password_dialog_init (VpnPasswordDialog *dialog) -{ - VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - - priv->show_password = TRUE; - priv->show_password_secondary = TRUE; - priv->secondary_password_label = g_strdup ( _("_Secondary Password:") ); -} - -/* GtkDialog callbacks */ -static void -dialog_show_callback (GtkWidget *widget, gpointer callback_data) -{ - VpnPasswordDialog *dialog = VPN_PASSWORD_DIALOG (callback_data); - VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - - if (GTK_WIDGET_VISIBLE (priv->password_entry)) - gtk_widget_grab_focus (priv->password_entry); - else if (GTK_WIDGET_VISIBLE (priv->password_entry_secondary)) - gtk_widget_grab_focus (priv->password_entry_secondary); -} - -static void -dialog_close_callback (GtkWidget *widget, gpointer callback_data) -{ - gtk_widget_hide (widget); -} - -static void -add_row (GtkWidget *table, int row, const char *label_text, GtkWidget *entry) -{ - GtkWidget *label; - - label = gtk_label_new_with_mnemonic (label_text); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, row, row + 1); - gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, row, row + 1); - - gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); -} - -static void -remove_child (GtkWidget *child, GtkWidget *table) -{ - gtk_container_remove (GTK_CONTAINER (table), child); -} - -static void -add_table_rows (VpnPasswordDialog *dialog) -{ - VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - int row; - int offset = 0; - - gtk_alignment_set_padding (GTK_ALIGNMENT (priv->table_alignment), 0, 0, offset, 0); - - /* This will not kill the entries, since they are ref:ed */ - gtk_container_foreach (GTK_CONTAINER (priv->table), (GtkCallback) remove_child, priv->table); - - row = 0; - if (priv->show_password) - add_row (priv->table, row++, _("_Password:"), priv->password_entry); - if (priv->show_password_secondary) - add_row (priv->table, row++, priv->secondary_password_label, priv->password_entry_secondary); - - gtk_table_attach_defaults (GTK_TABLE (priv->table), priv->show_passwords_checkbox, 1, 2, row, row + 1); - - gtk_widget_show_all (priv->table); -} - -static void -show_passwords_toggled_cb (GtkWidget *widget, gpointer user_data) -{ - VpnPasswordDialog *dialog = VPN_PASSWORD_DIALOG (user_data); - VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - gboolean visible; - - visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - - gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), visible); - gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry_secondary), visible); -} - -/* Public VpnPasswordDialog methods */ -GtkWidget * -vpn_password_dialog_new (const char *title, - const char *message, - const char *password) -{ - GtkWidget *dialog; - VpnPasswordDialogPrivate *priv; - GtkLabel *message_label; - GtkWidget *hbox; - GtkWidget *vbox; - GtkWidget *main_vbox; - GtkWidget *dialog_icon; - GSList *group; - - dialog = gtk_widget_new (VPN_TYPE_PASSWORD_DIALOG, NULL); - if (!dialog) - return NULL; - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - - gtk_window_set_title (GTK_WINDOW (dialog), title); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - - /* Setup the dialog */ - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 6); - - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - - g_signal_connect (dialog, "show", - G_CALLBACK (dialog_show_callback), - dialog); - g_signal_connect (dialog, "close", - G_CALLBACK (dialog_close_callback), - dialog); - - /* The table that holds the captions */ - priv->table_alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); - - priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - - priv->table = gtk_table_new (4, 2, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (priv->table), 12); - gtk_table_set_row_spacings (GTK_TABLE (priv->table), 6); - gtk_container_add (GTK_CONTAINER (priv->table_alignment), priv->table); - - priv->password_entry = gtk_entry_new (); - priv->password_entry_secondary = gtk_entry_new (); - - priv->show_passwords_checkbox = gtk_check_button_new_with_mnemonic (_("Sh_ow passwords")); - - /* We want to hold on to these during the table rearrangement */ -#if GLIB_CHECK_VERSION (2, 10, 0) - g_object_ref_sink (priv->password_entry); - g_object_ref_sink (priv->password_entry_secondary); - g_object_ref_sink (priv->show_passwords_checkbox); -#else - g_object_ref (priv->password_entry); - gtk_object_sink (GTK_OBJECT (priv->password_entry)); - - g_object_ref (priv->password_entry_secondary); - gtk_object_sink (GTK_OBJECT (priv->password_entry_secondary)); - - g_object_ref (priv->show_passwords_checkbox); - gtk_object_sink (GTK_OBJECT (priv->show_passwords_checkbox)); -#endif - - gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), FALSE); - gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry_secondary), FALSE); - - g_signal_connect_swapped (priv->password_entry, "activate", - G_CALLBACK (gtk_window_activate_default), - dialog); - g_signal_connect_swapped (priv->password_entry_secondary, "activate", - G_CALLBACK (gtk_window_activate_default), - dialog); - - g_signal_connect (priv->show_passwords_checkbox, "toggled", - G_CALLBACK (show_passwords_toggled_cb), - dialog); - - add_table_rows (VPN_PASSWORD_DIALOG (dialog)); - - /* Adds some eye-candy to the dialog */ - hbox = gtk_hbox_new (FALSE, 12); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - dialog_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment (GTK_MISC (dialog_icon), 0.5, 0.0); - gtk_box_pack_start (GTK_BOX (hbox), dialog_icon, FALSE, FALSE, 0); - - /* Fills the vbox */ - main_vbox = gtk_vbox_new (FALSE, 18); - - if (message) { - message_label = GTK_LABEL (gtk_label_new (message)); - gtk_label_set_justify (message_label, GTK_JUSTIFY_LEFT); - gtk_label_set_line_wrap (message_label, TRUE); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (message_label)); - gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label), FALSE, FALSE, 0); - gtk_size_group_add_widget (priv->group, priv->table_alignment); - } - - vbox = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), priv->table_alignment, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), main_vbox, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); - - priv->remember_session_button = gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session")); - priv->remember_forever_button = gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring")); - - gtk_box_pack_start (GTK_BOX (vbox), priv->remember_session_button, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), priv->remember_forever_button, FALSE, FALSE, 0); - - vpn_password_dialog_set_password (VPN_PASSWORD_DIALOG (dialog), password); - - return GTK_WIDGET (dialog); -} - -gboolean -vpn_password_dialog_run_and_block (VpnPasswordDialog *dialog) -{ - gint button_clicked; - - g_return_val_if_fail (dialog != NULL, FALSE); - g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), FALSE); - - button_clicked = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_hide (GTK_WIDGET (dialog)); - - return button_clicked == GTK_RESPONSE_OK; -} - -void -vpn_password_dialog_set_password (VpnPasswordDialog *dialog, - const char *password) -{ - VpnPasswordDialogPrivate *priv; - - g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - gtk_entry_set_text (GTK_ENTRY (priv->password_entry), password ? password : ""); -} - -void -vpn_password_dialog_set_password_secondary (VpnPasswordDialog *dialog, - const char *password_secondary) -{ - VpnPasswordDialogPrivate *priv; - - g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - gtk_entry_set_text (GTK_ENTRY (priv->password_entry_secondary), - password_secondary ? password_secondary : ""); -} - -void -vpn_password_dialog_set_show_password (VpnPasswordDialog *dialog, gboolean show) -{ - VpnPasswordDialogPrivate *priv; - - g_return_if_fail (dialog != NULL); - g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - - show = !!show; - if (priv->show_password != show) { - priv->show_password = show; - add_table_rows (dialog); - } -} - -void -vpn_password_dialog_set_show_password_secondary (VpnPasswordDialog *dialog, - gboolean show) -{ - VpnPasswordDialogPrivate *priv; - - g_return_if_fail (dialog != NULL); - g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - - show = !!show; - if (priv->show_password_secondary != show) { - priv->show_password_secondary = show; - add_table_rows (dialog); - } -} - -void -vpn_password_dialog_focus_password (VpnPasswordDialog *dialog) -{ - VpnPasswordDialogPrivate *priv; - - g_return_if_fail (dialog != NULL); - g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - if (priv->show_password) - gtk_widget_grab_focus (priv->password_entry); -} - -void -vpn_password_dialog_focus_password_secondary (VpnPasswordDialog *dialog) -{ - VpnPasswordDialogPrivate *priv; - - g_return_if_fail (dialog != NULL); - g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - if (priv->show_password_secondary) - gtk_widget_grab_focus (priv->password_entry_secondary); -} - -const char * -vpn_password_dialog_get_password (VpnPasswordDialog *dialog) -{ - VpnPasswordDialogPrivate *priv; - - g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), NULL); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - return gtk_entry_get_text (GTK_ENTRY (priv->password_entry)); -} - -const char * -vpn_password_dialog_get_password_secondary (VpnPasswordDialog *dialog) -{ - VpnPasswordDialogPrivate *priv; - - g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), NULL); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - return gtk_entry_get_text (GTK_ENTRY (priv->password_entry_secondary)); -} - -void -vpn_password_dialog_set_show_remember (VpnPasswordDialog *dialog, - gboolean show_remember) -{ - VpnPasswordDialogPrivate *priv; - - g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - if (show_remember) { - gtk_widget_show (priv->remember_session_button); - gtk_widget_show (priv->remember_forever_button); - } else { - gtk_widget_hide (priv->remember_session_button); - gtk_widget_hide (priv->remember_forever_button); - } -} - -void -vpn_password_dialog_set_remember (VpnPasswordDialog *dialog, - VpnPasswordRemember remember) -{ - VpnPasswordDialogPrivate *priv; - gboolean session = FALSE, forever = FALSE; - - g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - - if (remember == VPN_PASSWORD_REMEMBER_SESSION) - session = TRUE; - else if (remember == VPN_PASSWORD_REMEMBER_FOREVER) - forever = TRUE; - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->remember_session_button), session); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->remember_forever_button), forever); -} - -VpnPasswordRemember -vpn_password_dialog_get_remember (VpnPasswordDialog *dialog) -{ - VpnPasswordDialogPrivate *priv; - gboolean session, forever; - - g_return_val_if_fail (dialog != NULL, VPN_PASSWORD_REMEMBER_NOTHING); - g_return_val_if_fail (VPN_IS_PASSWORD_DIALOG (dialog), VPN_PASSWORD_REMEMBER_NOTHING); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - - session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->remember_session_button)); - forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->remember_forever_button)); - if (forever) - return VPN_PASSWORD_REMEMBER_FOREVER; - else if (session) - return VPN_PASSWORD_REMEMBER_SESSION; - - return VPN_PASSWORD_REMEMBER_NOTHING; -} - -void vpn_password_dialog_set_password_secondary_label (VpnPasswordDialog *dialog, - const char *label) -{ - VpnPasswordDialogPrivate *priv; - - g_return_if_fail (dialog != NULL); - g_return_if_fail (VPN_IS_PASSWORD_DIALOG (dialog)); - - priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - - g_free (priv->secondary_password_label); - priv->secondary_password_label = g_strdup (label); - - if (priv->show_password_secondary) - add_table_rows (dialog); -} - diff --git a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h b/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h deleted file mode 100644 index 66cb8802a1..0000000000 --- a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h +++ /dev/null @@ -1,94 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* gnome-two-password-dialog.h - A use password prompting dialog widget - asking for two passwords. Based of - gnome-password-dialog.[ch] from libgnomeui - - Copyright (C) 1999, 2000 Eazel, Inc. - Copyright (C) 2005, Red Hat, Inc. - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Authors: Ramiro Estrugo -*/ - -#ifndef VPN_PASSWORD_DIALOG_H -#define VPN_PASSWORD_DIALOG_H - -#include - -G_BEGIN_DECLS - -#define VPN_TYPE_PASSWORD_DIALOG (vpn_password_dialog_get_type ()) -#define VPN_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VPN_TYPE_PASSWORD_DIALOG, VpnPasswordDialog)) -#define VPN_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VPN_TYPE_PASSWORD_DIALOG, VpnPasswordDialogClass)) -#define VPN_IS_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VPN_TYPE_PASSWORD_DIALOG)) -#define VPN_IS_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VPN_TYPE_PASSWORD_DIALOG)) - -typedef struct VpnPasswordDialog VpnPasswordDialog; -typedef struct VpnPasswordDialogClass VpnPasswordDialogClass; - -struct VpnPasswordDialog { - GtkDialog parent; -}; - -struct VpnPasswordDialogClass { - GtkDialogClass parent_class; -}; - -typedef enum { - VPN_PASSWORD_REMEMBER_NOTHING, - VPN_PASSWORD_REMEMBER_SESSION, - VPN_PASSWORD_REMEMBER_FOREVER -} VpnPasswordRemember; - - -GType vpn_password_dialog_get_type (void); -GtkWidget* vpn_password_dialog_new (const char *title, - const char *message, - const char *password); - -gboolean vpn_password_dialog_run_and_block (VpnPasswordDialog *dialog); - -/* Attribute mutators */ -void vpn_password_dialog_set_show_password (VpnPasswordDialog *dialog, - gboolean show); -void vpn_password_dialog_focus_password (VpnPasswordDialog *dialog); -void vpn_password_dialog_set_password (VpnPasswordDialog *dialog, - const char *password); - -void vpn_password_dialog_set_show_password_secondary (VpnPasswordDialog *dialog, - gboolean show); -void vpn_password_dialog_focus_password_secondary (VpnPasswordDialog *dialog); -void vpn_password_dialog_set_password_secondary (VpnPasswordDialog *dialog, - const char *password_secondary); -void vpn_password_dialog_set_password_secondary_label (VpnPasswordDialog *dialog, - const char *label); - -void vpn_password_dialog_set_show_remember (VpnPasswordDialog *dialog, - gboolean show_remember); -void vpn_password_dialog_set_remember (VpnPasswordDialog *dialog, - VpnPasswordRemember remember); -VpnPasswordRemember vpn_password_dialog_get_remember (VpnPasswordDialog *dialog); - -/* Attribute accessors */ -const char *vpn_password_dialog_get_password (VpnPasswordDialog *dialog); - -const char *vpn_password_dialog_get_password_secondary (VpnPasswordDialog *dialog); - -G_END_DECLS - -#endif /* VPN_PASSWORD_DIALOG_H */ diff --git a/vpn-daemons/vpnc/auth-dialog/main.c b/vpn-daemons/vpnc/auth-dialog/main.c deleted file mode 100644 index 5d214ee310..0000000000 --- a/vpn-daemons/vpnc/auth-dialog/main.c +++ /dev/null @@ -1,362 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager Wireless Applet -- Display wireless access points and allow user control - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2008 Red Hat, Inc. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "common-gnome/keyring-helpers.h" -#include "src/nm-vpnc-service.h" -#include "gnome-two-password-dialog.h" - -#define KEYRING_UUID_TAG "connection-uuid" -#define KEYRING_SN_TAG "setting-name" -#define KEYRING_SK_TAG "setting-key" - -static char * -find_connection_path (const char *vpn_uuid) -{ - char *key, *str, *connection_path = NULL; - GConfClient *gconf_client = NULL; - GSList *conf_list; - GSList *iter; - - /* FIXME: This whole thing sucks: we should not go around poking gconf - directly, but there's nothing that does it for us right now */ - - gconf_client = gconf_client_get_default (); - - conf_list = gconf_client_all_dirs (gconf_client, "/system/networking/connections", NULL); - if (!conf_list) - return NULL; - - for (iter = conf_list; iter; iter = iter->next) { - const char *path = (const char *) iter->data; - - key = g_strdup_printf ("%s/%s/%s", - path, - NM_SETTING_CONNECTION_SETTING_NAME, - NM_SETTING_CONNECTION_TYPE); - str = gconf_client_get_string (gconf_client, key, NULL); - g_free (key); - - if (!str || strcmp (str, "vpn")) { - g_free (str); - continue; - } - g_free (str); - - key = g_strdup_printf ("%s/%s/%s", - path, - NM_SETTING_CONNECTION_SETTING_NAME, - NM_SETTING_CONNECTION_UUID); - str = gconf_client_get_string (gconf_client, key, NULL); - g_free (key); - - if (!str || strcmp (str, vpn_uuid)) { - g_free (str); - continue; - } - g_free (str); - - /* Woo, found the connection */ - connection_path = g_strdup (path); - break; - } - - g_slist_foreach (conf_list, (GFunc) g_free, NULL); - g_slist_free (conf_list); - - g_object_unref (gconf_client); - return connection_path; -} - -static gboolean -get_secrets (const char *vpn_uuid, - const char *vpn_name, - gboolean retry, - char **upw, - const char *upw_type, - char **gpw, - const char *gpw_type) -{ - VpnPasswordDialog *dialog; - gboolean is_session = TRUE; - gboolean found_upw = FALSE; - gboolean found_gpw = FALSE; - char *prompt; - gboolean success = FALSE; - - g_return_val_if_fail (vpn_uuid != NULL, FALSE); - g_return_val_if_fail (vpn_name != NULL, FALSE); - g_return_val_if_fail (upw != NULL, FALSE); - g_return_val_if_fail (*upw == NULL, FALSE); - g_return_val_if_fail (gpw != NULL, FALSE); - g_return_val_if_fail (*gpw == NULL, FALSE); - - /* If a password type wasn't present in the VPN connection details, then - * default to saving the password if it was found in the keyring. But if - * it wasn't found in the keyring, default to always asking for the password. - */ - - found_upw = keyring_helpers_get_one_secret (vpn_uuid, VPNC_USER_PASSWORD, upw, &is_session); - if (!upw_type) - upw_type = found_upw ? NM_VPNC_PW_TYPE_SAVE : NM_VPNC_PW_TYPE_ASK; - else if (!strcmp (upw_type, NM_VPNC_PW_TYPE_UNUSED)) { - gnome_keyring_memory_free (*upw); - *upw = NULL; - } - - found_gpw = keyring_helpers_get_one_secret (vpn_uuid, VPNC_GROUP_PASSWORD, gpw, &is_session); - if (!gpw_type) - gpw_type = found_gpw ? NM_VPNC_PW_TYPE_SAVE : NM_VPNC_PW_TYPE_ASK; - else if (!strcmp (gpw_type, NM_VPNC_PW_TYPE_UNUSED)) { - gnome_keyring_memory_free (*gpw); - *gpw = NULL; - } - - if (!retry) { - gboolean need_upw = TRUE, need_gpw = TRUE; - - /* Don't ask if both passwords are either saved and present, or unused */ - if ( (!strcmp (upw_type, NM_VPNC_PW_TYPE_SAVE) && found_upw && *upw) - || (!upw_type && found_upw && *upw) /* treat unknown type as "save" */ - || !strcmp (upw_type, NM_VPNC_PW_TYPE_UNUSED)) - need_upw = FALSE; - - if ( (!strcmp (gpw_type, NM_VPNC_PW_TYPE_SAVE) && found_gpw && *gpw) - || (!gpw_type && found_gpw && *gpw) /* treat unknown type as "save" */ - || !strcmp (gpw_type, NM_VPNC_PW_TYPE_UNUSED)) - need_gpw = FALSE; - - if (!need_upw && !need_gpw) - return TRUE; - } else { - /* Don't ask if both passwords are unused */ - if ( !strcmp (upw_type, NM_VPNC_PW_TYPE_UNUSED) - && !strcmp (gpw_type, NM_VPNC_PW_TYPE_UNUSED)) - return TRUE; - } - - prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name); - dialog = VPN_PASSWORD_DIALOG (vpn_password_dialog_new (_("Authenticate VPN"), prompt, NULL)); - g_free (prompt); - - vpn_password_dialog_set_show_remember (dialog, FALSE); - vpn_password_dialog_set_password_secondary_label (dialog, _("_Group Password:")); - - if (!strcmp (upw_type, NM_VPNC_PW_TYPE_UNUSED)) - vpn_password_dialog_set_show_password (dialog, FALSE); - else if (!retry && found_upw && strcmp (upw_type, NM_VPNC_PW_TYPE_ASK)) - vpn_password_dialog_set_show_password (dialog, FALSE); - - if (!strcmp (gpw_type, NM_VPNC_PW_TYPE_UNUSED)) - vpn_password_dialog_set_show_password_secondary (dialog, FALSE); - else if (!retry && found_gpw && strcmp (gpw_type, NM_VPNC_PW_TYPE_ASK)) - vpn_password_dialog_set_show_password_secondary (dialog, FALSE); - - /* On reprompt the first entry of type 'ask' gets the focus */ - if (retry) { - if (!strcmp (upw_type, NM_VPNC_PW_TYPE_ASK)) - vpn_password_dialog_focus_password (dialog); - else if (!strcmp (gpw_type, NM_VPNC_PW_TYPE_ASK)) - vpn_password_dialog_focus_password_secondary (dialog); - } - - /* if retrying, pre-fill dialog with the password */ - if (*upw) { - vpn_password_dialog_set_password (dialog, *upw); - gnome_keyring_memory_free (*upw); - *upw = NULL; - } - if (*gpw) { - vpn_password_dialog_set_password_secondary (dialog, *gpw); - gnome_keyring_memory_free (*gpw); - *gpw = NULL; - } - - gtk_widget_show (GTK_WIDGET (dialog)); - - success = vpn_password_dialog_run_and_block (dialog); - if (success) { - *upw = gnome_keyring_memory_strdup (vpn_password_dialog_get_password (dialog)); - *gpw = gnome_keyring_memory_strdup (vpn_password_dialog_get_password_secondary (dialog)); - - if (!strcmp (upw_type, NM_VPNC_PW_TYPE_SAVE)) { - if (*upw) - keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_USER_PASSWORD, *upw); - } else if ( !strcmp (upw_type, NM_VPNC_PW_TYPE_ASK) - || !strcmp (upw_type, NM_VPNC_PW_TYPE_UNUSED)) { - /* Clear the password from the keyring */ - keyring_helpers_delete_secret (vpn_uuid, VPNC_USER_PASSWORD); - } - - if (!strcmp (gpw_type, NM_VPNC_PW_TYPE_SAVE)) { - if (*gpw) - keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_GROUP_PASSWORD, *gpw); - } else if ( !strcmp (gpw_type, NM_VPNC_PW_TYPE_ASK) - || !strcmp (gpw_type, NM_VPNC_PW_TYPE_UNUSED)) { - /* Clear the password from the keyring */ - keyring_helpers_delete_secret (vpn_uuid, VPNC_GROUP_PASSWORD); - } - } - - gtk_widget_hide (GTK_WIDGET (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); - - return success; -} - -static gboolean -get_connection_info (const char *vpn_uuid, - char **out_name, - char **out_upw_type, - char **out_gpw_type) -{ - char *key, *str; - char *connection_path = NULL; - char *upw_type = NULL, *gpw_type = NULL; - GConfClient *gconf_client; - - connection_path = find_connection_path (vpn_uuid); - if (!connection_path) - return FALSE; - - gconf_client = gconf_client_get_default (); - key = g_strdup_printf ("%s/%s/%s", connection_path, - NM_SETTING_CONNECTION_SETTING_NAME, - NM_SETTING_CONNECTION_ID); - *out_name = gconf_client_get_string (gconf_client, key, NULL); - g_free (key); - - key = g_strdup_printf ("%s/%s/%s", connection_path, - NM_SETTING_VPN_SETTING_NAME, - NM_VPNC_KEY_XAUTH_PASSWORD_TYPE); - *out_upw_type = gconf_client_get_string (gconf_client, key, NULL); - g_free (key); - - key = g_strdup_printf ("%s/%s/%s", connection_path, - NM_SETTING_VPN_SETTING_NAME, - NM_VPNC_KEY_SECRET_TYPE); - *out_gpw_type = gconf_client_get_string (gconf_client, key, NULL); - g_free (key); - - g_free (connection_path); - g_object_unref (gconf_client); - return TRUE; -} - -int -main (int argc, char *argv[]) -{ - gboolean retry = FALSE; - char *vpn_name = NULL, *vpn_uuid = NULL, *vpn_service = NULL; - char *ignored; - char *password = NULL, *group_password = NULL; - char *upw_type = NULL, *gpw_type = NULL; - char buf[1]; - int ret; - GError *error = NULL; - GOptionContext *context; - GOptionEntry entries[] = { - { "reprompt", 'r', 0, G_OPTION_ARG_NONE, &retry, "Reprompt for passwords", NULL}, - { "uuid", 'u', 0, G_OPTION_ARG_STRING, &vpn_uuid, "UUID of VPN connection", NULL}, - { "name", 'n', 0, G_OPTION_ARG_STRING, &ignored, "Name of VPN connection", NULL}, - { "service", 's', 0, G_OPTION_ARG_STRING, &vpn_service, "VPN service type", NULL}, - { NULL } - }; - - bindtextdomain (GETTEXT_PACKAGE, NULL); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - gtk_init (&argc, &argv); - textdomain (GETTEXT_PACKAGE); - - context = g_option_context_new ("- vpnc auth dialog"); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); - - if (!g_option_context_parse (context, &argc, &argv, &error)) { - g_warning ("Error parsing options: %s\n", error->message); - g_error_free (error); - return 1; - } - - g_option_context_free (context); - - if (vpn_uuid == NULL || vpn_service == NULL) { - fprintf (stderr, "A connection UUID and VPN plugin service name are required.\n"); - return 1; - } - - if (strcmp (vpn_service, NM_DBUS_SERVICE_VPNC) != 0) { - fprintf (stderr, "This dialog only works with the '%s' service\n", NM_DBUS_SERVICE_VPNC); - return 1; - } - - if (!get_connection_info (vpn_uuid, &vpn_name, &upw_type, &gpw_type)) { - g_free (upw_type); - g_free (gpw_type); - fprintf (stderr, "This VPN connection '%s' (%s) could not be found in GConf.", - vpn_name ? vpn_name : "(unknown)", vpn_uuid); - return 1; - } - - if (!get_secrets (vpn_uuid, vpn_name, retry, &password, upw_type, &group_password, gpw_type)) { - g_free (upw_type); - g_free (gpw_type); - return 1; - } - g_free (upw_type); - g_free (gpw_type); - - /* dump the passwords to stdout */ - if (password) - printf ("%s\n%s\n", NM_VPNC_KEY_XAUTH_PASSWORD, password); - if (group_password) - printf ("%s\n%s\n", NM_VPNC_KEY_SECRET, group_password); - printf ("\n\n"); - - if (password) { - memset (password, 0, strlen (password)); - gnome_keyring_memory_free (password); - } - if (group_password) { - memset (group_password, 0, strlen (group_password)); - gnome_keyring_memory_free (group_password); - } - - /* for good measure, flush stdout since Kansas is going Bye-Bye */ - fflush (stdout); - - /* wait for data on stdin */ - ret = fread (buf, sizeof (char), sizeof (buf), stdin); - return 0; -} diff --git a/vpn-daemons/vpnc/autogen.sh b/vpn-daemons/vpnc/autogen.sh deleted file mode 100755 index 951e9b2674..0000000000 --- a/vpn-daemons/vpnc/autogen.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. -REQUIRED_AUTOMAKE_VERSION=1.7 -PKG_NAME=NetworkManager-vpnc - -(test -f $srcdir/configure.in \ - && test -f $srcdir/auth-dialog/main.c) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} - - -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} -USE_GNOME2_MACROS=1 . gnome-autogen.sh - - diff --git a/vpn-daemons/vpnc/common-gnome/Makefile.am b/vpn-daemons/vpnc/common-gnome/Makefile.am deleted file mode 100644 index fd38f3a0c8..0000000000 --- a/vpn-daemons/vpnc/common-gnome/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -noinst_LTLIBRARIES=libnm-vpnc-common-gnome.la - -libnm_vpnc_common_gnome_la_CPPFLAGS = \ - $(NM_UTILS_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ - -DG_DISABLE_DEPRECATED - -libnm_vpnc_common_gnome_la_SOURCES= \ - keyring-helpers.c \ - keyring-helpers.h - -libnm_vpnc_common_gnome_la_LIBADD = \ - $(NM_UTILS_LIBS) \ - $(GLIB_LIBS) \ - $(GNOMEKEYRING_LIBS) - diff --git a/vpn-daemons/vpnc/common-gnome/keyring-helpers.c b/vpn-daemons/vpnc/common-gnome/keyring-helpers.c deleted file mode 100644 index 9e2374fe58..0000000000 --- a/vpn-daemons/vpnc/common-gnome/keyring-helpers.c +++ /dev/null @@ -1,200 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager Wireless Applet -- Display wireless access points and allow user control - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2008 Red Hat, Inc. - */ - -#include -#include - -#include - -#include "keyring-helpers.h" -#include "../src/nm-vpnc-service.h" - -#define KEYRING_UUID_TAG "connection-uuid" -#define KEYRING_SN_TAG "setting-name" -#define KEYRING_SK_TAG "setting-key" - -static char * -find_one_password (const char *vpn_uuid, - const char *secret_name, - gboolean *is_session) -{ - GList *found_list = NULL; - GnomeKeyringResult ret; - GnomeKeyringFound *found; - char *secret; - - ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET, - &found_list, - KEYRING_UUID_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - vpn_uuid, - KEYRING_SN_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - NM_SETTING_VPN_SETTING_NAME, - KEYRING_SK_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - secret_name, - NULL); - if ((ret != GNOME_KEYRING_RESULT_OK) || (g_list_length (found_list) == 0)) - return NULL; - - found = (GnomeKeyringFound *) found_list->data; - - if (is_session) { - if (strcmp (found->keyring, "session") == 0) - *is_session = TRUE; - else - *is_session = FALSE; - } - - secret = found->secret ? gnome_keyring_memory_strdup (found->secret) : NULL; - gnome_keyring_found_list_free (found_list); - - return secret; -} - -gboolean -keyring_helpers_lookup_secrets (const char *vpn_uuid, - char **password, - char **group_password, - gboolean *is_session) -{ - g_return_val_if_fail (password != NULL, FALSE); - g_return_val_if_fail (*password == NULL, FALSE); - g_return_val_if_fail (group_password != NULL, FALSE); - g_return_val_if_fail (*group_password == NULL, FALSE); - - *password = find_one_password (vpn_uuid, VPNC_USER_PASSWORD, is_session); - if (!*password) - return FALSE; - - *group_password = find_one_password (vpn_uuid, VPNC_GROUP_PASSWORD, is_session); - if (!*group_password) { - memset (*password, 0, strlen (*password)); - gnome_keyring_memory_free (*password); - *password = NULL; - return FALSE; - } - - return TRUE; -} - -gboolean -keyring_helpers_get_one_secret (const char *vpn_uuid, - const char *which_secret, - char **password, - gboolean *is_session) -{ - g_return_val_if_fail (password != NULL, FALSE); - g_return_val_if_fail (*password == NULL, FALSE); - - *password = find_one_password (vpn_uuid, which_secret, is_session); - if (!*password) - return FALSE; - - return TRUE; -} - -GnomeKeyringResult -keyring_helpers_save_secret (const char *vpn_uuid, - const char *vpn_name, - const char *keyring, - const char *secret_name, - const char *secret) -{ - char *display_name; - GnomeKeyringResult ret; - GnomeKeyringAttributeList *attrs = NULL; - guint32 id = 0; - - display_name = g_strdup_printf ("VPN %s secret for %s/%s/" NM_SETTING_VPN_SETTING_NAME, - secret_name, - vpn_name, - NM_DBUS_SERVICE_VPNC); - - attrs = gnome_keyring_attribute_list_new (); - gnome_keyring_attribute_list_append_string (attrs, - KEYRING_UUID_TAG, - vpn_uuid); - gnome_keyring_attribute_list_append_string (attrs, - KEYRING_SN_TAG, - NM_SETTING_VPN_SETTING_NAME); - gnome_keyring_attribute_list_append_string (attrs, - KEYRING_SK_TAG, - secret_name); - - ret = gnome_keyring_item_create_sync (keyring, - GNOME_KEYRING_ITEM_GENERIC_SECRET, - display_name, - attrs, - secret, - TRUE, - &id); - gnome_keyring_attribute_list_free (attrs); - g_free (display_name); - return ret; -} - -static void -ignore_callback (GnomeKeyringResult result, gpointer data) -{ -} - -gboolean -keyring_helpers_delete_secret (const char *vpn_uuid, - const char *secret_name) -{ - GList *found = NULL, *iter; - GnomeKeyringResult ret; - - g_return_val_if_fail (vpn_uuid != NULL, FALSE); - g_return_val_if_fail (secret_name != NULL, FALSE); - - ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET, - &found, - KEYRING_UUID_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - vpn_uuid, - KEYRING_SN_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - NM_SETTING_VPN_SETTING_NAME, - KEYRING_SK_TAG, - GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, - secret_name, - NULL); - if (ret != GNOME_KEYRING_RESULT_OK && ret != GNOME_KEYRING_RESULT_NO_MATCH) - return FALSE; - if (g_list_length (found) == 0) - return TRUE; - - /* delete them all */ - for (iter = found; iter; iter = g_list_next (iter)) { - GnomeKeyringFound *item = (GnomeKeyringFound *) iter->data; - - gnome_keyring_item_delete (item->keyring, item->item_id, - ignore_callback, NULL, NULL); - } - - gnome_keyring_found_list_free (found); - return TRUE; -} - diff --git a/vpn-daemons/vpnc/common-gnome/keyring-helpers.h b/vpn-daemons/vpnc/common-gnome/keyring-helpers.h deleted file mode 100644 index c7a5e56828..0000000000 --- a/vpn-daemons/vpnc/common-gnome/keyring-helpers.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager Wireless Applet -- Display wireless access points and allow user control - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2008 Red Hat, Inc. - */ - -#ifndef KEYRING_HELPERS_H -#define KEYRING_HELPERS_H - -#include -#include - -#define VPNC_USER_PASSWORD "password" -#define VPNC_GROUP_PASSWORD "group-password" - -gboolean keyring_helpers_lookup_secrets (const char *vpn_uuid, - char **password, - char **group_password, - gboolean *is_session); - -gboolean keyring_helpers_get_one_secret (const char *vpn_uuid, - const char *which_secret, - char **password, - gboolean *is_session); - -GnomeKeyringResult keyring_helpers_save_secret (const char *vpn_uuid, - const char *vpn_name, - const char *keyring, - const char *secret_name, - const char *secret); - -gboolean keyring_helpers_delete_secret (const char *vpn_uuid, - const char *secret_name); - -#endif /* KEYRING_HELPERS_H */ - diff --git a/vpn-daemons/vpnc/configure.in b/vpn-daemons/vpnc/configure.in deleted file mode 100644 index 8b82d1a82f..0000000000 --- a/vpn-daemons/vpnc/configure.in +++ /dev/null @@ -1,125 +0,0 @@ -AC_PREREQ(2.52) - -AC_INIT(NetworkManager-vpnc, 0.7.0, dcbw@redhat.com, NetworkManager-vpnc) -AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([subdir-objects]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) - -dnl -dnl Require programs -dnl -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_INSTALL -AC_PROG_LIBTOOL - -dnl -dnl Required headers -dnl -AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h syslog.h unistd.h) - -dnl -dnl Checks for typedefs, structures, and compiler characteristics. -dnl -AC_TYPE_MODE_T -AC_TYPE_PID_T -AC_HEADER_TIME - -dnl -dnl Checks for library functions. -dnl -AC_PROG_GCC_TRADITIONAL -AC_FUNC_MEMCMP -AC_CHECK_FUNCS(select socket uname) - -dnl -dnl GNOME support -dnl -AC_ARG_WITH(gnome, AC_HELP_STRING([--without-gnome], [Build NetworkManager-vpnc without GNOME support, e.g. vpn service only])) -AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno) - -GETTEXT_PACKAGE=NetworkManager-vpnc -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) - -IT_PROG_INTLTOOL([0.35]) -AM_GLIB_GNU_GETTEXT - -PKG_CHECK_MODULES(GTHREAD, gthread-2.0) -AC_SUBST(GTHREAD_CFLAGS) -AC_SUBST(GTHREAD_LIBS) - -PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.30) -AC_SUBST(DBUS_CFLAGS) -AC_SUBST(DBUS_LIBS) - -if test x"$with_gnome" != xno; then - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - - PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) - AC_SUBST(GDK_PIXBUF_CFLAGS) - AC_SUBST(GDK_PIXBUF_LIBS) - - PKG_CHECK_MODULES(GLADE, libglade-2.0) - AC_SUBST(GLADE_CFLAGS) - AC_SUBST(GLADE_LIBS) - - PKG_CHECK_MODULES(GCONF, gconf-2.0) - AC_SUBST(GCONF_CFLAGS) - AC_SUBST(GCONF_LIBS) - - PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1) - AC_SUBST(GNOMEKEYRING_CFLAGS) - AC_SUBST(GNOMEKEYRING_LIBS) -fi - -PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.7.0 libnm-util libnm_glib libnm_glib_vpn) -AC_SUBST(NM_UTILS_CFLAGS) -AC_SUBST(NM_UTILS_LIBS) - -AC_ARG_ENABLE(more-warnings, -AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), -set_more_warnings="$enableval",[ -if test -d "$srcdir/{arch}" || test -d "$srcdir/CVS"; then - set_more_warnings=yes -else - set_more_warnings=no -fi -]) -AC_MSG_CHECKING(for more warnings, including -Werror) -if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT(yes) - CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS" - - for option in -Wno-unused -Wno-strict-aliasing -Wno-sign-compare -Wdeclaration-after-statement -Wno-pointer-sign ; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done - unset option -else - AC_MSG_RESULT(no) -fi - -AC_OUTPUT([ -Makefile -src/Makefile -common-gnome/Makefile -auth-dialog/Makefile -properties/Makefile -po/Makefile.in -]) diff --git a/vpn-daemons/vpnc/doc/example-vpnc-system-wide-connection.sh b/vpn-daemons/vpnc/doc/example-vpnc-system-wide-connection.sh deleted file mode 100755 index 2b2017cd38..0000000000 --- a/vpn-daemons/vpnc/doc/example-vpnc-system-wide-connection.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# This is an example of how to install a system-wide connection that -# cannot be edited by unprivileged users using nm-vpn-properties. This -# script needs to be run as root and you may need to restart any -# gconfd daemons after the script has run (logging in and out will -# suffice) - -NAME="vpnc-system-wide" -ESCAPED_NAME="vpnc-system-wide" -IPSEC_GATEWAY="1.2.3.4" -IPSEC_ID="myGroupName" -IPSEC_ROUTES="[172.16.0.0/16,192.168.4.0/24]" - -GCONF_PATH="/system/networking/vpn_connections/$ESCAPED_NAME" - -GCONFTOOL2_OPTS="--direct --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory" - -gconftool-2 $GCONFTOOL2_OPTS --type string --set $GCONF_PATH/name "$NAME" -gconftool-2 $GCONFTOOL2_OPTS --type string --set $GCONF_PATH/service_name "org.freedesktop.NetworkManager.vpnc" -gconftool-2 $GCONFTOOL2_OPTS --type list --list-type=string --set $GCONF_PATH/vpn_data ["IPSec gateway","$IPSEC_GATEWAY","IPSec ID","$IPSEC_ID"] -gconftool-2 $GCONFTOOL2_OPTS --type list --list-type=string --set $GCONF_PATH/routes $IPSEC_ROUTES - diff --git a/vpn-daemons/vpnc/gnome-mime-application-x-cisco-vpn-settings.png b/vpn-daemons/vpnc/gnome-mime-application-x-cisco-vpn-settings.png deleted file mode 100644 index d8354ff65551b1db41091b57532368acf26271d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2595 zcmV+;3f%RHP)g+^_g)%r(wSEz|A?gQf{XydxAW?5aE zE+*PEtr~}}iP_dBbd9vhh829k)<;>9hZ00U@WpG8;V}cu?Dsn}-*BY^3=g|&vL}A| z?!DZ(_x#TJoyYfGRd&0bo@PRwjWIKM6q74#3~v-+tr94cBim1BhanMgY3@zXTvPEiJA1 z`0?Y90T}r#3FhL(ix^V^q}17a8a!%9PEKZJ-6<}QSFBjU!+9PkK)iu*;lhO}0h$gE zoGmIUG9)G@x>bBEP|6uV6k|+4(@G)mzpk!s(u$9E4}hFMe_qZ?Kt`c+*K`3$O;1lR z&d<-EkaC{{He{-{f^^-Y8!cLEozN#FV3wk-@S6FFOKT}TIsrfaBz?Y1_qd? zcDs$>U<+UY`txXYhR3dZG$1+q2SOE z_4oIaMx!-bEergjqZcUkQBID4!!v9)280 zxOf5e4-Q|mTCILvU0tNr+9)_Um|p?~F{?o-wR+SXZnp_A!aH64Lv*vgk(!#k$=BDH zX3m_+!yT2}S${$?0Od{n$}3vZ=)7l!K?=t-)n9$Hr^78T;l|CK;P-$lNSp;R8nwo^gh?*Pg>EpaV zu|j(P0D9xCpV6}9RQk5`JRSOAFMWHlgn##J;`8*8@e9iTsMGPj5>Gj++hIo=g;To zmz0!DF8~-6fts=^jo!}uCAGIcq}rNF>M?f<*N3oWm6iwRm%a28M;b*26UxG4e6Dib zqtoel$c(1^{Zu>9;w5;Fso$7{D>aODL=H_I9OFn=?}l4i0hVsjpYNXd|hkOrgR9rqMdou>fq;>-7hh zC(I2DpEH}HqoX;En!92tY3Yw$$`4qrOqJZcPwAV#f5D1FUVe2oJrkcGVq`G~uF|4N zjb7vk*s!oLwz{N_s4sjT85ub)eZ~T?F+M)tc>45d`nsxz-EFa0M79{Bi0Fm1?cKe6 zjvS8{_VxAAGqG_Lx8prm6_%EMckc&0Tf}`_7sRt%Ers}}6CgrDLU=d}q>E}!>rWU! zCAD1{5(_frl+E0TBl` zdu?dIkw&cpq5I41AhI3;b{> z(_`)-bB~#i0Y(O>9ziNCEJk>+FAv;@_hFVYp7loq5QSc(y}g|u(Dk6fNDuy8==@t& ze9Eusg$0f(36Kb2w96y2hdgF5B0xbC3~P7iFc?7_z25h+G^&)z0$`p35 zAvQLa3JMAcUFe!MYiQM~RSW`PWhGUnL#1NMAeCSm8yj8Jae&dgV!=}Y?qc9FYHF&huaVZ4iYb+I*XtvjfjamNj-#TY zT%K^pe@_mo8mO$BrF)Ofd;aDmRv; z-3hF}a^=bbarov~0NkxQj73F7F6ALemk z(%IQbnVFfK0Dh;QG%odHb-L{(K4?_y8Y0|(2>%0~4B zXoP`a=H4C+nxGSu2A47K+_{s}?s)NlXUMstqJqwxIRgVWc)CM9T031L9`bLYbkax= zNQF=yc^rU{fglebK4j`(Al1Ty%a$$UlsTHj*TGQ!$dMzkK3w+IbO5*}C}3E>e!W`| zNUh*M0$M3(H;`(Tzi}rhV)ga)tUTgp-@bj|{z37l%n2>dJ=k7<9x);M9>b|qr(7FN z$oFXMz((&{xpSrzd>goa z{W>cyXkilV0hB9nW)v)L_dJo0#>(M=z!P>s6?<-Ou01_H-Hz5nwBPvgSux&o((Z|V z=yvHl2>=Yjx%FQzMxGe2|B(N^K&h|l|NmR%zbyX|U;rP9vz1Q6+}8jA002ovPDHLk FV1mA;+W7zg diff --git a/vpn-daemons/vpnc/nm-vpnc-service.conf b/vpn-daemons/vpnc/nm-vpnc-service.conf deleted file mode 100644 index cd02870fc7..0000000000 --- a/vpn-daemons/vpnc/nm-vpnc-service.conf +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/vpn-daemons/vpnc/nm-vpnc-service.name.in b/vpn-daemons/vpnc/nm-vpnc-service.name.in deleted file mode 100644 index 3914b406be..0000000000 --- a/vpn-daemons/vpnc/nm-vpnc-service.name.in +++ /dev/null @@ -1,8 +0,0 @@ -[VPN Connection] -name=vpnc -service=org.freedesktop.NetworkManager.vpnc -program=@LIBEXECDIR@/nm-vpnc-service - -[GNOME] -auth-dialog=nm-vpnc-auth-dialog -properties=libnm-vpnc-properties diff --git a/vpn-daemons/vpnc/nm-vpnc.desktop.in b/vpn-daemons/vpnc/nm-vpnc.desktop.in deleted file mode 100644 index b9a6e5cbc7..0000000000 --- a/vpn-daemons/vpnc/nm-vpnc.desktop.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_Name=VPN Connection Manager (vpnc) -_GenericName=VPN Connection Manager (vpnc) -_Comment=Add, Remove, and Edit VPN Connections -Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.vpnc --import-file %f -Icon=gnome-mime-application-x-cisco-vpn-settings -Terminal=false -Type=Application -DocPath= -Categories=GNOME;Application;Network; -MimeType=application/x-cisco-vpn-settings -NoDisplay=true diff --git a/vpn-daemons/vpnc/po/.cvsignore b/vpn-daemons/vpnc/po/.cvsignore deleted file mode 100644 index 06d88514e4..0000000000 --- a/vpn-daemons/vpnc/po/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -Makefile.in.in -Makefile -Makefile.in -POTFILES -*.pot -stamp-it -*.gmo diff --git a/vpn-daemons/vpnc/po/ChangeLog b/vpn-daemons/vpnc/po/ChangeLog deleted file mode 100644 index 67426f39ec..0000000000 --- a/vpn-daemons/vpnc/po/ChangeLog +++ /dev/null @@ -1,569 +0,0 @@ -2008-12-07 Simos Xenitellis - - * el.po: Updated Greek translation by Evgenia Petoumenou. - -2008-12-06 Mario Blättermann - - * de.po: Updated German translation. - -2008-11-28 Mario Blättermann - - * de.po: Updated German translation. - -2008-11-27 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-11-19 Tomasz Dominikowski - - * pl.po: Updated Polish translation - -2008-10-14 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-10-01 Priit Laes - - * et.po: Translation updated by Mattias Põldaru - -2008-09-25 Gabor Kelemen - - * hu.po: Translation updated. - -2008-09-25 Claude Paroz - - * fr.po: Updated French translation. - -2008-09-25 Žygimantas Beručka - - * lt.po: Added Lithuanian translation. - * LINGUAS: Added "lt". - -2008-09-20 Luca Ferretti - - * it.po: Updated Italian translation by Francesco Marletta. - -2008-09-18 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2008-09-17 Petr Kovar - - * cs.po: Updated Czech translation by Jiri Eischmann. - -2008-09-15 Wouter Bolsterlee - - * nl.po: Updated Dutch translation by Wouter Bolsterlee. - -2008-09-10 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-09-09 Inaki Larranaga Murgoitio - - * eu.po: Updated Basque translation. - -2008-09-08 Tomasz Dominikowski - - * pl.po: Updated Polish translation - -2008-09-05 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-08-22 Tomasz Dominikowski - - * pl.po: Updated Polish translation - -2008-08-22 Chao-Hsiung Liao - - * zh_HK.po: Updated Traditional Chinese translation(Hong Kong). - * zh_TW.po: Updated Traditional Chinese translation(Taiwan). - -2008-08-17 Claude Paroz - - * fr.po: Updated French translation by Robert-André Mauchin. - -2008-08-14 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2008-08-08 Leonid Kanter - - * ru.po: Updated Russian translation - -2008-08-02 Alexander Shopov - - * bg.po: Updated Bulgarian translation by - Alexander Shopov - -2008-07-31 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2008-07-31 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2008-07-21 Hendrik Richter - - * de.po: Updated German translation. - -2008-07-11 Tambet Ingo - - * de.po: Fix typos (From Markus Becker ). - -2008-07-06 Arangel Angov - - * mk.po: Updated Macedonian translation. - -2008-07-04 Leonardo Ferreira Fontenelle - - * pt_BR.po: Brazilian Portuguese translation updated by Fábio - Nogueira. - -2008-06-24 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-06-21 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-06-06 Clytie Siddall - - * vi.po: Updated Vietnamese translation. - -2008-03-19 Gabor Kelemen - - * hu.po: Translation updated - -2008-03-09 Philip Withnall - - * en_GB.po: Updated British English translation. - -2008-02-28 Arangel Angov - - * mk.po: Updated Macedonian translation. - -2008-02-28 Gil Forcada - - * ca.po: Updated Catalan translation. - -2008-02-20 Inaki Larranaga Murgoitio - - * LINGUAS: Added 'eu' (Basque) entry. - * eu.po: Added Basque translation. - -2008-02-19 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2008-02-07 Artur Flinta - - * pl.po: Updated Polish translation by GNOME PL Team. - -2008-01-29 Jonh Wendell - - * pt_BR.po: Brazilian Portuguese translation updated by Luiz Armesto. - -2008-01-19 Stéphane Raimbault - - * fr.po: Updated French translation by Robert-André Mauchin. - -2007-12-29 Changwoo Ryu - - * ko.po: Updated Korean translation by Namhyung Kim. - -2007-12-26 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-12-26 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-12-26 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-12-17 Espen Stefansen - - * nb.po: Updated Norwegian Bokmål translation. - -2007-12-16 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2007-12-06 Jakub Friedl - - * cs.po: Added 'cs' to linguas. - -2007-12-06 Jorge Gonzalez - - * es.po: Updated Spanish translation. - -2007-12-03 Jovan Naumovski - - * mk.po: Updated Macedonian translation. - -2007-12-03 Changwoo Ryu - - * LINGUAS: Added 'ko'. Bug #501020. - -2007-10-31 Gabor Kelemen - - * hu.po: Translation updated - -2007-10-28 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2007-10-28 Priit Laes - - * et.po: Translation updated by Priit Laes. - -2007-10-28 Priit Laes - - * et.po: Translation updated by Priit Laes. - -2007-10-28 Priit Laes - - * et.po: Translation updated by Priit Laes. - -2007-10-26 Jorge Gonzalez - - * es.po: Updated Spanish translation. - -2007-09-15 Leonardo Ferreira Fontenelle - - * pt_BR.po: Brazilian Portuguese translation updated by Luiz Armesto - . - -2007-09-09 Espen Stefansen - - * nb.po: Updated Norwegian bokmål translation. - -2007-08-20 Wadim Dziedzic - - * pl.po: Updated Polish translation. - -2007-08-17 Kjartan Maraas,,23491770 - - * nb.po: Updated Norwegian bokmål translation. - -2007-08-15 Kostas Papadimas - - * el.po: Updated Greek Translation - -2007-08-11 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2007-07-23 Satoru SATOH - - * ja.po: Updated Japanese translation. - -2007-06-19 Leonid Kanter - - * ru.po: Initial Russian translation - -2007-06-11 Artur Flinta - - * pl.po: Updated Polish translation by GNOME PL Team. - -2007-06-07 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2007-04-24 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2007-04-14 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-03-10 Hendrik Richter - - * de.po: Updated German translation. - -2007-03-10 Hendrik Richter - - * de.po: Updated German translation, by - Thomas Gier - -2007-03-07 Vladimer Sichinava - - * ka.po: Updated Georgian translation by - Malkhaz Barkalaya - -2007-03-06 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2007-03-04 Priit Laes - - * et.po: Updated Estonian translation by Ivar Smolin . - -2007-03-03 Vincent van Adrighem - - * nl.po: Translation updated by Tino Meinen. - -2007-02-28 Kjartan Maraas - - * nb.po: Updated Norwegian bokmål translation. - -2007-02-27 Abel Cheung - - * LINGUAS: Added zh_HK and zh_TW. - * zh_HK.po, zh_TW.po: New traditional Chinese translation by - Chao-Hsiung Liao . - -2007-02-25 Stéphane Raimbault - - * fr.po: Updated French translation by Claude Paroz. - -2007-02-25 Duarte Loreto - - * pt.po: Updated Portuguese translation. - -2007-02-25 Priit Laes - - * LINGUAS, et.po: Added incomplete Estonian translation. - -2007-02-25 Raphael Higino - - * pt_BR.po: Updated Brazilian Portuguese translation by Washington Lins . - -2007-02-25 Gabor Kelemen - - * hu.po: Translation updated. - -2007-02-25 Changwoo Ryu - - * ko.po: Updated Korean translation by Young-Ho Cha. - -2007-02-23 Lasse Bang Mikkelsen - - * da.po: Updated Danish translation. - -2007-02-23 Ignacio Casal Quinteiro - - * gl.po: Updated Galician Translation. - -2007-02-23 Theppitak Karoonboonyanan - - * th.po: Updated Thai translation. - -2007-02-23 Alexander Shopov - - * bg.po: Updated Bulgarian translation by - Alexander Shopov - -2007-02-22 Josep Puigdemont i Casamajó - - * ca.po: Updated Catalan translation by - Gil Forcada - -2007-02-22 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2007-02-21 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-02-18 Artur Flinta - - * pl.po: Updated Polish translation by GNOME PL Team. - -2007-02-16 Maxim Dziumanenko - - * uk.po: Add Ukrainian translation. - * LINGUAS: Add uk to list. - -2007-02-13 Lasse Bang Mikkelsen - - * da.po: Updated Danish translation. - -2007-02-9 Djihed Afifi - - * ar.po: Updated Arabic Translation by Khaled Hosny. - -2007-02-08 Duarte Loreto - - * pt.po: Added Portuguese translation. - * LINGUAS: Added Portuguese (pt). - -2007-02-04 Stéphane Raimbault - - * fr.po: Added French translation by Jonathan Ernst. - -2007-02-04 AP S Alam - - * pa.po: Added Punjabi Translation - * LINGUAS: pa is added - -2007-02-04 Changwoo Ryu - - * ko.po: Added Korean translation by Young-Ho Cha. - -2007-02-02 Alexander Shopov - - * bg.po: Added Bulgarian translation by - Alexander Shopov - * LINGUAS: Added "bg" (Bulgarian). - -2007-01-31 Ilkka Tuohela - - * fi.po: Updated Finnish translation. - -2007-01-30 Theppitak Karoonboonyanan - - * th.po: Updated Thai translation. - -2007-01-29 Theppitak Karoonboonyanan - - * th.po: Added Thai translation. - * LINGUAS: Added 'th' (Thai). - -2007-01-26 Ignacio Casal Quinteiro - - * gl.po: Added 'gl' to ALL_LINGUAS. - -2007-01-13 Raphael Higino - - * LINGUAS: Added pt_BR. - * pt_BR.po: Added Brazilian Portuguese translation. - -2007-01-13 Kostas Papadimas - - * el.po: Added Greek Translation - * LINGUAS: Added el to the list - -2007-01-12 Jovan Naumovski - - * mk.po: Added Macedonian translation. - * LINGUAS: Added mk to the list. - -2007-01-10 Matic Zgur - - * sl.po: Fixed a wrongly translated string. - -2007-01-09 Matic Zgur - - * sl.po: Added Slovenian translation. - * LINGUAS: Added sl to the list of languages. - -2007-01-01 David Lodge - - * en_GB.po: Updated English (British) translation - -2006-12-09 Francisco Javier F. Serrador - - * es.po: UPdated SPanish translation. - -2006-11-18 Djihed Afifi - - * ar.po: Added Arabic Translation. - * LINGUAS: Added ar. - -2006-11-02 Pema Geyleg - - * LINGUAS: Added "dz". - * dz.po: Added Dzongkha Translation. - -2006-10-30 Kjartan Maraas - - * LINGUAS: Add «nb» - * nb.po: And add the translation. - -2006-10-30 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-10-21 Gabor Kelemen - - * hu.po: Translation updated. - -2006-10-21 Gabor Kelemen - - * hu.po: Translation added. - -2006-10-07 Vincent van Adrighem - - * nl.po: Translation added by Tino Meinen. - -2006-09-30 Alessio Frusciante - - * it.po: Added Italian translation by - Francesco Marletta . - * LINGUAS: Added "it" (Italian). - -2006-09-20 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-09-14 David Lodge - - * en_GB.po: Updated English (British) translation - * LINGUAS: Added en_GB - -2006-09-03 Josep Puigdemont i Casamajó - - * ca.po: Updated Catalan translation by - Gil Forcada . - * LINGUAS: added "ca" to the list of language codes. - -2006-08-26 Clytie Siddall - - * vi.po: Added Vietnamese translation. - * LINGUAS: added "vi" to list of language codes. - -2006-08-20 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2006-08-16 Ilkka Tuohela - - * fi.po: Added Finnish translation. - -2006-07-19 Satoru SATOH - - * ja.po: Added Japanese translation. - -2006-07-16 Funda Wang - - * zh_CN.po: Added Simplified Chinese translation. - -2006-07-12 Christian Rose - - * sv.po: Updated Swedish translation. - -2006-06-20 Jakub Friedl - - * cs.po: Updated Czech po file - -2006-06-14 Jakub Friedl - - * cs.po: Created Czech po file - -2006-01-26 Lasse Bang Mikkelsen - - * da.po: Updated Danish translation. - -2006-01-18 Lasse Bang Mikkelsen - - * da.po: Updated Danish translation. - -2005-06-17 David Zeuthen - - * POTFILES.in: Added nm-vpnc.desktop.in - - * da.po: Updated danish translations - -2005-06-16 David Zeuthen - - * da.po: Updated danish translations - diff --git a/vpn-daemons/vpnc/po/LINGUAS b/vpn-daemons/vpnc/po/LINGUAS deleted file mode 100644 index 1030494abb..0000000000 --- a/vpn-daemons/vpnc/po/LINGUAS +++ /dev/null @@ -1,38 +0,0 @@ -# please keep this list sorted alphabetically -ar -bg -ca -cs -da -de -dz -el -en_GB -es -et -eu -fi -fr -gl -hu -it -ja -ka -ko -lt -mk -nb -nl -pa -pl -pt -pt_BR -ru -sl -sv -th -uk -vi -zh_CN -zh_HK -zh_TW diff --git a/vpn-daemons/vpnc/po/POTFILES.in b/vpn-daemons/vpnc/po/POTFILES.in deleted file mode 100644 index c1109cde7c..0000000000 --- a/vpn-daemons/vpnc/po/POTFILES.in +++ /dev/null @@ -1,10 +0,0 @@ -# List of source files containing translatable strings. -# Please keep this file sorted alphabetically. -auth-dialog/gnome-two-password-dialog.c -auth-dialog/main.c -nm-vpnc.desktop.in -properties/nm-vpnc.c -properties/nm-vpnc-dialog.glade -src/nm-vpnc-service.c - - diff --git a/vpn-daemons/vpnc/po/ar.po b/vpn-daemons/vpnc/po/ar.po deleted file mode 100644 index 21276d2fb5..0000000000 --- a/vpn-daemons/vpnc/po/ar.po +++ /dev/null @@ -1,322 +0,0 @@ -# translation of NetworkManager-vpnc.HEAD.ar.po to Arabic -# Arabic translations for PACKAGE package. -# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Automatically generated, 2006. -# Khaled Hosny , 2007. -msgid "" -msgstr "" -"Project-Id-Version: Project\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-31 10:41+0100\n" -"PO-Revision-Date: 2007-12-26 09:15+0100\n" -"Last-Translator: Djihed Afifi \n" -"Language-Team: Arabic \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && " -"n<=10 ? 2 : 3\n" -"X-Poedit-Language: Arabic\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_كلمة سر ثانوية:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "ا_سم المستخدم:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "ال_نطاق:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_كلمة السر:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "اتصل كشخص م_جهول" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "اتصل _كمستخدم:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_تذكّر كلمة سر هذه الجلسة" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "احفظ كلمة السر في _حلقة المفاتيح" - -#: ../auth-dialog/main.c:182 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "تحتاج إلى التوثيق لتَنفُذ إلى الشبكة الخاصة التخيلية '%s'." - -#: ../auth-dialog/main.c:183 -msgid "Authenticate VPN" -msgstr "وثِّق VPN" - -#: ../auth-dialog/main.c:190 -msgid "_Group Password:" -msgstr "كلمة سر ال_مجموعة:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "أضِف، احذِف، و حرِّر اتصالات VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "مدير اتصالات VPN (vpnc)" - -#: ../properties/nm-vpnc.c:51 -#, fuzzy -msgid "Cisco Compatible VPN (vpnc)" -msgstr "عميل متوافق مع VPN سيسكو (vpnc) " - -#: ../properties/nm-vpnc.c:52 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" - -#: ../properties/nm-vpnc.c:204 -msgid "Secure (default)" -msgstr "" - -#: ../properties/nm-vpnc.c:207 -msgid "Weak (use with caution)" -msgstr "" - -#: ../properties/nm-vpnc.c:215 -msgid "None (completely insecure)" -msgstr "" - -#: ../properties/nm-vpnc.c:260 -msgid "NAT-T (default)" -msgstr "" - -#: ../properties/nm-vpnc.c:267 -msgid "Cisco UDP" -msgstr "" - -#: ../properties/nm-vpnc.c:274 -msgid "Disabled" -msgstr "" - -#: ../properties/nm-vpnc.c:698 -msgid "TCP tunneling not supported" -msgstr "أنفاق TCP ليست مدعومة" - -#: ../properties/nm-vpnc.c:700 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"ينص ملف اعدادات VPN '%s' على توجد تمرير حركة المرور عبر نفقة TCP وهو ما ليس " -"مدعوما حاليا في برمجيات vpnc\n" -"\n" -"ما زال بالإمكان إنشاء الإتصال مع تعطيل أنفاق TCP، بالرغم من أنها قد لا تعمل " -"كما هو متوقع." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr "" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -#, fuzzy -msgid "Optional" -msgstr "خياري" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -#, fuzzy -msgid "Domain:" -msgstr "ال_نطاق:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption Method:" -msgstr "" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -#, fuzzy -msgid "G_roup Name:" -msgstr "اسم الم_جموعة:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -#, fuzzy -msgid "NAT Traversal:" -msgstr "عطل الإرسال عبر NAT" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -#, fuzzy -msgid "User name:" -msgstr "ا_سم المستخدم:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Gateway:" -msgstr "ال_بوّابة:" - -#~ msgid "The following vpnc VPN connection will be created:" -#~ msgstr "سيُنشأ اتصال VPN التالي:" - -#~ msgid "Name: %s" -#~ msgstr "الإسم: %s" - -#~ msgid "Gateway: %s" -#~ msgstr "البوّابة: %s" - -#~ msgid "Group Name: %s" -#~ msgstr "اسم المجموعة: %s" - -#~ msgid "Username: %s" -#~ msgstr "اسم المستخدم: %s" - -#~ msgid "Domain: %s" -#~ msgstr "النطاق: %s" - -#~ msgid "Routes: %s" -#~ msgstr "المسارات: %s" - -#~ msgid "NAT-Keepalive packet interval: %s" -#~ msgstr "فترة حياة رزمة NAT: %s" - -#~ msgid "Enable Single DES" -#~ msgstr "فعل DES أحادي" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "يمكن تتغيير تفاصيل الإتصال باستخدام زر \"حرِّر\"." - -#~ msgid "Settings import incomplete" -#~ msgstr "استيراد الإعدادات غير كامل" - -#~ msgid "" -#~ "The VPN settings file '%s' is incomplete. You may not be able to connect " -#~ "without providing further information." -#~ msgstr "" -#~ "ملف إعدادات VPN المسمى '%s' غير كامل. يمكن أن لا تتمكن من الإتصل قبل " -#~ "إضافة معلومات أخرى." - -#~ msgid "Cannot import settings" -#~ msgstr "تعذّر استيراد الإعدادات" - -#~ msgid "The VPN settings file '%s' could not be read or is invalid." -#~ msgstr "لا يحتوي ملف اعدادات VPN '%s' على بيانات صالحة أو لم يمكن قرائته." - -#~ msgid "Select file to import" -#~ msgstr "انتقِ ملفّ للإستيراد" - -#~ msgid "Save as..." -#~ msgstr "احفظ كـ..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "يوجد ملف بالإسم \"%s\" مسبقاً." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "أتريد استبداله بالملف الذي تقوم بحفظه؟" - -#~ msgid "Failed to export configuration" -#~ msgstr "فشل تصدير الإعدادات" - -#~ msgid "Failed to save file %s" -#~ msgstr "فشب حفظ الملف %s" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "مثال: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "Connection na_me:" -#~ msgstr "إس_م الإتصال:" - -#~ msgid "Disable NAT _traversal" -#~ msgstr "عطل الإر_سال عبر NAT" - -#~ msgid "Enable _weak single DES encryption" -#~ msgstr "فعل الت_شفير الأحادي الضعيف DES" - -#~ msgid "Import _Saved Configuration..." -#~ msgstr "ا_ستورد اعدادات محفوظة..." - -#~ msgid "Interval:" -#~ msgstr "فترة:" - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "الإ_سم المستخدم لتعريف الإتصال للشبكة الخاصة، مثلا: \"Campus VPN\" أو " -#~ "\"Corporate Network\"" - -#~ msgid "Override _user name" -#~ msgstr "تخطّى اسم ال_مستخدم" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "من فضلك أدخل المعلومات التي وفرها مدير نظامك بأسفل. لا تدخل كلمة السر هنا " -#~ "حيث أنك ستسأل عنها عند الإتصال." - -#~ msgid "" -#~ "Please note that the file you import is not a Cisco VPN or VPNC " -#~ "configuration file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "ملاحظة: الملف الذي تريد استيراده ليس ملف VPN أو VPNC. اتصل بالمدير حول " -#~ "هذا الملف." - -#~ msgid "Required" -#~ msgstr "ضروري" - -#~ msgid "Use NAT _keepalive packets" -#~ msgstr "ا_ستعمل رزمات NAT" - -#~ msgid "Use _domain for authentication" -#~ msgstr "استخدم ال_نطاق للتوثّق" - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "استخدم _فقط اتصالات VPN لهذه العناوين" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "فشل ولوج VPN لأن اسم المستخدم أو كلمة السر لم تُقبل." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "فشل ولوج VPN لأن برنامج VPN لا يمكن بدأه." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "فشل ولوج VPN لأن برنامج VPN لا يمكنه الإتصال بخادم VPN." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "فشل ولوج VPN لأن خيارات اعدادات VPN غير صالحة." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "فشل ولوج VPN لأن برنامج VPN لم يتلقى اعدادات صالحة من خادم VPN." - -#~ msgid "Connection Information" -#~ msgstr "معلومات الإتصال" - -#~ msgid "Connection Name" -#~ msgstr "اسم الإتصال" - -#~ msgid "O_ptional Information" -#~ msgstr "معلومات ا_ختيارية" diff --git a/vpn-daemons/vpnc/po/bg.po b/vpn-daemons/vpnc/po/bg.po deleted file mode 100644 index fc0cc1f665..0000000000 --- a/vpn-daemons/vpnc/po/bg.po +++ /dev/null @@ -1,286 +0,0 @@ -# Bulgarian translation of NetworkManager-vpnc po-file -# Copyright (C) 2007, 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager package. -# Alexander Shopov , 2007, 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc trunk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-02 08:59+0300\n" -"PO-Revision-Date: 2008-08-01 07:18+0300\n" -"Last-Translator: Alexander Shopov \n" -"Language-Team: Bulgarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Втора парола:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Потребителско _име:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Домейн:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Парола:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "_Анонимно свързване" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Свързване _като потребителя:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Запомняне на паролата за тази сесия" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "Запазване на паролата в клю_чодържателя" - -#: ../auth-dialog/main.c:182 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Трябва да се идентифицирате, за да ползвате ВЧМ „%s“." - -#: ../auth-dialog/main.c:183 -msgid "Authenticate VPN" -msgstr "Идентифициране пред ВЧМ" - -#: ../auth-dialog/main.c:190 -msgid "_Group Password:" -msgstr "_Парола на групата:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Добавяне, изтриване и редактиране на връзки към ВЧМ" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Управление на връзките към ВЧМ (за vpnc)" - -#: ../properties/nm-vpnc.c:51 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "ВЧМ съвместима със Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:52 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Съвместима с шлюзове предоставящи ВЧМ чрез IPSec на Cisco, Juniper, " -"Netscreen и Sonicwall." - -#: ../properties/nm-vpnc.c:204 -msgid "Secure (default)" -msgstr "Сигурна (стандартно)" - -#: ../properties/nm-vpnc.c:207 -msgid "Weak (use with caution)" -msgstr "Несигурна (ползвайте с внимание)" - -#: ../properties/nm-vpnc.c:215 -msgid "None (completely insecure)" -msgstr "Никаква (напълно несигурно)" - -#: ../properties/nm-vpnc.c:260 -msgid "NAT-T (default)" -msgstr "NAT-T (стандартно)" - -#: ../properties/nm-vpnc.c:267 -msgid "Cisco UDP" -msgstr "UDP на Cisco" - -#: ../properties/nm-vpnc.c:274 -msgid "Disabled" -msgstr "Изключено" - -#: ../properties/nm-vpnc.c:698 -msgid "TCP tunneling not supported" -msgstr "Не се поддържа тунелиране по TCP" - -#: ../properties/nm-vpnc.c:700 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"Файлът с настройки за ВЧМ — „%s“ указва да се ползва тунелиране по TCP, " -"което не се поддържа в момента от vpnc.\n" -"\n" -"Връзката ще бъде създадена без тунелиране по TCP, но може да не работи " -"според очакванията." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Общи" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Допълнителни" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Изключване на откриването на забилите съседи" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Домейн:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption Method:" -msgstr "Метод на шифриране:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup Name:" -msgstr "Име на _групата:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "NAT Traversal:" -msgstr "Преминаване на NAT:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "User name:" -msgstr "Потребителско име:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Gateway:" -msgstr "_Шлюз:" - -#~ msgid "The following vpnc VPN connection will be created:" -#~ msgstr "Ще бъде създадена следната връзка чрез vpnc:" - -#~ msgid "Name: %s" -#~ msgstr "Име: „%s“" - -#~ msgid "Gateway: %s" -#~ msgstr "Шлюз: %s" - -#~ msgid "Group Name: %s" -#~ msgstr "Име на групата: %s" - -#~ msgid "Username: %s" -#~ msgstr "Потребителско име: %s" - -#~ msgid "Domain: %s" -#~ msgstr "Домейн: %s" - -#~ msgid "Routes: %s" -#~ msgstr "Маршрути: %s" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "" -#~ "Настройките на връзката могат да се редактират с бутона „Редактиране“." - -#~ msgid "Cannot import settings" -#~ msgstr "Настройките не могат да бъдат внесени." - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "Файлът с настройки за ВЧМ „%s“ не съдържа валидни данни." - -#~ msgid "Select file to import" -#~ msgstr "Избор на файл за внасяне" - -#~ msgid "Save as..." -#~ msgstr "Запазване като…" - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Файл с име „%s“ вече съществува." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Искате ли да го презапишете?" - -#~ msgid "Failed to export configuration" -#~ msgstr "Неуспех при изнасяне на настройките" - -#~ msgid "Failed to save file %s" -#~ msgstr "Неуспех при запазването на файла „%s“" - -#~ msgid "Connection Information" -#~ msgstr "Информация за връзката" - -#~ msgid "Connection Name" -#~ msgstr "Име на връзката" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "например: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "Connection Name" -#~ msgstr "Име на връзката" - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "_Име, което се ползва за различаването на връзката към частната мрежа, " -#~ "напр. „Корпоративна мрежа“." - -#~ msgid "Override _user name" -#~ msgstr "Задаване на друго _потребителско име" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Въведете отдолу информацията предоставена от системния ви администратор. " -#~ "Не въвеждайте паролата си. За нея ще бъдете запитани при свързване." - -#~ msgid "" -#~ "Please note that the file you import is not a Cisco VPN or VPNC " -#~ "configuration file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "Файлът, който внесохте, не е файл с настройки за ВЧМ на Cisco (VPNC). " -#~ "Помолете системния си администратор да ви предостави такъв файл." - -#~ msgid "Use _domain for authentication" -#~ msgstr "Използване на _домейн за идентификацията" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "_Внасяне на запазени настройки…" - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "Да се използва само връзката през _ВЧМ за тези адреси" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "Неуспешно свързване към ВЧМ — името или паролата са отхвърлени." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "Неуспешно свързване към ВЧМ — програмата за ВЧМ не може да бъде " -#~ "стартирана." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "Неуспешно свързване към ВЧМ — програмата за ВЧМ не успя да се свърже със " -#~ "сървъра за ВЧМ." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "Неуспешно свързване към ВЧМ — настройките на ВЧМ са грешни." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "Неуспешно свързване към ВЧМ — програмата за ВЧМ получи грешни настройки " -#~ "от сървъра за ВЧМ." diff --git a/vpn-daemons/vpnc/po/ca.po b/vpn-daemons/vpnc/po/ca.po deleted file mode 100644 index 83cef09fc4..0000000000 --- a/vpn-daemons/vpnc/po/ca.po +++ /dev/null @@ -1,316 +0,0 @@ -# Catalan translation of NetworkManager-vpnc -# Copyright © 2005 The Free Software Foundation, Inc. -# This file is distributed under the same license as the -# NetworkManager-vpnc package. -# Gil Forcada , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-28 16:38+0100\n" -"PO-Revision-Date: 2008-02-28 16:39+0100\n" -"Last-Translator: Gil Forcada \n" -"Language-Team: Catalan \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Contrasenya _secundària:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Nom d'_usuari:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domini:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Contrasenya:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Connecta _anònimament" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Connecta com a _usuari:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Recorda la contrasenya per aquesta sessió" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Desa la contrasenya a l'anell de claus" - -#: ../auth-dialog/main.c:172 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Us heu d'autenticar per poder accedir a la xarxa privada virtual «%s»." - -#: ../auth-dialog/main.c:173 -msgid "Authenticate VPN" -msgstr "Autentica la VPN" - -#: ../auth-dialog/main.c:180 -msgid "_Group Password:" -msgstr "Contrasenya de _grup:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Afegiu, suprimiu, i editeu connexions VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Gestor de connexions VPN (vpnc)" - -#: ../properties/nm-vpnc.c:98 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Client VPN compatible amb Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:543 -msgid "The following vpnc VPN connection will be created:" -msgstr "Es crearà la següent connexió VPN de vpnc:" - -#: ../properties/nm-vpnc.c:545 -#, c-format -msgid "Name: %s" -msgstr "Nom: %s" - -#: ../properties/nm-vpnc.c:548 -#, c-format -msgid "Gateway: %s" -msgstr "Passarel·la: %s" - -#: ../properties/nm-vpnc.c:550 -#, c-format -msgid "Group Name: %s" -msgstr "Nom del grup: %s" - -#: ../properties/nm-vpnc.c:554 -#, c-format -msgid "Username: %s" -msgstr "Nom d'usuari: %s" - -#: ../properties/nm-vpnc.c:559 -#, c-format -msgid "Domain: %s" -msgstr "Domini: %s" - -#: ../properties/nm-vpnc.c:564 -#, c-format -msgid "Routes: %s" -msgstr "Rutes: %s" - -#: ../properties/nm-vpnc.c:568 -#, c-format -msgid "NAT-Keepalive packet interval: %s" -msgstr "Interval del paquet NAT-Keepalive: %s" - -#: ../properties/nm-vpnc.c:572 -#, c-format -msgid "Enable Single DES" -msgstr "Habilita el DES únic" - -#: ../properties/nm-vpnc.c:576 -#, c-format -msgid "Disable NAT Traversal" -msgstr "Inhabilita el NAT transversal" - -#: ../properties/nm-vpnc.c:580 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Els detalls de la connexió es poden canviar amb el botó «Edita»." - -#: ../properties/nm-vpnc.c:665 -msgid "TCP tunneling not supported" -msgstr "No està implementat els túnels TCP" - -#: ../properties/nm-vpnc.c:667 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"El fitxer de paràmetres de la VPN «%s» especifica que el tràfic VPN s'hauria " -"de posar en un túnel TCP, que de moment encara no està implementat a " -"l'aplicació vpnc.\n" -"\n" -"Tot i això es pot crear la connexió, amb el túnel a través de TCP " -"inhabilitat, tanmateix segurament no funcionarà com s'espera." - -#: ../properties/nm-vpnc.c:687 -msgid "Settings import incomplete" -msgstr "No s'han pogut importar els paràmetres" - -#: ../properties/nm-vpnc.c:689 -#, c-format -msgid "" -"The VPN settings file '%s' is incomplete. You may not be able to connect " -"without providing further information." -msgstr "" -"El fitxer de configuració de la VPN «%s» no és complet. No us podreu " -"connectar si no proporcioneu més informació." - -#: ../properties/nm-vpnc.c:709 -msgid "Cannot import settings" -msgstr "No es poden importar els paràmetres" - -#: ../properties/nm-vpnc.c:711 -#, c-format -msgid "The VPN settings file '%s' could not be read or is invalid." -msgstr "" -"No s'ha pogut llegir el fitxer de configuració de la VPN «%s» o no és vàlid." - -#: ../properties/nm-vpnc.c:726 -msgid "Select file to import" -msgstr "Seleccioneu el fitxer a importar" - -#: ../properties/nm-vpnc.c:908 -msgid "Save as..." -msgstr "Anomena i desa..." - -#: ../properties/nm-vpnc.c:937 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Ja existeix un fitxer anomenat «%s»." - -#: ../properties/nm-vpnc.c:940 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Voleu reemplaçar-lo amb el que voleu desar?" - -#: ../properties/nm-vpnc.c:954 -msgid "Failed to export configuration" -msgstr "No s'ha pogut exportar la configuració" - -#: ../properties/nm-vpnc.c:956 -#, c-format -msgid "Failed to save file %s" -msgstr "No s'ha pogut desar el fitxer %s" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "exemple: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection na_me:" -msgstr "No_m de la connexió:" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Disable NAT _traversal" -msgstr "Inhabilita el NAT _transversal" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Enable _weak single DES encryption" -msgstr "Habilita el xifratge DES únic _fluix" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "G_roup name:" -msgstr "Nom del g_rup:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Import _Saved Configuration..." -msgstr "Importa la configuració _desada..." - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "Interval:" -msgstr "Interval:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Nom utilitzat per identificar la connexió a la xarxa privada, per exemple " -"«VPN del Campus» o «Xarxa Corporativa»" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Optional" -msgstr "Opcional" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Override _user name" -msgstr "Sobreescriu el nom d'_usuari" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Entreu la informació proporcionada pel vostre administrador de sistema. No " -"hi entreu la vostra contrasenya, ja es demanarà en connectar." - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"Tingueu en compte que el fitxer que heu importat no és un fitxer de " -"configuració Cisco VPN o VPNC. Demaneu el fitxer al vostre administrador." - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "Required" -msgstr "Necessària" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "Use NAT _keepalive packets" -msgstr "Utilitza els paquets NAT _keepalive" - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "Use _domain for authentication" -msgstr "Utilitzeu el _domini per l'autenticació" - -#: ../properties/nm-vpnc-dialog.glade.h:16 -msgid "_Gateway:" -msgstr "_Passarel·la:" - -#: ../properties/nm-vpnc-dialog.glade.h:17 -msgid "_Only use VPN connection for these addresses" -msgstr "_Fes servir només la connexió VPN per aquestes adreces" - -#~ msgid "Connection Information" -#~ msgstr "Informació de la connexió" - -#~ msgid "Connection Name" -#~ msgstr "Nom de la connexió" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "" -#~ "No s'ha pogut connectar a la VPN perquè no s'han acceptat el nom d'usuari " -#~ "i la contrasenya." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "No s'ha pogut connectar a la VPN perquè no s'ha pogut iniciar l'aplicació " -#~ "VPN." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "No s'ha pogut connectar a la VPN perquè l'aplicació VPN no s'ha pogut " -#~ "connectar al servidor VPN." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "No s'ha pogut connectar a la VPN perquè les opcions de configuració de la " -#~ "VPN eren errònies." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "No s'ha pogut connectar a la VPN perquè l'aplicació VPN ha rebut una " -#~ "configuració errònia del servidor VPN." - -#~ msgid "O_ptional Information" -#~ msgstr "Informació o_pcional" diff --git a/vpn-daemons/vpnc/po/cs.po b/vpn-daemons/vpnc/po/cs.po deleted file mode 100644 index ef63417e58..0000000000 --- a/vpn-daemons/vpnc/po/cs.po +++ /dev/null @@ -1,178 +0,0 @@ -# Czech translation of NetworkManager-vpnc. -# Copyright (C) 2008 the author(s) of NetworkManager-vpnc. -# This file is distributed under the same license as the NetworkManager-vpnc package. -# Jakub Friedl , 2006. -# Jiří Eischmann , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-17 22:22+0200\n" -"PO-Revision-Date: 2008-09-16 23:11+0100\n" -"Last-Translator: Jiří Eischmann \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "Ověření _hesla:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Uživ. jméno:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Doména:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Heslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Připojit _anonymně" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Připojit jako _uživatel:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "_Zapamatovat si hesla pro toto sezení" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "_Uložit hesla do svazku klíčů" - -#: ../auth-dialog/main.c:66 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Pro přístup do VPN '%s' se musíte autentizovat." - -#: ../auth-dialog/main.c:67 -msgid "Authenticate VPN" -msgstr "Ověřování VPN" - -#: ../auth-dialog/main.c:74 -msgid "_Group Password:" -msgstr "Heslo _skupiny:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Přidat, odstranit a upravit VPN připojení" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Správce VPN spojení (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "VPN kompatibilní s Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Kompatibilní s různými VPN bránami založenými na IPSec od Cisco, Juniper, " -"Netscreen a Sonicwall." - -#: ../properties/nm-vpnc.c:282 -msgid "Secure (default)" -msgstr "Zabezpečené (výchozí)" - -#: ../properties/nm-vpnc.c:285 -msgid "Weak (use with caution)" -msgstr "Slabé (používejte obezřetně)" - -#: ../properties/nm-vpnc.c:293 -msgid "None (completely insecure)" -msgstr "Žádné (kompletně nezabezpečené)" - -#: ../properties/nm-vpnc.c:331 -msgid "NAT-T (default)" -msgstr "NAT-T (výchozí)" - -#: ../properties/nm-vpnc.c:338 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:345 -msgid "Disabled" -msgstr "Zakázáno" - -#: ../properties/nm-vpnc.c:809 -msgid "TCP tunneling not supported" -msgstr "TCP tunelování není podporováno" - -#: ../properties/nm-vpnc.c:811 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"Soubor VPN nastavení '%s' udává, že má být VPN připojení tunelováno přes " -"TCP. To není v současné době ve vpnc podporováno.\n" -"\n" -"Připojení půjde navázat bez TCP tunelování, ale je možné, že nebude fungovat " -"korektně." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Obecné" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Volitelné" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Zakázaná Dead Peer Detection" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Doména:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Metoda šifrování:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "J_méno skupiny:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "Heslo sk_upiny:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "NAT traversal:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Zobrazit hesla" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Uživ. jméno:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Brána:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "_Uživ. heslo:" diff --git a/vpn-daemons/vpnc/po/da.po b/vpn-daemons/vpnc/po/da.po deleted file mode 100644 index 36d75179c6..0000000000 --- a/vpn-daemons/vpnc/po/da.po +++ /dev/null @@ -1,276 +0,0 @@ -# Danish translation of NetworkManager-vpnc -# Copyright (C) 2005-2007 -# This file is distributed under the same license as the NetworkManager-vpnc package. -# David Zeuthen , 2005. -# Lasse Bang Mikkelsen , 2006, 07. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-23 19:19+0100\n" -"PO-Revision-Date: 2007-02-23 19:19+0100\n" -"Last-Translator: Lasse Bang Mikkelsen \n" -"Language-Team: Danish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Sekundær adgangskode:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Brugernavn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domæne:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Adgangskode:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Tilslut _anonymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Tilslut som _bruger:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Husk adgangskoder for denne session" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Gem adgangskoder i nøglering" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Brugerverifikation er påkrævet for at tilslutte til det virtuelle private " -"netværk '%s'." - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "VPN-brugerverifikation" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "_Gruppe-adgangskode:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Tilføj, fjern og redigér VPN-forbindelser" - -# -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN-forbindelser (vpnc)" - -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Kompatibel Cisco VPN-klient (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "Følgende vpnc VPN-forbindelse vil blive oprettet:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "Navn: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "Ad_gangspunkt: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "Gruppenavn: %s" - -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "Brugernavn: %s" - -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "Domæne: %s" - -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "Ruter: %s" - -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Forbindelsens detaljer kan ændres ved at bruge knappen \"Redigér\"." - -#: ../properties/nm-vpnc.c:542 -msgid "TCP tunneling not supported" -msgstr "TCP-tunnel er ikke understøttet" - -#: ../properties/nm-vpnc.c:544 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"VPN-opsætningsfilen '%s' angiver at VPN-trafikken skal sendes igennem en TCP-" -"tunnel, som i øjeblikket ikke er understøttet i vpnc-programmet.\n" -"\n" -"Forbindelsen kan stadig oprettes uden TCP-tunnel, men vil muligvis ikke " -"fungere som forventet." - -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "Kan ikke importere opsætning" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "VPN-opsætningsfilen '%s' indeholder ikke gyldige data." - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "Vælg fil der skal importeres" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "Gem som..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "En fil med navnet \"%s\" eksisterer allerede." - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Vil du erstatte den med den du gemmer?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "Kunne ikke eksportere konfiguration" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "Kunne ikke gemme fil %s" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Information" -msgstr "Information om forbindelse" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection Name" -msgstr "Navn på forbindelse" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Required" -msgstr "Påkrævet" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "eksempel: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Connection Name" -msgstr "Navn på forbindelse" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "G_roup Name:" -msgstr "G_ruppenavn:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Navn brugt til at identificere forbindelsen til det private netværk, f.eks. " -"\"Universitets VPN\" eller \"Virksomhedens netværk\"" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Optional" -msgstr "Valgfri" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Override _user name" -msgstr "Overskriv br_ugernavn" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Indtast oplysninger fra din systemadministrator nedenfor. Du skal ikke " -"indtaste din adgangskode her, da du bliver spurgt om den ved tilslutning." - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"Bemærk venligst at filen du importerer ikke er en Cisco VPN eller VPNC " -"konfigurationsfil. Spørg din administrator efter filen." - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "Use _domain for authentication" -msgstr "Brug _domæne til brugerverifikation" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_Gateway:" -msgstr "Ad_gangspunkt:" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "_Import Saved Configuration..." -msgstr "_Importér gemt konfiguration..." - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "_Only use VPN connection for these addresses" -msgstr "_Brug kun VPN-forbindelse til flg. adresser" - -#: ../src/nm-vpnc-service.c:119 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "VPN-tjenesten fejlede fordi brugernavn og adgangskode blev afvist." - -#: ../src/nm-vpnc-service.c:121 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "VPN-tjenesten fejlede fordi VPN-programmet ikke kunne startes." - -#: ../src/nm-vpnc-service.c:123 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"VPN-tjenesten fejlede fordi VPN-programmet ikke kunne forbinde til VPN-" -"serveren." - -#: ../src/nm-vpnc-service.c:125 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "VPN-tjenesten fejlede fordi VPN-konfigurationen var ugyldig." - -#: ../src/nm-vpnc-service.c:127 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"VPN-tjenesten fejlede fordi VPN-programmet modtog en ugyldig konfiguration " -"fra VPN-serveren." - -#~ msgid "O_ptional Information" -#~ msgstr "Yderligere oplysninger" diff --git a/vpn-daemons/vpnc/po/de.po b/vpn-daemons/vpnc/po/de.po deleted file mode 100644 index ea15c5d64b..0000000000 --- a/vpn-daemons/vpnc/po/de.po +++ /dev/null @@ -1,319 +0,0 @@ -# German translations for NetworkManager-vpnc package. -# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Thomas Gier , 2007. -# Mario Blättermann , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 21:11+0100\n" -"PO-Revision-Date: 2008-12-06 21:12+0100\n" -"Last-Translator: Mario Blättermann \n" -"Language-Team: de \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:118 -msgid "_Secondary Password:" -msgstr "_Zweitpasswort:" - -#: ../auth-dialog/gnome-two-password-dialog.c:174 -msgid "_Password:" -msgstr "_Passwort:" - -#: ../auth-dialog/gnome-two-password-dialog.c:255 -msgid "Sh_ow passwords" -msgstr "Passwörter an_zeigen" - -#: ../auth-dialog/gnome-two-password-dialog.c:315 -msgid "_Remember passwords for this session" -msgstr "Passwo_rt für diese Sitzung behalten" - -#: ../auth-dialog/gnome-two-password-dialog.c:316 -msgid "_Save passwords in keyring" -msgstr "Passwort im _Schlüsselbund speichern" - -#: ../auth-dialog/main.c:170 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Sie müssen sich legitimieren, um auf das Virtuelle private Netzwerk »%s« " -"zugreifen zu können." - -#: ../auth-dialog/main.c:171 -msgid "Authenticate VPN" -msgstr "VPN legitimieren" - -#: ../auth-dialog/main.c:175 -msgid "_Group Password:" -msgstr "_Gruppenpasswort:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN-Verbindungen hinzufügen, entfernen und bearbeiten" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN-Verbindungsmanager (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cisco-kompatibler VPN-Client (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Kompatibel zu verschiedenen VPN-Gateways von Cisco, Juniper, Netscreen und " -"Sonicwall (IPSec-basiert)." - -#: ../properties/nm-vpnc.c:339 -msgid "Saved" -msgstr "Gespeichert" - -#: ../properties/nm-vpnc.c:346 -msgid "Always Ask" -msgstr "Immer fragen" - -#: ../properties/nm-vpnc.c:353 -msgid "Not Required" -msgstr "Nicht notwendig" - -#: ../properties/nm-vpnc.c:412 -msgid "Secure (default)" -msgstr "Sicher (Vorgabe)" - -#: ../properties/nm-vpnc.c:415 -msgid "Weak (use with caution)" -msgstr "Weich (mit Vorsicht zu verwenden)" - -#: ../properties/nm-vpnc.c:423 -msgid "None (completely insecure)" -msgstr "Keine (komplett unsicher)" - -#: ../properties/nm-vpnc.c:471 -msgid "Cisco UDP (default)" -msgstr "Cisco-UDP (Vorgabe)" - -#: ../properties/nm-vpnc.c:478 -msgid "NAT-T" -msgstr "NAT-T" - -#: ../properties/nm-vpnc.c:485 -msgid "Disabled" -msgstr "Deaktiviert" - -#: ../properties/nm-vpnc.c:1104 -msgid "TCP tunneling not supported" -msgstr "TCP-Tunneling wird nicht unterstützt" - -#: ../properties/nm-vpnc.c:1106 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"Die VPN-Einstellungsdatei »%s« legt fest, dass VPN-Verkehr über TCP getunnelt " -"werden soll, was jedoch zur Zeit nicht in der vpnc-Software unterstützt " -"wird.\n" -"\n" -"Die Verbindung kann dennoch mit unterdrücktem TCP-Tunneling erzeugt werden, " -"allerdings besteht die Möglichkeit, dass sie nicht wie erwartet funktioniert." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Allgemein" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Optional" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Peer-To-Peer-Erkennung deaktivieren" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Domäne:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Verschlüsselungsmethode:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "G_ruppenname:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "_Gruppenpasswort:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "NAT-Traversal:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Passwörter anzeigen" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Benutzername:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "Ben_utzerpasswort:" - -#~ msgid "_Username:" -#~ msgstr "_Benutzername:" - -#~ msgid "_Domain:" -#~ msgstr "_Domäne:" - -#~ msgid "Connect _anonymously" -#~ msgstr "_Anonym verbinden" - -#~ msgid "Connect as _user:" -#~ msgstr "Als Ben_utzer verbinden:" - -#~ msgid "The following vpnc VPN connection will be created:" -#~ msgstr "Folgende vpnc-VPN-Verbindung wird erzeugt:" - -#~ msgid "Name: %s" -#~ msgstr "Name: »%s«" - -#~ msgid "Gateway: %s" -#~ msgstr "Gateway: »%s«" - -#~ msgid "Group Name: %s" -#~ msgstr "Gruppenname: »%s«" - -#~ msgid "Username: %s" -#~ msgstr "Benutzername: »%s«" - -#~ msgid "Domain: %s" -#~ msgstr "Domäne: »%s«" - -#~ msgid "Routes: %s" -#~ msgstr "Routen: »%s«" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "" -#~ "Die Verbindungsdetails können mit Hilfe des »Bearbeiten«-Knopfes geändert " -#~ "werden." - -#~ msgid "Cannot import settings" -#~ msgstr "Einstellungen können nicht importiert werden" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "Die VPN-Einstellungendatei »%s« enthält keine gültigen Daten." - -#~ msgid "Select file to import" -#~ msgstr "Datei zum Import auswählen" - -#~ msgid "Save as..." -#~ msgstr "Speichern unter …" - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Eine Datei mit dem Namen »%s« existiert bereits." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Möchten Sie sie mit der aktuellen Datei ersetzen?" - -#~ msgid "Failed to export configuration" -#~ msgstr "Export der Konfiguration gescheitert" - -#~ msgid "Failed to save file %s" -#~ msgstr "Speichern der Datei »%s« gescheitert" - -#~ msgid "Connection Information" -#~ msgstr "Verbindungsinformationen" - -#~ msgid "Connection Name" -#~ msgstr "Verbindungsname" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "Beispiel: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "Connection Name" -#~ msgstr "Verbindungsname" - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. \"Campus " -#~ "VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Name, der zur Identifikation der Verbindung zum privaten Netzwerk " -#~ "verwendet wird, z.B. »Campus VPN« oder »Firmennetzwerk«" - -#~ msgid "Override _user name" -#~ msgstr "Ben_utzernamen außer Kraft setzen" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Bitte tragen Sie die Informationen, die Sie von Ihrem Systemadministrator " -#~ "erhalten haben unten ein. Geben Sie Ihr Kennwort nicht ein, da Sie beim " -#~ "Verbinden danach gefragt werden." - -#~ msgid "" -#~ "Please note that the file you import is not a Cisco VPN or VPNC " -#~ "configuration file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "Beachten Sie bitte, dass die Datei, die Sie importieren, keine Cisco VPN " -#~ "oder VPNC-Konfigurationsdatei ist. Wenden Sie sich an Ihren Administrator." - -#~ msgid "Use _domain for authentication" -#~ msgstr "_Domäne zur Authentifikation verwenden" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "Gespeicherte Konfiguration importieren …" - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "_VPN-Verbindung nur für diese Adressen verwenden" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "" -#~ "Die VPN-Anmeldung scheiterte, da Benutzername und Kennwort nicht " -#~ "akzeptiert wurden." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "Die VPN-Anmeldung scheiterte, weil das VPN-Porgramm nicht gestartet werden " -#~ "konnte." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "Die VPN-Anmeldung scheiterte, weil das VPN-Programm sich nicht mit dem VPN-" -#~ "Server verbinden konnte." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "Die VPN-Anmeldung scheiterte, weil die VPN-Konfigurationsoptionen ungültig " -#~ "waren." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "Die VPN-Anmeldung scheiterte, weil das VPN-Programm eine ungültige " -#~ "Konfiguration vom VPN-Server erhielt." diff --git a/vpn-daemons/vpnc/po/dz.po b/vpn-daemons/vpnc/po/dz.po deleted file mode 100644 index de819088ef..0000000000 --- a/vpn-daemons/vpnc/po/dz.po +++ /dev/null @@ -1,247 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: networkmanager-vpnc.networkmanager-0-6-0-release.pot\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-19 03:35+0000\n" -"PO-Revision-Date: 2007-03-19 16:36+0530\n" -"Last-Translator: sonam pelden \n" -"Language-Team: Dzongkha \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Poedit-Language: Dzongkha\n" -"X-Poedit-Country: Bhutan\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "གལ་གནད་ཆུང་བའི་ཆོག་ཡིག: (_S)" - -#: ../auth-dialog/gnome-two-password-dialog.c:267 -msgid "_Username:" -msgstr "ལག་ལེན་པའི་མིང་: (_U)" - -#: ../auth-dialog/gnome-two-password-dialog.c:269 -msgid "_Domain:" -msgstr "ཌོ་མེན: (_D)" - -#: ../auth-dialog/gnome-two-password-dialog.c:271 -msgid "_Password:" -msgstr "ཆོག་ཡིག: (_P)" - -#: ../auth-dialog/gnome-two-password-dialog.c:354 -msgid "Connect _anonymously" -msgstr "མིང་མེད་ཐོག་ལས་མཐུད། (_a)" - -#: ../auth-dialog/gnome-two-password-dialog.c:359 -msgid "Connect as _user:" -msgstr "ལག་ལེན་པ་སྦེ་མཐུད: (_u)" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "ལཱ་ཡུན་འདི་གི་དོན་ལུ་ཆོག་ཡིག་ཚུ་སེམས་ཁར་བཞག། (_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "ལྡེ་འཁོར་ནང་ཆོག་ཡིག་ཚུ་སྲུངས་། (_S)" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "བར་ཅུལ་སྒེར་སྡེའི་ཡོངས་འབྲེལ་ '%s' འདི་འཛུལ་སྤྱོད་འབད་ནི་ལུ་ཁྱོད་ཀྱིས་བདེན་བཤད་འབད་དགོ།" - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "ཝི་པི་ཨེན་བདེན་བཤད་འབད་" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "ཆོག་ཡིག་སྡེ་ཚན་བཟོ: (_G)" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ་ཁ་སྐོང་བརྐྱབ་ནི་ རྩ་བསྐྲད་གཏང་ནི་དང་ཞུན་དག་འབད་" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཛིན་སྐྱོང་(ཝི་པི་ཨེན་སི་)" - -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "མཐུན་འགྱུར་ཅན་སིསི་ཀོ་ཝི་པི་ཨེན་ཞབས་ཏོག (ཝི་པི་ཨེན་སི་)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "འོག་གི་ཝི་པི་ཨེན་སི་ ཝི་པི་ཨེན་མཐུད་ལམ་འདི་གསར་བསྐྲུན་འབད་ནི་ཨིན:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "མིང་: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "འཛུལ་སྒོ: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "སྡེ་ཚན་མིང་: %s" - -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "ལག་ལེན་པའི་མིང་: %s" - -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "ཌོ་མེན: %s" - -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "འགྲུལ་ལམ: %s" - -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "མཐུད་ལམ་རྒྱས་བཤད་ཚུ་ \"Edit\" ཨེབ་རྟ་ལག་ལེན་འཐབ་ཐོག་ལས་ བསྒྱུར་བཅོས་འབད་ཚུགས།" - -#: ../properties/nm-vpnc.c:542 -msgid "TCP tunneling not supported" -msgstr "ཊི་སི་པི་ཊ་ན་ལིང་རྒྱབ་སྐྱོར་མ་འབད་བས་" - -#: ../properties/nm-vpnc.c:544 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it may not work as expected." -msgstr "" -"ཝི་པི་ཨེན་སྒྲིག་སྟངས་ཡིག་སྣོད་ '%s' དེ་གིས་ ཝི་པི་ཨེན་འགྲུལ་ལམ་འདི་ཊི་སི་པི་ལས་རྒྱུད་དེ་ཊ་ནལཌི་འབད་དགོཔ་ དེ་ཡང་ ད་ལྟོ་ཝི་པི་ཨེན་སི་མཉེན་ཆས་ནང་རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་མི་འདི་ཨིན།\n" -"\n" -"མཐུད་ལམ་འདི་ད་ལྟོ་ཡང་གསར་བསྐྲུན་འབད་ཚུགས་ དེ་ཡང་ ཊི་སི་པི་ཊ་ན་ལིང་ལྕོགས་མེད་བཟོ་ཐོག་ལས་ ག་ལས་སྐོར་རུང་ རེ་བ་བསྐྱེད་དོ་བཟུམ་སྦེ་དེ་གིས་ལཱ་མི་འབད།" - -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "སྒྲིག་སྟངས་ཚུ་ནང་འདྲེན་འབད་མི་ཚུགས་" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "ཝི་པི་ཨེན་སྒྲིག་སྟངས་ཡིག་སྣོད་ '%s' དེ་ལུ་ནུས་ཅན་གནས་སྡུད་གནས་ཏེ་མེད།" - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "ནང་འདྲེན་འབད་ནི་ལུ་ཡིག་སྣོད་སེལ་འཐུ་འབད་" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "དེ་སྦེ་སྲུང་..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "ཡིག་སྣོད་\"%s\" འདི་ཧེ་མ་ལས་རང་འདུག།" - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "ཁྱོད་ཀྱིས་སྲུང་མི་དང་ཅིག་ཁར་ ཁྱོད་ཀྱིས་ཚབ་བཙུགས་ནི་ཨིན་ན?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "རིམ་སྒྲིག་ཕྱིར་འདྲེན་འབད་མ་ཚུགས་" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "ཡིག་སྣོད་ %sསྲུང་མ་ཚུགས་" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Information" -msgstr "མཐུད་ལམ་བརྡ་དོན་" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection Name" -msgstr "མཐུད་ལམ་མིང་" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Required" -msgstr "དགོས་མཁོ་ཡོདཔ" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "དཔེར་ན: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Connection Name" -msgstr "མཐུད་ལམ་མིང་" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "G_roup Name:" -msgstr "སྡེ་ཚན་མིང་: (_r)" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "སྒེར་སྡེ་ཡོངས་འབྲེལ་ལུ་མཐུད་ལམ་ངོས་འཛིན་འབད་ནི་ལུ་ལག་ལེན་འཐབ་ཡོད་པའི་མིང་ e.g. \"Campus VPN\" ཡང་ན་ \"Corporate Network\"" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Optional" -msgstr "གདམ་ཁ་ཅན་" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Override _user name" -msgstr "ལག་ལེན་པའི་མིང་མེདཔ་གཏང་མི། (_u)" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting." -msgstr "འོག་གི་ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་གིས་བྱིན་ཡོད་པའི་ བརྡ་དོན་འདི་ཐོ་བཀོད་འབད། མཐུད་པའི་བསྒང་ཡར་བསྐྱེད་འབདཝ་ལས་ ཁྱོད་ཀྱིས་ཆོག་ཡིག་འདི་ཐོ་བཀོད་མ་འབད།" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file." -msgstr "ཁྱོད་ཀྱིས་ནང་འདྲེན་འབད་མི་ཡིག་སྣོད་འདི་ སིསི་ཀོ་ཝི་པི་ཨེན་ཡང་ན་ ཝི་པི་ཨེན་སི་རིམ་སྒྲིག་ཡིག་སྣོད་མེན་ཟེར་ དྲན་འཛིན་འབད་གནང་། ཡིག་སྣོད་ཀྱི་དོན་ལུ་ཁྱོད་རའི་བདག་སྐྱོང་པ་ལུ་དྲི།" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "Use _domain for authentication" -msgstr "བདེན་བཤད་ཀྱི་དོན་ལུ་ཌོ་མེན་ལག་ལེན་འཐབ། (_d)" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_Gateway:" -msgstr "འཛུལ་སྒོ: (_G)" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "_Import Saved Configuration..." -msgstr "སྲུང་བཞག་ཡོད་པའི་རིམ་སྒྲིག་ནང་འདྲེན་འབད... (_I)" - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "_Only use VPN connection for these addresses" -msgstr "ཁ་བྱང་འདི་གི་དོན་ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་རྐྱངམ་ཅིག་ལག་ལེན་འཐབ། (_O)" - -#: ../src/nm-vpnc-service.c:118 -msgid "The VPN login failed because the user name and password were not accepted." -msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོད་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ལག་ལེན་པའི་མིང་དང་ཆོག་ཡིག་དང་ལེན་མ་འབད་བས།" - -#: ../src/nm-vpnc-service.c:120 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "ཝི་པི་ཨེན་འཐུས་ཤོར་བྱུང་ཡོད་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཝི་པི་ཨེན་ལས་རིམ་འདི་འགོ་བཙུགས་མ་ཚུགས།" - -#: ../src/nm-vpnc-service.c:122 -msgid "The VPN login failed because the VPN program could not connect to the VPN server." -msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོད་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཝི་པི་ཨེན་ལས་རིམ་འདི་ཝི་པི་ཨེན་སར་བར་ལུ་མཐུད་མ་ཚུགས།" - -#: ../src/nm-vpnc-service.c:124 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོད་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཝི་པི་ཨེན་རིམ་སྒྲིག་གདམ་ཁ་ཚུ་ནུས་ཅན་མེདཔ་ཨིན།" - -#: ../src/nm-vpnc-service.c:126 -msgid "The VPN login failed because the VPN program received an invalid configuration from the VPN server." -msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོད་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ ཝི་པི་ཨེན་ལས་རིམ་དེ་གིས་ ཝི་པི་ཨེན་སར་བར་ལས་ནུས་ཅན་མེད་པའི་རིམ་སྒྲིག་ཐོབ་ཡོད།" - diff --git a/vpn-daemons/vpnc/po/el.po b/vpn-daemons/vpnc/po/el.po deleted file mode 100644 index 1adbcd7243..0000000000 --- a/vpn-daemons/vpnc/po/el.po +++ /dev/null @@ -1,194 +0,0 @@ -# translation of NetworkManager-vpnc.HEAD.po to -# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Kostas Papadimas , 2007. -# Jennie Petoumenou , 2008. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-07 15:57+0000\n" -"PO-Revision-Date: 2008-12-07 01:08+0200\n" -"Last-Translator: Jennie Petoumenou \n" -"Language-Team: Greek \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:118 -msgid "_Secondary Password:" -msgstr "_Δευτερεύον συνθηματικό:" - -#: ../auth-dialog/gnome-two-password-dialog.c:174 -msgid "_Password:" -msgstr "_Συνθηματικό:" - -#: ../auth-dialog/gnome-two-password-dialog.c:255 -msgid "Sh_ow passwords" -msgstr "Εμ_φάνιση συνθηματικών" - -#: ../auth-dialog/gnome-two-password-dialog.c:315 -msgid "_Remember passwords for this session" -msgstr "Απο_μνημόνευση συνθηματικών για αυτή τη συνεδρία" - -#: ../auth-dialog/gnome-two-password-dialog.c:316 -msgid "_Save passwords in keyring" -msgstr "Απο_θήκευση συνθηματικών στην κλειδοθήκη" - -#: ../auth-dialog/main.c:170 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Χρειάζεστε πιστοποίηση για να αποκτήσετε πρόσβαση στο Ιδιωτικό Εικονικό " -"Δίκτυο (VPN) '%s'." - -#: ../auth-dialog/main.c:171 -msgid "Authenticate VPN" -msgstr "Πιστοποίηση VPN" - -#: ../auth-dialog/main.c:175 -msgid "_Group Password:" -msgstr "Συνθηματικό ο_μάδας:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Προσθήκη, απομάκρυνση και επεξεργασία συνδέσεων VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Διαχείριση σύνδεσης VPN (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Συμβατός με Cisco πελάτης VPN (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Συμβατός με διάφορες βασισμένες στο IPSec πύλες VPN των Cisco, Juniper, " -"Netscreen και Sonicwall." - -#: ../properties/nm-vpnc.c:339 -msgid "Saved" -msgstr "Αποθηκευμένη" - -#: ../properties/nm-vpnc.c:346 -msgid "Always Ask" -msgstr "Να γίνεται πάντα ερώτηση" - -#: ../properties/nm-vpnc.c:353 -msgid "Not Required" -msgstr "Δεν απαιτείται" - -#: ../properties/nm-vpnc.c:412 -msgid "Secure (default)" -msgstr "Ασφαλής (προεπιλογή)" - -#: ../properties/nm-vpnc.c:415 -msgid "Weak (use with caution)" -msgstr "Ασθενής (να χρησιμοποιείται με προσοχή)" - -#: ../properties/nm-vpnc.c:423 -msgid "None (completely insecure)" -msgstr "Καμία (καθόλου ασφάλεια)" - -#: ../properties/nm-vpnc.c:471 -msgid "Cisco UDP (default)" -msgstr "Cisco UDP (προεπιλογή)" - -#: ../properties/nm-vpnc.c:478 -msgid "NAT-T" -msgstr "NAT-T" - -#: ../properties/nm-vpnc.c:485 -msgid "Disabled" -msgstr "Απενεργοποιημένη" - -#: ../properties/nm-vpnc.c:1104 -msgid "TCP tunneling not supported" -msgstr "Το TCP tunneling δεν υποστηρίζεται" - -#: ../properties/nm-vpnc.c:1106 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"Το αρχείο ρυθμίσεων VPN '%s' καθορίζει ότι η κυκλοφορία VPN θα πρέπει να " -"δρομολογηθεί μέσω TCP, κάτι που δεν υποστηρίζεται αυτή τη στιγμή από το " -"λογισμικό vpnc.\n" -"
\n" -"Παρόλ' αυτά η σύνδεση μπορεί να δημιουργηθεί, αλλά με το TCP tunneling " -"απενεργοποιημένο. Ενδέχεται, όμως, να μη λειτουργήσει σωστά. " - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Γενικά" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Προαιρετικά" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Απενεργοποίηση του Dead Peer Detection " - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Τομέας:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Μέθοδος κρυπτογράφησης:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "Όνομα ομά_δας:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "Συνθηματικό ο_μάδας:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "Διάβαση μέσα από NAT:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Εμφάνιση συνθηματικών" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Όνομα χρήστη:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Πύλη:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "_Συνθηματικό χρήστη:" - -#~ msgid "_Username:" -#~ msgstr "Ό_νομα χρήστη:" - -#~ msgid "_Domain:" -#~ msgstr "_Τομέας:" - -#~ msgid "Connect _anonymously" -#~ msgstr "_Ανώνυμη σύνδεση" - -#~ msgid "Connect as _user:" -#~ msgstr "Σύνδεση ως _χρήστης:" diff --git a/vpn-daemons/vpnc/po/en_GB.po b/vpn-daemons/vpnc/po/en_GB.po deleted file mode 100755 index 78efd144c6..0000000000 --- a/vpn-daemons/vpnc/po/en_GB.po +++ /dev/null @@ -1,307 +0,0 @@ -# English (British) translation for gnome-torrent -# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the gnome-torrent package. -# David Lodge , 2006 -# -msgid "" -msgstr "" -"Project-Id-Version: gnome-torrent\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-09 15:25+0000\n" -"PO-Revision-Date: 2008-03-09 15:25+0000\n" -"Last-Translator: David Lodge \n" -"Language-Team: en_GB \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Secondary Password:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Username:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domain:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Password:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Connect _anonymously" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Connect as _user:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Remember passwords for this session" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Save passwords in keyring" - -#: ../auth-dialog/main.c:172 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "You need to authenticate to access the Virtual Private Network '%s'." - -#: ../auth-dialog/main.c:173 -msgid "Authenticate VPN" -msgstr "Authenticate VPN" - -#: ../auth-dialog/main.c:180 -msgid "_Group Password:" -msgstr "_Group Password:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Add, Remove, and Edit VPN Connections" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN Connection Manager (vpnc)" - -#: ../properties/nm-vpnc.c:98 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Compatible Cisco VPN client (vpnc)" - -#: ../properties/nm-vpnc.c:543 -msgid "The following vpnc VPN connection will be created:" -msgstr "The following vpnc VPN connection will be created:" - -#: ../properties/nm-vpnc.c:545 -#, c-format -msgid "Name: %s" -msgstr "Name: %s" - -#: ../properties/nm-vpnc.c:548 -#, c-format -msgid "Gateway: %s" -msgstr "Gateway: %s" - -#: ../properties/nm-vpnc.c:550 -#, c-format -msgid "Group Name: %s" -msgstr "Group Name: %s" - -#: ../properties/nm-vpnc.c:554 -#, c-format -msgid "Username: %s" -msgstr "Username: %s" - -#: ../properties/nm-vpnc.c:559 -#, c-format -msgid "Domain: %s" -msgstr "Domain: %s" - -#: ../properties/nm-vpnc.c:564 -#, c-format -msgid "Routes: %s" -msgstr "Routes: %s" - -#: ../properties/nm-vpnc.c:568 -#, c-format -msgid "NAT-Keepalive packet interval: %s" -msgstr "NAT-Keepalive packet interval: %s" - -#: ../properties/nm-vpnc.c:572 -#, c-format -msgid "Enable Single DES" -msgstr "Enable Single DES" - -#: ../properties/nm-vpnc.c:576 -#, c-format -msgid "Disable NAT Traversal" -msgstr "Disable NAT Traversal" - -#: ../properties/nm-vpnc.c:580 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "The connection details can be changed using the \"Edit\" button." - -#: ../properties/nm-vpnc.c:665 -msgid "TCP tunneling not supported" -msgstr "TCP tunnelling not supported" - -#: ../properties/nm-vpnc.c:667 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"The VPN settings file '%s' specifies that VPN traffic should be tunnelled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunnelling disabled, however " -"it may not work as expected." - -#: ../properties/nm-vpnc.c:687 -msgid "Settings import incomplete" -msgstr "Settings import incomplete" - -#: ../properties/nm-vpnc.c:689 -#, c-format -msgid "" -"The VPN settings file '%s' is incomplete. You may not be able to connect " -"without providing further information." -msgstr "" -"The VPN settings file '%s' is incomplete. You may not be able to connect " -"without providing further information." - -#: ../properties/nm-vpnc.c:709 -msgid "Cannot import settings" -msgstr "Cannot import settings" - -#: ../properties/nm-vpnc.c:711 -#, c-format -msgid "The VPN settings file '%s' could not be read or is invalid." -msgstr "The VPN settings file '%s' could not be read or is invalid." - -#: ../properties/nm-vpnc.c:726 -msgid "Select file to import" -msgstr "Select file to import" - -#: ../properties/nm-vpnc.c:908 -msgid "Save as..." -msgstr "Save as..." - -#: ../properties/nm-vpnc.c:937 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "A file named \"%s\" already exists." - -#: ../properties/nm-vpnc.c:940 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Do you want to replace it with the one you are saving?" - -#: ../properties/nm-vpnc.c:954 -msgid "Failed to export configuration" -msgstr "Failed to export configuration" - -#: ../properties/nm-vpnc.c:956 -#, c-format -msgid "Failed to save file %s" -msgstr "Failed to save file %s" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "example: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection na_me:" -msgstr "Connection na_me:" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Disable NAT _traversal" -msgstr "Disable NAT _traversal" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Enable _weak single DES encryption" -msgstr "Enable _weak single DES encryption" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "G_roup name:" -msgstr "G_roup name:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Import _Saved Configuration..." -msgstr "Import _Saved Configuration..." - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "Interval:" -msgstr "Interval:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Optional" -msgstr "Optional" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Override _user name" -msgstr "Override _user name" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your administrator for the file." - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "Required" -msgstr "Required" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "Use NAT _keepalive packets" -msgstr "Use NAT _keepalive packets" - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "Use _domain for authentication" -msgstr "Use _domain for authentication" - -#: ../properties/nm-vpnc-dialog.glade.h:16 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-vpnc-dialog.glade.h:17 -msgid "_Only use VPN connection for these addresses" -msgstr "_Only use VPN connection for these addresses" - -#~ msgid "Required Information" -#~ msgstr "Required Information" - -#~ msgid "O_ptional Information" -#~ msgstr "O_ptional Information" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "" -#~ "The VPN login failed because the user name and password were not accepted." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "The VPN login failed because the VPN program could not be started." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "The VPN login failed because the VPN configuration options were invalid." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." diff --git a/vpn-daemons/vpnc/po/es.po b/vpn-daemons/vpnc/po/es.po deleted file mode 100644 index 101dc04996..0000000000 --- a/vpn-daemons/vpnc/po/es.po +++ /dev/null @@ -1,212 +0,0 @@ -# translation of NetworkManager-vpnc.HEAD.po to Español -# Spanish message file for YaST2 (@memory@). -# Copyright (C) 2005 SUSE Linux Products GmbH. -# Copyright (C) 2002, 2003 SuSE Linux AG. -# Copyright (C) 1999, 2000, 2001 SuSE GmbH. -# -# Ibán josé García Castillo , 2000. -# Javier Moreno , 2000. -# Jordi Jaen Pallares , 1999, 2000, 2001. -# Pablo Iranzo Gómez , 2000. -# Jorge González , 2007, 2008. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc.HEAD\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=NetworkManager&component=general\n" -"POT-Creation-Date: 2008-11-14 17:04+0000\n" -"PO-Revision-Date: 2008-11-14 20:24+0100\n" -"Last-Translator: Jorge González \n" -"Language-Team: Español \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "Contraseña _secundaria:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "Nombre de _usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Contraseña:" - -# include/printconf/dialogs.ycp:150 -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Conectar _anónimamente" - -# include/scanner/scanner_overview.ycp:85 -# include/scanner/scanner_overview.ycp:85 -# include/scanner/scanner_overview.ycp:85 -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Conectar como _usuario:" - -# include/partitioning/custom_part_dialogs.ycp:67 -# include/partitioning/custom_part_dialogs.ycp:67 -# include/partitioning/custom_part_dialogs.ycp:67 include/partitioning/custom_part_dialogs.ycp:197 -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "_Recordar contraseñas para esta sesión" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "_Guardar contraseñas en el depósito de claves" - -#: ../auth-dialog/main.c:105 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Debe autenticarse para acceder a la red privada virtual «%s»." - -#: ../auth-dialog/main.c:106 -msgid "Authenticate VPN" -msgstr "Autenticación VPN" - -#: ../auth-dialog/main.c:113 -msgid "_Group Password:" -msgstr "Contraseña del _grupo:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Añadir, eliminar y editar conexiones VPN" - -# include/network/modem/dialogs.ycp:400 -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Gestor de conexiones VPN (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Compatible con Cisco VPN (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Compatible con varias puertas de enlace VPN basadas en IpSec como Cisco, " -"Juniper, Netscreen y Sonicwall." - -#: ../properties/nm-vpnc.c:325 -msgid "Saved" -msgstr "Guardado" - -#: ../properties/nm-vpnc.c:332 -msgid "Always Ask" -msgstr "Preguntar siempre" - -#: ../properties/nm-vpnc.c:339 -msgid "Not Required" -msgstr "No requerido" - -#: ../properties/nm-vpnc.c:398 -msgid "Secure (default)" -msgstr "Seguro (predeterminado)" - -#: ../properties/nm-vpnc.c:401 -msgid "Weak (use with caution)" -msgstr "Débil (usar con cautela)" - -#: ../properties/nm-vpnc.c:409 -msgid "None (completely insecure)" -msgstr "Ninguno (completamente inseguro)" - -#: ../properties/nm-vpnc.c:450 -msgid "Cisco UDP (default)" -msgstr "Cisco UDP (predeterminado)" - -#: ../properties/nm-vpnc.c:457 -msgid "NAT-T" -msgstr "NAT-T" - -#: ../properties/nm-vpnc.c:464 -msgid "Disabled" -msgstr "Desactivado" - -#: ../properties/nm-vpnc.c:1085 -msgid "TCP tunneling not supported" -msgstr "No se soporta el túnel por TCP" - -#: ../properties/nm-vpnc.c:1087 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"El archivo de ajustes para VPN «%s» especifica que el tráfico VPN se debería " -"usar un túnel a través de TCP lo que actualmente no está soportado en el " -"software VPNC.\n" -"\n" -"Aún se puede crear la conexión con el túnel TCP deshabilitado, no obstante " -"puede que no funcione como se esperaba." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "General" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Opcional" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Desactivar la detección de pares muertos" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Dominio:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Método de cifrado:" - -# clients/lan_dns.ycp:280 -# clients/lan_dns.ycp:269 -# include/users/ui.ycp:1021 -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "Nombre del g_rupo:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "Contraseña del gr_upo:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "NAT transversal:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Mostrar contraseñas" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Nombre de usuario:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Pasarela:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "Contraseña del _usuario:" - -#~ msgid "NAT-T (default)" -#~ msgstr "NAT-T (predeterminado)" diff --git a/vpn-daemons/vpnc/po/et.po b/vpn-daemons/vpnc/po/et.po deleted file mode 100644 index 42d31e278e..0000000000 --- a/vpn-daemons/vpnc/po/et.po +++ /dev/null @@ -1,255 +0,0 @@ -# GNOME NetworkManager - vpnc klient -# Estonian translation of GNOME NetworkManager - vpnc client. -# -# Copyright (C) 2007 The GNOME Project. -# This file is distributed under the same license as the NetworkManager-vpnc package. -# -# Priit Laes , 2007. -# Ivar Smolin , 2007. -# Mattias Põldaru , 2007-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-03 21:00+0000\n" -"PO-Revision-Date: 2008-09-28 03:25+0300\n" -"Last-Translator: Mattias Põldaru \n" -"Language-Team: Estonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "_Teisene parool:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Kasutajanimi:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domeen:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Parool:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Ühendu _anonüümselt" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Ühendu ka_sutajana:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "_Jäta selle seansi jaoks parool meelde" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "_Salvesta parool võtmerõngasse" - -#: ../auth-dialog/main.c:67 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Virtuaalse eravõrguga '%s' ühendumiseks pead end autentima." - -#: ../auth-dialog/main.c:68 -msgid "Authenticate VPN" -msgstr "VPN-i autentimine" - -#: ../auth-dialog/main.c:75 -msgid "_Group Password:" -msgstr "_Grupiparool:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN-ühenduste lisamine, muutmine ja eemaldamine" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN-ühenduste haldur (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cisco VPN kliendiga ühilduv (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based VPN gateways." -msgstr "Ühilduv erinevate Cisco, Juniper, Netscreen, ja Sonicwall IPSec seadmetel baseeruvate VPN võrgulüüsidega." - -#: ../properties/nm-vpnc.c:265 -msgid "Secure (default)" -msgstr "Turvaline (vaikimisi)" - -#: ../properties/nm-vpnc.c:268 -msgid "Weak (use with caution)" -msgstr "Nõrk (kasuta ettevaatlikult)" - -#: ../properties/nm-vpnc.c:276 -msgid "None (completely insecure)" -msgstr "Pole (täiesti turvamata)" - -#: ../properties/nm-vpnc.c:314 -msgid "NAT-T (default)" -msgstr "NAT-T (vaikimisi)" - -#: ../properties/nm-vpnc.c:321 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:328 -msgid "Disabled" -msgstr "Keelatud" - -#: ../properties/nm-vpnc.c:724 -msgid "TCP tunneling not supported" -msgstr "TCP-tunneldamine pole toetatud" - -#: ../properties/nm-vpnc.c:726 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it may not work as expected." -msgstr "" -"VPN-i seadete fail '%s' määrab, et VPN liikluse tunnel tuleks teha TCP kaudu. Kahjuks ei toeta seda vpnc tarkvara.\n" -"\n" -"Siiski saab tekitada ilma TCP tunnelita ühenduse, kuid see ei pruugi toimida soovitud viisil." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Üldine" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Valikuline" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -#, fuzzy -msgid "Disable Dead Peer Detection" -msgstr "Keela surnud masina tuvastamine" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Domeen:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Krüpteerimise meetod:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "G_rupi nimi:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "_Grupiparool:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "NAT-traversal:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Näita paroole" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Kasutajanimi:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "_Kasutaja parool:" - -#~ msgid "The following vpnc VPN connection will be created:" -#~ msgstr "Luuakse alljärgnev VPN ühendus:" -#~ msgid "Name: %s" -#~ msgstr "Nimi: %s" -#~ msgid "Gateway: %s" -#~ msgstr "Värav: %s" -#~ msgid "Group Name: %s" -#~ msgstr "Grupinimi: %s" -#~ msgid "Username: %s" -#~ msgstr "Kasutajanimi: %s" -#~ msgid "Domain: %s" -#~ msgstr "Domeen: %s" -#~ msgid "Routes: %s" -#~ msgstr "Marsruudid: %s" -#~ msgid "NAT-Keepalive packet interval: %s" -#~ msgstr "NAT-Keepalive pakettide intervall: %s" -#~ msgid "Enable Single DES" -#~ msgstr "Ühekordse DES krüptimise lubamine" -#~ msgid "Disable NAT Traversal" -#~ msgstr "Keela NAT-traversal" -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "Ühenduse üksikasjade muutmiseks kasuta \"Redigeeri\" nuppu." -#~ msgid "Cannot import settings" -#~ msgstr "Sätteid pole võimalik importida" -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN seadete fail '%s' ei sisalda sobivat infot." -#~ msgid "Select file to import" -#~ msgstr "Imporditava faili valimine" -#~ msgid "Save as..." -#~ msgstr "Salvesta kui..." -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Fail nimega \"%s\" on juba olemas." -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Kas sa tahad seda asendada sellega, mida sa salvestad?" -#~ msgid "Failed to export configuration" -#~ msgstr "Tõrge sätete eksportimisel" -#~ msgid "Failed to save file %s" -#~ msgstr "Tõrge faili %s salvestamisel" -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "näide: 172.16.0.0/16 10.11.12.0/24" -#~ msgid "Connection na_me:" -#~ msgstr "Ühe_nduse nimi:" -#~ msgid "Enable _weak single DES encryption" -#~ msgstr "Luba _nõrga ühekordse DES krüptimisalgoritmi kasutamist" -#~ msgid "Import _Saved Configuration..." -#~ msgstr "_Impordi salvestatud sätted..." -#~ msgid "Interval:" -#~ msgstr "Intervall:" -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Privaatvõrgu eristamise nimi, nt \"Ülikooli VPN\" või \"Firma võrk\"" -#~ msgid "Override _user name" -#~ msgstr "Kasutaja_nime ülimuslikkus" -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Palun sisesta siia süsteemiadministraatorilt saadud info. Ära sisesta " -#~ "siia oma parooli, seda küsitakse ühendumiselt." -#~ msgid "" -#~ "Please note that the file you import is not a Cisco VPN or VPNC " -#~ "configuration file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "Võta teadmiseks, et imporditav fail ei ole ei Cisco VPN-i ega VPNC " -#~ "seadistamise fail. Küsi õiget faili oma administraatorilt." -#~ msgid "Required" -#~ msgstr "Vajalik" -#~ msgid "Use NAT _keepalive packets" -#~ msgstr "_NAT-keepalive pakettide kasutamine" -#~ msgid "Use _domain for authentication" -#~ msgstr "Autentimiseks _domeeni kasutamine" -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "_Ainult neile aadressidele kasutatakse VPN-i" -#~ msgid "Required Information" -#~ msgstr "Vajalik teave" -#~ msgid "O_ptional Information" -#~ msgstr "_Valikulised andmed" - diff --git a/vpn-daemons/vpnc/po/eu.po b/vpn-daemons/vpnc/po/eu.po deleted file mode 100644 index eb8e72a3b8..0000000000 --- a/vpn-daemons/vpnc/po/eu.po +++ /dev/null @@ -1,179 +0,0 @@ -# translation of eu.po to Basque -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Iñaki Larrañaga Murgoitio , 2008. -msgid "" -msgstr "" -"Project-Id-Version: eu\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-09 16:46+0200\n" -"PO-Revision-Date: 2008-09-09 16:52+0200\n" -"Last-Translator: Iñaki Larrañaga Murgoitio \n" -"Language-Team: Basque \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "_Bigarren pasahitza:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Erabiltzaile-izena:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domeinua:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Pasahitza:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Konektatu _anonimo gisa" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Konektatu _erabiltzaile gisa:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "_Gogoratu pasahitza saio honetan" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "_Gorde pasahitza gako-sortan" - -#: ../auth-dialog/main.c:67 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Autentifikatu egin behar zara '%s' VPN-ra sarbidetzeko." - -#: ../auth-dialog/main.c:68 -msgid "Authenticate VPN" -msgstr "Autentifikatu VPN" - -#: ../auth-dialog/main.c:75 -msgid "_Group Password:" -msgstr "_Taldearen pasahitza:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Gehitu, kendu eta editatu VPN konexioak" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN konexioen kudeatzailea (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "VPN Cisco-rekin bateragarria (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Hainbat Cisco, Juniper, Netscreen eta Sonicwall IPSec-ean oinarritutako VPN atebideekin " -"bateragarria." - -#: ../properties/nm-vpnc.c:265 -msgid "Secure (default)" -msgstr "Segurua (lehenetsia)" - -#: ../properties/nm-vpnc.c:268 -msgid "Weak (use with caution)" -msgstr "Ahula (erabili kontu handiz)" - -#: ../properties/nm-vpnc.c:276 -msgid "None (completely insecure)" -msgstr "Bat ere ez (erabat ez-segurua)" - -#: ../properties/nm-vpnc.c:314 -msgid "NAT-T (default)" -msgstr "NAT-T (lehenetsia)" - -#: ../properties/nm-vpnc.c:321 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:328 -msgid "Disabled" -msgstr "Desgaituta" - -#: ../properties/nm-vpnc.c:724 -msgid "TCP tunneling not supported" -msgstr "TCP tunela ez dago onartuta" - -#: ../properties/nm-vpnc.c:726 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"VPN-ren '%s' ezarpen-fitxategiak VPN-ren trafikoa TCP tunelaren bidez egin " -"behar dela dio, baina oraingoz vpnc softwareak ez du onartzen.\n" -"\n" -"Konexioa oraindik ere sor daiteke, TCP tunela desgaituta edukiz, baina agian " -"ez du uste bezala funtzionatuko." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Orokorra" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Aukerakoa" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Desgaitu hildako parekoen detekzioa" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Domeinua:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Enkripzio-metodoa:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "_Taldearen izena:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "_Taldearen pasahitza:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "Zeharretako NAT-a:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Erakutsi pasahitzak" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Erabiltzaile-izena:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Atebidea:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "_Erabiltzailearen pasahitza:" - diff --git a/vpn-daemons/vpnc/po/fi.po b/vpn-daemons/vpnc/po/fi.po deleted file mode 100644 index 50710540df..0000000000 --- a/vpn-daemons/vpnc/po/fi.po +++ /dev/null @@ -1,193 +0,0 @@ -# Finnish messages for network-manager-vpnc. -# Copyright (C) 2006-2008 Free Software Foundation, Inc. -# Ilkka Tuohela , 2006-2008. -# -# Suomennos: http://gnome.fi/ -# -msgid "" -msgstr "" -"Project-Id-Version: network-manager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-29 20:22+0300\n" -"PO-Revision-Date: 2008-11-29 20:25+0300\n" -"Last-Translator: Ilkka Tuohela \n" -"Language-Team: Finnish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "_Toissijainen salasana:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Käyttäjätunnus:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Toimialue:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Salasana:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Yhdistä _anonyymisti" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Yhdistä _käyttäjänä:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "_Muista salasana istunnon ajan" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "_Tallenna salasana avainrenkaaseen" - -#: ../auth-dialog/main.c:105 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Yhteydenotto VPN-verkkoon \"%s\" vaatii kirjautumista." - -#: ../auth-dialog/main.c:106 -msgid "Authenticate VPN" -msgstr "Todenna VPN-yhteyden avaus" - -#: ../auth-dialog/main.c:113 -msgid "_Group Password:" -msgstr "_Ryhmän salasana:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Lisää, poista tai muokkaa VPN-yhteyksiä" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN-yhteysohjelmisto (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cisco-yhteensopiva VPN-asiakas (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Yhteensopiva useiden esimerkiksi Ciscon, Juniperin, Netscreenin ja " -"Sonicwallin valmistamien IPSec-pohjaisten VPN-yhdyskäytävien kanssa." - -#: ../properties/nm-vpnc.c:325 -msgid "Saved" -msgstr "Tallennettu" - -#: ../properties/nm-vpnc.c:332 -msgid "Always Ask" -msgstr "Kysy aina" - -#: ../properties/nm-vpnc.c:339 -msgid "Not Required" -msgstr "Ei vaadittu" - -#: ../properties/nm-vpnc.c:398 -msgid "Secure (default)" -msgstr "Turvallinen (oletus)" - -#: ../properties/nm-vpnc.c:401 -msgid "Weak (use with caution)" -msgstr "Heikko (käytä varoen)" - -#: ../properties/nm-vpnc.c:409 -msgid "None (completely insecure)" -msgstr "Ei salausta (täysin turvaton)" - -#: ../properties/nm-vpnc.c:450 -msgid "Cisco UDP (default)" -msgstr "Cisco UDP (oletus)" - -#: ../properties/nm-vpnc.c:457 -msgid "NAT-T" -msgstr "NAT-T" - -#: ../properties/nm-vpnc.c:464 -msgid "Disabled" -msgstr "Ei käytössä" - -#: ../properties/nm-vpnc.c:1085 -msgid "TCP tunneling not supported" -msgstr "TCP-tunnelointi ei ole tuettu" - -#: ../properties/nm-vpnc.c:1087 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"VPN-asetustiedosto \"%s\" määrittelee, että VPN-liikenne tulisi tunneloida " -"TCP-yhteyden läpi, mutta vpnc ei vielä tue tätä ominaisuutta.\n" -"\n" -"Yhteys voidaan edelleen luoda ilman TCP-tunnelointia, mutta se ei ehkä toimi " -"kuten oli tarkoitus." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Yleisasetukset" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Lisäasetukset" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Älä havaitse vastapaan katoamista" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Toimialue:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Salausmenetelmä:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "_Ryhmän nimi:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "_Ryhmän salasana:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "NAT-läpäisytapa:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Näytä salasanat" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Käyttäjätunnus:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Yhdyskäytävä:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "_Käyttäjän salasana:" - -#~ msgid "NAT-T (default)" -#~ msgstr "NAT-T (oletus)" diff --git a/vpn-daemons/vpnc/po/fr.po b/vpn-daemons/vpnc/po/fr.po deleted file mode 100644 index 3994ae1cbe..0000000000 --- a/vpn-daemons/vpnc/po/fr.po +++ /dev/null @@ -1,182 +0,0 @@ -# French translation of NetworkManager-vpnc. -# Copyright (C) 2007-2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager package. -# -# Jonathan Ernst , 2007. -# Claude Paroz , 2007-2008. -# Robert-André Mauchin , 2007-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 22:56+0200\n" -"PO-Revision-Date: 2008-09-25 22:58+0200\n" -"Last-Translator: Claude Paroz \n" -"Language-Team: GNOME French Team \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n>1;\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "Mot de passe _secondaire :" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "Nom d'_utilisateur :" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domaine :" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "Mot de _passe :" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Se connecter _anonymement" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Se connecter en _tant que :" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "_Conserver les mots de passe pour cette session" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "_Enregistrer les mots de passe dans le trousseau" - -#: ../auth-dialog/main.c:66 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Vous devez vous authentifier pour accéder au réseau privé virtuel « %s »." - -#: ../auth-dialog/main.c:67 -msgid "Authenticate VPN" -msgstr "Authentifier le VPN" - -#: ../auth-dialog/main.c:74 -msgid "_Group Password:" -msgstr "Mot de passe du _groupe :" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Ajoute, supprime et modifie des connexions VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Gestionnaire de connexions VPN (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "VPN compatible Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Compatible avec de nombreuses passerelles VPN basées sur IPSec de Cisco, " -"Juniper, Netscreen et Sonicwall." - -#: ../properties/nm-vpnc.c:282 -msgid "Secure (default)" -msgstr "Sécurisé (par défaut)" - -#: ../properties/nm-vpnc.c:285 -msgid "Weak (use with caution)" -msgstr "Faible (à utiliser avec précaution)" - -#: ../properties/nm-vpnc.c:293 -msgid "None (completely insecure)" -msgstr "Aucun (complètement non sécurisé)" - -#: ../properties/nm-vpnc.c:331 -msgid "NAT-T (default)" -msgstr "NAT-T (par défaut)" - -#: ../properties/nm-vpnc.c:338 -msgid "Cisco UDP" -msgstr "UDP Cisco" - -#: ../properties/nm-vpnc.c:345 -msgid "Disabled" -msgstr "Désactivé" - -#: ../properties/nm-vpnc.c:809 -msgid "TCP tunneling not supported" -msgstr "Utilisation d'un tunnel TCP non pris en charge" - -#: ../properties/nm-vpnc.c:811 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"Le fichier de configuration VPN « %s » indique que le trafic VPN devrait " -"transiter par un tunnel TCP, mais ceci n'est pas pris en charge actuellement " -"par le logiciel vpnc.\n" -"\n" -"La connexion sera néanmoins créée sans tunnel TCP ; pour cette raison, la " -"connexion pourrait ne pas fonctionner comme prévu." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Général" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Facultatif" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Désactiver la détection des pairs bloqués" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Domaine :" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Méthode de chiffrement :" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "Nom de g_roupe :" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "Mot de passe du _groupe :" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "Traversée du NAT :" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Afficher les mots de passe" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Nom d'utilisateur :" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Passerelle :" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "Mot de passe _utilisateur :" diff --git a/vpn-daemons/vpnc/po/gl.po b/vpn-daemons/vpnc/po/gl.po deleted file mode 100644 index 9c9669480d..0000000000 --- a/vpn-daemons/vpnc/po/gl.po +++ /dev/null @@ -1,267 +0,0 @@ -# translation of gl.po to Galego -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Ignacio Casal Quinteiro , 2007. -msgid "" -msgstr "" -"Project-Id-Version: gl\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-23 14:48+0100\n" -"PO-Revision-Date: 2007-02-23 14:50+0100\n" -"Last-Translator: Ignacio Casal Quinteiro \n" -"Language-Team: Galego \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Contrasinal _secundario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Nome de _usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Contrasinal:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Conectar como _anónimo" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Conectar como _usuario:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Lembrar contrasinais para esta sesión" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Gardar contrasinais no anel" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Necesita autenticarse para acceder á rede privada virtual '%s'." - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "Autenticar VPN" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "Contrasinal de _grupo:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Engadir, eliminar e editar conexións VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Xestor de conexións VPN (vpnc)" - -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Cliente VPN compatible Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "Crearase a seguinte conexión VPN vpnc:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "Nome: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "Pasarela: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "Nome de grupo: %s" - -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "Nome de usuario: %s" - -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "Dominio: %s" - -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "Rutas: %s" - -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Os detalles da conexión pódense modificar mediante o botón \"Editar\"." - -#: ../properties/nm-vpnc.c:542 -msgid "TCP tunneling not supported" -msgstr "Túnel TCP non soportado" - -#: ../properties/nm-vpnc.c:544 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"O ficheiro de axustes de VPN '%s' especifica que o tráfico de VPN debería ir " -"a través de TCP o cal actualmente non está soportado polo software vpnc.\n" -"\n" -"A conexión aínda se pode crear, co túnel TCP desactivado, porén podería non " -"funcionar como se espera." - -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "Non se poden importar os axustes" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "O ficheiro de axustes '%s' non contén datos válidos." - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "Seleccione un ficheiro para importar" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "Gardar como..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Xa existe un ficheiro co nome \"%s\"." - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Desexa reemprazalo co ficheiro que está gardando?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "Fallou a exportación da configuración" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "Ocorreu un erro ao gardar o ficheiro %s" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Information" -msgstr "Información de conexión" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection Name" -msgstr "Nome da conexión" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Required" -msgstr "Obrigatoria" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "exemplo: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Connection Name" -msgstr "Nome da conexión" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "G_roup Name:" -msgstr "Nome de g_rupo:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"O _nome empregado para identificar a conexión á rede privada, por exemplo: " -"\"VPN do campus\" ou \"Rede corporativa\"" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Optional" -msgstr "Opcional" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Override _user name" -msgstr "Ignorar nome de _usuario" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Introduza a información proporcionada polo seu administrador de sistemas " -"aquí embaixo. Non introduza o seu contrasinal, posto que se lle pedirá cando " -"conecte." - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "Note que o ficheiro importado non é un ficheiro VPNC ou VPN Cisco. Pregúntelle ao seu administrador polo ficheiro." - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "Use _domain for authentication" -msgstr "Usar _dominio para autenticar" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_Gateway:" -msgstr "_Pasarela:" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "_Import Saved Configuration..." -msgstr "_Importar a configuración gardada..." - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "_Only use VPN connection for these addresses" -msgstr "_Só empregar a conexión VPN para estes enderezos" - -#: ../src/nm-vpnc-service.c:118 -msgid "The VPN login failed because the user name and password were not accepted." -msgstr "" -"O acceso VPN fallou porque o nome de usuario e o contrasinal non se " -"aceptaron." - -#: ../src/nm-vpnc-service.c:120 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "O acceso VPN fallou porque non se puido iniciar o programa VPN." - -#: ../src/nm-vpnc-service.c:122 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "O acceso VPN fallou porque non se puido conectar co servidor VPN." - -#: ../src/nm-vpnc-service.c:124 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "O acceso VPN fallou porque as opcións de configuración de VPN eran inválidas." - -#: ../src/nm-vpnc-service.c:126 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"O acceso VPN fallou porque o programa VPN recibiu unha configuración " -"incorrecta do servidor VPN." - diff --git a/vpn-daemons/vpnc/po/hu.po b/vpn-daemons/vpnc/po/hu.po deleted file mode 100644 index e950697b6a..0000000000 --- a/vpn-daemons/vpnc/po/hu.po +++ /dev/null @@ -1,177 +0,0 @@ -# Hungarian translation of NetworkManager-vpnc -# Copyright (C) 2006, 2007, 2008, Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager-vpnc package. -# -# Gabor Kelemen , 2006, 2007, 2008. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-03 21:00+0000\n" -"PO-Revision-Date: 2008-09-25 23:22+0200\n" -"Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "Jelszó _még egyszer:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Felhasználónév:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Tartomány:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Jelszó:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Kapcsolódás _névtelenül" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Csatlakozás _mint:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "_Jelszavak megjegyzése erre a munkamenetre" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "Jelszavak mentése a k_ulcstartóra" - -#: ../auth-dialog/main.c:67 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Azonosítania kell magát a(z) „%s” virtuális magánhálózat eléréséhez." - -#: ../auth-dialog/main.c:68 -msgid "Authenticate VPN" -msgstr "VPN azonosítás" - -#: ../auth-dialog/main.c:75 -msgid "_Group Password:" -msgstr "_Csoportjelszó:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN kapcsolatok hozzáadása, szerkesztése és eltávolítása" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN kapcsolatkezelő (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cisco-kompatibilis VPN kliens (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "Kompatibilis számos Cisco, Juniper, Netscreen és Sonicwall IPSec-alapú VPN átjáróval." - -#: ../properties/nm-vpnc.c:265 -msgid "Secure (default)" -msgstr "Biztonságos (alapértelmezett)" - -#: ../properties/nm-vpnc.c:268 -msgid "Weak (use with caution)" -msgstr "Gyenge (óvatosan használja)" - -#: ../properties/nm-vpnc.c:276 -msgid "None (completely insecure)" -msgstr "Nincs (nem biztonságos)" - -#: ../properties/nm-vpnc.c:314 -msgid "NAT-T (default)" -msgstr "NAT-T (alapértelmezett)" - -#: ../properties/nm-vpnc.c:321 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:328 -msgid "Disabled" -msgstr "Tiltva" - -#: ../properties/nm-vpnc.c:724 -msgid "TCP tunneling not supported" -msgstr "A TCP alagutazás nem támogatott" - -#: ../properties/nm-vpnc.c:726 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"A(z) „%s” VPN beállítófájl alapján a VPN forgalmat TCP alagúton keresztül " -"kell bonyolítani, ami jelenleg nem támogatott.\n" -"\n" -"A kapcsolat így is létrehozható letiltott TCP alagutazással, azonban " -"lehetséges, hogy nem a várt módon fog működni." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Általános" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Opcionális" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Halott partnerek felismerésének tiltása" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Tartomány:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Titkosítási mód:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "Cso_portnév:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "_Csoportjelszó:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "NAT bejárás:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Jelszavak megjelenítése" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Felhasználónév:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "Á_tjáró:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "_Felhasználó jelszava:" - diff --git a/vpn-daemons/vpnc/po/it.po b/vpn-daemons/vpnc/po/it.po deleted file mode 100644 index 1db39d3cdf..0000000000 --- a/vpn-daemons/vpnc/po/it.po +++ /dev/null @@ -1,178 +0,0 @@ -# Italian translation of NetworkManager-VPNC. -# Copyright (C) 2008 THE NetworkManager-VPNC'S COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager-VPNC package. -# Francesco Marletta , 2006-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-VPNC 0.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-17 04:41+0000\n" -"PO-Revision-Date: 2008-09-17 15:29-0400\n" -"Last-Translator: Francesco Marletta \n" -"Language-Team: italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "Password _secondaria:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "Nome _utente:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Dominio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Password:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Connessione _anonima" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Connessione come _utente:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "_Ricorda la password per questa sessione" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "_Salva la password nel portachiavi" - -#: ../auth-dialog/main.c:66 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"È necessario autenticarsi per accedere alla Rete Privata Virtuale (VPN) '%s'." - -#: ../auth-dialog/main.c:67 -msgid "Authenticate VPN" -msgstr "Autenticazione VPN" - -#: ../auth-dialog/main.c:74 -msgid "_Group Password:" -msgstr "Password di _gruppo:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Aggiunge, rimuove e modifica connessioni VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Gestore connessioni VPN (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Compatibile con VPN Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Compatibile con vari gateway VPN Cisco, Juniper, Netscreen e basati su IPSec " -"Sonicwall." - -#: ../properties/nm-vpnc.c:282 -msgid "Secure (default)" -msgstr "Sicuro (predefinito)" - -#: ../properties/nm-vpnc.c:285 -msgid "Weak (use with caution)" -msgstr "Debole (usare con cautela)" - -#: ../properties/nm-vpnc.c:293 -msgid "None (completely insecure)" -msgstr "Nessuno (completamente insicuro)" - -#: ../properties/nm-vpnc.c:331 -msgid "NAT-T (default)" -msgstr "NAT-T (predefinito)" - -#: ../properties/nm-vpnc.c:338 -msgid "Cisco UDP" -msgstr "UDP Cisco" - -#: ../properties/nm-vpnc.c:345 -msgid "Disabled" -msgstr "Disabilitato" - -#: ../properties/nm-vpnc.c:809 -msgid "TCP tunneling not supported" -msgstr "Tunnel TCP non supportato" - -#: ../properties/nm-vpnc.c:811 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"Il file di impostazioni VPN “%s” specifica the il traffico VPN deve passare " -"in un tunnel TCP che non è attualmente supportato dal software vpnc.\n" -"\n" -"La connessione può essere creata lo stesso, con il tunnel TCP disabilitato, " -"comunque potrebbe non funzionare come ci si aspetta." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Generale" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Opzionale" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Disabilitare riconoscimento del peer morto" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Dominio:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Metodo di cifratura:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "Nome g_ruppo:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "Password di gr_uppo:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "Attraversamento NAT:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Mostra le password" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Nome utente:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "Password _utente:" diff --git a/vpn-daemons/vpnc/po/ja.po b/vpn-daemons/vpnc/po/ja.po deleted file mode 100644 index 49c6161e4b..0000000000 --- a/vpn-daemons/vpnc/po/ja.po +++ /dev/null @@ -1,292 +0,0 @@ -# Japanese message catalog for NetworkManager-vpnc -# Copyright (C) 2006 THE NetworkManager-vpnc's COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager-vpnc package. -# Satoru SATOH , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-23 00:35+0900\n" -"PO-Revision-Date: 2007-07-23 01:45+0900\n" -"Last-Translator: Satoru SATOH \n" -"Language-Team: Japanese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "第二パスワード(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "ユーザ名(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "ドメイン(_D)" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "パスワード(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "匿名で接続(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "ユーザで接続(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "このセッションのパスワードを記憶する(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "パスワードをキーリングに保存する(_S)" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "仮想プライベートネットワーク '%s' にアクセスするには認証が必要です。" - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "VPN 認証" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "グループパスワード(_G):" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN 接続を追加、削除または編集" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN 接続マネージャ (vpnc)" - -#: ../properties/nm-vpnc.c:91 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Cisco VPN 互換クライアント (vpnc)" - -#: ../properties/nm-vpnc.c:510 -msgid "The following vpnc VPN connection will be created:" -msgstr "次の vpnc VPN 接続を作成します:" - -#: ../properties/nm-vpnc.c:512 -#, c-format -msgid "Name: %s" -msgstr "名前: %s" - -#: ../properties/nm-vpnc.c:515 -#, c-format -msgid "Gateway: %s" -msgstr "ゲートウェイ: %s" - -#: ../properties/nm-vpnc.c:517 -#, c-format -msgid "Group Name: %s" -msgstr "グループ名: %s" - -#: ../properties/nm-vpnc.c:521 -#, c-format -msgid "Username: %s" -msgstr "ユーザ名: %s" - -#: ../properties/nm-vpnc.c:526 -#, c-format -msgid "Domain: %s" -msgstr "ドメイン: %s" - -#: ../properties/nm-vpnc.c:531 -#, c-format -msgid "Routes: %s" -msgstr "ルート: %s" - -#: ../properties/nm-vpnc.c:535 -#, c-format -msgid "NAT-Keepalive packet interval: %s" -msgstr "NAT-Keepalive パケット間隔: %s" - -#: ../properties/nm-vpnc.c:539 -msgid "Enable Single DES" -msgstr "シングル DES を有効にする" - -#: ../properties/nm-vpnc.c:543 -msgid "Disable NAT Traversal" -msgstr "NAT Traversal を無効にする" - -#: ../properties/nm-vpnc.c:547 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "接続の詳細は\"編集\"ボタンで変更できます。" - -#: ../properties/nm-vpnc.c:625 -msgid "TCP tunneling not supported" -msgstr "TCP トンネリングはサポートされていません" - -#: ../properties/nm-vpnc.c:627 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"VPn 設定ファイル '%s' は VPN 通信が TCP を介してトンネルされるように指定して" -"いますが、今のところ vpnc はこの機能をサポートしていません。\n" -"\n" -"TCP トンネリングを無効にした上で接続を作成することはできますが期待どおりに動" -"作しないかもしれません。" - -#: ../properties/nm-vpnc.c:648 -msgid "Cannot import settings" -msgstr "設定をインポートできません" - -#: ../properties/nm-vpnc.c:650 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "VPN 設定ファイル '%s' には適切なデータが含まれていません。" - -#: ../properties/nm-vpnc.c:667 -msgid "Select file to import" -msgstr "インポートするファイルを選択" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:840 -msgid "Save as..." -msgstr "別名で保存..." - -#: ../properties/nm-vpnc.c:870 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "ファイル \"%s\" は既にあります。" - -#: ../properties/nm-vpnc.c:873 -msgid "Do you want to replace it with the one you are saving?" -msgstr "保存しようとしているファイルで上書きしますか?" - -#: ../properties/nm-vpnc.c:887 -msgid "Failed to export configuration" -msgstr "設定のエクスポートに失敗" - -#: ../properties/nm-vpnc.c:889 -#, c-format -msgid "Failed to save file %s" -msgstr "ファイル %s の保存に失敗" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "例: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection na_me:" -msgstr "接続名(_M):" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Disable NAT _traversal" -msgstr "NAT Traversal を無効にする(_T)" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Enable _weak single DES encryption" -msgstr "弱いシングル DES 暗号を有効にする(_W)" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "G_roup name:" -msgstr "グループ名(_R):" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Import _Saved Configuration..." -msgstr "保存設定をインポート(_S)..." - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "Interval:" -msgstr "間隔:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "例えば \"キャンパス VPN\" や \"社内ネットワーク\" などといった" -"プライベートネットワークの接続を識別するための名前です。" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Optional" -msgstr "オプション" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Override _user name" -msgstr "ユーザ名を上書き指定(_U)" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"システム管理者が提供した情報を下に入力してください。接続時にきかれるまではパ" -"スワードは入力しないでください。" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "インポートしたファイルは Cisco VPN と VPNC の設定ファイルの" -"いずれでもありません。管理者に尋ねてみて下さい。" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "Required" -msgstr "必須" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "Use NAT _keepalive packets" -msgstr "NAT Keepalive パケットを使用(_K)" - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "Use _domain for authentication" -msgstr "認証にドメインを使用(_D)" - -#: ../properties/nm-vpnc-dialog.glade.h:16 -msgid "_Gateway:" -msgstr "ゲートウェイ(_G):" - -#: ../properties/nm-vpnc-dialog.glade.h:17 -msgid "_Only use VPN connection for these addresses" -msgstr "これらのアドレスについてのみ VPN 接続を利用(_O)" - -#: ../src/nm-vpnc-service.c:119 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "VPN ログインに失敗。ユーザ名、パスワードが間違っています。" - -#: ../src/nm-vpnc-service.c:121 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "VPN ログインに失敗。VPN プログラムを起動できませんでした。" - -#: ../src/nm-vpnc-service.c:123 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"VPN ログインに失敗。VPN プログラムは VPN サーバに接続できませんでした。" - -#: ../src/nm-vpnc-service.c:125 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "VPN ログインに失敗。VPN 設定オプションが間違っています。" - -#: ../src/nm-vpnc-service.c:127 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"VPN ログインに失敗。VPN プログラムが VPN サーバから受け取った設定は適切なもの" -"ではありません。" - -#~ msgid "Required Information" -#~ msgstr "必須情報" - -#~ msgid "O_ptional Information" -#~ msgstr "オプション情報(_P)" diff --git a/vpn-daemons/vpnc/po/ka.po b/vpn-daemons/vpnc/po/ka.po deleted file mode 100644 index dca22a2a7b..0000000000 --- a/vpn-daemons/vpnc/po/ka.po +++ /dev/null @@ -1,320 +0,0 @@ -# translation of NetworkManager-vpnc.HEAD.po to Georgian -# Malkhaz Barkalaya მალზახ ბარკალაია , 2007. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-02 03:30+0000\n" -"PO-Revision-Date: 2007-03-07 01:14+0100\n" -"Last-Translator: Vladimer Sichinava ვლადიმერ სიჭინავა \n" -"Language-Team: Georgian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_მეორადი პაროლი:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_სახელი:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_დომენი:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_პაროლი:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "_ანონიმური შეერთება" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "" -"_შეერთება მომხმარებლის " -"სახელით:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "" -"_სესიის პაროლის " -"დამახსოვრება" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_პაროლის აწმში შენახვა" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"საჭიროა აუთენტიკაცია VPN " -"‘%s’-ში შესვლისათვის" - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "VPN-აუთენტიკაცია" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "_ჯგუფის პაროლი:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "" -"VPN-შეერთებების დამატება, " -"წაშლა და რედაქტირება" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN-შეერთებების მენეჯერი (vpnc)" - -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "თავსებადი Cisco VPN-კლიენტი (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "გახსნილია VPN-შეერთებები:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "სახელი: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "კარიბჭე: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "ჯგუფის სახელი: %s" - -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "მომხმარებლის სახელი: %s" - -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "დომენი: %s" - -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "მაშრუტები: %s" - -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" -"\"Edit\" ღილაკით შეიძლება " -"შეერთების დეტალების " -"რედაქტირება" - -#: ../properties/nm-vpnc.c:542 -msgid "TCP tunneling not supported" -msgstr "" -"TCP-გვირაბები არ არის " -"მხარდაჭერილი" - -#: ../properties/nm-vpnc.c:544 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"VPN-პარამეტრების ფაილი '%s' " -"მიუთითებს, რომ VPN-ტრაფიკი " -"უნდა განხორციელდეს " -"TCP-გვირაბით, რომლის " -"მხარდაჭერა vpnc პროგრამას არა " -"აქვს.\n" -" \n" -"შეერთება შენარჩუნებულია " -"გამორთული TCP-გვირაბით, რის " -"გამოც შეიძლება არ იმუშაოს " -"სწორად." - -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "" -"ვერ ხერხდება პარამეტრების " -"იმპორტი" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "" -"VPN-პარამეტრების ფაილი '%s' " -"არასწორ მონაცემებს შეიცავს." - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "" -"მიუთითეთ ფაილი " -"იმპორტისათვის" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "შევინახოთ როგორც..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "ფაილი \"%s\" უკვე არსებობს." - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "შევცვალოთ იგი თქვენი ფაილით?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "" -"შეცდომა კონფიგურაციის " -"ექსპორტისას" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "ვერ შეინახა ფაილი %s" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Information" -msgstr "" -"ინფორმაცია შეერთების " -"შესახებ" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection Name" -msgstr "შეერთების სახელი" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Required" -msgstr "საჭიროა" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "მაგალითი:172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Connection Name" -msgstr "შეერთების სახელი" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "G_roup Name:" -msgstr "_ჯგუფის სახელი:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"სახელი VPN-ში შეერთების " -"იდენტიფიცირებისათვის, მაგ.: " -"\"CampusVPN\" ან \"Corporate Network\"" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Optional" -msgstr "" -"არ არის აუცილებელი\n" -" \n" -" " - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Override _user name" -msgstr "ს_ახელის ჩანაცვლება" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"შეიყვანეთ სისტემური " -"ადმინისტრატორისაგან " -"მიღებული ინფორმაცია. ნუ " -"შეიყვანთ თქვენს პაროლს " -"დაკავშiრებისას ." - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"თქვენს მიერ იმპორტირებული " -"ფაილი არ არის არც Cisco VPN და არც " -"VPNC კონფიგურაციის ფაილი. " -"მიმართეთ ადმინისტრატორს " -"ფაილისათვის." - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "Use _domain for authentication" -msgstr "_დომენი აუთენტიკაციისათვის" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_Gateway:" -msgstr "_კარიბჭე:" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "_Import Saved Configuration..." -msgstr "" -"_შენახული კონფიგურაციის " -"იმპორტი..." - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "_Only use VPN connection for these addresses" -msgstr "" -"მ_ოცემული " -"მისამართებისათვის მხოლოდ VPN " -"კავშირის გამოყენება" - -#: ../src/nm-vpnc-service.c:119 -msgid "The VPN login failed because the user name and password were not accepted." -msgstr "" -"სახელი ან პაროლი არასწორია, " -"ავტორიზაცია არ შედგა." - -#: ../src/nm-vpnc-service.c:121 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" -"ვერ გაიშვა VPN-პროგრამა, " -"ავტორიზაცია არ შედგა." - -#: ../src/nm-vpnc-service.c:123 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"VPN-პროგრამა ვერ დაუკავშირდა " -"VPN-სერვერს, ავტორიზაცია არ " -"შედგა." - -#: ../src/nm-vpnc-service.c:125 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "" -"VPN-კონფიგურაციის " -"პარამეტრები არასწორია, " -"ავტორიზაცია არ შედგა." - -#: ../src/nm-vpnc-service.c:127 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"VPN-პროგრამამ VPN-სერვერისაგან " -"არასწორი კონფიგურაცია " -"მიიღო, ავტორიზაცია არ შედგა." - diff --git a/vpn-daemons/vpnc/po/ko.po b/vpn-daemons/vpnc/po/ko.po deleted file mode 100644 index 535fd95aef..0000000000 --- a/vpn-daemons/vpnc/po/ko.po +++ /dev/null @@ -1,301 +0,0 @@ -# GNOME Korea translation of nm-vpnc. -# Copyright (C) 2007 THE nm-vpnc'S COPYRIGHT HOLDER -# This file is distributed under the same license as the nm-vpnc package. -# Young-Ho Cha , 2007. -# Namhyung Kim , 2007. -# -# -msgid "" -msgstr "" -"Project-Id-Version: nm-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-05 22:06+0000\n" -"PO-Revision-Date: 2007-12-24 17:15+0900\n" -"Last-Translator: Namhyung kim \n" -"Language-Team: GNOME Korea \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "보조 암호(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "사용자 이름(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "도메인(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "암호(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "익명으로 연결(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "사용자로 연결(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "이 세션에서 암호 기억(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "키링에 암호 저장(_S)" - -#: ../auth-dialog/main.c:172 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "가상 사설 네트워크 '%s'에 접근할 때 인증이 필요합니다." - -#: ../auth-dialog/main.c:173 -msgid "Authenticate VPN" -msgstr "VPN 인증" - -#: ../auth-dialog/main.c:180 -msgid "_Group Password:" -msgstr "그룹 암호(_G):" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN 연결 더하기, 지우기, 편집" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN 연결 관리자 (vpnc)" - -#: ../properties/nm-vpnc.c:98 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Cisco VPN 클라이언트 호환 (vpnc)" - -#: ../properties/nm-vpnc.c:543 -msgid "The following vpnc VPN connection will be created:" -msgstr "다음 vpnc VPN 연결이 만들어집니다:" - -#: ../properties/nm-vpnc.c:545 -#, c-format -msgid "Name: %s" -msgstr "이름: %s" - -#: ../properties/nm-vpnc.c:548 -#, c-format -msgid "Gateway: %s" -msgstr "게이트웨이: %s" - -#: ../properties/nm-vpnc.c:550 -#, c-format -msgid "Group Name: %s" -msgstr "그룹 이름: %s" - -#: ../properties/nm-vpnc.c:554 -#, c-format -msgid "Username: %s" -msgstr "사용자이름: %s" - -#: ../properties/nm-vpnc.c:559 -#, c-format -msgid "Domain: %s" -msgstr "도메인: %s" - -#: ../properties/nm-vpnc.c:564 -#, c-format -msgid "Routes: %s" -msgstr "경로: %s" - -#: ../properties/nm-vpnc.c:568 -#, c-format -msgid "NAT-Keepalive packet interval: %s" -msgstr "NAT-keepalive 패킷 간격: %s" - -#: ../properties/nm-vpnc.c:572 -msgid "Enable Single DES" -msgstr "싱글 DES 사용" - -#: ../properties/nm-vpnc.c:576 -msgid "Disable NAT Traversal" -msgstr "NAT 탐색 사용 안함" - -#: ../properties/nm-vpnc.c:580 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "\"편집\" 단추를 눌러서 연결 설정을 바꿀 수 있습니다." - -#: ../properties/nm-vpnc.c:665 -msgid "TCP tunneling not supported" -msgstr "TCP 터널링은 지원하지 않습니다" - -#: ../properties/nm-vpnc.c:667 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"VPN 설정 파일 '%s'에 VPN연결이 TCP를 통해 터널을 뚫도록 되어있습니다만, vpnc " -"소프트웨어에서 현재 지원하지 않습니다.\n" -"\n" -"TCP 터널링이 꺼진채로 연결이 만들어집니다만, 제대로 동작하지 않을 것입니다." - -#: ../properties/nm-vpnc.c:687 -msgid "Settings import incomplete" -msgstr "설정 가져오기 미완료" - -#: ../properties/nm-vpnc.c:689 -#, c-format -msgid "" -"The VPN settings file '%s' is incomplete. You may not be able to connect " -"without providing further information." -msgstr "" -"VPN 설정 파일 '%s'의 정보가 충분하지 않습니다. 필요한 정보를 제공하지 않으면 " -"연결할 수 없습니다." - -#: ../properties/nm-vpnc.c:709 -msgid "Cannot import settings" -msgstr "설정을 가져올 수 없음" - -#: ../properties/nm-vpnc.c:711 -#, c-format -msgid "The VPN settings file '%s' could not be read or is invalid." -msgstr "VPN 설정 파일 '%s'을(를) 읽을 수 없거나 올바르지 않습니다." - -#: ../properties/nm-vpnc.c:726 -msgid "Select file to import" -msgstr "가져올 파일 선택" - -#: ../properties/nm-vpnc.c:908 -msgid "Save as..." -msgstr "다른 이름으로 저장..." - -#: ../properties/nm-vpnc.c:937 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "\"%s\" 파일이 이미 있습니다." - -#: ../properties/nm-vpnc.c:940 -msgid "Do you want to replace it with the one you are saving?" -msgstr "이를 저장할 파일로 바꾸겠습니까?" - -#: ../properties/nm-vpnc.c:954 -msgid "Failed to export configuration" -msgstr "설정 내보내기 실패" - -#: ../properties/nm-vpnc.c:956 -#, c-format -msgid "Failed to save file %s" -msgstr "파일 %s(으)로 저장 실패" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "예: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection na_me:" -msgstr "연결 이름(_M):" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Disable NAT _traversal" -msgstr "NAT 탐색 사용 안함(_T)" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Enable _weak single DES encryption" -msgstr "weak single DES 암호화 사용(_W)" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "G_roup name:" -msgstr "그룹 이름(_R):" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Import _Saved Configuration..." -msgstr "저장된 설정 가져오기(_S)..." - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "Interval:" -msgstr "간격:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "사설 네트워크 연결에 붙일 이름. (예: \"학교 VPN\", \"회사 네트워크\")" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Optional" -msgstr "추가 정보" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Override _user name" -msgstr "사용자 이름 덮어쓰기(_U)" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"시스템 관리자에게 받은 정보를 입력하십시오. 연결될 때 나타나는 화면에 암호를 " -"입력하지 마십시오." - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"가져온 파일이 Cisco VPN이나 VPNC 설정 파일이 아닙니다. 관리자에게 문의하십시" -"오." - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "Required" -msgstr "필수 정보" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "Use NAT _keepalive packets" -msgstr "NAT keepalive 패킷 사용(_K)" - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "Use _domain for authentication" -msgstr "인증에 도메인 사용(_D)" - -#: ../properties/nm-vpnc-dialog.glade.h:16 -msgid "_Gateway:" -msgstr "게이트웨이(_G):" - -#: ../properties/nm-vpnc-dialog.glade.h:17 -msgid "_Only use VPN connection for these addresses" -msgstr "이 주소에 VPN 연결 만 사용(_O)" - -msgid "Connection Information" -msgstr "연결 정보" - -msgid "Connection Name" -msgstr "연결 이름" - -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "사용자 이름과 열쇠글이 틀려서 로그인 실패했습니다." - -msgid "The VPN login failed because the VPN program could not be started." -msgstr "VPN 프로그램을 시작할 수 없어서 로그인 실패했습니다." - -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "VPN 프로그램이 VPN 서버에 연결하지 못해서 로그인 실패했습니다." - -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "VPN 설정 옵션이 잘못되어서 로그인 실패했습니다." - -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"VPN 프로그램이 VPN 서버에서 잘못된 설정값을 받아서 로그인 실패했습니다." - -msgid "O_ptional Information" -msgstr "기타 정보(_P)" diff --git a/vpn-daemons/vpnc/po/lt.po b/vpn-daemons/vpnc/po/lt.po deleted file mode 100644 index 87f390592c..0000000000 --- a/vpn-daemons/vpnc/po/lt.po +++ /dev/null @@ -1,181 +0,0 @@ -# Lithuanian translation of NetworkManager-vpnc. -# Copyright (C) 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager package. -# Žygimantas Beručka , 2008. -# -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-25 00:32+0300\n" -"PO-Revision-Date: 2008-09-25 00:32+0300\n" -"Last-Translator: Žygimantas Beručka \n" -"Language-Team: Lithuanian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "_Antrinis slaptažodis:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Naudotojo vardas:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "S_ritis:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Slaptažodis:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Jungtis an_onimiškai" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Prisijungti kaip na_udotojas:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "_Atsiminti slaptažodžius šiam seansui" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "Iš_saugoti slaptažodius raktinėje" - -#: ../auth-dialog/main.c:66 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Norint gauti prieigą prie Virtualiojo Privačiojo Tinklo „%s“, reikia " -"nustatyti jūsų tapatybę." - -#: ../auth-dialog/main.c:67 -msgid "Authenticate VPN" -msgstr "Nustatyti tapatybę VPN" - -#: ../auth-dialog/main.c:74 -msgid "_Group Password:" -msgstr "_Grupės slaptažodis:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Pridėti, šalinti ir taisyti VPN ryšius" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN ryšių valdyklė (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Su Cisco suderinamas VPN (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Suderinamas su įvairiais Cisco, Juniper, Netscreen ir Sonicwall IPSec " -"pagrįstais VPN šliuzais." - -#: ../properties/nm-vpnc.c:282 -msgid "Secure (default)" -msgstr "Saugus (numatytasis)" - -#: ../properties/nm-vpnc.c:285 -msgid "Weak (use with caution)" -msgstr "Silpnas (naudokite atsargiai)" - -#: ../properties/nm-vpnc.c:293 -msgid "None (completely insecure)" -msgstr "Nėra (visiškai nesaugu)" - -#: ../properties/nm-vpnc.c:331 -msgid "NAT-T (default)" -msgstr "NAT-T (numatytasis)" - -#: ../properties/nm-vpnc.c:338 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:345 -msgid "Disabled" -msgstr "Išjungta" - -#: ../properties/nm-vpnc.c:809 -msgid "TCP tunneling not supported" -msgstr "TCP tuneliavimas nepalaikomas" - -#: ../properties/nm-vpnc.c:811 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"VPN parametrų faile „%s“ nurodyta, kad VPN srautas turėtų būti tuneliuojamas " -"naudojant TCP, ko šiuo metu vpnc programinė įranga nepalaiko.\n" -"\n" -"Ryšį vis dar galima sukurti, išjungus TCP tuneliavimą, tačiau tikėtina, kad " -"jis neveiks kaip turėtų." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Bendra" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Neprivalomas" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Išjungti neatsakančių lygiarangių aptikimą" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Sritis:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Šifravimo metodas:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "G_rupės vardas:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "Gr_upės slaptažodis:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "NAT perėjimas:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Rodyti slaptažodžius:" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Naudotojo vardas:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "Š_liuzas:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "_Naudotojo slaptažodis:" diff --git a/vpn-daemons/vpnc/po/mk.po b/vpn-daemons/vpnc/po/mk.po deleted file mode 100644 index d015234534..0000000000 --- a/vpn-daemons/vpnc/po/mk.po +++ /dev/null @@ -1,170 +0,0 @@ -# translation of mk.po to Macedonian -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Jovan Naumovski , 2007. -# Arangel Angov , 2007. -# Arangel Angov , 2008. -msgid "" -msgstr "" -"Project-Id-Version: mk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-17 17:49+0000\n" -"PO-Revision-Date: 2008-07-06 14:57+0200\n" -"Last-Translator: Arangel Angov \n" -"Language-Team: Macedonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Втора лозинка:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Корисничко име:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Домен:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Лозинка:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Поврзи се _анонимно" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Поврзи се како _корисник:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Зачувај ја лозинката за оваа сесија" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Зачувај ги лозинките во приврзок" - -#: ../auth-dialog/main.c:182 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Треба да ја потврдите автентичноста за да пристапите кон виртуелната " -"приватна мрежа „%s“." - -#: ../auth-dialog/main.c:183 -msgid "Authenticate VPN" -msgstr "Потврди автентичност на VPN" - -#: ../auth-dialog/main.c:190 -msgid "_Group Password:" -msgstr "Лозинка на _групата:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Додавајте, отстранувајте и уредувајте VPN врски" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Менаџер на VPN врски (vpnc)" - -#: ../properties/nm-vpnc.c:51 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "VPN компатибилен со Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:52 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Компатибилност со разни Cisco, Juniper, Netscreen и Sonicwall IPSec VPN " -"премини." - -#: ../properties/nm-vpnc.c:194 -msgid "Secure (default)" -msgstr "Безбедно (стандардно)" - -#: ../properties/nm-vpnc.c:197 -msgid "Weak (use with caution)" -msgstr "Слабо (користете го претпазливо)" - -#: ../properties/nm-vpnc.c:205 -msgid "None (completely insecure)" -msgstr "Ниедно (целосно небезбедно)" - -#: ../properties/nm-vpnc.c:247 -msgid "NAT-T (default)" -msgstr "NAT-T (стандардно)" - -#: ../properties/nm-vpnc.c:254 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:261 -msgid "Disabled" -msgstr "Исклучено" - -#: ../properties/nm-vpnc.c:681 -msgid "TCP tunneling not supported" -msgstr "TCP тунелирањето не е поддржано" - -#: ../properties/nm-vpnc.c:683 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"Датотеката со поставувања на VPN %s одредува дали сообраќајот на VPN да се " -"тунелира преку TCP кој моментално не е поддржан од vpnc софтверот.\n" -"\n" -"Врската сепак може да биде креирана со оневозможено TCP тунелирање и може да " -"не работи како што треба." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Општо" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Дополнително" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Домен:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption Method:" -msgstr "Метод за енкриптирање:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup Name:" -msgstr "И_ме на група:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "NAT Traversal:" -msgstr "NAT Traversal:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "User name:" -msgstr "Корисничко име:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Gateway:" -msgstr "_Премин:" - diff --git a/vpn-daemons/vpnc/po/nb.po b/vpn-daemons/vpnc/po/nb.po deleted file mode 100644 index 81d9d13b31..0000000000 --- a/vpn-daemons/vpnc/po/nb.po +++ /dev/null @@ -1,254 +0,0 @@ -# Norwegian bokmål translation of NetworkManager's vpnc support. -# Copyright (C) 2006-2007 Red Hat, Inc. -# This file is distributed under the same license as the NetworkManager package. -# Kjartan Maraas , 2006-2007. -# -msgid "" -msgstr "" -"Project-Id-Version: vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 14:54+0100\n" -"PO-Revision-Date: 2007-12-17 15:00+0100\n" -"Last-Translator: Espen Stefansen \n" -"Language-Team: Norwegian Bokmål \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Sekundært passord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Br_ukernavn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domene:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Passord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Koble til _anonymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Koble til som br_uker:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Husk passord for denne sesjonen" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Lagre passord i nøkkelring" - -#: ../auth-dialog/main.c:172 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Du må autentisere deg for å få tilgang til virtuelt privat nettverk «%s»." - -#: ../auth-dialog/main.c:173 -msgid "Authenticate VPN" -msgstr "Autentiser VPN" - -#: ../auth-dialog/main.c:180 -msgid "_Group Password:" -msgstr "_Gruppepassord:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Legg til, fjern og regiger VPN-tilkoblinger" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Håndtering av VPN-tilkobling (vpnc)" - -#: ../properties/nm-vpnc.c:98 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Kompatibel Cisco VPN-klient (vpnc)" - -#: ../properties/nm-vpnc.c:543 -msgid "The following vpnc VPN connection will be created:" -msgstr "Følgende vpnc-tilkobling vil bli opprettet:" - -#: ../properties/nm-vpnc.c:545 -#, c-format -msgid "Name: %s" -msgstr "Navn: %s" - -#: ../properties/nm-vpnc.c:548 -#, c-format -msgid "Gateway: %s" -msgstr "Gateway: %s" - -#: ../properties/nm-vpnc.c:550 -#, c-format -msgid "Group Name: %s" -msgstr "Gruppenavn: %s" - -#: ../properties/nm-vpnc.c:554 -#, c-format -msgid "Username: %s" -msgstr "Brukernavn: %s" - -#: ../properties/nm-vpnc.c:559 -#, c-format -msgid "Domain: %s" -msgstr "Domene: %s" - -#: ../properties/nm-vpnc.c:564 -#, c-format -msgid "Routes: %s" -msgstr "Ruter: %s" - -#: ../properties/nm-vpnc.c:568 -#, c-format -msgid "NAT-Keepalive packet interval: %s" -msgstr "Pakkeintervall for NAT-Keepalive: %s" - -#: ../properties/nm-vpnc.c:572 -#, c-format -msgid "Enable Single DES" -msgstr "Aktiver enkel DES" - -#: ../properties/nm-vpnc.c:576 -#, c-format -msgid "Disable NAT Traversal" -msgstr "Inaktiver NAT-traversering" - -#: ../properties/nm-vpnc.c:580 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Tilkoblingsdetaljene kan endres med «Rediger»-knappen." - -#: ../properties/nm-vpnc.c:665 -msgid "TCP tunneling not supported" -msgstr "TCP-tunnelering ikke støttet" - -#: ../properties/nm-vpnc.c:667 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it may not work as expected." -msgstr "" -"Filen «%s» med innstillinger for VPN spesifiserer at VPN-trafikk skal tunneleres gjennom TCP, men dette er ikke støttet i vpnc-programvaren.\n" -"\n" -"Tilkoblingen kan fremdeles opprettes med TCP-tunnelering deaktivert, men det er ikke sikkert at dette vil fungere som forventet." - -#: ../properties/nm-vpnc.c:687 -msgid "Settings import incomplete" -msgstr "Import av innstillingene er ikke komplett" - -#: ../properties/nm-vpnc.c:689 -#, c-format -msgid "The VPN settings file '%s' is incomplete. You may not be able to connect without providing further information." -msgstr "Innstillingsfilen «%s» for VPN er ikke komplett. Uten å oppgi mer informasjon, er det ikke sikkert at det er mulig å koble til." - -#: ../properties/nm-vpnc.c:709 -msgid "Cannot import settings" -msgstr "Kan ikke importere innstillinger" - -#: ../properties/nm-vpnc.c:711 -#, c-format -msgid "The VPN settings file '%s' could not be read or is invalid." -msgstr "Filen «%s» med innstillinger for VPN inneholder ikke gyldige data eller kan ikke bli lest." - -#: ../properties/nm-vpnc.c:726 -msgid "Select file to import" -msgstr "Velg fil som skal importeres" - -#: ../properties/nm-vpnc.c:908 -msgid "Save as..." -msgstr "Lagre som..." - -#: ../properties/nm-vpnc.c:937 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "En fil med navn «%s» eksisterer allerede." - -#: ../properties/nm-vpnc.c:940 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Vil du erstatte den med filen du lagrer nå?" - -#: ../properties/nm-vpnc.c:954 -msgid "Failed to export configuration" -msgstr "Klarte ikke å eksportere konfigurasjonen" - -#: ../properties/nm-vpnc.c:956 -#, c-format -msgid "Failed to save file %s" -msgstr "Klarte ikke å lagre fil %s" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "eksempel: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection na_me:" -msgstr "_Navn på tilkobling:" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Disable NAT _traversal" -msgstr "Inaktiver NAT-_traversering" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Enable _weak single DES encryption" -msgstr "Aktiver _svak enkel DES-kryptering" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "G_roup name:" -msgstr "G_ruppenavn:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Import _Saved Configuration..." -msgstr "Importer lagret konfigura_sjon..." - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "Interval:" -msgstr "Intervall:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "Navn som brukes til å identifisere tilkoblingen til det private nettverket. F.eks. «Mitt VPN» eller «Jobbnettverk»" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Optional" -msgstr "Valgfri" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Override _user name" -msgstr "Overstyr br_ukernavn" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting." -msgstr "Vennligst oppgi informasjonen du har fått av din systemadministrator under. Ikke oppgi passordet her da du vil bli spurt om dette når du kobler til." - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file." -msgstr "Vennligst legg merke til at filen som du importerer ikke er en konfigurasjonsfil for Cisco VPN eller VPNC. Spør din administrator om filen." - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "Required" -msgstr "Krevet" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "Use NAT _keepalive packets" -msgstr "Bruk NAT-_keepalivepakker" - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "Use _domain for authentication" -msgstr "Bruk _domene for autentisering" - -#: ../properties/nm-vpnc-dialog.glade.h:16 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-vpnc-dialog.glade.h:17 -msgid "_Only use VPN connection for these addresses" -msgstr "K_un bruk VPN-tilkoblingen for disse adressene" - diff --git a/vpn-daemons/vpnc/po/nl.po b/vpn-daemons/vpnc/po/nl.po deleted file mode 100644 index 29b412de4d..0000000000 --- a/vpn-daemons/vpnc/po/nl.po +++ /dev/null @@ -1,316 +0,0 @@ -# Dutch translation of NetworkManager-vpnc -# -# This file is distributed under the same license as the NetworkManager -# package. -# -# Tino Meinen , 2006, 2007. -# Wouter Bolsterlee , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-15 10:45+0200\n" -"PO-Revision-Date: 2008-09-15 10:45+0200\n" -"Last-Translator: Wouter Bolsterlee \n" -"Language-Team: Dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "_Secondair wachtwoord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Gebruikersnaam:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domein:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Wachtwoord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "_Anoniem verbinden" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Verbinden met _gebruikersnaam:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "W_achtwoorden voor deze sessie onthouden" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "Wachtwoorden in _sleutelbos opslaan" - -# eigenlijk: moet er een aanmeldingscontrole worden uitgevoerd, -# maar het gaat erom dat er een wachtwoord moet worden gegeven -#: ../auth-dialog/main.c:66 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Om toegang te krijgen tot het Virtual Private Network ‘%s’ moet u uzelf " -"aanmelden." - -#: ../auth-dialog/main.c:67 -msgid "Authenticate VPN" -msgstr "VPN aanmeldingscontrole" - -#: ../auth-dialog/main.c:74 -msgid "_Group Password:" -msgstr "_Groepswachtwoord:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN-verbindingen toevoegen, verwijderen en bewerken" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN verbindingen beheren (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cisco-compatibele VPN-cliënt (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Geschikt voor verschillende Cisco, Juniper, Netscreen en Sonicwall IPSec-" -"gebaseerde VPN-gateways." - -#: ../properties/nm-vpnc.c:282 -msgid "Secure (default)" -msgstr "Veilig (standaard)" - -#: ../properties/nm-vpnc.c:285 -msgid "Weak (use with caution)" -msgstr "Zwak (voorzichtigheid geboden)" - -#: ../properties/nm-vpnc.c:293 -msgid "None (completely insecure)" -msgstr "Geen (geheel onveilig)" - -#: ../properties/nm-vpnc.c:331 -msgid "NAT-T (default)" -msgstr "NAT-T (standaard)" - -#: ../properties/nm-vpnc.c:338 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:345 -msgid "Disabled" -msgstr "Uitgeschakeld" - -#: ../properties/nm-vpnc.c:809 -msgid "TCP tunneling not supported" -msgstr "TCP tunneling is niet mogelijk" - -#: ../properties/nm-vpnc.c:811 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"Het VPN-instellingenbestand ‘%s’ geeft aan dat VPN-verkeer getunnelt moet " -"worden via TCP hetgeen momenteel nog niet mogelijk is met de vpnc-software.\n" -"\n" -"De verbinding kan evengoed worden gemaakt met TPC-tunneling uitgeschakeld, " -"maar het werkt mogelijkerwijs niet helemaal correct." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Algemeen" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Optioneel" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Detectie van ‘Dead peers’ uitschakelen" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Domein:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Versleutelingsmethode:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "G_roepsnaam:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "_Groepswachtwoord:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "NAT-traversal:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Wachtwoorden tonen" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Gebruikersnaam:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "_Gebuikerswachtwoord:" - -#~ msgid "The following vpnc VPN connection will be created:" -#~ msgstr "De volgende vpnc VPN-verbinding zal worden aangemaakt:" - -#~ msgid "Name: %s" -#~ msgstr "Naam: %s" - -#~ msgid "Gateway: %s" -#~ msgstr "Gateway: %s" - -#~ msgid "Group Name: %s" -#~ msgstr "Groepsnaam: %s" - -#~ msgid "Username: %s" -#~ msgstr "Gebruikersnaam: %s" - -#~ msgid "Domain: %s" -#~ msgstr "Domein: %s" - -#~ msgid "Routes: %s" -#~ msgstr "Routes: %s" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "" -#~ "De verbindingsdetails kunnen gewijzigd worden met de knop ‘Bewerken’." - -#~ msgid "Cannot import settings" -#~ msgstr "Kan instellingen niet importeren" - -# ongeldige/geen geldige -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "Het VPN instellingenbestand ‘%s’ bevat geen geldige gegevens." - -#~ msgid "Select file to import" -#~ msgstr "Selecteer een bestand om te importeren" - -#~ msgid "Save as..." -#~ msgstr "Opslaan als..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Een bestand met naam ‘%s’ bestaat al." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Wilt u het vervangen door het bestand dat u nu wilt opslaan?" - -#~ msgid "Failed to export configuration" -#~ msgstr "Kon configuratie niet exporteren" - -#~ msgid "Failed to save file %s" -#~ msgstr "Kon bestand %s niet opslaan" - -#~ msgid "Connection Information" -#~ msgstr "Verbindingsinformatie" - -#~ msgid "Connection Name" -#~ msgstr "Naam verbinding" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "bijvoorbeeld: 172.16.0.0/16 10.11.12.0/24" - -# Verbindingsnaam/naam van de verbinding -#~ msgid "Connection Name" -#~ msgstr "Naam van de verbinding" - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Naam waarmee de verbinding met het privénetwerk aangeduid wordt, " -#~ "bijvoorbeeld ‘Universiteit VPN’ of ‘Bedrijfsnetwerk’" - -# niet gebruiken/negeren/... -#~ msgid "Override _user name" -#~ msgstr "_Gebruikersnaam niet gebruiken" - -# erom/daarom -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Geef hieronder de informatie die u van uw systeembeheerder heeft " -#~ "gekregen. Vul uw wachtwoord niet hier in, maar wacht daarmee tot erom " -#~ "gevraagd wordt bij het verbinden." - -#~ msgid "" -#~ "Please note that the file you import is not a Cisco VPN or VPNC " -#~ "configuration file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "Merk op dat het bestand dat u importeert geen Cisco VPN of VPNC " -#~ "configuratiebestand is. Vraag uw systeembeheerder om het bestand." - -#~ msgid "Use _domain for authentication" -#~ msgstr "_Domein gebruiken voor aanmeldingscontrole" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "_Opgeslagen configuratie importeren..." - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "_Voor deze adressen alleen een VPN-verbinding gebruiken" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "" -#~ "Aanmelding bij het VPN is mislukt omdat de combinatie van gebruikersnaam " -#~ "en wachtwoord niet geaccepteerd werd." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "Aanmelding bij het VPN is mislukt omdat het VPN-programma niet opgestart " -#~ "kon worden." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "Aanmelding bij het VPN is mislukt omdat het VPN-programma geen verbinding " -#~ "kon maken met de VPN-server." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "Aanmelding bij het VPN is mislukt omdat de VPN-configuratieopties " -#~ "ongeldig waren." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "Aanmelding bij het VPN is mislukt omdat het VPN-programma een ongeldige " -#~ "configuratie kreeg van de VPN-server." - -#~ msgid "O_ptional Information" -#~ msgstr "O_ptionele informatie" diff --git a/vpn-daemons/vpnc/po/pa.po b/vpn-daemons/vpnc/po/pa.po deleted file mode 100644 index 239f39f763..0000000000 --- a/vpn-daemons/vpnc/po/pa.po +++ /dev/null @@ -1,246 +0,0 @@ -# translation of NetworkManager-vpnc.HEAD.po to Punjabi -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# A S Alam , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-03 18:38+0000\n" -"PO-Revision-Date: 2007-02-04 08:50+0530\n" -"Last-Translator: A S Alam \n" -"Language-Team: Punjabi \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "ਸੈਕੰਡਰੀ ਗੁਪਤ-ਕੋਡ(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "ਉਪਭੋਗੀ ਨਾਂ(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "ਡੋਮੇਨ(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "ਗੁਪਤ-ਕੋਡ(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "ਅਗਿਆਤ ਵਾਂਗ ਜੁੜੋ(_a)" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "ਉਪਭੋਗੀ ਵਾਂਗ ਜੁੜੋ(_u):" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "ਇਹ ਸ਼ੈਸ਼ਨ ਲਈ ਗੁਪਤ-ਕੋਡ ਯਾਦ ਰੱਖੋ(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "ਛੱਲੇ 'ਚ ਗੁਪਤ-ਕੋਡ ਸੰਭਾਲੋ(_S)" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "ਪਰਮਾਣਿਤ VPN" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "ਗਰੁੱਪ ਗੁਪਤ-ਕੋਡ(_G):" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਿਲ, ਹਟਾਓ ਜਾਂ ਸੋਧ" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ (vpnc)" - -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "ਢੁੱਕਵਾਂ Cisco VPN ਕਲਾਂਇਟ (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "ਹੇਠ ਦਿੱਤਾ vpnc VPN ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਗਿਆ ਹੈ:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "ਨਾਂ: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "ਗੇਟਵੇ: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "ਗਰੁੱਪ ਨਾਂ: %s" - -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "ਉਪਭੋਗੀ ਨਾਂ: %s" - -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "ਡੋਮੇਨ: %s" - -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "ਰੂਟ: %s" - -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" - -#: ../properties/nm-vpnc.c:542 -msgid "TCP tunneling not supported" -msgstr "TCP ਟਨਲਿੰਗ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ" - -#: ../properties/nm-vpnc.c:544 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" - -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "ਸੈਟਿੰਗ ਆਯਾਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "VPN ਸੈਟਿੰਗ ਫਾਇਲ '%s' ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਸੀ।" - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "ਆਯਾਤ ਕਰਨ ਲਈ ਫਾਇਲ ਚੁਣੋ" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "ਇੰਝ ਸੰਭਾਲੋ..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "\"%s\" ਨਾਂ ਨਾਲ ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।" - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਆਪਣੇ ਵਲੋਂ ਸੰਭਾਲੀ ਜਾਣ ਵਾਲੀ ਨਾਲ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "ਸੰਰਚਨਾ ਨਿਰਯਾਤ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "ਫਾਇਲ %s ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Name" -msgstr "ਕੁਨੈਕਸ਼ਨ ਨਾਂ" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Required Information" -msgstr "ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "ਜਿਵੇਂ: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "G_roup Name:" -msgstr "ਗਰੁੱਪ ਨਾਂ(_r):" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "O_ptional Information" -msgstr "ਚੋਣਵੀਂ ਜਾਣਕਾਰੀ(_p)" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Override _user name" -msgstr "ਉਪਭੋਗੀ ਨਾਂ ਅਣਡਿੱਠਾ(_u)" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Use _domain for authentication" -msgstr "ਪਰਮਾਣਕਿਤਾ ਲਈ ਡੋਮੇਨ ਵਰਤੋਂ(_d)" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "_Gateway:" -msgstr "ਗੇਟਵੇ(_G):" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Import Saved Configuration..." -msgstr "ਸੰਭਾਲੀ ਸੰਰਚਨਾ ਆਯਾਤ(_I)..." - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Only use VPN connection for these addresses" -msgstr "ਇਹ ਸਿਰਨਾਵਿਆਂ ਲਈ ਸਿਰਫ਼ VPN ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_O)" - -#: ../src/nm-vpnc-service.c:118 -msgid "The VPN login failed because the user name and password were not accepted." -msgstr "" -"VPN ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੋ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ ਉਪਭੋਗੀ ਨਾਂ ਅਤੇ ਗੁਪਤ-ਕੋਡ ਸਵੀਕਾਰ " -"ਨਹੀਂ ਕੀਤਾ।" - -#: ../src/nm-vpnc-service.c:120 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "VPN ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੋ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ VPN ਪ੍ਰੋਗਰਾਮ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।" - -#: ../src/nm-vpnc-service.c:122 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"VPN ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੋ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ VPN ਪ੍ਰੋਗਰਾਮ VPN ਸਰਵਰ ਨਾਲ " -"ਜੁੜ ਨਹੀਂ ਸਕਿਆ।" - -#: ../src/nm-vpnc-service.c:124 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "VPN ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੋ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ VPN ਸੰਰਚਨਾ ਚੋਣਾਂ ਗਲਤ ਹਨ।" - -#: ../src/nm-vpnc-service.c:126 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"VPN ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੋ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ VPN ਪ੍ਰੋਗਰਾਮ ਨੇ VPN ਸਰਵਰ ਤੋਂ ਗਲਤ " -"ਸੰਰਚਨਾ ਮਿਲੀ ਹੈ।" - diff --git a/vpn-daemons/vpnc/po/pl.po b/vpn-daemons/vpnc/po/pl.po deleted file mode 100644 index 90e83ad1a8..0000000000 --- a/vpn-daemons/vpnc/po/pl.po +++ /dev/null @@ -1,305 +0,0 @@ -# translation of networkmanager-vpnc to Polish -# Copyright (C) 2001-2008 Free Software Foundation, Inc. -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-19 20:20+0100\n" -"PO-Revision-Date: 2008-11-19 20:21+0100\n" -"Last-Translator: Tomasz Dominikowski \n" -"Language-Team: Aviary.pl \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "Hasło _dodatkowe:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "Nazwa _użytkownika:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domena:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Hasło:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Połączenie _anonimowe" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Połączenie jako _użytkownik:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "Zapamiętanie _hasła na czas tej sesji" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "_Zapamiętanie hasła w bazie kluczy" - -#: ../auth-dialog/main.c:105 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Aby uzyskać dostęp do wirtualnej sieci prywatnej \"%s\", należy dokonać uwierzytelnienia." - -#: ../auth-dialog/main.c:106 -msgid "Authenticate VPN" -msgstr "Uwierzytelnianie VPN" - -#: ../auth-dialog/main.c:113 -msgid "_Group Password:" -msgstr "Hasło g_rupy:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Dodawanie, usuwanie i modyfikowanie połączeń VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Menedżer połączeń VPN (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Klient kompatybilny z Cisco VPN (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based VPN gateways." -msgstr "Kompatybilny z wieloma bramami VPN IPSec, jak Cisco, Juniper, Netscreen i Sonicwall." - -#: ../properties/nm-vpnc.c:325 -msgid "Saved" -msgstr "Zapisano" - -#: ../properties/nm-vpnc.c:332 -msgid "Always Ask" -msgstr "Pytanie zawsze" - -#: ../properties/nm-vpnc.c:339 -msgid "Not Required" -msgstr "Niewymagane" - -#: ../properties/nm-vpnc.c:398 -msgid "Secure (default)" -msgstr "Bezpieczne (domyślne)" - -#: ../properties/nm-vpnc.c:401 -msgid "Weak (use with caution)" -msgstr "Słabe (używać z ostrożnością)" - -#: ../properties/nm-vpnc.c:409 -msgid "None (completely insecure)" -msgstr "Brak (całkowity brak zabezpieczeń)" - -#: ../properties/nm-vpnc.c:450 -msgid "Cisco UDP (default)" -msgstr "Cisco UDP (domyślne)" - -#: ../properties/nm-vpnc.c:457 -msgid "NAT-T" -msgstr "NAT-T" - -#: ../properties/nm-vpnc.c:464 -msgid "Disabled" -msgstr "Wyłączone" - -#: ../properties/nm-vpnc.c:1085 -msgid "TCP tunneling not supported" -msgstr "Tunelowanie TCP nie jest obsługiwane" - -#: ../properties/nm-vpnc.c:1087 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it may not work as expected." -msgstr "" -"Plik ustawień VPN \"%s\" określa, że ruch VPN ma być tunelowany poprzez TCP. Opcja nie jest jednak obsługiwana przez program vpnc.\n" -"\n" -"Połączenie z wyłączonym tunelowaniem TCP może nie działać poprawnie." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Ogólne" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Opcjonalne" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Wyłączenie DPD (Dead Peer Detection)" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Domena:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Metoda szyfrowania:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "Nazwa g_rupy:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "_Hasło grupy:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "Omijanie NAT:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Wyświetlanie haseł" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Nazwa użytkownika:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Brama:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "Hasło _użytkownika:" - -#~ msgid "NAT-T (default)" -#~ msgstr "NAT-T (domyślne)" -#~ msgid "The following vpnc VPN connection will be created:" -#~ msgstr "Utworzone zostanie poniższe połączenie VPN vpnc:" -#~ msgid "Name: %s" -#~ msgstr "Nazwa: %s" -#~ msgid "Gateway: %s" -#~ msgstr "Brama: %s" -#~ msgid "Group Name: %s" -#~ msgstr "Nazwa grupy: %s" -#~ msgid "Username: %s" -#~ msgstr "Nazwa użytkownika: %s" -#~ msgid "Domain: %s" -#~ msgstr "Domena: %s" -#~ msgid "Routes: %s" -#~ msgstr "Trasy: %s" -#~ msgid "NAT-Keepalive packet interval: %s" -#~ msgstr "Czas między kolejnymi pakietami NAT-Keepalive: %s" -#~ msgid "Enable Single DES" -#~ msgstr "Uruchom Single DES" -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "Szczegóły połączenia można zmienić za pomocą przycisku \"Edytuj\"." -#~ msgid "Settings import incomplete" -#~ msgstr "Importowanie ustawień niekompletne" -#~ msgid "" -#~ "The VPN settings file '%s' is incomplete. You may not be able to connect " -#~ "without providing further information." -#~ msgstr "" -#~ "Plik ustawień \"%s\" jest niekompletny. Połączenie może nie być możliwe " -#~ "bez podania dalszych informacji." -#~ msgid "Cannot import settings" -#~ msgstr "Nie można zaimportować ustawień" -#~ msgid "The VPN settings file '%s' could not be read or is invalid." -#~ msgstr "" -#~ "Plik ustawień VPN \"%s\" nie mógł zostać odczytany lub jest uszkodzony." -#~ msgid "Select file to import" -#~ msgstr "Plik do zaimportowania" -#~ msgid "Save as..." -#~ msgstr "Zapisz jako..." -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Plik \"%s\" już istnieje." -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Nadpisać go zapisywanym plikiem?" -#~ msgid "Failed to export configuration" -#~ msgstr "Nie można wyeksportować konfiguracji" -#~ msgid "Failed to save file %s" -#~ msgstr "Nie można zapisać pliku %s" -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "przykład: 172.16.0.0/16 10.11.12.0/24" -#~ msgid "Connection na_me:" -#~ msgstr "_Nazwa połączenia" -#~ msgid "Disable NAT _traversal" -#~ msgstr "Wyłącz pomijanie NA_T" -#~ msgid "Enable _weak single DES encryption" -#~ msgstr "Włącz _słabe szyfrowanie single DES" -#~ msgid "Import _Saved Configuration..." -#~ msgstr "Importuj zapi_saną konfigurację..." -#~ msgid "Interval:" -#~ msgstr "Interwał:" -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Nazwa identyfikująca połączenie do sieci prywatnej. Np. \"VPN kampusu\" " -#~ "lub \"Sieć firmowa\"" -#~ msgid "Override _user name" -#~ msgstr "Wymuś _nazwę użytkownika" -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Proszę podać poniżej informacje dostarczone przez administratora. Hasło " -#~ "należy podać później, podczas łączenia." -#~ msgid "" -#~ "Please note that the file you import is not a Cisco VPN or VPNC " -#~ "configuration file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "Uwaga: importowany plik nie jest plikiem konfiguracyjnym Cisco VPN ani " -#~ "VPNC. Proszę poprosić administratora o poprawny plik." -#~ msgid "Use NAT _keepalive packets" -#~ msgstr "Użyj pakietów NAT _keepalive" -#~ msgid "Use _domain for authentication" -#~ msgstr "Użyj _domeny do uwierzytelniania" -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "_Używanie połączeń VPN tylko dla tych adresów" -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu błędnego użytkownika i " -#~ "hasła." -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu niemożności uruchomienia " -#~ "programu VPN." -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu braku połączenia z " -#~ "serwerem VPN." -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu błędnych opcji " -#~ "konfiguracyjnych." -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "Logowanie VPN zakończone niepowodzeniem z powodu otrzymania od serwera " -#~ "VPN błędnej konfiguracji." -#~ msgid "Connection Information" -#~ msgstr "Informacje o połączeniu" -#~ msgid "Connection Name" -#~ msgstr "Nazwa połączenia" -#~ msgid "O_ptional Information" -#~ msgstr "Informacje _dodatkowe" - diff --git a/vpn-daemons/vpnc/po/pt.po b/vpn-daemons/vpnc/po/pt.po deleted file mode 100644 index abe3205ec1..0000000000 --- a/vpn-daemons/vpnc/po/pt.po +++ /dev/null @@ -1,278 +0,0 @@ -# NetworkManager-vpnc's Portuguese translation. -# Copyright © 2007 NetworkManager-vpnc -# This file is distributed under the same license as the NetworkManager-vpnc package. -# Duarte Loreto , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: 2.18\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-25 17:09+0000\n" -"PO-Revision-Date: 2007-02-25 17:15+0000\n" -"Last-Translator: Duarte Loreto \n" -"Language-Team: Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Sen_ha Secundária:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Utilizador:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domínio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Senha:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Ligar-se _anonimamente" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Ligar-se como o _utilizador:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Recordar as senhas durante esta sessão" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Gravar as senhas no chaveiro" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Tem de se autenticar para aceder à Rede Privada Virtual (VPN) '%s'." - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "Autenticar na VPN" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "Senha de _Grupo:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Adicionar, Remover e Editar Ligações VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Gestor de Ligações VPN (vpnc)" - -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Cliente VPN compatível com Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "Serão criadas as seguintes ligações VPN vpnc:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "Nome: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "Gateway: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "Nome do Grupo: %s" - -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "Utilizador: %s" - -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "Domínio: %s" - -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "Rotas: %s" - -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "" -"Os detalhes da ligação poder ser alterados utilizando o botão \"Edit\"." - -#: ../properties/nm-vpnc.c:542 -msgid "TCP tunneling not supported" -msgstr "Tunneling TCP não suportado" - -#: ../properties/nm-vpnc.c:544 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"O ficheiro de definições VPN '%s' especifica que o tráfego VPN deveria ser " -"tunneled através de TCP o que de momento não é suportado pela aplicação " -"vpnc.\n" -"\n" -"A ligação pode ainda ser criada, com o tunneling TCP desactivado, poderá no " -"entanto não funcionar como esperado." - -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "Incapaz de importar as definições" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "O ficheiro de definições VPN '%s' não contém dados válidos." - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "Seleccionar o ficheiro a importar" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "Gravar como..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Já existe um ficheiro denominado \"%s\"." - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Deseja substituí-lo pelo que está a gravar?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "Falha ao exportar a configuração" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "Falha ao gravar o ficheiro %s" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Information" -msgstr "Informação de Ligação" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection Name" -msgstr "Nome da Ligação" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Required" -msgstr "Necessária" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "exemplo: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Connection Name" -msgstr "Nome da Ligação" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "G_roup Name:" -msgstr "Nome do G_rupo:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Nome utilizado para identificar a ligação à rede privada, por. ex. \"VPN da " -"Universidade\" ou \"Rede da Empresa\"" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Optional" -msgstr "Opcional" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Override _user name" -msgstr "Ignorar o nome do _utilizador" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Introduza abaixo a informação disponibilizada pelo administrador do seu " -"sistema. Não introduza aqui a sua senha pois essa ser-lhe-á pedida quando se " -"ligar." - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"Note que o ficheiro que importou não é um ficheiro de configuração " -"de VPN ou VPNC Cisco. Peça o ficheiro ao administrador da sua rede." - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "Use _domain for authentication" -msgstr "Utilizar o _domínio para a autenticação" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "_Import Saved Configuration..." -msgstr "_Importar a Configuração Gravada..." - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "_Only use VPN connection for these addresses" -msgstr "_Apenas utilizar ligação VPN para estes endereços" - -#: ../src/nm-vpnc-service.c:119 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "" -"O início de sessão VPN falhou porque o utilizador e senha não foram aceites." - -#: ../src/nm-vpnc-service.c:121 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" -"O início de sessão VPN falhou porque não foi possível iniciar a aplicação de " -"VPN." - -#: ../src/nm-vpnc-service.c:123 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"O início de sessão VPN falhou porque a aplicação de VPN foi incapaz de se " -"ligar ao servidor de VPN." - -#: ../src/nm-vpnc-service.c:125 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "" -"O início de sessão VPN falhou porque as opções de configuração são inválidas." - -#: ../src/nm-vpnc-service.c:127 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"O início de sessão VPN falhou porque a aplicação de VPN recebeu uma " -"configuração inválida do servidor de VPN." - -#~ msgid "O_ptional Information" -#~ msgstr "Informação O_pcional" diff --git a/vpn-daemons/vpnc/po/pt_BR.po b/vpn-daemons/vpnc/po/pt_BR.po deleted file mode 100644 index 55fe5abee1..0000000000 --- a/vpn-daemons/vpnc/po/pt_BR.po +++ /dev/null @@ -1,330 +0,0 @@ -# Brazilian Portuguese translation of NetworkManager-vpnc. -# Copyright (C) 2007 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager-vpnc package. -# Raphael Higino (In Memoriam), 2007. -# Luiz Armesto , 2007. -# Fábio Nogueira -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-17 17:49+0000\n" -"PO-Revision-Date: 2008-07-04 00:56-0300\n" -"Last-Translator: Fábio Nogueira \n" -"Language-Team: Brazilian Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: BRAZIL\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Senha secundária:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "Nome do _usuário:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domínio:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Senha:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Conectar _anonimamente" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Conectar como o _usuário:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Lembrar senhas para esta sessão" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Salvar senhas no chaveiro" - -#: ../auth-dialog/main.c:182 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "" -"Você precisa se autenticar para acessar a Rede Privada Virtual (VPN) \"%s\"." - -#: ../auth-dialog/main.c:183 -msgid "Authenticate VPN" -msgstr "Autenticar VPN" - -#: ../auth-dialog/main.c:190 -msgid "_Group Password:" -msgstr "Senha do _grupo:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Adiciona, Remove e Edita Conexões VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Gerenciador de Conexões VPN (vpnc)" - -#: ../properties/nm-vpnc.c:51 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cliente VPN compatível com Cisco (vpnc)" - -#: ../properties/nm-vpnc.c:52 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"Compatível com vários VPN gateways Cisco, Juniper, NetScreen e SonicWALL " -"baseado em IPSec." - -#: ../properties/nm-vpnc.c:194 -msgid "Secure (default)" -msgstr "Seguro (padrão)" - -#: ../properties/nm-vpnc.c:197 -msgid "Weak (use with caution)" -msgstr "Fraco (utilize com precaução)" - -#: ../properties/nm-vpnc.c:205 -msgid "None (completely insecure)" -msgstr "Nenhum (completamente inseguro)" - -#: ../properties/nm-vpnc.c:247 -msgid "NAT-T (default)" -msgstr "NAT-T (padrão)" - -#: ../properties/nm-vpnc.c:254 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:261 -msgid "Disabled" -msgstr "Desabilitado" - -#: ../properties/nm-vpnc.c:681 -msgid "TCP tunneling not supported" -msgstr "Não há suporte a encapsulamento TCP" - -#: ../properties/nm-vpnc.c:683 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"O arquivo de configurações de VPN \"%s\" especifica que o tráfico VPN deve " -"ser encapsulado por TCP que, atualmente, não é suportado pelo software " -"vpnc.\n" -"\n" -"A conexão ainda pode ser criada, com encapsulamento por TCP desativado, mas " -"pode não funcionar como esperado." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Geral" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Opcional" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Desabilitar detecção de par morto" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Domínio:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption Method:" -msgstr "Método de criptografia:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup Name:" -msgstr "Nome do g_rupo:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "NAT Traversal:" -msgstr "NAT Traversal:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "User name:" -msgstr "Nome do usuário:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Gateway:" -msgstr "_Gateway:" - -#~ msgid "The following vpnc VPN connection will be created:" -#~ msgstr "A seguinte conexão VPN vpnc será criada:" - -#~ msgid "Name: %s" -#~ msgstr "Nome: %s" - -#~ msgid "Gateway: %s" -#~ msgstr "Gateway: %s" - -#~ msgid "Group Name: %s" -#~ msgstr "Nome do Grupo: %s" - -#~ msgid "Username: %s" -#~ msgstr "Nome do Usuário: %s" - -#~ msgid "Domain: %s" -#~ msgstr "Domínio: %s" - -#~ msgid "Routes: %s" -#~ msgstr "Rotas: %s" - -#~ msgid "NAT-Keepalive packet interval: %s" -#~ msgstr "Intervalo do pacote NAT-Keepalive: %s" - -#~ msgid "Enable Single DES" -#~ msgstr "Habilitar DES Simples" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "" -#~ "Os detalhes da conexão podem ser alterados usando o botão \"Editar\"." - -#~ msgid "Settings import incomplete" -#~ msgstr "Importação de configurações incompleta" - -#~ msgid "" -#~ "The VPN settings file '%s' is incomplete. You may not be able to connect " -#~ "without providing further information." -#~ msgstr "" -#~ "O arquivo de configurações VPN \"%s\" está incompleto. Você pode não " -#~ "estar apto a conectar sem fornecer outras informações." - -#~ msgid "Cannot import settings" -#~ msgstr "Não é possível importar as configurações" - -#~ msgid "The VPN settings file '%s' could not be read or is invalid." -#~ msgstr "" -#~ "O arquivo de configurações de VPN \"%s\" não pôde ser lido ou é inválido." - -#~ msgid "Select file to import" -#~ msgstr "Selecione o arquivo para importar" - -#~ msgid "Save as..." -#~ msgstr "Salvar como..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "Um arquivo com o nome \"%s\" já existe." - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Deseja substituí-lo com o arquivo que você está salvando?" - -#~ msgid "Failed to export configuration" -#~ msgstr "Falha ao exportar a configuração" - -#~ msgid "Failed to save file %s" -#~ msgstr "Falha ao salvar o arquivo %s" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "exemplo: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "Connection na_me:" -#~ msgstr "No_me da conexão:" - -#~ msgid "Disable NAT _traversal" -#~ msgstr "Desabilitar NAT _traversal" - -#~ msgid "Enable _weak single DES encryption" -#~ msgstr "Habilitar criptografia _fraca DES simples" - -#~ msgid "Import _Saved Configuration..." -#~ msgstr "Importar Configuração _Salva..." - -#~ msgid "Interval:" -#~ msgstr "Intervalo:" - -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Nome usado para identificar a conexão à rede privada, p. ex. \"VPN do " -#~ "Campus\" ou \"Rede Corporativa\"" - -#~ msgid "Override _user name" -#~ msgstr "Ignorar nome do _usuário" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Por favor, digite as informações fornecidas pelo seu administrador de " -#~ "sistemas. Não digite sua senha aqui, já que ela será pedida ao conectar." - -#~ msgid "" -#~ "Please note that the file you import is not a Cisco VPN or VPNC " -#~ "configuration file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "Por favor, observe que arquivo que você importou não é um arquivo de " -#~ "configuração Cisco VPN ou VPNC. Pergunte ao seu administrador pelo " -#~ "arquivo." - -#~ msgid "Required" -#~ msgstr "Requerido" - -#~ msgid "Use NAT _keepalive packets" -#~ msgstr "Usar pacotes NAT _keepalive" - -#~ msgid "Use _domain for authentication" -#~ msgstr "Usar _domínio para autenticação" - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "Usar conexão VPN _apenas para estes endereços" - -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "" -#~ "A autenticação na VPN falhou porque o nome do usuário e a senha não foram " -#~ "aceitos." - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "A autenticação na VPN falhou porque o programa VPN não pôde ser iniciado." - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "A autenticação na VPN falhou porque o programa VPN não pôde conectar ao " -#~ "servidor VPN." - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "A autenticação na VPN falhou porque as opções de configuração de VPN eram " -#~ "inválidas." - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "A autenticação na VPN falhou porque o programa VPN recebeu uma " -#~ "configuração inválida do servidor VPN." - -#~ msgid "Connection Information" -#~ msgstr "Informações da conexão" - -#~ msgid "Connection Name" -#~ msgstr "Nome da conexão" - -#~ msgid "O_ptional Information" -#~ msgstr "_Informações opcionais" diff --git a/vpn-daemons/vpnc/po/ru.po b/vpn-daemons/vpnc/po/ru.po deleted file mode 100644 index d5545e4885..0000000000 --- a/vpn-daemons/vpnc/po/ru.po +++ /dev/null @@ -1,169 +0,0 @@ -# translation of ru.po to Russian -# translation of ru.po to -# Ukrainian translation of NetworkManager openvpn -# Copyright (C) Free Software Foundation, 2005 -# This file is distributed under the same license as the NetworkManager package. -# -# Maxim Dziumanenko , 2005-2007. -# Leonid Kanter , 2007, 2008. -msgid "" -msgstr "" -"Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-08 15:14+0300\n" -"PO-Revision-Date: 2008-08-08 15:19+0300\n" -"Last-Translator: Leonid Kanter \n" -"Language-Team: Russian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Вторичный пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Имя пользователя:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Домен:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Подключаться _анонимно" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "_Подключаться как пользователь:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Запомнить пароли для этого сеанса" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Сохранить пароли на брелоке" - -#: ../auth-dialog/main.c:182 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Для доступа к виртуальной частной сети '%s' требуется аутентификация." - -#: ../auth-dialog/main.c:183 -msgid "Authenticate VPN" -msgstr "Аутентификация VPN" - -#: ../auth-dialog/main.c:190 -msgid "_Group Password:" -msgstr "_Пароль группы:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Добавление, изменение и удаление соединений VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Менеджер соединений VPN (vpnc)" - -#: ../properties/nm-vpnc.c:51 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cisco-совместимый VPN (vpnc)" - -#: ../properties/nm-vpnc.c:52 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "Совместим с различными роутерами Cisco, Juniper, Netscreen, Sonicwall." - -#: ../properties/nm-vpnc.c:204 -msgid "Secure (default)" -msgstr "Строгое (по умолчанию)" - -#: ../properties/nm-vpnc.c:207 -msgid "Weak (use with caution)" -msgstr "Слабое (использовать с осторожностью)" - -#: ../properties/nm-vpnc.c:215 -msgid "None (completely insecure)" -msgstr "Нет (без шифрования)" - -#: ../properties/nm-vpnc.c:260 -msgid "NAT-T (default)" -msgstr "NAT-T (по умолчанию)" - -#: ../properties/nm-vpnc.c:267 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:274 -msgid "Disabled" -msgstr "Выключено" - -#: ../properties/nm-vpnc.c:697 -msgid "TCP tunneling not supported" -msgstr "Туннелирование TCP не поддерживается" - -#: ../properties/nm-vpnc.c:699 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"Файл параметров VPN \"%s\" указывает, что трафик VPN должен быть " -"туннелирован через TCP. Эта функция сейчас не поддерживается программой " -"vpnc.\n" -"\n" -"Подключение может быть создано с отключенным туннелированием TCP, но оно " -"может работать не так, как ожидается." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Общие" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Необязательные" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Отключить Dead Peer Detection" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Домен:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption Method:" -msgstr "Метод шифрования:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup Name:" -msgstr "Имя г_руппы:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "NAT Traversal:" -msgstr "Traversal NAT:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "User name:" -msgstr "Имя пользователя:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Gateway:" -msgstr "_Шлюз:" - diff --git a/vpn-daemons/vpnc/po/sl.po b/vpn-daemons/vpnc/po/sl.po deleted file mode 100644 index c89a2f7451..0000000000 --- a/vpn-daemons/vpnc/po/sl.po +++ /dev/null @@ -1,234 +0,0 @@ -# Slovenian translation of NetworkManager-vpnc. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the NetworkManager-vpnc package. -# -# Matic Žgur , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-09 03:29+0000\n" -"PO-Revision-Date: 2007-01-10 15:21+0100\n" -"Last-Translator: Matic Žgur \n" -"Language-Team: Slovenian GNOME Translation Team \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Slovenian\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Sekundarno geslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Uporabniško ime:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Domena:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Geslo:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Poveži _anonimno" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Poveži se kot _uporabnik:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_Zapomni si geslo za to sejo" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Shrani geslo v zbirko ključev" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Morate se overoviti za dostop do navideznega zasebnega omrežja '%s'." - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "Overovi VPN" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "_Geslo skupine:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Dodajte, odstranite ali uredite povezave VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Upravitelj povezav VPN (vpnc)" - -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Z Cisco VPN združljiv odjemalec (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "Ustvarjena bo naslednja povezava VPN vpnc:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "Ime: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "Prehod: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "Ime skupine: %s" - -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "Uporabniško ime: %s" - -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "Domena: %s" - -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "Smeri: %s" - -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Podrobnosti o povezavi so lahko spremenjene z uporabo gumba \"Uredi\"." - -#: ../properties/nm-vpnc.c:542 -msgid "TCP tunneling not supported" -msgstr "TCP tuneliranje ni podprto" - -#: ../properties/nm-vpnc.c:544 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it may not work as expected." -msgstr "" -"Datoteka z nastavitvami za VPN '%s' določa, da bi moral biti promet VPN tuneliran skozi TCP, kar trenutno ni podprto v programski opremi vpnc.\n" -"\n" -"Povezava je lahko še vedno ustvarjena, z onemogočenim TCP tuneliranjem, vendar lahko ne deluje po pričakovanjih." - -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "Ni mogoče uvoziti nastavitev" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "Datoteka z nastavitvami za VPN '%s' ne vsebuje veljavnih podatkov." - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "Izberite datoteko za uvoz" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "Shrani kot ..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Datoteka z imenom \"%s\" že obstaja." - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Ali jo želite zamenjati s to, ki jo shranjujete?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "Izvoz nastavitev ni uspel" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "Shranjevanje datoteke %s ni uspelo" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Name" -msgstr "Ime povezave" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Required Information" -msgstr "Zahtevane informacije" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "primer: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "G_roup Name:" -msgstr "I_me skupine:" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "O_ptional Information" -msgstr "D_odatne informacije" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Override _user name" -msgstr "Povozi _uporabniško ime" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting." -msgstr "Prosim, spodaj vnesite informacije, ki vam jih je priskrbel sistemski administrator. Ne vnesite svojega gesla tukaj, saj boste ponovno vprašani zanj med povezovanjem." - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Use _domain for authentication" -msgstr "Uporabi _domeno za overovitev" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "_Gateway:" -msgstr "_Prehod:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Import Saved Configuration..." -msgstr "_Uvozi shranjene nastavitve ..." - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "_Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\"" -msgstr "_Ime, uporabljeno za identificiranje povezave v zasebno omrežje, npr. \"Campus VPN\" ali \"Corporate Network\"" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Only use VPN connection for these addresses" -msgstr "Uporabi povezavo VPN _samo za te naslove" - -#: ../src/nm-vpnc-service.c:117 -msgid "The VPN login failed because the user name and password were not accepted." -msgstr "Prijava v VPN ni uspela, ker uporabniško ime in geslo nista bila sprejeta." - -#: ../src/nm-vpnc-service.c:119 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "Prijava v VPN ni uspela, ker ni mogoče zagnati programa VPN." - -#: ../src/nm-vpnc-service.c:121 -msgid "The VPN login failed because the VPN program could not connect to the VPN server." -msgstr "Prijava v VPN ni uspela, ker se program VPN ne more povezati s strežnikom VPN." - -#: ../src/nm-vpnc-service.c:123 -msgid "The VPN login failed because the VPN configuration options were invalid." -msgstr "Prijava v VPN ni uspela, ker so nastavitve VPN neveljavne." - -#: ../src/nm-vpnc-service.c:125 -msgid "The VPN login failed because the VPN program received an invalid configuration from the VPN server." -msgstr "Prijava v VPN ni uspela, ker je program VPN prejel neveljavne nastavitve iz strežnika VPN." - diff --git a/vpn-daemons/vpnc/po/sv.po b/vpn-daemons/vpnc/po/sv.po deleted file mode 100644 index 974827bd12..0000000000 --- a/vpn-daemons/vpnc/po/sv.po +++ /dev/null @@ -1,359 +0,0 @@ -# Swedish messages for NetworkManager-vpnc. -# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# Daniel Nylander , 2006, 2007, 2008. -# Christian Rose , 2004, 2005, 2006. -# -# $Id: sv.po,v 1.2 2006/07/12 12:49:06 menthos Exp $ -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-27 20:55+0100\n" -"PO-Revision-Date: 2008-11-27 20:55+0100\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:145 -msgid "_Secondary Password:" -msgstr "_Sekundärt lösenord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:259 -msgid "_Username:" -msgstr "_Användarnamn:" - -#: ../auth-dialog/gnome-two-password-dialog.c:261 -msgid "_Domain:" -msgstr "_Domän:" - -#: ../auth-dialog/gnome-two-password-dialog.c:263 -msgid "_Password:" -msgstr "_Lösenord:" - -#: ../auth-dialog/gnome-two-password-dialog.c:352 -msgid "Connect _anonymously" -msgstr "Anslut anon_ymt" - -#: ../auth-dialog/gnome-two-password-dialog.c:357 -msgid "Connect as _user:" -msgstr "Anslut som _användare:" - -#: ../auth-dialog/gnome-two-password-dialog.c:466 -msgid "_Remember passwords for this session" -msgstr "_Kom ihåg lösenord för denna session" - -#: ../auth-dialog/gnome-two-password-dialog.c:468 -msgid "_Save passwords in keyring" -msgstr "_Spara lösenord i nyckelring" - -#: ../auth-dialog/main.c:105 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Du måsta autentisera för att komma åt VPN-nätverket \"%s\"." - -#: ../auth-dialog/main.c:106 -msgid "Authenticate VPN" -msgstr "Autentisera VPN" - -#: ../auth-dialog/main.c:113 -msgid "_Group Password:" -msgstr "_Grupplösenord:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Lägg till, ta bort och redigera VPN-anslutningar" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN-anslutningshanterare (vpnc)" - -#: ../properties/nm-vpnc.c:53 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cisco-kompatibel VPN (vpnc)" - -#: ../properties/nm-vpnc.c:54 -msgid "Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based VPN gateways." -msgstr "Kompatibel med olika Cisco, Juniper, Netscreen och Sonicwall IPSec-baserade VPN-gateway." - -#: ../properties/nm-vpnc.c:325 -msgid "Saved" -msgstr "Sparat" - -#: ../properties/nm-vpnc.c:332 -msgid "Always Ask" -msgstr "Fråga alltid" - -#: ../properties/nm-vpnc.c:339 -msgid "Not Required" -msgstr "Krävs inte" - -#: ../properties/nm-vpnc.c:398 -msgid "Secure (default)" -msgstr "Säker (standard)" - -#: ../properties/nm-vpnc.c:401 -msgid "Weak (use with caution)" -msgstr "Svag (använd med försiktighet)" - -#: ../properties/nm-vpnc.c:409 -msgid "None (completely insecure)" -msgstr "Ingen (totalt osäker)" - -#: ../properties/nm-vpnc.c:450 -msgid "Cisco UDP (default)" -msgstr "Cisco UDP (standard)" - -#: ../properties/nm-vpnc.c:457 -msgid "NAT-T" -msgstr "NAT-T" - -#: ../properties/nm-vpnc.c:464 -msgid "Disabled" -msgstr "Inaktiverad" - -#: ../properties/nm-vpnc.c:1085 -msgid "TCP tunneling not supported" -msgstr "TCP-tunnling stöds inte" - -#: ../properties/nm-vpnc.c:1087 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it may not work as expected." -msgstr "" -"VPN-inställningsfilen \"%s\" anger att VPN-trafiken ska tunnlas genom TCP vilket för tillfället inte stöds i vpnc-programvaran.\n" -"\n" -"Anslutningen kan fortfarande skapas, med inaktiverad TCP-tunnling, men det kanske inte fungerar som väntat." - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "Allmänt" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "Valfri" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "Inaktivera Dead Peer Detection" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "Domän:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption method:" -msgstr "Krypteringsmetod:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup name:" -msgstr "G_ruppnamn:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Gro_up password:" -msgstr "Gr_upplösenord:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "NAT traversal:" -msgstr "NAT-traversering:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Show passwords" -msgstr "Visa lösenord" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "User name:" -msgstr "Användarnamn:" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Gateway:" -msgstr "_Gateway:" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_User password:" -msgstr "Användarlös_enord:" - -#~ msgid "NAT-T (default)" -#~ msgstr "NAT-T (standard)" -#~ msgid "G_roup Name:" -#~ msgstr "G_ruppnamn:" -#~ msgid "The following vpnc VPN connection will be created:" -#~ msgstr "Följande VPN-anslutning av typen vpnc kommer att skapas:" -#~ msgid "Name: %s" -#~ msgstr "Namn: %s" -#~ msgid "Gateway: %s" -#~ msgstr "Gateway: %s" -#~ msgid "Group Name: %s" -#~ msgstr "Gruppnamn: %s" -#~ msgid "Username: %s" -#~ msgstr "Användarnamn: %s" -#~ msgid "Domain: %s" -#~ msgstr "Domän: %s" -#~ msgid "Routes: %s" -#~ msgstr "Vägar: %s" -#~ msgid "NAT-Keepalive packet interval: %s" -#~ msgstr "Paketintervall för NAT-Keepalive: %s" -#~ msgid "Enable Single DES" -#~ msgstr "Aktivera Single DES" -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "Anslutningsdetaljerna kan ändras med hjälp av knappen \"Redigera\"." -#~ msgid "Settings import incomplete" -#~ msgstr "Import av inställningar är inte komplett" -#~ msgid "" -#~ "The VPN settings file '%s' is incomplete. You may not be able to connect " -#~ "without providing further information." -#~ msgstr "" -#~ "VPN-inställningsfilen \"%s\" är inte komplett. Du kanske inte kan ansluta " -#~ "utan att tillhandahålla ytterligare information." -#~ msgid "Cannot import settings" -#~ msgstr "Kan inte importera inställningar" -#~ msgid "The VPN settings file '%s' could not be read or is invalid." -#~ msgstr "VPN-inställningsfilen \"%s\" kunde inte läsas eller är ogiltig." -#~ msgid "Select file to import" -#~ msgstr "Välj fil att importera" -#~ msgid "Save as..." -#~ msgstr "Spara som..." -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "En fil med namnet \"%s\" finns redan." -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "Vill du ersätta den med den du håller på att spara?" -#~ msgid "Failed to export configuration" -#~ msgstr "Misslyckades med att exportera konfigurationen" -#~ msgid "Failed to save file %s" -#~ msgstr "Misslyckades med att spara filen %s" -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "exempel: 172.16.0.0/16 10.11.12.0/24" -#~ msgid "Connection na_me:" -#~ msgstr "Anslutningsna_mn:" -#~ msgid "Disable NAT _traversal" -#~ msgstr "Inaktivera NAT-_traversering" -#~ msgid "Enable _weak single DES encryption" -#~ msgstr "Aktivera _svag single DES-kryptering" -#~ msgid "Import _Saved Configuration..." -#~ msgstr "Importera _sparad konfiguration..." -#~ msgid "Interval:" -#~ msgstr "Intervall:" -#~ msgid "" -#~ "Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "Namn som används för att identifiera anslutningen till det privata " -#~ "nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\"" -#~ msgid "Override _user name" -#~ msgstr "Åsidosätt _användarnamn" -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "Ange den information som har tillhandahållits av din systemadministratör " -#~ "nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det " -#~ "när du ansluter." -#~ msgid "" -#~ "Please note that the file you import is not a Cisco VPN or VPNC " -#~ "configuration file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "Observera att filen som du importerar inte är en konfigurationsfil för " -#~ "Cisco VPN eller VPNC. Fråga din adminstratör om filen." -#~ msgid "Use NAT _keepalive packets" -#~ msgstr "Använd NAT-_keepalivepaket" -#~ msgid "Use _domain for authentication" -#~ msgstr "Använd _domän för autentisering" -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "Använd _endast VPN-anslutning för dessa adresser" -#~ msgid "" -#~ "The VPN login failed because the user name and password were not accepted." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom användarnamnet och lösenordet inte " -#~ "accepterades." -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde startas." -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde ansluta " -#~ "till VPN-servern." -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-konfigurationsalternativen var " -#~ "ogiltiga." -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "" -#~ "VPN-inloggningen misslyckades eftersom VPN-programmet mottog en ogiltig " -#~ "konfiguration från VPN-servern." -#~ msgid "Connection Information" -#~ msgstr "Anslutningsinformation" -#~ msgid "Connection Name" -#~ msgstr "Anslutningsnamn" -#~ msgid "O_ptional Information" -#~ msgstr "_Valfri information" -#~ msgid "" -#~ "_Name used to identify the connection to the private network, e.g. " -#~ "\"Campus VPN\" or \"Corporate Network\"" -#~ msgstr "" -#~ "_Namn som används för att identifiera anslutningen till det privata " -#~ "nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\"" -#~ msgid "Remember passwords for this session" -#~ msgstr "Kom ihåg lösenord för denna session" -#~ msgid "Save passwords in keyring" -#~ msgstr "Spara lösenord i nyckelring" -#~ msgid "Name: %s" -#~ msgstr "Namn: %s" -#~ msgid "Name:" -#~ msgstr "Namn:" -#~ msgid "Gateway: %s" -#~ msgstr "Gateway: %s" -#~ msgid "Gateway:" -#~ msgstr "Gateway:" -#~ msgid "Group Name: %s" -#~ msgstr "Gruppnamn: %s" -#~ msgid "Username: %s" -#~ msgstr "Användarnamn: %s" -#~ msgid "Domain: %s" -#~ msgstr "Domän: %s" -#~ msgid "Routes: %s" -#~ msgstr "Vägar: %s" -#~ msgid "Routes:" -#~ msgstr "Vägar:" -#~ msgid "Optional Information" -#~ msgstr "Valfri information" -#~ msgid "Override user name" -#~ msgstr "Åsidosätt användarnamn" -#~ msgid "Use domain for authentication" -#~ msgstr "Använd domän för autentisering" -#~ msgid "Only use VPN connection for these addresses" -#~ msgstr "Använd endast VPN-anslutning för dessa adresser" -#~ msgid "_Import..." -#~ msgstr "_Importera..." -#~ msgid "" -#~ "The following vpnc VPN connection will be created:\n" -#~ "\n" -#~ "\tName: %s\n" -#~ "\n" -#~ "\tGateway: %s\n" -#~ "\tGroup Name: %s\n" -#~ "%s%s%s\n" -#~ "The connection details can be changed using the \"Edit\" button.\n" -#~ msgstr "" -#~ "Följande vpnc-VPN-anslutning kommer att skapas:\n" -#~ "\n" -#~ "\tNamn: %s\n" -#~ "\n" -#~ "\tGateway: %s\n" -#~ "\tGruppnamn: %s\n" -#~ "%s%s%s\n" -#~ "Anslutningsdetaljerna kan ändras genom att använda knappen \"Redigera\".\n" - diff --git a/vpn-daemons/vpnc/po/th.po b/vpn-daemons/vpnc/po/th.po deleted file mode 100644 index 65f611144b..0000000000 --- a/vpn-daemons/vpnc/po/th.po +++ /dev/null @@ -1,266 +0,0 @@ -# Thai translation of NetworkManager-vpnc. -# Copyright (C) 2007 Free Software Foundation, Inc. -# This file is distributed under the same license as the NetworkManager-vpnc package. -# Theppitak Karoonboonyanan , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-23 12:52+0700\n" -"PO-Revision-Date: 2007-02-23 12:58+0700\n" -"Last-Translator: Theppitak Karoonboonyanan \n" -"Language-Team: Thai \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "รหัสผ่านที่_สอง:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_ชื่อผู้ใช้:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "โ_ดเมน:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_รหัสผ่าน:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "เชื่อมต่อแบบ_นิรนาม" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "เชื่อมต่อในนาม_ผู้ใช้:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "_จำรหัสผ่านสำหรับใช้ในวาระนี้" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_บันทึกรหัสผ่านลงในพวงกุญแจ" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "คุณจะต้องยืนยันตัวบุคคลเพื่อเข้าใช้ Virtual Private Network '%s'" - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "ยืนยันตัวบุคคลกับ VPN" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "รหัสผ่าน_กลุ่ม:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "เพิ่ม, ลบ และแก้ไข การเชื่อมต่อ VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "เครื่องมือจัดการการเชื่อมต่อ VPN (vpnc)" - -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "ไคลเอนต์ VPN ของ Cisco ที่เข้ากันได้ (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "จะสร้างการเชื่อมต่อ VPN แบบ vpnc ต่อไปนี้:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "ชื่อ: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "เกตเวย์: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "ชื่อกลุ่ม: %s" - -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "ชื่อผู้ใช้: %s" - -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "โดเมน: %s" - -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "เส้นทาง: %s" - -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "รายละเอียดการเชื่อมต่อสามารถเปลี่ยนแปลงได้ โดยใช้ปุ่ม \"แก้ไข\"" - -#: ../properties/nm-vpnc.c:542 -msgid "TCP tunneling not supported" -msgstr "ไม่สนับสนุน TCP tunneling" - -#: ../properties/nm-vpnc.c:544 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"แฟ้มค่าตั้ง VPN '%s' ระบุว่าการส่งข้อมูลของ VPM ควรทำ tunnel ผ่าน TCP ซึ่งซอฟต์แวร์ vpnc " -"นี้ยังไม่สนับสนุน\n" -"\n" -"จะยังคงสร้างการเชื่อมต่ออยู่ แต่จะปิด TCP tunneling จึงอาจจะไม่ทำงานตามที่คาด" - -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "ไม่สามารถนำเข้าค่าตั้ง" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "แฟ้มค่าตั้ง VPN '%s' มีข้อมูลไม่ถูกต้อง" - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "เลือกแฟ้มที่จะนำเข้า" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "บันทึกเป็น..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "มีแฟ้มชื่อ \"%s\" อยู่ก่อนแล้ว" - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "คุณต้องการเขียนทับแฟ้มนี้ด้วยข้อมูลที่กำลังจะบันทึกหรือไม่?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "ส่งออกค่าตั้งไม่สำเร็จ" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "บันทึกแฟ้ม %s ไม่สำเร็จ" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Information" -msgstr "ข้อมูลการเชื่อมต่อ" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection Name" -msgstr "ชื่อการเชื่อมต่อ" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Required" -msgstr "ข้อมูลจำเป็น" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "ตัวอย่าง: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Connection Name" -msgstr "ชื่อการเชื่อมต่อ" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "G_roup Name:" -msgstr "ชื่อกลุ่_ม:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"ชื่อที่ใช้แทนการเชื่อมต่อไปยังเครือข่ายส่วนบุคคล เช่น \"VPN มหาวิทยาลัย\" หรือ \"เครือข่ายบริษัท" -"\"" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Optional" -msgstr "ข้อมูลเสริม" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Override _user name" -msgstr "เปลี่ยน_ชื่อผู้ใช้ทับ" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"กรุณาป้อนข้อมูลที่คุณได้มาจากผู้ดูแลระบบของคุณในแบบฟอร์มข้างล่างนี้ ไม่ต้องป้อนรหัสผ่านที่นี่ " -"เพราะคุณจะถูกถามเมื่อเชื่อมต่อ" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"โปรดสังเกตว่าแฟ้มที่คุณนำเข้าจะไม่ใช่แฟ้มค่าตั้ง Cisco VPN หรือ VPNC " -"กรุณาขอแฟ้มดังกล่าวจากผู้ดูแลระบบของคุณ" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "Use _domain for authentication" -msgstr "ใช้โ_ดเมนในการยืนยันตัวบุคคล" - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "_Gateway:" -msgstr "เ_กตเวย์:" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "_Import Saved Configuration..." -msgstr "_นำเข้าค่าตั้งที่บันทึกไว้..." - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "_Only use VPN connection for these addresses" -msgstr "ใ_ช้การเชื่อมต่อ VPN กับที่อยู่เหล่านี้เท่านั้น" - -#: ../src/nm-vpnc-service.c:118 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "การเข้าระบบ VPN ล้มเหลว เพราะชื่อผู้ใช้และรหัสผ่านไม่ผ่านการยอมรับ" - -#: ../src/nm-vpnc-service.c:120 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "การเข้าระบบ VPN ล้มเหลว เพราะโปรแกรม VPN ไม่สามารถเริ่มทำงานได้" - -#: ../src/nm-vpnc-service.c:122 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "การเข้าระบบ VPN ล้มเหลว เพราะโปรแกรม VPN ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์ VPN" - -#: ../src/nm-vpnc-service.c:124 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "การเข้าระบบ VPN ล้มเหลว เพราะตัวเลือกของค่าตั้ง VPN ไม่ถูกต้อง" - -#: ../src/nm-vpnc-service.c:126 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "การเข้าระบบ VPN ล้มเหลว เพราะโปรแกรม VPN ได้รับค่าตั้งที่ไม่ถูกต้องจากเซิร์ฟเวอร์ VPN" - -#~ msgid "O_ptional Information" -#~ msgstr "ข้อมูลเ_สริม" diff --git a/vpn-daemons/vpnc/po/uk.po b/vpn-daemons/vpnc/po/uk.po deleted file mode 100644 index 3103869ce3..0000000000 --- a/vpn-daemons/vpnc/po/uk.po +++ /dev/null @@ -1,254 +0,0 @@ -# Ukrainian translation of NetworkManager vpnc -# Copyright (C) Free Software Foundation, 2005 -# This file is distributed under the same license as the NetworkManager package. -# Maxim Dziumanenko , 2005-2007 -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-16 18:06+0200\n" -"PO-Revision-Date: 2007-02-16 03:32+0200\n" -"Last-Translator: Maxim Dziumanenko \n" -"Language-Team: Ukrainian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "_Вторинний пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Ім'я:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Домен" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "_Пароль:" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "З'єднуватись _анонімно" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "З'єднуватись як _користувач:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "Па_м'ятати пароль для цього сеансу" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "З_берегти пароль у в'язці паролів" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Для доступу до приватної мережі '%s' потрібна автентифікація." - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "Автентифікація VPN" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "Пароль _групи:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Додавання, видалення та редагування з'єднань типу VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Менеджер з'єднань VPN (vpnc)" - -#: ../properties/nm-vpnc.c:84 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Сумісний з Cisco VPN клієнт (vpnc)" - -#: ../properties/nm-vpnc.c:448 -msgid "The following vpnc VPN connection will be created:" -msgstr "Буде створено з'єднання vpnc VPN:" - -#: ../properties/nm-vpnc.c:450 -#, c-format -msgid "Name: %s" -msgstr "Назва: %s" - -#: ../properties/nm-vpnc.c:453 -#, c-format -msgid "Gateway: %s" -msgstr "Шлюз: %s" - -#: ../properties/nm-vpnc.c:455 -#, c-format -msgid "Group Name: %s" -msgstr "Назва групи: %s" - -#: ../properties/nm-vpnc.c:459 -#, c-format -msgid "Username: %s" -msgstr "Ім'я: %s" - -#: ../properties/nm-vpnc.c:464 -#, c-format -msgid "Domain: %s" -msgstr "Домен: %s" - -#: ../properties/nm-vpnc.c:469 -#, c-format -msgid "Routes: %s" -msgstr "Маршрутизатори: %s" - -#: ../properties/nm-vpnc.c:473 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Подробиці про з'єднання можна змінити кнопкою \"Правка\"." - -#: ../properties/nm-vpnc.c:542 -msgid "TCP tunneling not supported" -msgstr "Тунелювання TCP не підтримується" - -#: ../properties/nm-vpnc.c:544 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"У файлі параметрів VPN '%s' вказано, що трафік VPN повинен тунелюватись " -"через TCP, що наразі не підтримується програмою vpnc.\n" -"\n" -"З'єднання буде створено з вимкненим тунелюванням TCP, але воно може не " -"працювати належним чином." - -#: ../properties/nm-vpnc.c:565 -msgid "Cannot import settings" -msgstr "Не вдається імпортувати параметри" - -#: ../properties/nm-vpnc.c:567 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "Файл параметрів VPN '%s' містить некоректні дані." - -#: ../properties/nm-vpnc.c:584 -msgid "Select file to import" -msgstr "Виберіть файл для імпорту" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:744 -msgid "Save as..." -msgstr "Зберегти як..." - -#: ../properties/nm-vpnc.c:774 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Файл з назвою \"%s\" вже існує." - -#: ../properties/nm-vpnc.c:777 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Замінити його?" - -#: ../properties/nm-vpnc.c:791 -msgid "Failed to export configuration" -msgstr "Помилка експорту конфігурації" - -#: ../properties/nm-vpnc.c:793 -#, c-format -msgid "Failed to save file %s" -msgstr "Помилка збереження файлу %s" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Name" -msgstr "Назва з'єднання" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Required Information" -msgstr "Обов'язкова інформація" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "приклад: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "G_roup Name:" -msgstr "Назва г_рупи:" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "O_ptional Information" -msgstr "_Не обов'язкова інформація" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Override _user name" -msgstr "Перевизначати ім'я _користувача'" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Нижче введіть інформацію, що надана системним адміністратором. Не вводьте " -"тут ваш пароль, пароль буде запитаний на етапі встановлення з'єднання." - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Use _domain for authentication" -msgstr "Використовувати _домен для автентифікації" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "_Gateway:" -msgstr "_Шлюз:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Import Saved Configuration..." -msgstr "_Імпорт збереженої конфігурації..." - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"_Назва, що використовується для ідентифікації з'єднання з приватною мережею, " -"наприклад \"Campus VPN\" чи \"Corporate Network\"" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Only use VPN connection for these addresses" -msgstr "Використовувати VPN _лише для цих адрес" - -#: ../src/nm-vpnc-service.c:118 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "" -"Помилка входу у VPN, оскільки ім'я користувача та пароль не були прийняті." - -#: ../src/nm-vpnc-service.c:120 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "Помилка входу у VPN, оскільки не вдається запустити програму VPN." - -#: ../src/nm-vpnc-service.c:122 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" -"Помилка входу у VPN, оскільки програма VPN не може з'єднатись з сервером VPN." - -#: ../src/nm-vpnc-service.c:124 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "Помилка входу у VPN, оскільки конфігурація VPN була неправильною." - -#: ../src/nm-vpnc-service.c:126 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" -"Помилка входу у VPN, оскільки програма VPN отримала неправильну конфігурацію " -"від сервера VPN." diff --git a/vpn-daemons/vpnc/po/vi.po b/vpn-daemons/vpnc/po/vi.po deleted file mode 100644 index 549711d6aa..0000000000 --- a/vpn-daemons/vpnc/po/vi.po +++ /dev/null @@ -1,269 +0,0 @@ -# Vietnamese translation for Network Manager VPNC. -# Copyright © 2008 Free Software Foundation, Inc. -# Clytie Siddall , 2006-2008. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-05 22:06+0000\n" -"PO-Revision-Date: 2008-06-06 15:06+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.7b3\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "Mật khẩu _phụ :" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "_Tên người dùng:" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "_Miền:" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "Mật _khẩu :" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "Kết nối nặc d_anh" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "Kết nối _với tư cách người dùng:" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "Nhớ các mật khẩu cho _buổi hợp này" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "_Lưu các mật khẩu vào vòng khoá" - -#: ../auth-dialog/main.c:172 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "Bạn cần phải xác thực để truy cập đến Mạng Riêng Ảo (VPN) « %s »." - -#: ../auth-dialog/main.c:173 -msgid "Authenticate VPN" -msgstr "Xác thực VPN" - -#: ../auth-dialog/main.c:180 -msgid "_Group Password:" -msgstr "Mật khẩu _nhóm:" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "Thêm, Bỏ và Sửa kết nối VPN" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "Bộ Quản Lý Kết Nối VPN (vpnc)" - -#: ../properties/nm-vpnc.c:98 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "Ứng dụng khách VPN Cisco tương thích (vpnc)" - -#: ../properties/nm-vpnc.c:543 -msgid "The following vpnc VPN connection will be created:" -msgstr "Kết nối VPN vpnc theo đây sẽ được tạo :" - -#: ../properties/nm-vpnc.c:545 -#, c-format -msgid "Name: %s" -msgstr "Tên: %s" - -#: ../properties/nm-vpnc.c:548 -#, c-format -msgid "Gateway: %s" -msgstr "Cổng ra: %s" - -#: ../properties/nm-vpnc.c:550 -#, c-format -msgid "Group Name: %s" -msgstr "Tên nhóm: %s" - -#: ../properties/nm-vpnc.c:554 -#, c-format -msgid "Username: %s" -msgstr "Tên người dùng: %s" - -#: ../properties/nm-vpnc.c:559 -#, c-format -msgid "Domain: %s" -msgstr "Miền: %s" - -#: ../properties/nm-vpnc.c:564 -#, c-format -msgid "Routes: %s" -msgstr "Tuyến: %s" - -#: ../properties/nm-vpnc.c:568 -#, c-format -msgid "NAT-Keepalive packet interval: %s" -msgstr "Khoảng đợi gói tin cứ hoạt động NAT: %s" - -#: ../properties/nm-vpnc.c:572 -msgid "Enable Single DES" -msgstr "Bật DES Đơn" - -#: ../properties/nm-vpnc.c:576 -msgid "Disable NAT Traversal" -msgstr "Tắt đi ngang qua NAT" - -#: ../properties/nm-vpnc.c:580 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "Chi tiết kết nối có thể được sửa đổi bằng nút « Sửa »." - -#: ../properties/nm-vpnc.c:665 -msgid "TCP tunneling not supported" -msgstr "Không hỗ trợ đường hầm TCP" - -#: ../properties/nm-vpnc.c:667 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"Tập tin thiết lập VPN « %s » xác định rằng giao thông VPN nên theo đường hầm qua TCP, mà hiện thời không được hỗ trợ bởi phần mềm vpnc.\n" -"\n" -"Vẫn còn có khả năng tạo kết nối, với chức năng chạy đường hầm bị tắt, nhưng mà nó có thể " -"không hoạt động như mong đợi." - -#: ../properties/nm-vpnc.c:687 -msgid "Settings import incomplete" -msgstr "Chưa nhập thiết lập hoàn toàn" - -#: ../properties/nm-vpnc.c:689 -#, c-format -msgid "" -"The VPN settings file '%s' is incomplete. You may not be able to connect " -"without providing further information." -msgstr "" -"Tập tin thiết lập VPN « %s » chưa hoàn thành. Do đó bạn có thể không kết nối được mà không cung cấp thêm thông tin." - -#: ../properties/nm-vpnc.c:709 -msgid "Cannot import settings" -msgstr "Không thể nhập thiết lập" - -#: ../properties/nm-vpnc.c:711 -#, c-format -msgid "The VPN settings file '%s' could not be read or is invalid." -msgstr "Tập tin thiết lập VPN « %s » không đọc được hay không hợp lệ." - -#: ../properties/nm-vpnc.c:726 -msgid "Select file to import" -msgstr "Chọn tập tin cần nhập vào" - -#: ../properties/nm-vpnc.c:908 -msgid "Save as..." -msgstr "Lưu dạng..." - -#: ../properties/nm-vpnc.c:937 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "Một tập tin tên « %s » đã có." - -#: ../properties/nm-vpnc.c:940 -msgid "Do you want to replace it with the one you are saving?" -msgstr "Bạn có muốn thay thế nó bằng tập tin đang lưu không?" - -#: ../properties/nm-vpnc.c:954 -msgid "Failed to export configuration" -msgstr "Lỗi xuất cấu hình" - -#: ../properties/nm-vpnc.c:956 -#, c-format -msgid "Failed to save file %s" -msgstr "Lỗi lưu tập tin %s" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "v.d.: 172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Connection na_me:" -msgstr "Tên _kết nối:" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Disable NAT _traversal" -msgstr "_Tắt đi ngang qua NAT" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Enable _weak single DES encryption" -msgstr "Bật mật mã DES đơn _yếu" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "G_roup name:" -msgstr "Tên nhó_m:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Import _Saved Configuration..." -msgstr "Nhập cấu hình đã _lưu..." - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "Interval:" -msgstr "Khoảng:" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "" -"Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" -"Tên dùng để nhận diện kết nối cho mạng riêng, v.d. « VPN đại học » hay « Mạng " -"công ty »." - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "Optional" -msgstr "Tùy chọn" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "Override _user name" -msgstr "_Ghi đè lên tên người dùng" - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" -"Hãy gõ dưới đây thông tin được cung cấp bởi nhà quản trị hệ thống. Đừng gõ " -"mật khẩu vào đây: bạn sẽ được nhắc gõ nó trong khi kết nối." - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "" -"Please note that the file you import is not a Cisco VPN or VPNC " -"configuration file. Ask your adminstrator for the file." -msgstr "" -"Ghi chú : tập tin nhập vào không phải là tập tin cấu hình kiểu VPN Cisco hay VPNC. Hãy xin nhà quản trị hệ thống cung cấp tập tin đó." - -#: ../properties/nm-vpnc-dialog.glade.h:13 -msgid "Required" -msgstr "Đòi hỏi" - -#: ../properties/nm-vpnc-dialog.glade.h:14 -msgid "Use NAT _keepalive packets" -msgstr "Dùng gói cứ h_oạt động NAT" - -#: ../properties/nm-vpnc-dialog.glade.h:15 -msgid "Use _domain for authentication" -msgstr "Dùng miền để xác thực" - -#: ../properties/nm-vpnc-dialog.glade.h:16 -msgid "_Gateway:" -msgstr "Cổn_g ra:" - -#: ../properties/nm-vpnc-dialog.glade.h:17 -msgid "_Only use VPN connection for these addresses" -msgstr "Chỉ dùng kết nối VPN ch_o những địa chỉ này" diff --git a/vpn-daemons/vpnc/po/zh_CN.po b/vpn-daemons/vpnc/po/zh_CN.po deleted file mode 100644 index f2f6d84869..0000000000 --- a/vpn-daemons/vpnc/po/zh_CN.po +++ /dev/null @@ -1,239 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-16 04:58+0200\n" -"PO-Revision-Date: 2006-07-16 18:13+0800\n" -"Last-Translator: Funda Wang \n" -"Language-Team: zh_CN \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:147 -msgid "_Secondary Password:" -msgstr "次要密码(_S)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:267 -msgid "_Username:" -msgstr "用户名(_U)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:269 -msgid "_Domain:" -msgstr "域(_D)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:271 -msgid "_Password:" -msgstr "密码(_P)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:354 -msgid "Connect _anonymously" -msgstr "匿名连接(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:359 -msgid "Connect as _user:" -msgstr "以用户连接(_U)：" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "本次会话记住密码(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "在密钥环中保存密码(_S)" - -#: ../auth-dialog/main.c:161 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "您需要进行身份验证才能访问“%s”。" - -#: ../auth-dialog/main.c:162 -msgid "Authenticate VPN" -msgstr "" - -#: ../auth-dialog/main.c:169 -msgid "_Group Password:" -msgstr "组密码(_G)：" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "添加、删除及编辑 VPN 连接" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN 连接管理器(vpnc)" - -#: ../properties/nm-vpnc.c:83 -msgid "Compatible Cisco VPN client (vpnc)" -msgstr "" - -#: ../properties/nm-vpnc.c:447 -msgid "The following vpnc VPN connection will be created:" -msgstr "" - -#: ../properties/nm-vpnc.c:449 -#, c-format -msgid "Name: %s" -msgstr "名称：%s" - -#: ../properties/nm-vpnc.c:452 -#, c-format -msgid "Gateway: %s" -msgstr "网关：%s" - -#: ../properties/nm-vpnc.c:454 -#, c-format -msgid "Group Name: %s" -msgstr "组名称：%s" - -#: ../properties/nm-vpnc.c:458 -#, c-format -msgid "Username: %s" -msgstr "用户名：%s" - -#: ../properties/nm-vpnc.c:463 -#, c-format -msgid "Domain: %s" -msgstr "域：%s" - -#: ../properties/nm-vpnc.c:468 -#, c-format -msgid "Routes: %s" -msgstr "路由：%s" - -#: ../properties/nm-vpnc.c:472 -msgid "The connection details can be changed using the \"Edit\" button." -msgstr "连接细节可使用“编辑”按钮更改。" - -#: ../properties/nm-vpnc.c:548 -msgid "TCP tunneling not supported" -msgstr "" - -#: ../properties/nm-vpnc.c:550 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" - -#: ../properties/nm-vpnc.c:574 -msgid "Cannot import settings" -msgstr "" - -#: ../properties/nm-vpnc.c:576 -#, c-format -msgid "The VPN settings file '%s' does not contain valid data." -msgstr "" - -#: ../properties/nm-vpnc.c:593 -msgid "Select file to import" -msgstr "选择要导入的文件" - -#. printf ("in impl_export\n"); -#: ../properties/nm-vpnc.c:753 -msgid "Save as..." -msgstr "另存为..." - -#: ../properties/nm-vpnc.c:783 -#, c-format -msgid "A file named \"%s\" already exists." -msgstr "已经存在名为“%s”的文件。" - -#: ../properties/nm-vpnc.c:786 -msgid "Do you want to replace it with the one you are saving?" -msgstr "" - -#: ../properties/nm-vpnc.c:800 -msgid "Failed to export configuration" -msgstr "" - -#: ../properties/nm-vpnc.c:802 -#, c-format -msgid "Failed to save file %s" -msgstr "保存文件 %s 失败" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid "Connection Name" -msgstr "连接名称" - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "Required Information" -msgstr "所需信息" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "example: 172.16.0.0/16 10.11.12.0/24" -msgstr "如：172.16.0.0/16 10.11.12.0/24" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "G_roup Name:" -msgstr "组名称(_R)：" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "O_ptional Information" -msgstr "可选信息(_P)" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Override _user name" -msgstr "覆盖用户名(_U)" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "" -"Please enter the information provided by your system administrator below. Do " -"not enter your password here as you will be prompted when connecting." -msgstr "" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "Use _domain for authentication" -msgstr "" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "_Gateway:" -msgstr "网关(_G)：" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Import Saved Configuration..." -msgstr "导入已存的配置(_I)..." - -#: ../properties/nm-vpnc-dialog.glade.h:11 -msgid "" -"_Name used to identify the connection to the private network, e.g. \"Campus " -"VPN\" or \"Corporate Network\"" -msgstr "" - -#: ../properties/nm-vpnc-dialog.glade.h:12 -msgid "_Only use VPN connection for these addresses" -msgstr "仅对这些地址使用 VPN 连接(_O)" - -#: ../src/nm-vpnc-service.c:117 -msgid "" -"The VPN login failed because the user name and password were not accepted." -msgstr "" - -#: ../src/nm-vpnc-service.c:119 -msgid "The VPN login failed because the VPN program could not be started." -msgstr "" - -#: ../src/nm-vpnc-service.c:121 -msgid "" -"The VPN login failed because the VPN program could not connect to the VPN " -"server." -msgstr "" - -#: ../src/nm-vpnc-service.c:123 -msgid "" -"The VPN login failed because the VPN configuration options were invalid." -msgstr "" - -#: ../src/nm-vpnc-service.c:125 -msgid "" -"The VPN login failed because the VPN program received an invalid " -"configuration from the VPN server." -msgstr "" diff --git a/vpn-daemons/vpnc/po/zh_HK.po b/vpn-daemons/vpnc/po/zh_HK.po deleted file mode 100644 index e6a564066d..0000000000 --- a/vpn-daemons/vpnc/po/zh_HK.po +++ /dev/null @@ -1,249 +0,0 @@ -# Chinese (Hong Kong) translation of NetworkManager-vpnc. -# Copyright (C) 2007 Free Software Foundation, Inc. -# Chao-Hsiung Liao , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc 0.7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-22 20:11+0800\n" -"PO-Revision-Date: 2008-08-22 20:11+0800\n" -"Last-Translator: Chao-Hsiung Liao \n" -"Language-Team: Chinese (Hong Kong) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "第二組密碼(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "使用者名稱(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "網域(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "密碼(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "匿名連線(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "以使用者連線(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "在這個作業階段記住密碼(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "將密碼儲存在密碼匙圈內(_S)" - -#: ../auth-dialog/main.c:181 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "你需要驗證才能存取虛擬私人網絡「%s」。" - -#: ../auth-dialog/main.c:182 -msgid "Authenticate VPN" -msgstr "驗證 VPN" - -#: ../auth-dialog/main.c:189 -msgid "_Group Password:" -msgstr "羣組密碼(_G):" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "加入、移除與編輯 VPN 連線" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN 連線管理程式 (vpnc)" - -#: ../properties/nm-vpnc.c:50 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cisco 兼容 VPN (vpnc)" - -#: ../properties/nm-vpnc.c:51 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "兼容於各式 Cisco、Juniper、Netscreen和 Sonicwall 基於 IPSec 的 VPN 通訊閘。" - -#: ../properties/nm-vpnc.c:203 -msgid "Secure (default)" -msgstr "安全（預設值）" - -#: ../properties/nm-vpnc.c:206 -msgid "Weak (use with caution)" -msgstr "脆弱（請小心使用）" - -#: ../properties/nm-vpnc.c:214 -msgid "None (completely insecure)" -msgstr "無（完全不安全）" - -#: ../properties/nm-vpnc.c:254 -msgid "NAT-T (default)" -msgstr "NAT-T（預設值）" - -#: ../properties/nm-vpnc.c:261 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:268 -msgid "Disabled" -msgstr "已停用" - -#: ../properties/nm-vpnc.c:658 -msgid "TCP tunneling not supported" -msgstr "不支援 TCP 穿隧功能" - -#: ../properties/nm-vpnc.c:660 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"VPN 設定檔案「%s」指定 VPN 通訊應透過 TCP 穿隧（目前 vpnc 軟件尚未支援）。\n" -"\n" -"若停用 TCP 穿隧功能，此連線仍然可以建立，然而它可能無法如預期的方式運作。" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "一般" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "選擇性" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "停用斷線端偵測(DPD)" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "網域:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption Method:" -msgstr "加密方法:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup Name:" -msgstr "羣組名稱(_R)：" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "NAT Traversal:" -msgstr "NAT 穿越:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "User name:" -msgstr "使用者名稱:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Gateway:" -msgstr "通訊閘(_G):" - -#~ msgid "Name: %s" -#~ msgstr "名稱: %s" - -#~ msgid "Gateway: %s" -#~ msgstr "閘道: %s" - -#~ msgid "Group Name: %s" -#~ msgstr "群組名稱: %s" - -#~ msgid "Username: %s" -#~ msgstr "使用者名稱: %s" - -#~ msgid "Domain: %s" -#~ msgstr "網域: %s" - -#~ msgid "Routes: %s" -#~ msgstr "路由: %s" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "連線詳細資訊可以使用「編輯」按鈕改變。" - -#~ msgid "Cannot import settings" -#~ msgstr "不能匯入設定值" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN 設定檔「%s」沒有包含有效的資料。" - -#~ msgid "Select file to import" -#~ msgstr "選取要匯入的檔案" - -#~ msgid "Save as..." -#~ msgstr "另存為..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "已存在一個名為「%s」的檔案。" - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "是否要以儲存的版本來替換它？" - -#~ msgid "Failed to export configuration" -#~ msgstr "匯出組態失敗" - -#~ msgid "Failed to save file %s" -#~ msgstr "儲存檔案「%s」時失敗" - -#~ msgid "Connection Information" -#~ msgstr "連線資訊" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "範例: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "Connection Name" -#~ msgstr "連線名稱" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "請在下面輸入您的系統管理者提供的資訊。請勿在此輸入密碼，當進行連線時便會提" -#~ "示您輸入。" - -#~ msgid "" -#~ "Please note that the file you import is not a Cisco VPN or VPNC " -#~ "configuration file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "注意：您準備匯入的檔案不是 Cisco VPN 或 VPNC 設定檔。請向管理員查詢如果取" -#~ "得該檔案。" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "匯入儲存的組態(_I)..." - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "只對這些位址使用 _VPN 連線" - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "VPN 登入失敗，因為 VPN 程式無法啟動。" - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "VPN 登入失敗，因為 VPN 程式無法連線至 VPN 伺服器。" - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "VPN 登入失敗，因為 VPN 組態選項無效。" - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "VPN 登入失敗，因為 VPN 程式從 VPN 伺服器接收到無效的組態。" diff --git a/vpn-daemons/vpnc/po/zh_TW.po b/vpn-daemons/vpnc/po/zh_TW.po deleted file mode 100644 index 71e02f8ddb..0000000000 --- a/vpn-daemons/vpnc/po/zh_TW.po +++ /dev/null @@ -1,250 +0,0 @@ -# Chinese (Taiwan) translation of NetworkManager-vpnc. -# Copyright (C) 2007 Free Software Foundation, Inc. -# Chao-Hsiung Liao , 2007. -msgid "" -msgstr "" -"Project-Id-Version: NetworkManager-vpnc 0.7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-22 20:11+0800\n" -"PO-Revision-Date: 2008-08-22 02:53+0800\n" -"Last-Translator: Chao-Hsiung Liao \n" -"Language-Team: Chinese (traditional) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../auth-dialog/gnome-two-password-dialog.c:144 -msgid "_Secondary Password:" -msgstr "第二組密碼(_S):" - -#: ../auth-dialog/gnome-two-password-dialog.c:258 -msgid "_Username:" -msgstr "使用者名稱(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:260 -msgid "_Domain:" -msgstr "網域(_D):" - -#: ../auth-dialog/gnome-two-password-dialog.c:262 -msgid "_Password:" -msgstr "密碼(_P):" - -#: ../auth-dialog/gnome-two-password-dialog.c:351 -msgid "Connect _anonymously" -msgstr "匿名連線(_A)" - -#: ../auth-dialog/gnome-two-password-dialog.c:356 -msgid "Connect as _user:" -msgstr "以使用者連線(_U):" - -#: ../auth-dialog/gnome-two-password-dialog.c:465 -msgid "_Remember passwords for this session" -msgstr "在這個作業階段記住密碼(_R)" - -#: ../auth-dialog/gnome-two-password-dialog.c:467 -msgid "_Save passwords in keyring" -msgstr "將密碼儲存在金鑰圈內(_S)" - -#: ../auth-dialog/main.c:181 -#, c-format -msgid "You need to authenticate to access the Virtual Private Network '%s'." -msgstr "您需要驗證才能存取虛擬私人網路「%s」。" - -#: ../auth-dialog/main.c:182 -msgid "Authenticate VPN" -msgstr "驗證 VPN" - -#: ../auth-dialog/main.c:189 -msgid "_Group Password:" -msgstr "群組密碼(_G):" - -#: ../nm-vpnc.desktop.in.h:1 -msgid "Add, Remove, and Edit VPN Connections" -msgstr "加入、移除與編輯 VPN 連線" - -#: ../nm-vpnc.desktop.in.h:2 -msgid "VPN Connection Manager (vpnc)" -msgstr "VPN 連線管理程式 (vpnc)" - -#: ../properties/nm-vpnc.c:50 -msgid "Cisco Compatible VPN (vpnc)" -msgstr "Cisco 相容 VPN (vpnc)" - -#: ../properties/nm-vpnc.c:51 -msgid "" -"Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based " -"VPN gateways." -msgstr "" -"相容於各式 Cisco、Juniper、Netscreen和 Sonicwall 基於 IPSec 的 VPN 通訊閘。" - -#: ../properties/nm-vpnc.c:203 -msgid "Secure (default)" -msgstr "安全（預設值）" - -#: ../properties/nm-vpnc.c:206 -msgid "Weak (use with caution)" -msgstr "脆弱（請小心使用）" - -#: ../properties/nm-vpnc.c:214 -msgid "None (completely insecure)" -msgstr "無（完全不安全）" - -#: ../properties/nm-vpnc.c:254 -msgid "NAT-T (default)" -msgstr "NAT-T（預設值）" - -#: ../properties/nm-vpnc.c:261 -msgid "Cisco UDP" -msgstr "Cisco UDP" - -#: ../properties/nm-vpnc.c:268 -msgid "Disabled" -msgstr "已停用" - -#: ../properties/nm-vpnc.c:658 -msgid "TCP tunneling not supported" -msgstr "不支援 TCP 穿隧功能" - -#: ../properties/nm-vpnc.c:660 -#, c-format -msgid "" -"The VPN settings file '%s' specifies that VPN traffic should be tunneled " -"through TCP which is currently not supported in the vpnc software.\n" -"\n" -"The connection can still be created, with TCP tunneling disabled, however it " -"may not work as expected." -msgstr "" -"VPN 設定檔案「%s」指定 VPN 通訊應透過 TCP 穿隧（目前 vpnc 軟體尚未支援）。\n" -"\n" -"若停用 TCP 穿隧功能，此連線仍然可以建立，然而它可能無法如預期的方式運作。" - -#: ../properties/nm-vpnc-dialog.glade.h:1 -msgid " " -msgstr " " - -#: ../properties/nm-vpnc-dialog.glade.h:2 -msgid "General" -msgstr "一般" - -#: ../properties/nm-vpnc-dialog.glade.h:3 -msgid "Optional" -msgstr "選擇性" - -#: ../properties/nm-vpnc-dialog.glade.h:4 -msgid "Disable Dead Peer Detection" -msgstr "停用斷線端偵測(DPD)" - -#: ../properties/nm-vpnc-dialog.glade.h:5 -msgid "Domain:" -msgstr "網域:" - -#: ../properties/nm-vpnc-dialog.glade.h:6 -msgid "Encryption Method:" -msgstr "加密方法:" - -#: ../properties/nm-vpnc-dialog.glade.h:7 -msgid "G_roup Name:" -msgstr "群組名稱(_R)：" - -#: ../properties/nm-vpnc-dialog.glade.h:8 -msgid "NAT Traversal:" -msgstr "NAT 穿越:" - -#: ../properties/nm-vpnc-dialog.glade.h:9 -msgid "User name:" -msgstr "使用者名稱:" - -#: ../properties/nm-vpnc-dialog.glade.h:10 -msgid "_Gateway:" -msgstr "通訊閘(_G):" - -#~ msgid "Name: %s" -#~ msgstr "名稱: %s" - -#~ msgid "Gateway: %s" -#~ msgstr "閘道: %s" - -#~ msgid "Group Name: %s" -#~ msgstr "群組名稱: %s" - -#~ msgid "Username: %s" -#~ msgstr "使用者名稱: %s" - -#~ msgid "Domain: %s" -#~ msgstr "網域: %s" - -#~ msgid "Routes: %s" -#~ msgstr "路由: %s" - -#~ msgid "The connection details can be changed using the \"Edit\" button." -#~ msgstr "連線詳細資訊可以使用「編輯」按鈕改變。" - -#~ msgid "Cannot import settings" -#~ msgstr "不能匯入設定值" - -#~ msgid "The VPN settings file '%s' does not contain valid data." -#~ msgstr "VPN 設定檔「%s」沒有包含有效的資料。" - -#~ msgid "Select file to import" -#~ msgstr "選取要匯入的檔案" - -#~ msgid "Save as..." -#~ msgstr "另存為..." - -#~ msgid "A file named \"%s\" already exists." -#~ msgstr "已存在一個名為「%s」的檔案。" - -#~ msgid "Do you want to replace it with the one you are saving?" -#~ msgstr "是否要以儲存的版本來替換它？" - -#~ msgid "Failed to export configuration" -#~ msgstr "匯出組態失敗" - -#~ msgid "Failed to save file %s" -#~ msgstr "儲存檔案「%s」時失敗" - -#~ msgid "Connection Information" -#~ msgstr "連線資訊" - -#~ msgid "example: 172.16.0.0/16 10.11.12.0/24" -#~ msgstr "範例: 172.16.0.0/16 10.11.12.0/24" - -#~ msgid "Connection Name" -#~ msgstr "連線名稱" - -#~ msgid "" -#~ "Please enter the information provided by your system administrator below. " -#~ "Do not enter your password here as you will be prompted when connecting." -#~ msgstr "" -#~ "請在下面輸入您的系統管理者提供的資訊。請勿在此輸入密碼，當進行連線時便會提" -#~ "示您輸入。" - -#~ msgid "" -#~ "Please note that the file you import is not a Cisco VPN or VPNC " -#~ "configuration file. Ask your adminstrator for the file." -#~ msgstr "" -#~ "注意：您準備匯入的檔案不是 Cisco VPN 或 VPNC 設定檔。請向管理員查詢如果取" -#~ "得該檔案。" - -#~ msgid "_Import Saved Configuration..." -#~ msgstr "匯入儲存的組態(_I)..." - -#~ msgid "_Only use VPN connection for these addresses" -#~ msgstr "只對這些位址使用 _VPN 連線" - -#~ msgid "The VPN login failed because the VPN program could not be started." -#~ msgstr "VPN 登入失敗，因為 VPN 程式無法啟動。" - -#~ msgid "" -#~ "The VPN login failed because the VPN program could not connect to the VPN " -#~ "server." -#~ msgstr "VPN 登入失敗，因為 VPN 程式無法連線至 VPN 伺服器。" - -#~ msgid "" -#~ "The VPN login failed because the VPN configuration options were invalid." -#~ msgstr "VPN 登入失敗，因為 VPN 組態選項無效。" - -#~ msgid "" -#~ "The VPN login failed because the VPN program received an invalid " -#~ "configuration from the VPN server." -#~ msgstr "VPN 登入失敗，因為 VPN 程式從 VPN 伺服器接收到無效的組態。" diff --git a/vpn-daemons/vpnc/properties/.cvsignore b/vpn-daemons/vpnc/properties/.cvsignore deleted file mode 100644 index 3dda72986f..0000000000 --- a/vpn-daemons/vpnc/properties/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/vpn-daemons/vpnc/properties/Makefile.am b/vpn-daemons/vpnc/properties/Makefile.am deleted file mode 100644 index bc0a677228..0000000000 --- a/vpn-daemons/vpnc/properties/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -INCLUDES = -I${top_srcdir} - -plugindir = $(libdir)/NetworkManager -plugin_LTLIBRARIES = libnm-vpnc-properties.la - -libnm_vpnc_properties_la_SOURCES = \ - pcf-file.c \ - pcf-file.h \ - nm-vpnc.c \ - nm-vpnc.h - -gladedir = $(datadir)/gnome-vpn-properties/vpnc -glade_DATA = nm-vpnc-dialog.glade - -libnm_vpnc_properties_la_CPPFLAGS = \ - $(GLADE_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ - $(NM_UTILS_CFLAGS) \ - -DICONDIR=\""$(datadir)/pixmaps"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" - -libnm_vpnc_properties_la_LIBADD = \ - $(GLADE_LIBS) \ - $(GTK_LIBS) \ - $(GCONF_LIBS) \ - $(NM_UTILS_LIBS) \ - $(top_builddir)/common-gnome/libnm-vpnc-common-gnome.la - -libnm_vpnc_properties_la_LDFLAGS = \ - -avoid-version - -CLEANFILES = *.bak *.gladep *~ - -EXTRA_DIST = $(glade_DATA) diff --git a/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade b/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade deleted file mode 100644 index 95f1186eb8..0000000000 --- a/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - window1 - - - True - 12 - 16 - - - True - 6 - - - True - 0 - <b>General</b> - True - - - False - False - - - - - True - 12 - - - True - 5 - 3 - 6 - 6 - - - - - - - - - - - - - - - True - - - - 2 - 3 - 3 - 4 - - - - - True - - - - 2 - 3 - 2 - 3 - - - - - True - True - Show passwords - 0 - True - - - 1 - 2 - 4 - 5 - - - - - True - True - False - - - 1 - 2 - 3 - 4 - - - - - - True - 0 - Gro_up password: - True - group_entry - - - 3 - 4 - GTK_FILL - - - - - - True - 0 - _Gateway: - True - gateway_entry - - - GTK_FILL - - - - - - True - 0 - G_roup name: - True - group_entry - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - _User password: - True - group_entry - - - 2 - 3 - GTK_FILL - - - - - - True - True - False - - - 1 - 2 - 2 - 3 - - - - - - - - 1 - - - - - False - - - - - True - 6 - - - True - 0 - <b>Optional</b> - True - - - False - False - - - - - True - 12 - - - True - 5 - 2 - 6 - 6 - - - - - - True - True - Disable Dead Peer Detection - 0 - True - - - 1 - 2 - 4 - 5 - - - - - True - - - - 1 - 2 - 2 - 3 - - - - - True - 0 - Encryption method: - - - 2 - 3 - - - - - True - 0 - User name: - - - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - 0 - Domain: - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - NAT traversal: - - - 3 - 4 - - - - - True - - - - 1 - 2 - 3 - 4 - - - - - - - 1 - - - - - False - False - 1 - - - - - - diff --git a/vpn-daemons/vpnc/properties/nm-vpnc.c b/vpn-daemons/vpnc/properties/nm-vpnc.c deleted file mode 100644 index 36aaf2593c..0000000000 --- a/vpn-daemons/vpnc/properties/nm-vpnc.c +++ /dev/null @@ -1,1387 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * CVSID: $Id$ - * - * nm-vpnc.c : GNOME UI dialogs for configuring vpnc VPN connections - * - * Copyright (C) 2005 David Zeuthen, - * Copyright (C) 2005 - 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define NM_VPN_API_SUBJECT_TO_CHANGE - -#include -#include -#include -#include - -#include "src/nm-vpnc-service.h" -#include "common-gnome/keyring-helpers.h" -#include "pcf-file.h" -#include "nm-vpnc.h" - -#define VPNC_PLUGIN_NAME _("Cisco Compatible VPN (vpnc)") -#define VPNC_PLUGIN_DESC _("Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPSec-based VPN gateways.") -#define VPNC_PLUGIN_SERVICE NM_DBUS_SERVICE_VPNC - -#define ENC_TYPE_SECURE 0 -#define ENC_TYPE_WEAK 1 -#define ENC_TYPE_NONE 2 - -#define PW_TYPE_SAVE 0 -#define PW_TYPE_ASK 1 -#define PW_TYPE_UNUSED 2 - -/************** plugin class **************/ - -static void vpnc_plugin_ui_interface_init (NMVpnPluginUiInterface *iface_class); - -G_DEFINE_TYPE_EXTENDED (VpncPluginUi, vpnc_plugin_ui, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_INTERFACE, - vpnc_plugin_ui_interface_init)) - -/************** UI widget class **************/ - -static void vpnc_plugin_ui_widget_interface_init (NMVpnPluginUiWidgetInterface *iface_class); - -G_DEFINE_TYPE_EXTENDED (VpncPluginUiWidget, vpnc_plugin_ui_widget, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, - vpnc_plugin_ui_widget_interface_init)) - -#define VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), VPNC_TYPE_PLUGIN_UI_WIDGET, VpncPluginUiWidgetPrivate)) - -typedef struct { - GladeXML *xml; - GtkWidget *widget; - GtkSizeGroup *group; - gint orig_dpd_timeout; -} VpncPluginUiWidgetPrivate; - - -#define VPNC_PLUGIN_UI_ERROR vpnc_plugin_ui_error_quark () - -static GQuark -vpnc_plugin_ui_error_quark (void) -{ - static GQuark error_quark = 0; - - if (G_UNLIKELY (error_quark == 0)) - error_quark = g_quark_from_static_string ("vpnc-plugin-ui-error-quark"); - - return error_quark; -} - -/* This should really be standard. */ -#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } - -GType -vpnc_plugin_ui_error_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = { - /* Unknown error. */ - ENUM_ENTRY (VPNC_PLUGIN_UI_ERROR_UNKNOWN, "UnknownError"), - /* The specified property was invalid. */ - ENUM_ENTRY (VPNC_PLUGIN_UI_ERROR_INVALID_PROPERTY, "InvalidProperty"), - /* The specified property was missing and is required. */ - ENUM_ENTRY (VPNC_PLUGIN_UI_ERROR_MISSING_PROPERTY, "MissingProperty"), - /* The connection was missing invalid. */ - ENUM_ENTRY (VPNC_PLUGIN_UI_ERROR_INVALID_CONNECTION, "InvalidConnection"), - { 0, 0, 0 } - }; - etype = g_enum_register_static ("VpncPluginUiError", values); - } - return etype; -} - - -static gboolean -check_validity (VpncPluginUiWidget *self, GError **error) -{ - VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GtkWidget *widget; - char *str; - - widget = glade_xml_get_widget (priv->xml, "gateway_entry"); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); - if (!str || !strlen (str) || strstr (str, " ") || strstr (str, "\t")) { - g_set_error (error, - VPNC_PLUGIN_UI_ERROR, - VPNC_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_VPNC_KEY_GATEWAY); - return FALSE; - } - - widget = glade_xml_get_widget (priv->xml, "group_entry"); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); - if (!str || !strlen (str)) { - g_set_error (error, - VPNC_PLUGIN_UI_ERROR, - VPNC_PLUGIN_UI_ERROR_INVALID_PROPERTY, - NM_VPNC_KEY_ID); - return FALSE; - } - - return TRUE; -} - -static void -stuff_changed_cb (GtkWidget *widget, gpointer user_data) -{ - g_signal_emit_by_name (VPNC_PLUGIN_UI_WIDGET (user_data), "changed"); -} - -static gboolean -fill_vpn_passwords (VpncPluginUiWidget *self, NMConnection *connection) -{ - VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GtkWidget *widget; - gboolean success = FALSE; - char *password = NULL; - char *group_password = NULL; - - /* Grab secrets from the keyring */ - if (connection) { - NMSettingConnection *s_con; - NMSettingVPN *s_vpn; - const char *tmp; - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - - if (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM) { - if (s_vpn) { - tmp = nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD); - if (tmp) - password = gnome_keyring_memory_strdup (tmp); - - tmp = nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_SECRET); - if (tmp) - group_password = gnome_keyring_memory_strdup (tmp); - } - } else { - s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); - - /* Lookup passwords in the keyring, and if they weren't there, try - * the connection itself, which is where they'd be right after import. - */ - keyring_helpers_get_one_secret (nm_setting_connection_get_uuid (s_con), - VPNC_USER_PASSWORD, - &password, - NULL); - if (!password) - password = gnome_keyring_memory_strdup (nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD)); - - keyring_helpers_get_one_secret (nm_setting_connection_get_uuid (s_con), - VPNC_GROUP_PASSWORD, - &group_password, - NULL); - if (!group_password) - group_password = gnome_keyring_memory_strdup (nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_SECRET)); - } - } - - /* User password */ - widget = glade_xml_get_widget (priv->xml, "user_password_entry"); - if (!widget) - goto out; - if (password) - gtk_entry_set_text (GTK_ENTRY (widget), password); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - /* Group password */ - widget = glade_xml_get_widget (priv->xml, "group_password_entry"); - if (!widget) - goto out; - if (group_password) - gtk_entry_set_text (GTK_ENTRY (widget), group_password); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - success = TRUE; - -out: - gnome_keyring_memory_free (password); - gnome_keyring_memory_free (group_password); - - return success; -} - -static void -show_toggled_cb (GtkCheckButton *button, VpncPluginUiWidget *self) -{ - VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - GtkWidget *widget; - gboolean visible; - - visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); - - widget = glade_xml_get_widget (priv->xml, "user_password_entry"); - g_assert (widget); - gtk_entry_set_visibility (GTK_ENTRY (widget), visible); - - widget = glade_xml_get_widget (priv->xml, "group_password_entry"); - g_assert (widget); - gtk_entry_set_visibility (GTK_ENTRY (widget), visible); -} - -static void -pw_type_changed_helper (VpncPluginUiWidget *self, GtkWidget *combo) -{ - VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - const char *entry = NULL; - GtkWidget *widget; - GtkTreeModel *model; - - /* If the user chose "Not required", desensitize and clear the correct - * password entry. - */ - widget = glade_xml_get_widget (priv->xml, "user_pass_type_combo"); - if (combo == widget) - entry = "user_password_entry"; - else { - widget = glade_xml_get_widget (priv->xml, "group_pass_type_combo"); - if (combo == widget) - entry = "group_password_entry"; - } - if (!entry) - return; - - widget = glade_xml_get_widget (priv->xml, entry); - g_assert (widget); - - model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); - switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo))) { - case PW_TYPE_ASK: - case PW_TYPE_UNUSED: - gtk_entry_set_text (GTK_ENTRY (widget), ""); - gtk_widget_set_sensitive (widget, FALSE); - break; - default: - gtk_widget_set_sensitive (widget, TRUE); - break; - } -} - -static void -pw_type_combo_changed_cb (GtkWidget *combo, gpointer user_data) -{ - VpncPluginUiWidget *self = VPNC_PLUGIN_UI_WIDGET (user_data); - - pw_type_changed_helper (self, combo); - stuff_changed_cb (combo, self); -} - -static void -init_one_pw_combo (VpncPluginUiWidget *self, - NMSettingVPN *s_vpn, - const char *combo_name, - const char *key, - const char *entry_name) -{ - VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - int active = -1; - GtkWidget *widget; - GtkListStore *store; - GtkTreeIter iter; - const char *value = NULL; - guint32 default_idx = 1; - - /* If there's already a password and the password type can't be found in - * the VPN settings, default to saving it. Otherwise, always ask for it. - */ - widget = glade_xml_get_widget (priv->xml, entry_name); - if (widget) { - const char *tmp; - - tmp = gtk_entry_get_text (GTK_ENTRY (widget)); - if (tmp && strlen (tmp)) - default_idx = 0; - } - - store = gtk_list_store_new (1, G_TYPE_STRING); - if (s_vpn) - value = nm_setting_vpn_get_data_item (s_vpn, key); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("Saved"), -1); - if ((active < 0) && value) { - if (!strcmp (value, NM_VPNC_PW_TYPE_SAVE)) - active = 0; - } - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("Always Ask"), -1); - if ((active < 0) && value) { - if (!strcmp (value, NM_VPNC_PW_TYPE_ASK)) - active = 1; - } - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("Not Required"), -1); - if ((active < 0) && value) { - if (!strcmp (value, NM_VPNC_PW_TYPE_UNUSED)) - active = 2; - } - - widget = glade_xml_get_widget (priv->xml, combo_name); - g_assert (widget); - gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); - g_object_unref (store); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? default_idx : active); - pw_type_changed_helper (self, widget); - - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (pw_type_combo_changed_cb), self); -} - -static gboolean -init_plugin_ui (VpncPluginUiWidget *self, NMConnection *connection, GError **error) -{ - VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - NMSettingVPN *s_vpn; - GtkWidget *widget; - GtkListStore *store; - GtkTreeIter iter; - const char *value = NULL; - int active = -1; - const char *natt_mode = NULL; - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - - priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - - widget = glade_xml_get_widget (priv->xml, "gateway_entry"); - g_return_val_if_fail (widget != NULL, FALSE); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_GATEWAY); - if (value && strlen (value)) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - widget = glade_xml_get_widget (priv->xml, "group_entry"); - g_return_val_if_fail (widget != NULL, FALSE); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_ID); - if (value && strlen (value)) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - widget = glade_xml_get_widget (priv->xml, "encryption_combo"); - g_return_val_if_fail (widget != NULL, FALSE); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - - store = gtk_list_store_new (1, G_TYPE_STRING); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("Secure (default)"), -1); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("Weak (use with caution)"), -1); - if (s_vpn && (active < 0)) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_SINGLE_DES); - if (value && !strcmp (value, "yes")) - active = 1; - } - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("None (completely insecure)"), -1); - if (s_vpn && (active < 0)) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_NO_ENCRYPTION); - if (value && !strcmp (value, "yes")) - active = 2; - } - - gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); - g_object_unref (store); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 0 : active); - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - /* Fill the VPN passwords *before* initializing the PW type combos, since - * knowing if there are passwords when initializing the combos is helpful. - */ - fill_vpn_passwords (self, connection); - - init_one_pw_combo (self, s_vpn, "user_pass_type_combo", - NM_VPNC_KEY_XAUTH_PASSWORD_TYPE, "user_password_entry"); - init_one_pw_combo (self, s_vpn, "group_pass_type_combo", - NM_VPNC_KEY_SECRET_TYPE, "group_password_entry"); - - widget = glade_xml_get_widget (priv->xml, "user_entry"); - g_return_val_if_fail (widget != NULL, FALSE); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_XAUTH_USER); - if (value && strlen (value)) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - widget = glade_xml_get_widget (priv->xml, "domain_entry"); - g_return_val_if_fail (widget != NULL, FALSE); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_DOMAIN); - if (value && strlen (value)) - gtk_entry_set_text (GTK_ENTRY (widget), value); - } - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - active = -1; - store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); - if (s_vpn) - natt_mode = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("Cisco UDP (default)"), 1, NM_VPNC_NATT_MODE_CISCO, -1); - if ((active < 0) && natt_mode) { - if (!strcmp (natt_mode, NM_VPNC_NATT_MODE_CISCO)) - active = 0; - } - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("NAT-T"), 1, NM_VPNC_NATT_MODE_NATT, -1); - if ((active < 0) && natt_mode) { - if (!strcmp (natt_mode, NM_VPNC_NATT_MODE_NATT)) - active = 1; - } - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, _("Disabled"), 1, NM_VPNC_NATT_MODE_NONE, -1); - if ((active < 0) && natt_mode) { - if (!strcmp (natt_mode, NM_VPNC_NATT_MODE_NONE)) - active = 2; - } - - widget = glade_xml_get_widget (priv->xml, "natt_combo"); - g_return_val_if_fail (widget != NULL, FALSE); - gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); - gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); - g_object_unref (store); - gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 0 : active); - g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); - - widget = glade_xml_get_widget (priv->xml, "disable_dpd_checkbutton"); - g_return_val_if_fail (widget != NULL, FALSE); - if (s_vpn) { - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_DPD_IDLE_TIMEOUT); - if (value) { - long int tmp; - - errno = 0; - tmp = strtol (value, NULL, 10); - if (tmp >= 0 && tmp <= G_MAXUINT32 && errno == 0) - priv->orig_dpd_timeout = (guint32) tmp; - - if (priv->orig_dpd_timeout == 0) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - } - } - g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (stuff_changed_cb), self); - - widget = glade_xml_get_widget (priv->xml, "show_passwords_checkbutton"); - g_return_val_if_fail (widget != NULL, FALSE); - g_signal_connect (G_OBJECT (widget), "toggled", - (GCallback) show_toggled_cb, - self); - - return TRUE; -} - -static GObject * -get_widget (NMVpnPluginUiWidgetInterface *iface) -{ - VpncPluginUiWidget *self = VPNC_PLUGIN_UI_WIDGET (iface); - VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - - return G_OBJECT (priv->widget); -} - -static guint32 -handle_one_pw_type (NMSettingVPN *s_vpn, GladeXML *xml, const char *name, const char *key) -{ - GtkWidget *widget; - GtkTreeModel *model; - guint32 pw_type; - - widget = glade_xml_get_widget (xml, name); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); - - pw_type = gtk_combo_box_get_active (GTK_COMBO_BOX (widget)); - switch (pw_type) { - case PW_TYPE_SAVE: - nm_setting_vpn_add_data_item (s_vpn, key, NM_VPNC_PW_TYPE_SAVE); - break; - case PW_TYPE_UNUSED: - nm_setting_vpn_add_data_item (s_vpn, key, NM_VPNC_PW_TYPE_UNUSED); - break; - case PW_TYPE_ASK: - default: - pw_type = PW_TYPE_ASK; - nm_setting_vpn_add_data_item (s_vpn, key, NM_VPNC_PW_TYPE_ASK); - break; - } - - return pw_type; -} - -static gboolean -update_connection (NMVpnPluginUiWidgetInterface *iface, - NMConnection *connection, - GError **error) -{ - VpncPluginUiWidget *self = VPNC_PLUGIN_UI_WIDGET (iface); - VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - NMSettingVPN *s_vpn; - GtkWidget *widget; - char *str; - GtkTreeModel *model; - GtkTreeIter iter; - guint32 upw_type, gpw_type; - - if (!check_validity (self, error)) - return FALSE; - - s_vpn = NM_SETTING_VPN (nm_setting_vpn_new ()); - g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_VPNC, NULL); - - /* Gateway */ - widget = glade_xml_get_widget (priv->xml, "gateway_entry"); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_GATEWAY, str); - - /* Group name */ - widget = glade_xml_get_widget (priv->xml, "group_entry"); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_ID, str); - - widget = glade_xml_get_widget (priv->xml, "user_entry"); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_XAUTH_USER, str); - - widget = glade_xml_get_widget (priv->xml, "domain_entry"); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str)) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_DOMAIN, str); - - widget = glade_xml_get_widget (priv->xml, "encryption_combo"); - switch (gtk_combo_box_get_active (GTK_COMBO_BOX (widget))) { - case ENC_TYPE_WEAK: - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_SINGLE_DES, "yes"); - break; - case ENC_TYPE_NONE: - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_NO_ENCRYPTION, "yes"); - break; - case ENC_TYPE_SECURE: - default: - break; - } - - widget = glade_xml_get_widget (priv->xml, "natt_combo"); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)) { - const char *mode = NULL; - - gtk_tree_model_get (model, &iter, 1, &mode, -1); - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE, mode); - } else - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE, NM_VPNC_NATT_MODE_NATT); - - widget = glade_xml_get_widget (priv->xml, "disable_dpd_checkbutton"); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_DPD_IDLE_TIMEOUT, "0"); - } else { - /* If DPD was disabled and now the user wishes to enable it, just - * don't pass the DPD_IDLE_TIMEOUT option to vpnc and thus use the - * default DPD idle time. Otherwise keep the original DPD idle timeout. - */ - if (priv->orig_dpd_timeout >= 10) { - char *tmp = g_strdup_printf ("%d", priv->orig_dpd_timeout); - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_DPD_IDLE_TIMEOUT, tmp); - g_free (tmp); - } - } - - upw_type = handle_one_pw_type (s_vpn, priv->xml, "user_pass_type_combo", NM_VPNC_KEY_XAUTH_PASSWORD_TYPE); - gpw_type = handle_one_pw_type (s_vpn, priv->xml, "group_pass_type_combo", NM_VPNC_KEY_SECRET_TYPE); - - /* System secrets get stored in the connection, user secrets are saved - * via the save_secrets() hook. - */ - if (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM) { - /* User password */ - widget = glade_xml_get_widget (priv->xml, "user_password_entry"); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str) && (upw_type != PW_TYPE_UNUSED)) - nm_setting_vpn_add_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD, str); - - /* Group password */ - widget = glade_xml_get_widget (priv->xml, "group_password_entry"); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str) && (gpw_type != PW_TYPE_UNUSED)) - nm_setting_vpn_add_secret (s_vpn, NM_VPNC_KEY_SECRET, str); - } - - nm_connection_add_setting (connection, NM_SETTING (s_vpn)); - return TRUE; -} - -static void -save_one_password (GladeXML *xml, - const char *keyring_tag, - const char *uuid, - const char *id, - const char *entry, - const char *combo, - const char *desc) -{ - GnomeKeyringResult ret; - GtkWidget *widget; - const char *password; - GtkTreeModel *model; - gboolean saved = FALSE; - - widget = glade_xml_get_widget (xml, combo); - g_assert (widget); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); - if (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) == PW_TYPE_SAVE) { - widget = glade_xml_get_widget (xml, entry); - g_assert (widget); - password = gtk_entry_get_text (GTK_ENTRY (widget)); - if (password && strlen (password)) { - ret = keyring_helpers_save_secret (uuid, id, NULL, keyring_tag, password); - if (ret == GNOME_KEYRING_RESULT_OK) - saved = TRUE; - else - g_warning ("%s: failed to save %s to keyring.", __func__, desc); - } - } - - if (!saved) - keyring_helpers_delete_secret (uuid, keyring_tag); -} - -static gboolean -save_secrets (NMVpnPluginUiWidgetInterface *iface, - NMConnection *connection, - GError **error) -{ - VpncPluginUiWidget *self = VPNC_PLUGIN_UI_WIDGET (iface); - VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - NMSettingConnection *s_con; - const char *str, *id, *uuid; - - s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); - if (!s_con) { - g_set_error (error, - VPNC_PLUGIN_UI_ERROR, - VPNC_PLUGIN_UI_ERROR_INVALID_CONNECTION, - "missing 'connection' setting"); - return FALSE; - } - - id = nm_setting_connection_get_id (s_con); - uuid = nm_setting_connection_get_uuid (s_con); - - save_one_password (priv->xml, VPNC_USER_PASSWORD, uuid, id, - "user_password_entry", "user_pass_type_combo", "user password"); - save_one_password (priv->xml, VPNC_GROUP_PASSWORD, uuid, id, - "group_password_entry", "group_pass_type_combo", "group password"); - - return TRUE; -} - -static NMVpnPluginUiWidgetInterface * -nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error) -{ - NMVpnPluginUiWidgetInterface *object; - VpncPluginUiWidgetPrivate *priv; - char *glade_file; - - if (error) - g_return_val_if_fail (*error == NULL, NULL); - - object = NM_VPN_PLUGIN_UI_WIDGET_INTERFACE (g_object_new (VPNC_TYPE_PLUGIN_UI_WIDGET, NULL)); - if (!object) { - g_set_error (error, VPNC_PLUGIN_UI_ERROR, 0, "could not create vpnc object"); - return NULL; - } - - priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (object); - - glade_file = g_strdup_printf ("%s/%s", GLADEDIR, "nm-vpnc-dialog.glade"); - priv->xml = glade_xml_new (glade_file, "vpnc-vbox", GETTEXT_PACKAGE); - if (priv->xml == NULL) { - g_set_error (error, VPNC_PLUGIN_UI_ERROR, 0, - "could not load required resources at %s", glade_file); - g_free (glade_file); - g_object_unref (object); - return NULL; - } - g_free (glade_file); - - priv->widget = glade_xml_get_widget (priv->xml, "vpnc-vbox"); - if (!priv->widget) { - g_set_error (error, VPNC_PLUGIN_UI_ERROR, 0, "could not load UI widget"); - g_object_unref (object); - return NULL; - } - g_object_ref_sink (priv->widget); - - if (!init_plugin_ui (VPNC_PLUGIN_UI_WIDGET (object), connection, error)) { - g_object_unref (object); - return NULL; - } - - return object; -} - -static void -dispose (GObject *object) -{ - VpncPluginUiWidget *plugin = VPNC_PLUGIN_UI_WIDGET (object); - VpncPluginUiWidgetPrivate *priv = VPNC_PLUGIN_UI_WIDGET_GET_PRIVATE (plugin); - - if (priv->group) - g_object_unref (priv->group); - - if (priv->widget) - g_object_unref (priv->widget); - - if (priv->xml) - g_object_unref (priv->xml); - - G_OBJECT_CLASS (vpnc_plugin_ui_widget_parent_class)->dispose (object); -} - -static void -vpnc_plugin_ui_widget_class_init (VpncPluginUiWidgetClass *req_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (req_class); - - g_type_class_add_private (req_class, sizeof (VpncPluginUiWidgetPrivate)); - - object_class->dispose = dispose; -} - -static void -vpnc_plugin_ui_widget_init (VpncPluginUiWidget *plugin) -{ -} - -static void -vpnc_plugin_ui_widget_interface_init (NMVpnPluginUiWidgetInterface *iface_class) -{ - /* interface implementation */ - iface_class->get_widget = get_widget; - iface_class->update_connection = update_connection; - iface_class->save_secrets = save_secrets; -} - -static void -add_routes (NMSettingIP4Config *s_ip4, const char *routelist) -{ - char **substrs; - unsigned int i; - - substrs = g_strsplit (routelist, " ", 0); - for (i = 0; substrs[i] != NULL; i++) { - struct in_addr tmp; - char *p, *str_route; - long int prefix = 32; - - str_route = g_strdup (substrs[i]); - p = strchr (str_route, '/'); - if (!p || !(*(p + 1))) { - g_warning ("Ignoring invalid route '%s'", str_route); - goto next; - } - - errno = 0; - prefix = strtol (p + 1, NULL, 10); - if (errno || prefix <= 0 || prefix > 32) { - g_warning ("Ignoring invalid route '%s'", str_route); - goto next; - } - - /* don't pass the prefix to inet_pton() */ - *p = '\0'; - if (inet_pton (AF_INET, str_route, &tmp) > 0) { - NMIP4Route *route = nm_ip4_route_new (); - - nm_ip4_route_set_dest (route, tmp.s_addr); - nm_ip4_route_set_prefix (route, (guint32) prefix); - - nm_setting_ip4_config_add_route (s_ip4, route); - } else - g_warning ("Ignoring invalid route '%s'", str_route); - -next: - g_free (str_route); - } - - g_strfreev (substrs); -} - -static void -decrypt_child_finished_cb (GPid pid, gint status, gpointer userdata) -{ - int *child_status = (gint *) userdata; - - *child_status = status; -} - -static gboolean -child_stdout_data_cb (GIOChannel *source, GIOCondition condition, gpointer userdata) -{ - char *str; - char **output = (char **) userdata; - - if (*output || !(condition & (G_IO_IN | G_IO_ERR))) - return TRUE; - - if (g_io_channel_read_line (source, &str, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) { - int len; - - len = strlen (str); - if (len > 0) { - /* remove terminating newline */ - *output = g_strchomp (str); - } else - g_free (str); - } - return TRUE; -} - -static char * -decrypt_cisco_key (const char* enc_key) -{ - int child_stdout, child_status; - GPid child_pid; - guint32 ioid; - char *key = NULL; - GIOChannel *channel; - const char **decrypt_path; - GError *error = NULL; - - const char *decrypt_possible_paths[] = { - "/usr/lib/vpnc/cisco-decrypt", - "/usr/bin/cisco-decrypt", - NULL - }; - - const char *argv[] = { - NULL, /* The path we figure out later. */ - enc_key, /* The key in encrypted form */ - NULL - }; - - /* Find the binary. */ - decrypt_path = decrypt_possible_paths; - while (*decrypt_path != NULL){ - if (g_file_test (*decrypt_path, G_FILE_TEST_EXISTS)) - break; - ++decrypt_path; - } - - if (*decrypt_path == NULL){ - g_warning ("Couldn't find cisco-decrypt.\n"); - return NULL; - } - - /* Now that we know where it is, we call the decrypter. */ - argv[0] = *decrypt_path; - child_status = -1; - - if (!g_spawn_async_with_pipes ("/", /* working directory */ - (gchar **) argv, /* argv */ - NULL , /* envp */ - G_SPAWN_DO_NOT_REAP_CHILD, /* flags */ - NULL, /* child setup */ - NULL, /* user data */ - &child_pid, /* child pid */ - NULL, /* child stdin */ - &child_stdout, /* child stdout */ - NULL, /* child stderr */ - &error)) { /* error */ - /* The child did not spawn */ - g_warning ("Error processing password: %s", error ? error->message : "(none)"); - if (error) - g_error_free (error); - return NULL; - } - - g_child_watch_add (child_pid, decrypt_child_finished_cb, (gpointer) &child_status); - - /* Grab child output and wait for it to exit */ - channel = g_io_channel_unix_new (child_stdout); - g_io_channel_set_encoding (channel, NULL, NULL); - ioid = g_io_add_watch (channel, G_IO_IN | G_IO_ERR, child_stdout_data_cb, &key); - - while (child_status == -1) /* Wait until the child has finished. */ - g_main_context_iteration (NULL, TRUE); - - g_source_remove (ioid); - g_io_channel_shutdown (channel, TRUE, NULL); - g_io_channel_unref (channel); - - return key; -} - -static NMConnection * -import (NMVpnPluginUiInterface *iface, const char *path, GError **error) -{ - NMConnection *connection; - NMSettingConnection *s_con; - NMSettingVPN *s_vpn; - GHashTable *pcf; - const char *buf; - gboolean have_value; - - pcf = pcf_file_load (path); - if (!pcf) { - g_set_error (error, 0, 0, "does not look like a %s VPN connection", - VPNC_PLUGIN_NAME); - return NULL; - } - - connection = nm_connection_new (); - s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ()); - nm_connection_add_setting (connection, NM_SETTING (s_con)); - - s_vpn = NM_SETTING_VPN (nm_setting_vpn_new ()); - g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_VPNC, NULL); - nm_connection_add_setting (connection, NM_SETTING (s_vpn)); - - /* Connection name */ - if ((buf = pcf_file_lookup_value (pcf, "main", "Description"))) - g_object_set (s_con, NM_SETTING_CONNECTION_ID, buf, NULL); - else { - g_set_error (error, 0, 0, "does not look like a %s VPN connection (parse failed)", - VPNC_PLUGIN_NAME); - g_object_unref (connection); - return NULL; - } - - /* Gateway */ - if ((buf = pcf_file_lookup_value (pcf, "main", "Host"))) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_GATEWAY, buf); - else { - g_set_error (error, 0, 0, "does not look like a %s VPN connection (no Host)", - VPNC_PLUGIN_NAME); - g_object_unref (connection); - return NULL; - } - - /* Group name */ - if ((buf = pcf_file_lookup_value (pcf, "main", "GroupName"))) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_ID, buf); - else { - g_set_error (error, 0, 0, "does not look like a %s VPN connection (no GroupName)", - VPNC_PLUGIN_NAME); - g_object_unref (connection); - return NULL; - } - - /* Optional settings */ - - buf = pcf_file_lookup_value (pcf, "main", "UserName"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_XAUTH_USER, buf); - - buf = pcf_file_lookup_value (pcf, "main", "UserPassword"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) - nm_setting_vpn_add_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD, buf); - - buf = pcf_file_lookup_value (pcf, "main", "GroupPwd"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) - nm_setting_vpn_add_secret (s_vpn, NM_VPNC_KEY_SECRET, buf); - else { - /* Handle encrypted passwords */ - buf = pcf_file_lookup_value (pcf, "main", "enc_GroupPwd"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) { - char *decrypted; - - decrypted = decrypt_cisco_key (buf); - if (decrypted) { - nm_setting_vpn_add_secret (s_vpn, NM_VPNC_KEY_SECRET, decrypted); - memset (decrypted, 0, strlen (decrypted)); - g_free (decrypted); - } - } - } - - buf = pcf_file_lookup_value (pcf, "main", "NTDomain"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_DOMAIN, buf); - - buf = pcf_file_lookup_value (pcf, "main", "SingleDES"); - have_value = (buf == NULL ? FALSE : strcmp (buf, "0") != 0); - if (have_value) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_SINGLE_DES, "yes"); - - /* Default is enabled, only disabled if explicit EnableNat=0 exists */ - buf = pcf_file_lookup_value (pcf, "main", "EnableNat"); - have_value = (buf ? strncmp (buf, "0", 1) == 0 : FALSE); - if (have_value) - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE, NM_VPNC_NATT_MODE_NATT); - - if ((buf = pcf_file_lookup_value (pcf, "main", "PeerTimeout"))) { - long int val; - - errno = 0; - val = strtol (buf, NULL, 10); - if ((errno == 0) && ((val == 0) || ((val >= 10) && (val <= 86400)))) { - char *tmp = g_strdup_printf ("%d", (gint) val); - nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_DPD_IDLE_TIMEOUT, tmp); - g_free (tmp); - } - } - - buf = pcf_file_lookup_value (pcf, "main", "X-NM-Routes"); - have_value = buf == NULL ? FALSE : strlen (buf) > 0; - if (have_value) { - NMSettingIP4Config *s_ip4; - - s_ip4 = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ()); - nm_connection_add_setting (connection, NM_SETTING (s_ip4)); - add_routes (s_ip4, buf); - } - - if ((buf = pcf_file_lookup_value (pcf, "main", "TunnelingMode"))) { - /* If applicable, put up warning that TCP tunneling will be disabled */ - - if (strncmp (buf, "1", 1) == 0) { - GtkWidget *dialog; - char *basename; - - basename = g_path_get_basename (path); - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, - _("TCP tunneling not supported")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n\nThe connection can still be created, with TCP tunneling disabled, however it may not work as expected."), basename); - g_free (basename); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } - } - - g_hash_table_destroy (pcf); - - return connection; -} - -static gboolean -export (NMVpnPluginUiInterface *iface, - const char *path, - NMConnection *connection, - GError **error) -{ - NMSettingConnection *s_con; - NMSettingIP4Config *s_ip4; - NMSettingVPN *s_vpn; - FILE *f; - const char *value; - const char *gateway = NULL; - gboolean enablenat = TRUE; - gboolean singledes = FALSE; - const char *groupname = NULL; - const char *username = NULL; - const char *domain = NULL; - const char *peertimeout = NULL; - GString *routes = NULL; - gboolean success = FALSE; - - s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); - s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG); - - s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); - - f = fopen (path, "w"); - if (!f) { - g_set_error (error, 0, 0, "could not open file for writing"); - return FALSE; - } - - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_GATEWAY); - if (value && strlen (value)) - gateway = value; - else { - g_set_error (error, 0, 0, "connection was incomplete (missing gateway)"); - goto done; - } - - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_ID); - if (value && strlen (value)) - groupname = value; - else { - g_set_error (error, 0, 0, "connection was incomplete (missing group)"); - goto done; - } - - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_XAUTH_USER); - if (value && strlen (value)) - username = value; - - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_DOMAIN); - if (value && strlen (value)) - domain = value; - - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_SINGLE_DES); - if (value && !strcmp (value, "yes")) - singledes = TRUE; - - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE); - if (value && strlen (value) && strcmp (value, NM_VPNC_NATT_MODE_NONE)) - enablenat = TRUE; - - value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_DPD_IDLE_TIMEOUT); - if (value && strlen (value)) - peertimeout = value; - - routes = g_string_new (""); - if (s_ip4 && nm_setting_ip4_config_get_num_routes (s_ip4)) { - int i; - - for (i = 0; i < nm_setting_ip4_config_get_num_routes (s_ip4); i++) { - NMIP4Route *route = nm_setting_ip4_config_get_route (s_ip4, i); - char str_addr[INET_ADDRSTRLEN + 1]; - struct in_addr num_addr; - - if (routes->len) - g_string_append_c (routes, ' '); - - num_addr.s_addr = nm_ip4_route_get_dest (route); - if (inet_ntop (AF_INET, &num_addr, &str_addr[0], INET_ADDRSTRLEN + 1)) - g_string_append_printf (routes, "%s/%d", str_addr, nm_ip4_route_get_prefix (route)); - } - } - - fprintf (f, - "[main]\n" - "Description=%s\n" - "Host=%s\n" - "AuthType=1\n" - "GroupName=%s\n" - "GroupPwd=\n" - "EnableISPConnect=0\n" - "ISPConnectType=0\n" - "ISPConnect=\n" - "ISPCommand=\n" - "Username=%s\n" - "SaveUserPassword=0\n" - "EnableBackup=0\n" - "BackupServer=\n" - "EnableNat=%s\n" - "CertStore=0\n" - "CertName=\n" - "CertPath=\n" - "CertSubjectName=\n" - "CertSerialHash=\n" - "DHGroup=2\n" - "ForceKeepAlives=0\n" - "enc_GroupPwd=\n" - "UserPassword=\n" - "enc_UserPassword=\n" - "NTDomain=%s\n" - "EnableMSLogon=0\n" - "MSLogonType=0\n" - "TunnelingMode=0\n" - "TcpTunnelingPort=10000\n" - "PeerTimeout=%s\n" - "EnableLocalLAN=1\n" - "SendCertChain=0\n" - "VerifyCertDN=\n" - "EnableSplitDNS=1\n" - "SingleDES=%s\n" - "SPPhonebook=\n" - "%s", - /* Description */ nm_setting_connection_get_id (s_con), - /* Host */ gateway, - /* GroupName */ groupname, - /* Username */ username != NULL ? username : "", - /* EnableNat */ enablenat ? "1" : "0", - /* NTDomain */ domain != NULL ? domain : "", - /* PeerTimeout */ peertimeout != NULL ? peertimeout : "0", - /* SingleDES */ singledes ? "1" : "0", - /* X-NM-Routes */ routes->str ? routes->str : ""); - - success = TRUE; - -done: - if (routes) - g_string_free (routes, TRUE); - fclose (f); - return success; -} - -static char * -get_suggested_name (NMVpnPluginUiInterface *iface, NMConnection *connection) -{ - NMSettingConnection *s_con; - const char *id; - - g_return_val_if_fail (connection != NULL, NULL); - - s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); - g_return_val_if_fail (s_con != NULL, NULL); - - id = nm_setting_connection_get_id (s_con); - g_return_val_if_fail (id != NULL, NULL); - - return g_strdup_printf ("%s.pcf", id); -} - -static guint32 -get_capabilities (NMVpnPluginUiInterface *iface) -{ - return (NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT | NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT); -} - -static gboolean -delete_connection (NMVpnPluginUiInterface *iface, - NMConnection *connection, - GError **error) -{ - NMSettingConnection *s_con; - const char *id, *uuid; - - /* Remove any secrets in the keyring associated with this connection's UUID */ - s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); - if (!s_con) { - g_set_error (error, - VPNC_PLUGIN_UI_ERROR, - VPNC_PLUGIN_UI_ERROR_INVALID_CONNECTION, - "missing 'connection' setting"); - return FALSE; - } - - id = nm_setting_connection_get_id (s_con); - uuid = nm_setting_connection_get_uuid (s_con); - - if (!keyring_helpers_delete_secret (uuid, VPNC_USER_PASSWORD)) - g_message ("%s: couldn't delete user password for '%s'", __func__, id); - - if (!keyring_helpers_delete_secret (uuid, VPNC_GROUP_PASSWORD)) - g_message ("%s: couldn't delete group password for '%s'", __func__, id); - - return TRUE; -} - -static NMVpnPluginUiWidgetInterface * -ui_factory (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error) -{ - return nm_vpn_plugin_ui_widget_interface_new (connection, error); -} - -static void -get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) -{ - switch (prop_id) { - case NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: - g_value_set_string (value, VPNC_PLUGIN_NAME); - break; - case NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: - g_value_set_string (value, VPNC_PLUGIN_DESC); - break; - case NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: - g_value_set_string (value, VPNC_PLUGIN_SERVICE); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -vpnc_plugin_ui_class_init (VpncPluginUiClass *req_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (req_class); - - object_class->get_property = get_property; - - g_object_class_override_property (object_class, - NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME, - NM_VPN_PLUGIN_UI_INTERFACE_NAME); - - g_object_class_override_property (object_class, - NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC, - NM_VPN_PLUGIN_UI_INTERFACE_DESC); - - g_object_class_override_property (object_class, - NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE, - NM_VPN_PLUGIN_UI_INTERFACE_SERVICE); -} - -static void -vpnc_plugin_ui_init (VpncPluginUi *plugin) -{ -} - -static void -vpnc_plugin_ui_interface_init (NMVpnPluginUiInterface *iface_class) -{ - /* interface implementation */ - iface_class->ui_factory = ui_factory; - iface_class->get_capabilities = get_capabilities; - iface_class->import = import; - iface_class->export = export; - iface_class->get_suggested_name = get_suggested_name; - iface_class->delete_connection = delete_connection; -} - - -G_MODULE_EXPORT NMVpnPluginUiInterface * -nm_vpn_plugin_ui_factory (GError **error) -{ - if (error) - g_return_val_if_fail (*error == NULL, NULL); - - return NM_VPN_PLUGIN_UI_INTERFACE (g_object_new (VPNC_TYPE_PLUGIN_UI, NULL)); -} - diff --git a/vpn-daemons/vpnc/properties/nm-vpnc.h b/vpn-daemons/vpnc/properties/nm-vpnc.h deleted file mode 100644 index bc939266d2..0000000000 --- a/vpn-daemons/vpnc/properties/nm-vpnc.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/*************************************************************************** - * nm-vpnc.h : GNOME UI dialogs for configuring vpnc VPN connections - * - * Copyright (C) 2008 Dan Williams, - * - * 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. - * - **************************************************************************/ - -#ifndef _NM_VPNC_H_ -#define _NM_VPNC_H_ - -#include - -typedef enum -{ - VPNC_PLUGIN_UI_ERROR_UNKNOWN = 0, - VPNC_PLUGIN_UI_ERROR_INVALID_PROPERTY, - VPNC_PLUGIN_UI_ERROR_MISSING_PROPERTY, - VPNC_PLUGIN_UI_ERROR_INVALID_CONNECTION -} VpncPluginUiError; - -#define VPNC_TYPE_PLUGIN_UI_ERROR (vpnc_plugin_ui_error_get_type ()) -GType vpnc_plugin_ui_error_get_type (void); - -#define VPNC_TYPE_PLUGIN_UI (vpnc_plugin_ui_get_type ()) -#define VPNC_PLUGIN_UI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VPNC_TYPE_PLUGIN_UI, VpncPluginUi)) -#define VPNC_PLUGIN_UI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VPNC_TYPE_PLUGIN_UI, VpncPluginUiClass)) -#define VPNC_IS_PLUGIN_UI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VPNC_TYPE_PLUGIN_UI)) -#define VPNC_IS_PLUGIN_UI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), VPNC_TYPE_PLUGIN_UI)) -#define VPNC_PLUGIN_UI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VPNC_TYPE_PLUGIN_UI, VpncPluginUiClass)) - -typedef struct _VpncPluginUi VpncPluginUi; -typedef struct _VpncPluginUiClass VpncPluginUiClass; - -struct _VpncPluginUi { - GObject parent; -}; - -struct _VpncPluginUiClass { - GObjectClass parent; -}; - -GType vpnc_plugin_ui_get_type (void); - - -#define VPNC_TYPE_PLUGIN_UI_WIDGET (vpnc_plugin_ui_widget_get_type ()) -#define VPNC_PLUGIN_UI_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VPNC_TYPE_PLUGIN_UI_WIDGET, VpncPluginUiWidget)) -#define VPNC_PLUGIN_UI_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VPNC_TYPE_PLUGIN_UI_WIDGET, VpncPluginUiWidgetClass)) -#define VPNC_IS_PLUGIN_UI_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VPNC_TYPE_PLUGIN_UI_WIDGET)) -#define VPNC_IS_PLUGIN_UI_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), VPNC_TYPE_PLUGIN_UI_WIDGET)) -#define VPNC_PLUGIN_UI_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VPNC_TYPE_PLUGIN_UI_WIDGET, VpncPluginUiWidgetClass)) - -typedef struct _VpncPluginUiWidget VpncPluginUiWidget; -typedef struct _VpncPluginUiWidgetClass VpncPluginUiWidgetClass; - -struct _VpncPluginUiWidget { - GObject parent; -}; - -struct _VpncPluginUiWidgetClass { - GObjectClass parent; -}; - -GType vpnc_plugin_ui_widget_get_type (void); - -#endif /* _NM_VPNC_H_ */ - diff --git a/vpn-daemons/vpnc/properties/pcf-file.c b/vpn-daemons/vpnc/properties/pcf-file.c deleted file mode 100644 index 5f7e0d4fd0..0000000000 --- a/vpn-daemons/vpnc/properties/pcf-file.c +++ /dev/null @@ -1,158 +0,0 @@ -#include -#include -#include -#include - -#include "pcf-file.h" - -static void -pcf_entry_free (PcfEntry *entry) -{ - if (entry) { - g_free (entry->key); - g_free (entry->value); - g_free (entry); - } -} - -/* - The main reader loop here is based on the simple .ini file - parser from avahi/avahi-daemon/ini-file-parser.c -*/ - -GHashTable * -pcf_file_load (const char *fname) -{ - FILE *fo; - unsigned line; - GHashTable *pcf; - GHashTable *group = NULL; - - g_return_val_if_fail (fname != NULL, NULL); - - if (!(fo = fopen (fname, "r"))) { - g_warning ("Failed to open file '%s': %s", fname, strerror (errno)); - return NULL; - } - - pcf = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, - (GDestroyNotify) g_hash_table_destroy); - - line = 0; - while (!feof (fo)) { - char ln[256], *s, *e; - - if (!(fgets (ln, sizeof (ln), fo))) - break; - - line++; - - s = ln + strspn (ln, " \t"); - s[strcspn (s, "\r\n")] = 0; - - /* Skip comments and empty lines */ - if (*s == ';' || *s == 0) - continue; - - if (*s == '[') { - /* new group */ - - if (!(e = strchr (s, ']'))) { - g_warning ("Unclosed group header in %s:%u: <%s>", fname, line, s); - goto fail; - } - - *e = 0; - - group = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, - (GDestroyNotify) pcf_entry_free); - - g_hash_table_insert (pcf, g_utf8_strdown (s+1, -1), group); - } else { - PcfEntry *entry; - - /* Normal assignment */ - if (!(e = strchr (s, '='))) { - g_warning ("Missing assignment in %s:%u: <%s>", fname, line, s); - goto fail; - } - - if (!group) { - g_warning ("Assignment outside group in %s:%u <%s>", fname, line, s); - goto fail; - } - - /* Split the key and the value */ - *(e++) = 0; - - entry = g_new (PcfEntry, 1); - entry->value = g_strdup (e); - - if (*s == '!') { - entry->key = g_utf8_strdown (s+1, -1); - entry->read_only = TRUE; - } else { - entry->key = g_utf8_strdown (s, -1); - entry->read_only = FALSE; - } - - g_hash_table_insert (group, entry->key, entry); - } - } - - fclose (fo); - - return pcf; - -fail: - - if (fo) - fclose (fo); - - if (pcf) - g_hash_table_destroy (pcf); - - return NULL; -} - -PcfEntry * -pcf_file_lookup (GHashTable *pcf_file, - const char *group, - const char *key) -{ - gpointer section; - PcfEntry *entry = NULL; - char *group_lower = NULL; - char *key_lower = NULL; - - g_return_val_if_fail (pcf_file != NULL, NULL); - g_return_val_if_fail (group != NULL, NULL); - g_return_val_if_fail (key != NULL, NULL); - - group_lower = g_utf8_strdown (group, -1); - section = g_hash_table_lookup (pcf_file, group_lower); - if (section) { - key_lower = g_utf8_strdown (key, -1); - entry = (PcfEntry *) g_hash_table_lookup ((GHashTable *) section, key_lower); - } - - g_free (group_lower); - g_free (key_lower); - - return entry; -} - -const char * -pcf_file_lookup_value (GHashTable *pcf_file, - const char *group, - const char *key) -{ - PcfEntry *entry; - - entry = pcf_file_lookup (pcf_file, group, key); - if (entry) - return entry->value; - - return NULL; -} diff --git a/vpn-daemons/vpnc/properties/pcf-file.h b/vpn-daemons/vpnc/properties/pcf-file.h deleted file mode 100644 index a9bdb02fe1..0000000000 --- a/vpn-daemons/vpnc/properties/pcf-file.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef PCF_FILE_H -#define PCF_FILE_H - -#include - -typedef struct PcfEntry PcfEntry; - -struct PcfEntry { - char *key; - char *value; - gboolean read_only; -}; - -GHashTable *pcf_file_load (const char *fname); -PcfEntry *pcf_file_lookup (GHashTable *pcf_file, - const char *group, - const char *key); - -const char *pcf_file_lookup_value (GHashTable *pcf_file, - const char *group, - const char *key); - -#endif /* PCF_FILE_H */ diff --git a/vpn-daemons/vpnc/src/.cvsignore b/vpn-daemons/vpnc/src/.cvsignore deleted file mode 100644 index 8f1636d8fb..0000000000 --- a/vpn-daemons/vpnc/src/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile.in -Makefile -nm-vpnc-service -nm-vpnc-service-vpnc-helper diff --git a/vpn-daemons/vpnc/src/Makefile.am b/vpn-daemons/vpnc/src/Makefile.am deleted file mode 100644 index 197886c7a2..0000000000 --- a/vpn-daemons/vpnc/src/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -INCLUDES = -I${top_srcdir} - -AM_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GTHREAD_CFLAGS) \ - $(NM_UTILS_CFLAGS) \ - -DDBUS_API_SUBJECT_TO_CHANGE \ - -DG_DISABLE_DEPRECATED \ - -DBINDIR=\"$(bindir)\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DVERSION="\"$(VERSION)\"" \ - -DLIBDIR=\""$(libdir)"\" \ - -DLIBEXECDIR=\""$(libexecdir)"\" \ - -DLOCALSTATEDIR=\""$(localstatedir)"\" \ - -DDATADIR=\"$(datadir)\" - -libexec_PROGRAMS = nm-vpnc-service nm-vpnc-service-vpnc-helper - -nm_vpnc_service_SOURCES = \ - nm-vpnc-service.c \ - nm-vpnc-service.h - - -nm_vpnc_service_LDADD = \ - $(DBUS_LIBS) \ - $(GTHREAD_LIBS) \ - $(NM_UTILS_LIBS) \ - -lnm_glib_vpn - - -nm_vpnc_service_vpnc_helper_SOURCES = \ - nm-vpnc-service-vpnc-helper.c - -nm_vpnc_service_vpnc_helper_LDADD = \ - $(DBUS_LIBS) \ - $(GTHREAD_LIBS) \ - $(NM_UTILS_LIBS) - -CLEANFILES = *~ diff --git a/vpn-daemons/vpnc/src/nm-vpnc-service-vpnc-helper.c b/vpn-daemons/vpnc/src/nm-vpnc-service-vpnc-helper.c deleted file mode 100644 index 7664cb3d01..0000000000 --- a/vpn-daemons/vpnc/src/nm-vpnc-service-vpnc-helper.c +++ /dev/null @@ -1,380 +0,0 @@ -/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */ -/* nm-vpnc-service - vpnc integration with NetworkManager - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2005 Red Hat, Inc. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "nm-vpnc-service.h" -#include "nm-utils.h" - -/* These are here because nm-dbus-glib-types.h isn't exported */ -#define DBUS_TYPE_G_ARRAY_OF_UINT (dbus_g_type_get_collection ("GArray", G_TYPE_UINT)) -#define DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_ARRAY_OF_UINT)) - -static void -helper_failed (DBusGConnection *connection, const char *reason) -{ - DBusGProxy *proxy; - GError *err = NULL; - - nm_warning ("nm-nvpnc-service-vpnc-helper did not receive a valid %s from vpnc", reason); - - proxy = dbus_g_proxy_new_for_name (connection, - NM_DBUS_SERVICE_VPNC, - NM_VPN_DBUS_PLUGIN_PATH, - NM_VPN_DBUS_PLUGIN_INTERFACE); - - dbus_g_proxy_call (proxy, "SetFailure", &err, - G_TYPE_STRING, reason, - G_TYPE_INVALID, - G_TYPE_INVALID); - - if (err) { - nm_warning ("Could not send failure information: %s", err->message); - g_error_free (err); - } - - g_object_unref (proxy); - - exit (1); -} - -static void -send_ip4_config (DBusGConnection *connection, GHashTable *config) -{ - DBusGProxy *proxy; - GError *err = NULL; - - proxy = dbus_g_proxy_new_for_name (connection, - NM_DBUS_SERVICE_VPNC, - NM_VPN_DBUS_PLUGIN_PATH, - NM_VPN_DBUS_PLUGIN_INTERFACE); - - dbus_g_proxy_call (proxy, "SetIp4Config", &err, - dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), - config, - G_TYPE_INVALID, - G_TYPE_INVALID); - - if (err) { - nm_warning ("Could not send failure information: %s", err->message); - g_error_free (err); - } - - g_object_unref (proxy); -} - -static GValue * -str_to_gvalue (const char *str, gboolean try_convert) -{ - GValue *val; - - /* Empty */ - if (!str || strlen (str) < 1) - return NULL; - - if (!g_utf8_validate (str, -1, NULL)) { - if (try_convert && !(str = g_convert (str, -1, "ISO-8859-1", "UTF-8", NULL, NULL, NULL))) - str = g_convert (str, -1, "C", "UTF-8", NULL, NULL, NULL); - - if (!str) - /* Invalid */ - return NULL; - } - - val = g_slice_new0 (GValue); - g_value_init (val, G_TYPE_STRING); - g_value_set_string (val, str); - - return val; -} - -static GValue * -uint_to_gvalue (guint32 num) -{ - GValue *val; - - if (num == 0) - return NULL; - - val = g_slice_new0 (GValue); - g_value_init (val, G_TYPE_UINT); - g_value_set_uint (val, num); - - return val; -} - -static GValue * -addr_to_gvalue (const char *str) -{ - struct in_addr temp_addr; - - /* Empty */ - if (!str || strlen (str) < 1) - return NULL; - - if (inet_pton (AF_INET, str, &temp_addr) <= 0) - return NULL; - - return uint_to_gvalue (temp_addr.s_addr); -} - -static GValue * -addr_list_to_gvalue (const char *str) -{ - GValue *val; - char **split; - int i; - GArray *array; - - /* Empty */ - if (!str || strlen (str) < 1) - return NULL; - - split = g_strsplit (str, " ", -1); - if (g_strv_length (split) == 0) - return NULL; - - array = g_array_sized_new (FALSE, TRUE, sizeof (guint32), g_strv_length (split)); - for (i = 0; split[i]; i++) { - struct in_addr addr; - - if (inet_pton (AF_INET, split[i], &addr) > 0) { - g_array_append_val (array, addr.s_addr); - } else { - g_strfreev (split); - g_array_free (array, TRUE); - return NULL; - } - } - - g_strfreev (split); - - val = g_slice_new0 (GValue); - g_value_init (val, DBUS_TYPE_G_UINT_ARRAY); - g_value_set_boxed (val, array); - - return val; -} - -static GValue * -get_routes (void) -{ - GValue *value = NULL; - GPtrArray *routes; - char *tmp; - int num; - int i; - -#define BUFLEN 256 - - tmp = getenv ("CISCO_SPLIT_INC"); - if (!tmp || strlen (tmp) < 1) - return NULL; - - num = atoi (tmp); - if (!num) - return NULL; - - routes = g_ptr_array_new (); - - for (i = 0; i < num; i++) { - GArray *array; - char buf[BUFLEN]; - struct in_addr network; - guint32 next_hop = 0; /* no next hop */ - guint32 prefix, metric = 0; - - snprintf (buf, BUFLEN, "CISCO_SPLIT_INC_%d_ADDR", i); - tmp = getenv (buf); - if (!tmp || inet_pton (AF_INET, tmp, &network) <= 0) { - nm_warning ("Ignoring invalid static route address '%s'", tmp ? tmp : "NULL"); - continue; - } - - snprintf (buf, BUFLEN, "CISCO_SPLIT_INC_%d_MASKLEN", i); - tmp = getenv (buf); - if (tmp) { - long int tmp_prefix; - - errno = 0; - tmp_prefix = strtol (tmp, NULL, 10); - if (errno || tmp_prefix <= 0 || tmp_prefix > 32) { - nm_warning ("Ignoring invalid static route prefix '%s'", tmp ? tmp : "NULL"); - continue; - } - prefix = (guint32) tmp_prefix; - } else { - struct in_addr netmask; - - snprintf (buf, BUFLEN, "CISCO_SPLIT_INC_%d_MASK", i); - tmp = getenv (buf); - if (!tmp || inet_pton (AF_INET, tmp, &netmask) <= 0) { - nm_warning ("Ignoring invalid static route netmask '%s'", tmp ? tmp : "NULL"); - continue; - } - prefix = nm_utils_ip4_netmask_to_prefix (netmask.s_addr); - } - - array = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 4); - g_array_append_val (array, network.s_addr); - g_array_append_val (array, prefix); - g_array_append_val (array, next_hop); - g_array_append_val (array, metric); - g_ptr_array_add (routes, array); - } - - if (routes->len > 0) { - value = g_new0 (GValue, 1); - g_value_init (value, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT); - g_value_take_boxed (value, routes); - } else - g_ptr_array_free (routes, TRUE); - - return value; -} - -/* - * Environment variables passed back from 'vpnc': - * - * VPNGATEWAY -- vpn gateway address (always present) - * TUNDEV -- tunnel device (always present) - * INTERNAL_IP4_ADDRESS -- address (always present) - * INTERNAL_IP4_NETMASK -- netmask (often unset) - * INTERNAL_IP4_DNS -- list of dns serverss - * INTERNAL_IP4_NBNS -- list of wins servers - * CISCO_DEF_DOMAIN -- default domain name - * CISCO_BANNER -- banner from server - * - */ -int -main (int argc, char *argv[]) -{ - DBusGConnection *connection; - char *tmp; - GHashTable *config; - GValue *val; - GError *err = NULL; - struct in_addr temp_addr; - - g_type_init (); - - /* vpnc 0.3.3 gives us a "reason" code. If we are given one, - * don't proceed unless its "connect". - */ - tmp = getenv ("reason"); - if (tmp && strcmp (tmp, "connect") != 0) - exit (0); - - connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err); - if (!connection) { - nm_warning ("Could not get the system bus: %s", err->message); - exit (1); - } - - config = g_hash_table_new (g_str_hash, g_str_equal); - - /* Gateway */ - val = addr_to_gvalue (getenv ("VPNGATEWAY")); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, val); - else - helper_failed (connection, "VPN Gateway"); - - /* Tunnel device */ - val = str_to_gvalue (getenv ("TUNDEV"), FALSE); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val); - else - helper_failed (connection, "Tunnel Device"); - - /* IP address */ - val = addr_to_gvalue (getenv ("INTERNAL_IP4_ADDRESS")); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, val); - else - helper_failed (connection, "IP4 Address"); - - /* PTP address; for vpnc PTP address == internal IP4 address */ - val = addr_to_gvalue (getenv ("INTERNAL_IP4_ADDRESS")); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PTP, val); - else - helper_failed (connection, "IP4 PTP Address"); - - /* Netmask */ - tmp = getenv ("INTERNAL_IP4_NETMASK"); - if (tmp && inet_pton (AF_INET, tmp, &temp_addr) > 0) { - GValue *val; - - val = g_slice_new0 (GValue); - g_value_init (val, G_TYPE_UINT); - g_value_set_uint (val, nm_utils_ip4_netmask_to_prefix (temp_addr.s_addr)); - - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val); - } - - /* DNS */ - val = addr_list_to_gvalue (getenv ("INTERNAL_IP4_DNS")); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_DNS, val); - - /* WINS servers */ - val = addr_list_to_gvalue (getenv ("INTERNAL_IP4_NBNS")); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_NBNS, val); - - /* Default domain */ - val = str_to_gvalue (getenv ("CISCO_DEF_DOMAIN"), TRUE); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, val); - - /* Routes */ - val = get_routes (); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, val); - - /* Banner */ - val = str_to_gvalue (getenv ("CISCO_BANNER"), TRUE); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_BANNER, val); - - /* Set MTU to 1412 */ - val = uint_to_gvalue (1412); - if (val) - g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_MTU, val); - - /* Send the config info to nm-vpnc-service */ - send_ip4_config (connection, config); - - exit (0); -} diff --git a/vpn-daemons/vpnc/src/nm-vpnc-service.c b/vpn-daemons/vpnc/src/nm-vpnc-service.c deleted file mode 100644 index ba9d332533..0000000000 --- a/vpn-daemons/vpnc/src/nm-vpnc-service.c +++ /dev/null @@ -1,598 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include "nm-vpnc-service.h" -#include "nm-utils.h" - -G_DEFINE_TYPE (NMVPNCPlugin, nm_vpnc_plugin, NM_TYPE_VPN_PLUGIN) - -typedef struct { - GPid pid; -} NMVPNCPluginPrivate; - -#define NM_VPNC_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPNC_PLUGIN, NMVPNCPluginPrivate)) - -static const char *vpnc_binary_paths[] = -{ - "/usr/sbin/vpnc", - "/sbin/vpnc", - "/usr/local/sbin/vpnc", - NULL -}; - -#define NM_VPNC_HELPER_PATH LIBEXECDIR"/nm-vpnc-service-vpnc-helper" -#define NM_VPNC_UDP_ENCAPSULATION_PORT 0 /* random port */ - -typedef struct { - const char *name; - GType type; - gint int_min; - gint int_max; -} ValidProperty; - -#define LEGACY_NAT_KEEPALIVE "NAT-Keepalive packet interval" - -static ValidProperty valid_properties[] = { - { NM_VPNC_KEY_GATEWAY, G_TYPE_STRING, 0, 0 }, - { NM_VPNC_KEY_ID, G_TYPE_STRING, 0, 0 }, - { NM_VPNC_KEY_XAUTH_USER, G_TYPE_STRING, 0, 0 }, - { NM_VPNC_KEY_DOMAIN, G_TYPE_STRING, 0, 0 }, - { NM_VPNC_KEY_DHGROUP, G_TYPE_STRING, 0, 0 }, - { NM_VPNC_KEY_PERFECT_FORWARD, G_TYPE_STRING, 0, 0 }, - { NM_VPNC_KEY_APP_VERSION, G_TYPE_STRING, 0, 0 }, - { NM_VPNC_KEY_SINGLE_DES, G_TYPE_BOOLEAN, 0, 0 }, - { NM_VPNC_KEY_NO_ENCRYPTION, G_TYPE_BOOLEAN, 0, 0 }, - { NM_VPNC_KEY_DPD_IDLE_TIMEOUT, G_TYPE_INT, 0, 86400 }, - { NM_VPNC_KEY_NAT_TRAVERSAL_MODE, G_TYPE_STRING, 0, 0 }, - { NM_VPNC_KEY_CISCO_UDP_ENCAPS_PORT, G_TYPE_INT, 0, 65535 }, - /* Ignored option for internal use */ - { NM_VPNC_KEY_SECRET_TYPE, G_TYPE_NONE, 0, 0 }, - { NM_VPNC_KEY_XAUTH_PASSWORD_TYPE, G_TYPE_NONE, 0, 0 }, - /* Legacy options that are ignored */ - { LEGACY_NAT_KEEPALIVE, G_TYPE_STRING, 0, 0 }, - { NULL, G_TYPE_NONE, 0, 0 } -}; - -static ValidProperty valid_secrets[] = { - { NM_VPNC_KEY_SECRET, G_TYPE_STRING, 0, 0 }, - { NM_VPNC_KEY_XAUTH_PASSWORD, G_TYPE_STRING, 0, 0 }, - { NULL, G_TYPE_NONE, 0, 0 } -}; - -typedef struct ValidateInfo { - ValidProperty *table; - GError **error; - gboolean have_items; -} ValidateInfo; - -static void -validate_one_property (const char *key, const char *value, gpointer user_data) -{ - ValidateInfo *info = (ValidateInfo *) user_data; - int i; - - if (*(info->error)) - return; - - info->have_items = TRUE; - - /* 'name' is the setting name; always allowed but unused */ - if (!strcmp (key, NM_SETTING_NAME)) - return; - - for (i = 0; info->table[i].name; i++) { - ValidProperty prop = info->table[i]; - long int tmp; - - if (strcmp (prop.name, key)) - continue; - - switch (prop.type) { - case G_TYPE_NONE: - return; /* technically valid, but unused */ - case G_TYPE_STRING: - return; /* valid */ - case G_TYPE_INT: - errno = 0; - tmp = strtol (value, NULL, 10); - if (errno == 0 && tmp >= prop.int_min && tmp <= prop.int_max) - return; /* valid */ - - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "invalid integer property '%s' or out of range [%d -> %d]", - key, prop.int_min, prop.int_max); - break; - case G_TYPE_BOOLEAN: - if (!strcmp (value, "yes") || !strcmp (value, "no")) - return; /* valid */ - - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "invalid boolean property '%s' (not yes or no)", - key); - break; - default: - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "unhandled property '%s' type %s", - key, g_type_name (prop.type)); - break; - } - } - - /* Did not find the property from valid_properties or the type did not match */ - if (!info->table[i].name) { - g_set_error (info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "property '%s' invalid or not supported", - key); - } -} - -static gboolean -nm_vpnc_properties_validate (NMSettingVPN *s_vpn, GError **error) -{ - ValidateInfo info = { &valid_properties[0], error, FALSE }; - - nm_setting_vpn_foreach_data_item (s_vpn, validate_one_property, &info); - if (!info.have_items) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "%s", - "No VPN configuration options."); - return FALSE; - } - - return *error ? FALSE : TRUE; -} - -static gboolean -nm_vpnc_secrets_validate (NMSettingVPN *s_vpn, GError **error) -{ - ValidateInfo info = { &valid_secrets[0], error, FALSE }; - - nm_setting_vpn_foreach_secret (s_vpn, validate_one_property, &info); - if (!info.have_items) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "%s", - "No VPN secrets!"); - return FALSE; - } - - return *error ? FALSE : TRUE; -} - -static void -vpnc_watch_cb (GPid pid, gint status, gpointer user_data) -{ - NMVPNCPlugin *plugin = NM_VPNC_PLUGIN (user_data); - NMVPNCPluginPrivate *priv = NM_VPNC_PLUGIN_GET_PRIVATE (plugin); - guint error = 0; - - if (WIFEXITED (status)) { - error = WEXITSTATUS (status); - if (error != 0) - nm_warning ("vpnc exited with error code %d", error); - } - else if (WIFSTOPPED (status)) - nm_warning ("vpnc stopped unexpectedly with signal %d", WSTOPSIG (status)); - else if (WIFSIGNALED (status)) - nm_warning ("vpnc died with signal %d", WTERMSIG (status)); - else - nm_warning ("vpnc died from an unknown cause"); - - /* Reap child if needed. */ - waitpid (priv->pid, NULL, WNOHANG); - priv->pid = 0; - - /* Must be after data->state is set since signals use data->state */ - switch (error) { - case 2: - /* Couldn't log in due to bad user/pass */ - nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED); - break; - case 1: - /* Other error (couldn't bind to address, etc) */ - nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED); - break; - default: - break; - } - - nm_vpn_plugin_set_state (NM_VPN_PLUGIN (plugin), NM_VPN_SERVICE_STATE_STOPPED); -} - -static gint -nm_vpnc_start_vpnc_binary (NMVPNCPlugin *plugin, GError **error) -{ - GPid pid; - const char **vpnc_binary = NULL; - GPtrArray *vpnc_argv; - GSource *vpnc_watch; - gint stdin_fd; - - /* Find vpnc */ - vpnc_binary = vpnc_binary_paths; - while (*vpnc_binary != NULL) { - if (g_file_test (*vpnc_binary, G_FILE_TEST_EXISTS)) - break; - vpnc_binary++; - } - - if (!*vpnc_binary) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED, - "%s", - "Could not find vpnc binary."); - return -1; - } - - vpnc_argv = g_ptr_array_new (); - g_ptr_array_add (vpnc_argv, (gpointer) (*vpnc_binary)); - g_ptr_array_add (vpnc_argv, (gpointer) "--non-inter"); - g_ptr_array_add (vpnc_argv, (gpointer) "--no-detach"); - g_ptr_array_add (vpnc_argv, (gpointer) "-"); - g_ptr_array_add (vpnc_argv, NULL); - - if (!g_spawn_async_with_pipes (NULL, (char **) vpnc_argv->pdata, NULL, - G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, &stdin_fd, - NULL, NULL, error)) { - g_ptr_array_free (vpnc_argv, TRUE); - nm_warning ("vpnc failed to start. error: '%s'", (*error)->message); - return -1; - } - g_ptr_array_free (vpnc_argv, TRUE); - - nm_info ("vpnc started with pid %d", pid); - - NM_VPNC_PLUGIN_GET_PRIVATE (plugin)->pid = pid; - vpnc_watch = g_child_watch_source_new (pid); - g_source_set_callback (vpnc_watch, (GSourceFunc) vpnc_watch_cb, plugin, NULL); - g_source_attach (vpnc_watch, NULL); - g_source_unref (vpnc_watch); - - return stdin_fd; -} - -static inline void -write_config_option (int fd, const char *format, ...) -{ - char * string; - va_list args; - int x; - - va_start (args, format); - string = g_strdup_vprintf (format, args); - x = write (fd, string, strlen (string)); - g_free (string); - va_end (args); -} - -typedef struct { - int fd; - GError *error; - gboolean upw_ignored; - gboolean gpw_ignored; -} WriteConfigInfo; - -static void -write_one_property (const char *key, const char *value, gpointer user_data) -{ - WriteConfigInfo *info = (WriteConfigInfo *) user_data; - GType type = G_TYPE_INVALID; - int i; - - if (info->error) - return; - - /* Find the value in the table to get its type */ - for (i = 0; valid_properties[i].name; i++) { - ValidProperty prop = valid_properties[i]; - - if (!strcmp (prop.name, (char *) key)) { - /* Property is ok */ - type = prop.type; - break; - } - } - - /* Try the valid secrets table */ - for (i = 0; type == G_TYPE_INVALID && valid_secrets[i].name; i++) { - ValidProperty prop = valid_secrets[i]; - - if (!strcmp (prop.name, (char *) key)) { - /* Property is ok */ - type = prop.type; - break; - } - } - - if (type == G_TYPE_INVALID) { - g_set_error (&info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Config option '%s' invalid or unknown.", - (const char *) key); - } - - /* Don't write ignored secrets */ - if (!strcmp (key, NM_VPNC_KEY_XAUTH_PASSWORD) && info->upw_ignored) - return; - if (!strcmp (key, NM_VPNC_KEY_SECRET) && info->gpw_ignored) - return; - - if (type == G_TYPE_STRING) - write_config_option (info->fd, "%s %s\n", (char *) key, (char *) value); - else if (type == G_TYPE_BOOLEAN) { - if (!strcmp (value, "yes")) - write_config_option (info->fd, "%s\n", (char *) key); - } else if (type == G_TYPE_INT) { - long int tmp_int; - char *tmp_str; - - /* Convert -> int and back to string for security's sake since - * strtol() ignores leading and trailing characters. - */ - errno = 0; - tmp_int = strtol (value, NULL, 10); - if (errno == 0) { - tmp_str = g_strdup_printf ("%ld", tmp_int); - write_config_option (info->fd, "%s %s\n", (char *) key, tmp_str); - g_free (tmp_str); - } else { - g_set_error (&info->error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Config option '%s' not an integer.", - (const char *) key); - } - } else if (type == G_TYPE_NONE) { - /* ignored */ - } else { - /* Just ignore unknown properties */ - nm_warning ("Don't know how to write property '%s' with type %s", - (char *) key, g_type_name (type)); - } -} - -static gboolean -nm_vpnc_config_write (gint vpnc_fd, - NMSettingVPN *s_vpn, - GError **error) -{ - WriteConfigInfo *info; - const char *props_username; - const char *props_natt_mode; - const char *default_username; - const char *pw_type; - - default_username = nm_setting_vpn_get_user_name (s_vpn); - - write_config_option (vpnc_fd, "Script " NM_VPNC_HELPER_PATH "\n"); - - write_config_option (vpnc_fd, - NM_VPNC_KEY_CISCO_UDP_ENCAPS_PORT " %d\n", - NM_VPNC_UDP_ENCAPSULATION_PORT); - - /* Fill username if it's not present */ - props_username = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_XAUTH_USER); - if ( default_username - && strlen (default_username) - && (!props_username || !strlen (props_username))) { - write_config_option (vpnc_fd, - NM_VPNC_KEY_XAUTH_USER " %s\n", - default_username); - } - - /* Use Cisco UDP by default */ - props_natt_mode = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_NAT_TRAVERSAL_MODE); - if (!props_natt_mode || !strlen (props_natt_mode)) { - write_config_option (vpnc_fd, - NM_VPNC_KEY_NAT_TRAVERSAL_MODE " %s\n", - NM_VPNC_NATT_MODE_CISCO); - } - - info = g_malloc0 (sizeof (WriteConfigInfo)); - info->fd = vpnc_fd; - - /* Check for ignored user password */ - pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD_TYPE); - if (pw_type && !strcmp (pw_type, NM_VPNC_PW_TYPE_UNUSED)) - info->upw_ignored = TRUE; - - /* Check for ignored group password */ - pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_SECRET_TYPE); - if (pw_type && !strcmp (pw_type, NM_VPNC_PW_TYPE_UNUSED)) - info->gpw_ignored = TRUE; - - nm_setting_vpn_foreach_data_item (s_vpn, write_one_property, info); - nm_setting_vpn_foreach_secret (s_vpn, write_one_property, info); - *error = info->error; - g_free (info); - - return *error ? FALSE : TRUE; -} - -static gboolean -real_connect (NMVPNPlugin *plugin, - NMConnection *connection, - GError **error) -{ - NMSettingVPN *s_vpn; - gint vpnc_fd = -1; - gboolean success = FALSE; - - s_vpn = NM_SETTING_VPN (nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN)); - g_assert (s_vpn); - - if (!nm_vpnc_properties_validate (s_vpn, error)) - goto out; - if (!nm_vpnc_secrets_validate (s_vpn, error)) - goto out; - - vpnc_fd = nm_vpnc_start_vpnc_binary (NM_VPNC_PLUGIN (plugin), error); - if (vpnc_fd < 0) - goto out; - - if (!nm_vpnc_config_write (vpnc_fd, s_vpn, error)) - goto out; - - success = TRUE; - -out: - if (vpnc_fd >= 0) - close (vpnc_fd); - return success; -} - -static gboolean -real_need_secrets (NMVPNPlugin *plugin, - NMConnection *connection, - char **setting_name, - GError **error) -{ - NMSettingVPN *s_vpn; - const char *pw_type; - - g_return_val_if_fail (NM_IS_VPN_PLUGIN (plugin), FALSE); - g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); - - s_vpn = NM_SETTING_VPN (nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN)); - if (!s_vpn) { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "%s", - "Could not process the request because the VPN connection settings were invalid."); - return FALSE; - } - - pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_SECRET_TYPE); - if (!pw_type || strcmp (pw_type, NM_VPNC_PW_TYPE_UNUSED)) { - if (!nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_SECRET)) { - *setting_name = NM_SETTING_VPN_SETTING_NAME; - return TRUE; - } - } - - pw_type = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD_TYPE); - if (!pw_type || strcmp (pw_type, NM_VPNC_PW_TYPE_UNUSED)) { - if (!nm_setting_vpn_get_secret (s_vpn, NM_VPNC_KEY_XAUTH_PASSWORD)) { - *setting_name = NM_SETTING_VPN_SETTING_NAME; - return TRUE; - } - } - - return FALSE; -} - -static gboolean -ensure_killed (gpointer data) -{ - int pid = GPOINTER_TO_INT (data); - - if (kill (pid, 0) == 0) - kill (pid, SIGKILL); - - return FALSE; -} - -static gboolean -real_disconnect (NMVPNPlugin *plugin, - GError **err) -{ - NMVPNCPluginPrivate *priv = NM_VPNC_PLUGIN_GET_PRIVATE (plugin); - - if (priv->pid) { - if (kill (priv->pid, SIGTERM) == 0) - g_timeout_add (2000, ensure_killed, GINT_TO_POINTER (priv->pid)); - else - kill (priv->pid, SIGKILL); - - nm_info ("Terminated vpnc daemon with PID %d.", priv->pid); - priv->pid = 0; - } - - return TRUE; -} - -static void -nm_vpnc_plugin_init (NMVPNCPlugin *plugin) -{ -} - -static void -nm_vpnc_plugin_class_init (NMVPNCPluginClass *vpnc_class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (vpnc_class); - NMVPNPluginClass *parent_class = NM_VPN_PLUGIN_CLASS (vpnc_class); - - g_type_class_add_private (object_class, sizeof (NMVPNCPluginPrivate)); - - /* virtual methods */ - parent_class->connect = real_connect; - parent_class->need_secrets = real_need_secrets; - parent_class->disconnect = real_disconnect; -} - -NMVPNCPlugin * -nm_vpnc_plugin_new (void) -{ - return (NMVPNCPlugin *) g_object_new (NM_TYPE_VPNC_PLUGIN, - NM_VPN_PLUGIN_DBUS_SERVICE_NAME, NM_DBUS_SERVICE_VPNC, - NULL); -} - -static void -quit_mainloop (NMVPNCPlugin *plugin, gpointer user_data) -{ - g_main_loop_quit ((GMainLoop *) user_data); -} - -int -main (int argc, char *argv[]) -{ - NMVPNCPlugin *plugin; - GMainLoop *main_loop; - - g_type_init (); - - if (system ("/sbin/modprobe tun") == -1) - exit (EXIT_FAILURE); - - plugin = nm_vpnc_plugin_new (); - if (!plugin) - exit (EXIT_FAILURE); - - main_loop = g_main_loop_new (NULL, FALSE); - - g_signal_connect (plugin, "quit", - G_CALLBACK (quit_mainloop), - main_loop); - - g_main_loop_run (main_loop); - - g_main_loop_unref (main_loop); - g_object_unref (plugin); - - exit (EXIT_SUCCESS); -} diff --git a/vpn-daemons/vpnc/src/nm-vpnc-service.h b/vpn-daemons/vpnc/src/nm-vpnc-service.h deleted file mode 100644 index 6cc174cb1e..0000000000 --- a/vpn-daemons/vpnc/src/nm-vpnc-service.h +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */ - -#ifndef NM_VPNC_PLUGIN_H -#define NM_VPNC_PLUGIN_H - -#include -#include -#include - -#define NM_TYPE_VPNC_PLUGIN (nm_vpnc_plugin_get_type ()) -#define NM_VPNC_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPNC_PLUGIN, NMVPNCPlugin)) -#define NM_VPNC_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPNC_PLUGIN, NMVPNCPluginClass)) -#define NM_IS_VPNC_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPNC_PLUGIN)) -#define NM_IS_VPNC_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_VPNC_PLUGIN)) -#define NM_VPNC_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPNC_PLUGIN, NMVPNCPluginClass)) - -#define NM_DBUS_SERVICE_VPNC "org.freedesktop.NetworkManager.vpnc" -#define NM_DBUS_INTERFACE_VPNC "org.freedesktop.NetworkManager.vpnc" -#define NM_DBUS_PATH_VPNC "/org/freedesktop/NetworkManager/vpnc" - -#define NM_VPNC_KEY_GATEWAY "IPSec gateway" -#define NM_VPNC_KEY_ID "IPSec ID" -#define NM_VPNC_KEY_SECRET "IPSec secret" -#define NM_VPNC_KEY_SECRET_TYPE "ipsec-secret-type" -#define NM_VPNC_KEY_XAUTH_USER "Xauth username" -#define NM_VPNC_KEY_XAUTH_PASSWORD "Xauth password" -#define NM_VPNC_KEY_XAUTH_PASSWORD_TYPE "xauth-password-type" -#define NM_VPNC_KEY_DOMAIN "Domain" -#define NM_VPNC_KEY_DHGROUP "IKE DH Group" -#define NM_VPNC_KEY_PERFECT_FORWARD "Perfect Forward Secrecy" -#define NM_VPNC_KEY_APP_VERSION "Application Version" -#define NM_VPNC_KEY_SINGLE_DES "Enable Single DES" -#define NM_VPNC_KEY_NO_ENCRYPTION "Enable no encryption" -#define NM_VPNC_KEY_NAT_TRAVERSAL_MODE "NAT Traversal Mode" -#define NM_VPNC_KEY_DPD_IDLE_TIMEOUT "DPD idle timeout (our side)" -#define NM_VPNC_KEY_CISCO_UDP_ENCAPS_PORT "Cisco UDP Encapsulation Port" - -#define NM_VPNC_NATT_MODE_NATT "natt" -#define NM_VPNC_NATT_MODE_NONE "none" -#define NM_VPNC_NATT_MODE_CISCO "cisco-udp" - -#define NM_VPNC_PW_TYPE_SAVE "save" -#define NM_VPNC_PW_TYPE_ASK "ask" -#define NM_VPNC_PW_TYPE_UNUSED "unused" - -typedef struct { - NMVPNPlugin parent; -} NMVPNCPlugin; - -typedef struct { - NMVPNPluginClass parent; -} NMVPNCPluginClass; - -GType nm_vpnc_plugin_get_type (void); - -NMVPNCPlugin *nm_vpnc_plugin_new (void); - -#endif /* NM_VPNC_PLUGIN_H */ From 706118b9db9411005292f45ecff981726276c3f6 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 16 Dec 2008 15:24:38 -0500 Subject: [PATCH 02/45] Use correct dhclient leasefile location for Debian systems Patch by Michael Biebl --- src/dhcp-manager/nm-dhcp-dhclient.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index f529315eda..846058d80c 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -36,7 +36,11 @@ #define NM_DHCP_MANAGER_PID_FILENAME "dhclient" #define NM_DHCP_MANAGER_PID_FILE_EXT "pid" +#if defined(TARGET_DEBIAN) +#define NM_DHCP_MANAGER_LEASE_DIR LOCALSTATEDIR "/lib/dhcp3" +#else #define NM_DHCP_MANAGER_LEASE_DIR LOCALSTATEDIR "/lib/dhclient" +#endif #define NM_DHCP_MANAGER_LEASE_FILENAME "dhclient" #define NM_DHCP_MANAGER_LEASE_FILE_EXT "lease" From a020ed21da6721e896c7eb4b84fc805e127031eb Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 19 Dec 2008 17:01:06 -0500 Subject: [PATCH 03/45] Re-add WINS support to the IPv4 config Don't do anything with WINS servers (dispatcher scripts installed with samba could certainly update samba's idea of WINS servers), but at least provide them so that the VPNs that can get upstream WINS servers can at least make other stuff aware of them. --- introspection/nm-ip4-config.xml | 3 ++ libnm-glib/libnm-glib-test.c | 12 ++++- libnm-glib/libnm_glib.ver | 1 + libnm-glib/nm-ip4-config.c | 72 +++++++++++++++++++++++-- libnm-glib/nm-ip4-config.h | 12 +++-- src/dhcp-manager/nm-dhcp-manager.c | 15 ++++++ src/nm-ip4-config.c | 82 +++++++++++++++++++++++++++-- src/nm-ip4-config.h | 7 +++ src/ppp-manager/nm-ppp-manager.c | 8 +++ src/vpn-manager/nm-vpn-connection.c | 2 +- 10 files changed, 197 insertions(+), 17 deletions(-) diff --git a/introspection/nm-ip4-config.xml b/introspection/nm-ip4-config.xml index 1203672785..57ce29529d 100644 --- a/introspection/nm-ip4-config.xml +++ b/introspection/nm-ip4-config.xml @@ -8,6 +8,9 @@ The nameservers in use. + + The Windows Internet Name Service servers associated with the connection. + A list of domains this address belongs to. diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c index 6b1f7d2372..ed296015cf 100644 --- a/libnm-glib/libnm-glib-test.c +++ b/libnm-glib/libnm-glib-test.c @@ -112,8 +112,6 @@ dump_ip4_config (NMIP4Config *cfg) g_free (tmp); } - g_print ("IP4 hostname: %s\n", nm_ip4_config_get_hostname (cfg)); - array = nm_ip4_config_get_nameservers (cfg); if (array) { g_print ("IP4 DNS:\n"); @@ -130,6 +128,16 @@ dump_ip4_config (NMIP4Config *cfg) for (i = 0; i < ptr_array->len; i++) g_print ("\t%s\n", (const char *) g_ptr_array_index (ptr_array, i)); } + + array = nm_ip4_config_get_wins_servers (cfg); + if (array) { + g_print ("IP4 WINS:\n"); + for (i = 0; i < array->len; i++) { + tmp = ip4_address_as_string (g_array_index (array, guint32, i)); + g_print ("\t%s\n", tmp); + g_free (tmp); + } + } } static void diff --git a/libnm-glib/libnm_glib.ver b/libnm-glib/libnm_glib.ver index 8dd6c72eab..6336c86df5 100644 --- a/libnm-glib/libnm_glib.ver +++ b/libnm-glib/libnm_glib.ver @@ -94,6 +94,7 @@ global: nm_ip4_config_get_domains; nm_ip4_config_get_hostname; nm_ip4_config_get_nameservers; + nm_ip4_config_get_wins_servers; nm_ip4_config_get_routes; nm_ip4_config_get_type; nm_ip4_config_new; diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c index 3af0f8d71e..9ab1607b82 100644 --- a/libnm-glib/nm-ip4-config.c +++ b/libnm-glib/nm-ip4-config.c @@ -42,6 +42,7 @@ typedef struct { GArray *nameservers; GPtrArray *domains; GSList *routes; + GArray *wins; } NMIP4ConfigPrivate; enum { @@ -51,6 +52,7 @@ enum { PROP_NAMESERVERS, PROP_DOMAINS, PROP_ROUTES, + PROP_WINS_SERVERS, LAST_PROP }; @@ -83,6 +85,9 @@ demarshal_ip4_array (NMObject *object, GParamSpec *pspec, GValue *value, gpointe if (!strcmp (pspec->name, NM_IP4_CONFIG_NAMESERVERS)) _nm_object_queue_notify (object, NM_IP4_CONFIG_NAMESERVERS); + else if (!strcmp (pspec->name, NM_IP4_CONFIG_WINS_SERVERS)) + _nm_object_queue_notify (object, NM_IP4_CONFIG_WINS_SERVERS); + return TRUE; } @@ -116,11 +121,12 @@ register_for_property_changed (NMIP4Config *config) { NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (config); const NMPropertiesChangedInfo property_changed_info[] = { - { NM_IP4_CONFIG_ADDRESSES, demarshal_ip4_address_array, &priv->addresses }, - { NM_IP4_CONFIG_HOSTNAME, _nm_object_demarshal_generic, &priv->hostname }, - { NM_IP4_CONFIG_NAMESERVERS, demarshal_ip4_array, &priv->nameservers }, - { NM_IP4_CONFIG_DOMAINS, demarshal_domains, &priv->domains }, - { NM_IP4_CONFIG_ROUTES, demarshal_ip4_routes_array, &priv->routes }, + { NM_IP4_CONFIG_ADDRESSES, demarshal_ip4_address_array, &priv->addresses }, + { NM_IP4_CONFIG_HOSTNAME, _nm_object_demarshal_generic, &priv->hostname }, + { NM_IP4_CONFIG_NAMESERVERS, demarshal_ip4_array, &priv->nameservers }, + { NM_IP4_CONFIG_DOMAINS, demarshal_domains, &priv->domains }, + { NM_IP4_CONFIG_ROUTES, demarshal_ip4_routes_array, &priv->routes }, + { NM_IP4_CONFIG_WINS_SERVERS, demarshal_ip4_array, &priv->wins }, { NULL }, }; @@ -172,6 +178,9 @@ finalize (GObject *object) if (priv->nameservers) g_array_free (priv->nameservers, TRUE); + if (priv->wins) + g_array_free (priv->wins, TRUE); + if (priv->domains) { g_ptr_array_foreach (priv->domains, (GFunc) g_free, NULL); g_ptr_array_free (priv->domains, TRUE); @@ -207,6 +216,9 @@ get_property (GObject *object, case PROP_ROUTES: nm_utils_ip4_routes_to_gvalue (priv->routes, value); break; + case PROP_WINS_SERVERS: + g_value_set_boxed (value, nm_ip4_config_get_wins_servers (self)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -289,6 +301,19 @@ nm_ip4_config_class_init (NMIP4ConfigClass *config_class) "Routes", "Routes", G_PARAM_READABLE)); + + /** + * NMIP4Config:wins-servers: + * + * The #GArray containing WINS servers (%guint32es) of the configuration. + **/ + g_object_class_install_property + (object_class, PROP_WINS_SERVERS, + g_param_spec_boxed (NM_IP4_CONFIG_WINS_SERVERS, + "WINS Servers", + "WINS Servers", + NM_TYPE_UINT_ARRAY, + G_PARAM_READABLE)); } /** @@ -404,6 +429,7 @@ nm_ip4_config_get_nameservers (NMIP4Config *config) return priv->nameservers; } + /** * nm_ip4_config_get_domains: * @config: a #NMIP4Config @@ -443,6 +469,42 @@ nm_ip4_config_get_domains (NMIP4Config *config) return handle_ptr_array_return (priv->domains); } +/** + * nm_ip4_config_get_wins_servers: + * @config: a #NMIP4Config + * + * Gets the Windows Internet Name Service servers (WINS). + * + * Returns: the #GArray containing %guint32s. This is the internal copy used by the + * configuration and must not be modified. + **/ +const GArray * +nm_ip4_config_get_wins_servers (NMIP4Config *config) +{ + NMIP4ConfigPrivate *priv; + GArray *array = NULL; + GValue value = {0,}; + + g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL); + + priv = NM_IP4_CONFIG_GET_PRIVATE (config); + if (!priv->nameservers) { + if (_nm_object_get_property (NM_OBJECT (config), + NM_DBUS_INTERFACE_IP4_CONFIG, + "Nameservers", + &value)) { + array = (GArray *) g_value_get_boxed (&value); + if (array && array->len) { + priv->nameservers = g_array_sized_new (FALSE, TRUE, sizeof (guint32), array->len); + g_array_append_vals (priv->nameservers, array->data, array->len); + } + g_value_unset (&value); + } + } + + return priv->nameservers; +} + /** * nm_ip4_config_get_routes: * @config: a #NMIP4Config diff --git a/libnm-glib/nm-ip4-config.h b/libnm-glib/nm-ip4-config.h index c8dbe19847..cc9f364559 100644 --- a/libnm-glib/nm-ip4-config.h +++ b/libnm-glib/nm-ip4-config.h @@ -51,16 +51,18 @@ typedef struct { #define NM_IP4_CONFIG_NAMESERVERS "nameservers" #define NM_IP4_CONFIG_DOMAINS "domains" #define NM_IP4_CONFIG_ROUTES "routes" +#define NM_IP4_CONFIG_WINS_SERVERS "wins-servers" GType nm_ip4_config_get_type (void); GObject *nm_ip4_config_new (DBusGConnection *connection, const char *object_path); -const GSList * nm_ip4_config_get_addresses (NMIP4Config *config); -const char * nm_ip4_config_get_hostname (NMIP4Config *config); -const GArray * nm_ip4_config_get_nameservers (NMIP4Config *config); -const GPtrArray *nm_ip4_config_get_domains (NMIP4Config *config); -const GSList * nm_ip4_config_get_routes (NMIP4Config *config); +const GSList * nm_ip4_config_get_addresses (NMIP4Config *config); +const char * nm_ip4_config_get_hostname (NMIP4Config *config); +const GArray * nm_ip4_config_get_nameservers (NMIP4Config *config); +const GPtrArray *nm_ip4_config_get_domains (NMIP4Config *config); +const GSList * nm_ip4_config_get_routes (NMIP4Config *config); +const GArray * nm_ip4_config_get_wins_servers (NMIP4Config *config); G_END_DECLS diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 6de7ac2890..9caeacada5 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -840,6 +840,21 @@ nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, g_strfreev (searches); } + str = g_hash_table_lookup (device->options, "new_netbios_name_servers"); + if (str) { + char **searches = g_strsplit (str, " ", 0); + char **s; + + for (s = searches; *s; s++) { + if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { + nm_ip4_config_add_wins (ip4_config, tmp_addr.s_addr); + nm_info (" wins '%s'", *s); + } else + nm_warning ("Ignoring invalid WINS server '%s'", *s); + } + g_strfreev (searches); + } + str = g_hash_table_lookup (device->options, "new_static_routes"); if (str) { char **searches = g_strsplit (str, " ", 0); diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 4caeb1508d..b9c2df7e4b 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -54,6 +54,8 @@ typedef struct { GPtrArray *domains; GPtrArray *searches; + GArray *wins; + GSList *routes; gboolean never_default; @@ -66,6 +68,7 @@ enum { PROP_NAMESERVERS, PROP_DOMAINS, PROP_ROUTES, + PROP_WINS_SERVERS, LAST_PROP }; @@ -179,10 +182,21 @@ void nm_ip4_config_set_ptp_address (NMIP4Config *config, guint32 ptp_addr) void nm_ip4_config_add_nameserver (NMIP4Config *config, guint32 nameserver) { - g_return_if_fail (NM_IS_IP4_CONFIG (config)); + NMIP4ConfigPrivate *priv; + int i; - if (nameserver != 0) - g_array_append_val (NM_IP4_CONFIG_GET_PRIVATE (config)->nameservers, nameserver); + g_return_if_fail (NM_IS_IP4_CONFIG (config)); + g_return_if_fail (nameserver > 0); + + priv = NM_IP4_CONFIG_GET_PRIVATE (config); + for (i = 0; i < priv->nameservers->len; i++) { + guint32 s = g_array_index (priv->nameservers, guint32, i); + + /* No dupes */ + g_return_if_fail (nameserver != s); + } + + g_array_append_val (priv->nameservers, nameserver); } guint32 nm_ip4_config_get_nameserver (NMIP4Config *config, guint i) @@ -210,6 +224,50 @@ void nm_ip4_config_reset_nameservers (NMIP4Config *config) g_array_remove_range (priv->nameservers, 0, priv->nameservers->len); } +void nm_ip4_config_add_wins (NMIP4Config *config, guint32 wins) +{ + NMIP4ConfigPrivate *priv; + int i; + + g_return_if_fail (NM_IS_IP4_CONFIG (config)); + g_return_if_fail (wins > 0); + + priv = NM_IP4_CONFIG_GET_PRIVATE (config); + for (i = 0; i < priv->wins->len; i++) { + guint32 s = g_array_index (priv->wins, guint32, i); + + /* No dupes */ + g_return_if_fail (wins != s); + } + + g_array_append_val (priv->wins, wins); +} + +guint32 nm_ip4_config_get_wins (NMIP4Config *config, guint i) +{ + g_return_val_if_fail (NM_IS_IP4_CONFIG (config), 0); + + return g_array_index (NM_IP4_CONFIG_GET_PRIVATE (config)->wins, guint32, i); +} + +guint32 nm_ip4_config_get_num_wins (NMIP4Config *config) +{ + g_return_val_if_fail (NM_IS_IP4_CONFIG (config), 0); + + return NM_IP4_CONFIG_GET_PRIVATE (config)->wins->len; +} + +void nm_ip4_config_reset_wins (NMIP4Config *config) +{ + NMIP4ConfigPrivate *priv; + + g_return_if_fail (NM_IS_IP4_CONFIG (config)); + + priv = NM_IP4_CONFIG_GET_PRIVATE (config); + if (priv->wins->len) + g_array_remove_range (priv->wins, 0, priv->wins->len); +} + void nm_ip4_config_take_route (NMIP4Config *config, NMIP4Route *route) { @@ -589,6 +647,11 @@ nm_ip4_config_diff (NMIP4Config *a, NMIP4Config *b) || !addr_array_compare (b_priv->nameservers, a_priv->nameservers)) flags |= NM_IP4_COMPARE_FLAG_NAMESERVERS; + if ( (a_priv->wins->len != b_priv->wins->len) + || !addr_array_compare (a_priv->wins, b_priv->wins) + || !addr_array_compare (b_priv->wins, a_priv->wins)) + flags |= NM_IP4_COMPARE_FLAG_WINS_SERVERS; + if ( !route_slist_compare (a_priv->routes, b_priv->routes) || !route_slist_compare (b_priv->routes, a_priv->routes)) flags |= NM_IP4_COMPARE_FLAG_ROUTES; @@ -618,6 +681,7 @@ nm_ip4_config_init (NMIP4Config *config) NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (config); priv->nameservers = g_array_new (FALSE, TRUE, sizeof (guint32)); + priv->wins = g_array_new (FALSE, TRUE, sizeof (guint32)); priv->domains = g_ptr_array_new (); priv->searches = g_ptr_array_new (); } @@ -629,6 +693,7 @@ finalize (GObject *object) nm_utils_slist_free (priv->addresses, (GDestroyNotify) nm_ip4_address_unref); nm_utils_slist_free (priv->routes, (GDestroyNotify) nm_ip4_route_unref); + g_array_free (priv->wins, TRUE); g_array_free (priv->nameservers, TRUE); g_ptr_array_free (priv->domains, TRUE); g_ptr_array_free (priv->searches, TRUE); @@ -653,6 +718,9 @@ get_property (GObject *object, guint prop_id, case PROP_ROUTES: nm_utils_ip4_routes_to_gvalue (priv->routes, value); break; + case PROP_WINS_SERVERS: + g_value_set_boxed (value, priv->wins); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -692,7 +760,6 @@ nm_ip4_config_class_init (NMIP4ConfigClass *config_class) "Domains", DBUS_TYPE_G_ARRAY_OF_STRING, G_PARAM_READABLE)); - g_object_class_install_property (object_class, PROP_ROUTES, g_param_spec_boxed (NM_IP4_CONFIG_ROUTES, @@ -700,6 +767,13 @@ nm_ip4_config_class_init (NMIP4ConfigClass *config_class) "Routes", DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, G_PARAM_READABLE)); + g_object_class_install_property + (object_class, PROP_WINS_SERVERS, + g_param_spec_boxed (NM_IP4_CONFIG_WINS_SERVERS, + "WinsServers", + "WINS server list", + DBUS_TYPE_G_UINT_ARRAY, + G_PARAM_READABLE)); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (config_class), &dbus_glib_nm_ip4_config_object_info); diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index 2e9de5095b..1c435adb60 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -45,6 +45,7 @@ typedef struct { #define NM_IP4_CONFIG_NAMESERVERS "nameservers" #define NM_IP4_CONFIG_DOMAINS "domains" #define NM_IP4_CONFIG_ROUTES "routes" +#define NM_IP4_CONFIG_WINS_SERVERS "wins-servers" GType nm_ip4_config_get_type (void); @@ -67,6 +68,11 @@ guint32 nm_ip4_config_get_nameserver (NMIP4Config *config, guint i); guint32 nm_ip4_config_get_num_nameservers (NMIP4Config *config); void nm_ip4_config_reset_nameservers (NMIP4Config *config); +void nm_ip4_config_add_wins (NMIP4Config *config, guint32 wins); +guint32 nm_ip4_config_get_wins (NMIP4Config *config, guint i); +guint32 nm_ip4_config_get_num_wins (NMIP4Config *config); +void nm_ip4_config_reset_wins (NMIP4Config *config); + void nm_ip4_config_take_route (NMIP4Config *config, NMIP4Route *route); void nm_ip4_config_add_route (NMIP4Config *config, NMIP4Route *route); void nm_ip4_config_replace_route (NMIP4Config *config, guint32 i, NMIP4Route *new_route); @@ -114,6 +120,7 @@ typedef enum { NM_IP4_COMPARE_FLAG_SEARCHES = 0x00000020, NM_IP4_COMPARE_FLAG_MTU = 0x00000040, NM_IP4_COMPARE_FLAG_MSS = 0x00000080, + NM_IP4_COMPARE_FLAG_WINS_SERVERS= 0x00000100, NM_IP4_COMPARE_FLAG_ALL = 0xFFFFFFFF /* match everything */ } NMIP4ConfigCompareFlags; diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 0a9c951ce2..19dc36d50a 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -508,6 +508,14 @@ impl_ppp_manager_set_ip4_config (NMPPPManager *manager, nm_ip4_config_add_nameserver (config, g_array_index (dns, guint, i)); } + val = (GValue *) g_hash_table_lookup (config_hash, NM_PPP_IP4_CONFIG_WINS); + if (val) { + GArray *wins = (GArray *) g_value_get_boxed (val); + + for (i = 0; i < wins->len; i++) + nm_ip4_config_add_wins (config, g_array_index (wins, guint, i)); + } + val = (GValue *) g_hash_table_lookup (config_hash, NM_PPP_IP4_CONFIG_INTERFACE); if (!val || !G_VALUE_HOLDS_STRING (val)) { nm_warning ("No interface"); diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 693ef44db6..66a252cdec 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -455,7 +455,7 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy, GArray *nbns = (GArray *) g_value_get_boxed (val); for (i = 0; i < nbns->len; i++) - nm_ip4_config_add_nameserver (config, g_array_index (nbns, guint, i)); + nm_ip4_config_add_wins (config, g_array_index (nbns, guint, i)); } val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP4_CONFIG_MSS); From 80686bc1812c9906c0aecd7fed4cdb5860dbb17b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 19 Dec 2008 21:19:09 -0500 Subject: [PATCH 04/45] [libnm-glib] Deprecate the NMIP4Config 'hostname' property NM doesn't implement it, but we forgot about it for 0.7 and now we have to live with it, so just deprecate it and make it return NULL. --- libnm-glib/libnm-glib-test.c | 2 -- libnm-glib/nm-ip4-config.c | 25 +++++-------------------- libnm-glib/nm-ip4-config.h | 4 ++-- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c index 6b1f7d2372..bf9c76cb62 100644 --- a/libnm-glib/libnm-glib-test.c +++ b/libnm-glib/libnm-glib-test.c @@ -112,8 +112,6 @@ dump_ip4_config (NMIP4Config *cfg) g_free (tmp); } - g_print ("IP4 hostname: %s\n", nm_ip4_config_get_hostname (cfg)); - array = nm_ip4_config_get_nameservers (cfg); if (array) { g_print ("IP4 DNS:\n"); diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c index 3af0f8d71e..d4c791faf7 100644 --- a/libnm-glib/nm-ip4-config.c +++ b/libnm-glib/nm-ip4-config.c @@ -38,7 +38,6 @@ typedef struct { DBusGProxy *proxy; GSList *addresses; - char *hostname; GArray *nameservers; GPtrArray *domains; GSList *routes; @@ -117,7 +116,6 @@ register_for_property_changed (NMIP4Config *config) NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (config); const NMPropertiesChangedInfo property_changed_info[] = { { NM_IP4_CONFIG_ADDRESSES, demarshal_ip4_address_array, &priv->addresses }, - { NM_IP4_CONFIG_HOSTNAME, _nm_object_demarshal_generic, &priv->hostname }, { NM_IP4_CONFIG_NAMESERVERS, demarshal_ip4_array, &priv->nameservers }, { NM_IP4_CONFIG_DOMAINS, demarshal_domains, &priv->domains }, { NM_IP4_CONFIG_ROUTES, demarshal_ip4_routes_array, &priv->routes }, @@ -168,7 +166,6 @@ finalize (GObject *object) g_slist_foreach (priv->routes, (GFunc) g_free, NULL); g_slist_free (priv->routes); - g_free (priv->hostname); if (priv->nameservers) g_array_free (priv->nameservers, TRUE); @@ -196,7 +193,7 @@ get_property (GObject *object, nm_utils_ip4_addresses_to_gvalue (priv->addresses, value); break; case PROP_HOSTNAME: - g_value_set_string (value, nm_ip4_config_get_hostname (self)); + g_value_set_string (value, NULL); break; case PROP_NAMESERVERS: g_value_set_boxed (value, nm_ip4_config_get_nameservers (self)); @@ -242,7 +239,7 @@ nm_ip4_config_class_init (NMIP4ConfigClass *config_class) /** * NMIP4Config:hostname: * - * The host name string of the configuration. + * DEPRECATED. Don't use. **/ g_object_class_install_property (object_class, PROP_HOSTNAME, @@ -347,26 +344,14 @@ nm_ip4_config_get_addresses (NMIP4Config *config) * nm_ip4_config_get_hostname: * @config: a #NMIP4Config * - * Gets the host name. + * DEPRECATED. Don't use. * - * Returns: the host name from the configuration. This is the internal copy used by the - * configuration and must not be modified. + * Returns: NULL **/ const char * nm_ip4_config_get_hostname (NMIP4Config *config) { - NMIP4ConfigPrivate *priv; - - g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL); - - priv = NM_IP4_CONFIG_GET_PRIVATE (config); - if (!priv->hostname) { - priv->hostname = _nm_object_get_string_property (NM_OBJECT (config), - NM_DBUS_INTERFACE_IP4_CONFIG, - "Hostname"); - } - - return priv->hostname; + return NULL; } /** diff --git a/libnm-glib/nm-ip4-config.h b/libnm-glib/nm-ip4-config.h index c8dbe19847..7807d98dbf 100644 --- a/libnm-glib/nm-ip4-config.h +++ b/libnm-glib/nm-ip4-config.h @@ -47,7 +47,7 @@ typedef struct { } NMIP4ConfigClass; #define NM_IP4_CONFIG_ADDRESSES "addresses" -#define NM_IP4_CONFIG_HOSTNAME "hostname" +#define NM_IP4_CONFIG_HOSTNAME "hostname" /* DEPRECATED */ #define NM_IP4_CONFIG_NAMESERVERS "nameservers" #define NM_IP4_CONFIG_DOMAINS "domains" #define NM_IP4_CONFIG_ROUTES "routes" @@ -57,7 +57,7 @@ GType nm_ip4_config_get_type (void); GObject *nm_ip4_config_new (DBusGConnection *connection, const char *object_path); const GSList * nm_ip4_config_get_addresses (NMIP4Config *config); -const char * nm_ip4_config_get_hostname (NMIP4Config *config); +const char * nm_ip4_config_get_hostname (NMIP4Config *config); /* DEPRECATED */ const GArray * nm_ip4_config_get_nameservers (NMIP4Config *config); const GPtrArray *nm_ip4_config_get_domains (NMIP4Config *config); const GSList * nm_ip4_config_get_routes (NMIP4Config *config); From c733dbf6d0d659e161f1f5c4d6f62d8cb63d1710 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 19 Dec 2008 21:23:08 -0500 Subject: [PATCH 05/45] Remove .cvsignore file, they are obsolete --- .cvsignore | 30 ------------------------------ examples/python/.cvsignore | 1 - examples/python/systray/.cvsignore | 4 ---- include/.cvsignore | 2 -- initscript/.cvsignore | 3 --- initscript/Arch/.cvsignore | 4 ---- initscript/Debian/.cvsignore | 2 -- initscript/Gentoo/.cvsignore | 4 ---- initscript/RedHat/.cvsignore | 5 ----- initscript/SUSE/.cvsignore | 4 ---- initscript/Slackware/.cvsignore | 4 ---- initscript/paldo/.cvsignore | 4 ---- libnm-util/.cvsignore | 4 ---- man/.cvsignore | 5 ----- po/.cvsignore | 15 --------------- src/.cvsignore | 6 ------ src/backends/.cvsignore | 3 --- src/dhcp-manager/.cvsignore | 2 -- src/named-manager/.cvsignore | 2 -- src/supplicant-manager/.cvsignore | 4 ---- src/vpn-manager/.cvsignore | 2 -- test/.cvsignore | 12 ------------ 22 files changed, 122 deletions(-) delete mode 100644 .cvsignore delete mode 100644 examples/python/.cvsignore delete mode 100644 examples/python/systray/.cvsignore delete mode 100644 include/.cvsignore delete mode 100644 initscript/.cvsignore delete mode 100644 initscript/Arch/.cvsignore delete mode 100644 initscript/Debian/.cvsignore delete mode 100644 initscript/Gentoo/.cvsignore delete mode 100644 initscript/RedHat/.cvsignore delete mode 100644 initscript/SUSE/.cvsignore delete mode 100644 initscript/Slackware/.cvsignore delete mode 100644 initscript/paldo/.cvsignore delete mode 100644 libnm-util/.cvsignore delete mode 100644 man/.cvsignore delete mode 100644 po/.cvsignore delete mode 100644 src/.cvsignore delete mode 100644 src/backends/.cvsignore delete mode 100644 src/dhcp-manager/.cvsignore delete mode 100644 src/named-manager/.cvsignore delete mode 100644 src/supplicant-manager/.cvsignore delete mode 100644 src/vpn-manager/.cvsignore delete mode 100644 test/.cvsignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 82b30a68a5..0000000000 --- a/.cvsignore +++ /dev/null @@ -1,30 +0,0 @@ -configure -config.log -config.status -config.h -config.h.in -Makefile -Makefile.in -[Nn]etwork[Mm]anager-*.tar.gz -NetworkManager.pc -autom4te.cache -aclocal.m4 -mkinstalldirs -stamp-h1 -libtool -COPYING -INSTALL -NetworkManager-0* -compile -config.guess -config.sub -depcomp -install-sh -ltmain.sh -missing -intltool-extract -intltool-merge -intltool-update -intltool-extract.in -intltool-merge.in -intltool-update.in diff --git a/examples/python/.cvsignore b/examples/python/.cvsignore deleted file mode 100644 index ac29597dec..0000000000 --- a/examples/python/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -NetworkManager.pyc diff --git a/examples/python/systray/.cvsignore b/examples/python/systray/.cvsignore deleted file mode 100644 index 4f2f17a1ff..0000000000 --- a/examples/python/systray/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -NetworkManager.pyc -config.h -trayicon.c -trayicon.defs diff --git a/include/.cvsignore b/include/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/include/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/initscript/.cvsignore b/initscript/.cvsignore deleted file mode 100644 index 372449d46c..0000000000 --- a/initscript/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -NMLaunchHelper diff --git a/initscript/Arch/.cvsignore b/initscript/Arch/.cvsignore deleted file mode 100644 index 489063dd77..0000000000 --- a/initscript/Arch/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -networkmanager -networkmanager-dispatcher diff --git a/initscript/Debian/.cvsignore b/initscript/Debian/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/initscript/Debian/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/initscript/Gentoo/.cvsignore b/initscript/Gentoo/.cvsignore deleted file mode 100644 index cb29b4820b..0000000000 --- a/initscript/Gentoo/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -NetworkManager -NetworkManagerDispatcher diff --git a/initscript/RedHat/.cvsignore b/initscript/RedHat/.cvsignore deleted file mode 100644 index d4f33ad452..0000000000 --- a/initscript/RedHat/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -NetworkManager -NetworkManagerDispatcher - diff --git a/initscript/SUSE/.cvsignore b/initscript/SUSE/.cvsignore deleted file mode 100644 index 489063dd77..0000000000 --- a/initscript/SUSE/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -networkmanager -networkmanager-dispatcher diff --git a/initscript/Slackware/.cvsignore b/initscript/Slackware/.cvsignore deleted file mode 100644 index 87ad021ac9..0000000000 --- a/initscript/Slackware/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -rc.networkmanager -rc.networkmanager-dispatcher -Makefile -Makefile.in diff --git a/initscript/paldo/.cvsignore b/initscript/paldo/.cvsignore deleted file mode 100644 index cb29b4820b..0000000000 --- a/initscript/paldo/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -NetworkManager -NetworkManagerDispatcher diff --git a/libnm-util/.cvsignore b/libnm-util/.cvsignore deleted file mode 100644 index b5c75df0c8..0000000000 --- a/libnm-util/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -libnm-util.pc - diff --git a/man/.cvsignore b/man/.cvsignore deleted file mode 100644 index 3ce353cbf3..0000000000 --- a/man/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -NetworkManager.8 -NetworkManagerDispatcher.8 -nm-tool.1 diff --git a/po/.cvsignore b/po/.cvsignore deleted file mode 100644 index 454d132cd3..0000000000 --- a/po/.cvsignore +++ /dev/null @@ -1,15 +0,0 @@ -*.gmo -*.mo -*.pot -Makefile -Makefile.in -Makefile.in.in -POTFILES -cat-id-tbl.c -messages -missing -notexist -po2tbl.sed -po2tbl.sed.in -stamp-cat-id -stamp-it diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 903005b2f4..0000000000 --- a/src/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -NetworkManager -nm-crash-logger -nm-marshal.c -nm-marshal.h diff --git a/src/backends/.cvsignore b/src/backends/.cvsignore deleted file mode 100644 index 46cd0498a7..0000000000 --- a/src/backends/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -.dirstamp -Makefile -Makefile.in diff --git a/src/dhcp-manager/.cvsignore b/src/dhcp-manager/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/src/dhcp-manager/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/named-manager/.cvsignore b/src/named-manager/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/src/named-manager/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/supplicant-manager/.cvsignore b/src/supplicant-manager/.cvsignore deleted file mode 100644 index c2fc55510a..0000000000 --- a/src/supplicant-manager/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -nm-supplicant-marshal.c -nm-supplicant-marshal.h diff --git a/src/vpn-manager/.cvsignore b/src/vpn-manager/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/src/vpn-manager/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/test/.cvsignore b/test/.cvsignore deleted file mode 100644 index 15348deb85..0000000000 --- a/test/.cvsignore +++ /dev/null @@ -1,12 +0,0 @@ -Makefile -Makefile.in -nminfotest -nmtest -nmtestdevices -libnm_glib_test -nm-dhcp-opt-test -nm-tool -nm-online -test-dbus-dict-helpers -nm-supplicant-test -nmnetlinktest From 3f907cb9e3cc8ca549b7681212de807fbf0b863a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sat, 20 Dec 2008 09:46:41 -0500 Subject: [PATCH 06/45] License header and FSF address update --- gfilemonitor/gfile.c | 8 +++---- gfilemonitor/gfile.h | 8 +++---- gfilemonitor/gfilemonitor.c | 8 +++---- gfilemonitor/gfilemonitor.h | 8 +++---- gfilemonitor/glocaldirectorymonitor.c | 8 +++---- gfilemonitor/glocaldirectorymonitor.h | 8 +++---- gfilemonitor/glocalfilemonitor.c | 8 +++---- gfilemonitor/glocalfilemonitor.h | 8 +++---- gfilemonitor/inotify-diag.c | 6 ++--- gfilemonitor/inotify-diag.h | 6 ++--- gfilemonitor/inotify-helper.c | 6 ++--- gfilemonitor/inotify-helper.h | 6 ++--- gfilemonitor/inotify-kernel.c | 6 ++--- gfilemonitor/inotify-kernel.h | 6 ++--- gfilemonitor/inotify-missing.c | 6 ++--- gfilemonitor/inotify-missing.h | 6 ++--- gfilemonitor/inotify-path.c | 6 ++--- gfilemonitor/inotify-path.h | 6 ++--- gfilemonitor/inotify-sub.c | 6 ++--- gfilemonitor/inotify-sub.h | 6 ++--- include/NetworkManager.h | 2 +- include/wireless-helper.h | 21 ++++++++++++++++++ libnm-glib/nm-device-private.h | 22 +++++++++++++++++++ libnm-glib/nm-types-private.h | 21 ++++++++++++++++++ src/dhcp-manager/nm-dhcp-manager.c | 1 + .../plugins/ifcfg-suse/nm-suse-connection.c | 20 ++++++++++++++++- .../plugins/ifcfg-suse/nm-suse-connection.h | 20 ++++++++++++++++- .../plugins/ifupdown/interface_parser.c | 6 ++--- .../plugins/ifupdown/interface_parser.h | 6 ++--- .../plugins/ifupdown/nm-ifupdown-connection.c | 6 ++--- .../plugins/ifupdown/nm-ifupdown-connection.h | 6 ++--- system-settings/plugins/ifupdown/parser.c | 6 ++--- system-settings/plugins/ifupdown/parser.h | 6 ++--- system-settings/plugins/ifupdown/plugin.c | 6 ++--- system-settings/plugins/ifupdown/plugin.h | 6 ++--- test/nm-online.c | 20 +++++++++++++++++ test/nmnetlinktest.c | 20 +++++++++++++++++ 37 files changed, 236 insertions(+), 95 deletions(-) diff --git a/gfilemonitor/gfile.c b/gfilemonitor/gfile.c index b69107a227..15102f6e67 100644 --- a/gfilemonitor/gfile.c +++ b/gfilemonitor/gfile.c @@ -11,10 +11,10 @@ * 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., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * 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. * * Author: Dan Williams */ diff --git a/gfilemonitor/gfile.h b/gfilemonitor/gfile.h index 4386b7ec9c..f9be44a814 100644 --- a/gfilemonitor/gfile.h +++ b/gfilemonitor/gfile.h @@ -11,10 +11,10 @@ * 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., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * 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. * * Author: Dan Williams */ diff --git a/gfilemonitor/gfilemonitor.c b/gfilemonitor/gfilemonitor.c index 10166e4fae..25d405f71f 100644 --- a/gfilemonitor/gfilemonitor.c +++ b/gfilemonitor/gfilemonitor.c @@ -12,10 +12,10 @@ * 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., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * 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. * * Author: Alexander Larsson */ diff --git a/gfilemonitor/gfilemonitor.h b/gfilemonitor/gfilemonitor.h index 53a923b688..68832b7dc8 100644 --- a/gfilemonitor/gfilemonitor.h +++ b/gfilemonitor/gfilemonitor.h @@ -12,10 +12,10 @@ * 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., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * 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. * * Author: Alexander Larsson */ diff --git a/gfilemonitor/glocaldirectorymonitor.c b/gfilemonitor/glocaldirectorymonitor.c index 778c8d97dc..1601093793 100644 --- a/gfilemonitor/glocaldirectorymonitor.c +++ b/gfilemonitor/glocaldirectorymonitor.c @@ -12,10 +12,10 @@ * 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., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * 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. * * Author: Alexander Larsson */ diff --git a/gfilemonitor/glocaldirectorymonitor.h b/gfilemonitor/glocaldirectorymonitor.h index 29c733723f..601fc69077 100644 --- a/gfilemonitor/glocaldirectorymonitor.h +++ b/gfilemonitor/glocaldirectorymonitor.h @@ -12,10 +12,10 @@ * 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., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * 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. * * Author: Alexander Larsson */ diff --git a/gfilemonitor/glocalfilemonitor.c b/gfilemonitor/glocalfilemonitor.c index 4a64503c60..4b0cf52ca3 100644 --- a/gfilemonitor/glocalfilemonitor.c +++ b/gfilemonitor/glocalfilemonitor.c @@ -12,10 +12,10 @@ * 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., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * 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. * * Author: Alexander Larsson */ diff --git a/gfilemonitor/glocalfilemonitor.h b/gfilemonitor/glocalfilemonitor.h index 76141afd9d..f041e9ad7d 100644 --- a/gfilemonitor/glocalfilemonitor.h +++ b/gfilemonitor/glocalfilemonitor.h @@ -12,10 +12,10 @@ * 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., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * 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. * * Author: Alexander Larsson */ diff --git a/gfilemonitor/inotify-diag.c b/gfilemonitor/inotify-diag.c index 937ebd7029..494eee07c1 100644 --- a/gfilemonitor/inotify-diag.c +++ b/gfilemonitor/inotify-diag.c @@ -15,9 +15,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Authors: John McCutchan diff --git a/gfilemonitor/inotify-diag.h b/gfilemonitor/inotify-diag.h index f818f16169..8837907421 100644 --- a/gfilemonitor/inotify-diag.h +++ b/gfilemonitor/inotify-diag.h @@ -13,9 +13,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Author: John McCutchan */ diff --git a/gfilemonitor/inotify-helper.c b/gfilemonitor/inotify-helper.c index ac53a8886c..29a7e51304 100644 --- a/gfilemonitor/inotify-helper.c +++ b/gfilemonitor/inotify-helper.c @@ -15,9 +15,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Authors: John McCutchan diff --git a/gfilemonitor/inotify-helper.h b/gfilemonitor/inotify-helper.h index 1fd9701d47..8ccf097b65 100644 --- a/gfilemonitor/inotify-helper.h +++ b/gfilemonitor/inotify-helper.h @@ -13,9 +13,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Author: John McCutchan */ diff --git a/gfilemonitor/inotify-kernel.c b/gfilemonitor/inotify-kernel.c index f9861a0bdb..fbf9a00768 100644 --- a/gfilemonitor/inotify-kernel.c +++ b/gfilemonitor/inotify-kernel.c @@ -12,9 +12,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Authors:. John McCutchan diff --git a/gfilemonitor/inotify-kernel.h b/gfilemonitor/inotify-kernel.h index b406d71d57..8baca3f73c 100644 --- a/gfilemonitor/inotify-kernel.h +++ b/gfilemonitor/inotify-kernel.h @@ -12,9 +12,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Authors:. John McCutchan diff --git a/gfilemonitor/inotify-missing.c b/gfilemonitor/inotify-missing.c index d19332acf8..6010c18f22 100644 --- a/gfilemonitor/inotify-missing.c +++ b/gfilemonitor/inotify-missing.c @@ -15,9 +15,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Authors: John McCutchan diff --git a/gfilemonitor/inotify-missing.h b/gfilemonitor/inotify-missing.h index b67b59525b..598db2f31b 100644 --- a/gfilemonitor/inotify-missing.h +++ b/gfilemonitor/inotify-missing.h @@ -13,9 +13,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Author: John McCutchan */ diff --git a/gfilemonitor/inotify-path.c b/gfilemonitor/inotify-path.c index 33275989c7..8d98a925d6 100644 --- a/gfilemonitor/inotify-path.c +++ b/gfilemonitor/inotify-path.c @@ -15,9 +15,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Authors: John McCutchan diff --git a/gfilemonitor/inotify-path.h b/gfilemonitor/inotify-path.h index c613b9f82d..72c7f2873f 100644 --- a/gfilemonitor/inotify-path.h +++ b/gfilemonitor/inotify-path.h @@ -12,9 +12,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Authors:. John McCutchan diff --git a/gfilemonitor/inotify-sub.c b/gfilemonitor/inotify-sub.c index 2b71c930da..1b4d184669 100644 --- a/gfilemonitor/inotify-sub.c +++ b/gfilemonitor/inotify-sub.c @@ -15,9 +15,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Authors: John McCutchan diff --git a/gfilemonitor/inotify-sub.h b/gfilemonitor/inotify-sub.h index 36561e74c7..01533bdb3b 100644 --- a/gfilemonitor/inotify-sub.h +++ b/gfilemonitor/inotify-sub.h @@ -13,9 +13,9 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. Author: John McCutchan */ diff --git a/include/NetworkManager.h b/include/NetworkManager.h index 6700145e3e..d61a89ca3c 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2004 Red Hat, Inc. + * (C) Copyright 2004 - 2008 Red Hat, Inc. */ #ifndef NETWORK_MANAGER_H diff --git a/include/wireless-helper.h b/include/wireless-helper.h index 7dc10c8f54..d150ef7df2 100644 --- a/include/wireless-helper.h +++ b/include/wireless-helper.h @@ -1,3 +1,24 @@ +/* NetworkManager -- Network link manager + * + * Dan Williams + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (C) Copyright 2008 Red Hat, Inc. + */ + /* Hacks necessary to #include wireless.h; yay for WEXT */ #ifndef __user diff --git a/libnm-glib/nm-device-private.h b/libnm-glib/nm-device-private.h index f9f2e79007..2c56a0e646 100644 --- a/libnm-glib/nm-device-private.h +++ b/libnm-glib/nm-device-private.h @@ -1,3 +1,25 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * libnm_glib -- Access network status & information from glib applications + * + * 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 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. + * + * Copyright (C) 2007 - 2008 Red Hat, Inc. + */ + #ifndef NM_DEVICE_PRIVATE_H #define NM_DEVICE_PRIVATE_H diff --git a/libnm-glib/nm-types-private.h b/libnm-glib/nm-types-private.h index 817955d22e..b55a82cc70 100644 --- a/libnm-glib/nm-types-private.h +++ b/libnm-glib/nm-types-private.h @@ -1,3 +1,24 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * libnm_glib -- Access network status & information from glib applications + * + * 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 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. + * + * Copyright (C) 2007 - 2008 Red Hat, Inc. + */ #ifndef NM_TYPES_PRIVATE_H #define NM_TYPES_PRIVATE_H diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 6de7ac2890..e5535a346b 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -16,6 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Copyright (C) 2005 - 2008 Red Hat, Inc. + * Copyright (C) 2006 - 2008 Novell, Inc. * */ diff --git a/system-settings/plugins/ifcfg-suse/nm-suse-connection.c b/system-settings/plugins/ifcfg-suse/nm-suse-connection.c index ccdcc7fa3c..c86b31c4f6 100644 --- a/system-settings/plugins/ifcfg-suse/nm-suse-connection.c +++ b/system-settings/plugins/ifcfg-suse/nm-suse-connection.c @@ -1,4 +1,22 @@ -/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager system settings service + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (C) Copyright 2008 Novell, Inc. + */ #include #include diff --git a/system-settings/plugins/ifcfg-suse/nm-suse-connection.h b/system-settings/plugins/ifcfg-suse/nm-suse-connection.h index 75d5337b5c..b308d67363 100644 --- a/system-settings/plugins/ifcfg-suse/nm-suse-connection.h +++ b/system-settings/plugins/ifcfg-suse/nm-suse-connection.h @@ -1,4 +1,22 @@ -/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager system settings service + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (C) Copyright 2008 Novell, Inc. + */ #ifndef NM_SUSE_CONNECTION_H #define NM_SUSE_CONNECTION_H diff --git a/system-settings/plugins/ifupdown/interface_parser.c b/system-settings/plugins/ifupdown/interface_parser.c index f5a0d540cf..dd0ba61455 100644 --- a/system-settings/plugins/ifupdown/interface_parser.c +++ b/system-settings/plugins/ifupdown/interface_parser.c @@ -13,9 +13,9 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * (C) Copyright 2004 Tom Parker */ diff --git a/system-settings/plugins/ifupdown/interface_parser.h b/system-settings/plugins/ifupdown/interface_parser.h index 43ad532162..52b98d04c4 100644 --- a/system-settings/plugins/ifupdown/interface_parser.h +++ b/system-settings/plugins/ifupdown/interface_parser.h @@ -13,9 +13,9 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * (C) Copyright 2004 Tom Parker */ diff --git a/system-settings/plugins/ifupdown/nm-ifupdown-connection.c b/system-settings/plugins/ifupdown/nm-ifupdown-connection.c index 0b9bd2a624..084065bd8c 100644 --- a/system-settings/plugins/ifupdown/nm-ifupdown-connection.c +++ b/system-settings/plugins/ifupdown/nm-ifupdown-connection.c @@ -14,9 +14,9 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * (C) Copyright 2007,2008 Canonical Ltd. */ diff --git a/system-settings/plugins/ifupdown/nm-ifupdown-connection.h b/system-settings/plugins/ifupdown/nm-ifupdown-connection.h index 96dc233781..4eb20e5032 100644 --- a/system-settings/plugins/ifupdown/nm-ifupdown-connection.h +++ b/system-settings/plugins/ifupdown/nm-ifupdown-connection.h @@ -14,9 +14,9 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * (C) Copyright 2008 Canonical Ltd. */ diff --git a/system-settings/plugins/ifupdown/parser.c b/system-settings/plugins/ifupdown/parser.c index 90995435d5..400e2a1827 100644 --- a/system-settings/plugins/ifupdown/parser.c +++ b/system-settings/plugins/ifupdown/parser.c @@ -14,9 +14,9 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * (C) Copyright 2008 Canonical Ltd. */ diff --git a/system-settings/plugins/ifupdown/parser.h b/system-settings/plugins/ifupdown/parser.h index 8e3a222f71..5e7ddd6056 100644 --- a/system-settings/plugins/ifupdown/parser.h +++ b/system-settings/plugins/ifupdown/parser.h @@ -14,9 +14,9 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * (C) Copyright 2008 Canonical Ltd. */ diff --git a/system-settings/plugins/ifupdown/plugin.c b/system-settings/plugins/ifupdown/plugin.c index c96917f968..8c2a1e64bd 100644 --- a/system-settings/plugins/ifupdown/plugin.c +++ b/system-settings/plugins/ifupdown/plugin.c @@ -14,9 +14,9 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * (C) Copyright 2007,2008 Canonical Ltd. */ diff --git a/system-settings/plugins/ifupdown/plugin.h b/system-settings/plugins/ifupdown/plugin.h index aad20ef633..09f8767a0d 100644 --- a/system-settings/plugins/ifupdown/plugin.h +++ b/system-settings/plugins/ifupdown/plugin.h @@ -14,9 +14,9 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * (C) Copyright 2008 Canonical Ltd. */ diff --git a/test/nm-online.c b/test/nm-online.c index 5133635a95..af80962df3 100644 --- a/test/nm-online.c +++ b/test/nm-online.c @@ -1,3 +1,23 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * 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, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2006 - 2008 Novell, Inc. + * + */ + /* * nm-online.c - Are we online? * diff --git a/test/nmnetlinktest.c b/test/nmnetlinktest.c index 582f1a68a2..da7734d912 100644 --- a/test/nmnetlinktest.c +++ b/test/nmnetlinktest.c @@ -1,3 +1,23 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * 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, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2005 - 2008 Red Hat, Inc. + * + */ + #include #include From 64af880fd7b8f42a6339b90a44e0959865baad9f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sat, 20 Dec 2008 09:48:02 -0500 Subject: [PATCH 07/45] Remove outdated examples --- examples/python/NMTester.py | 44 -- examples/python/NetworkManager.py | 214 --------- examples/python/README | 21 - examples/python/systray/Makefile | 34 -- examples/python/systray/eggtrayicon.c | 513 ---------------------- examples/python/systray/eggtrayicon.h | 80 ---- examples/python/systray/network_tray.py | 327 -------------- examples/python/systray/trayicon.override | 29 -- examples/python/systray/trayiconmodule.c | 25 -- 9 files changed, 1287 deletions(-) delete mode 100755 examples/python/NMTester.py delete mode 100755 examples/python/NetworkManager.py delete mode 100644 examples/python/README delete mode 100644 examples/python/systray/Makefile delete mode 100644 examples/python/systray/eggtrayicon.c delete mode 100644 examples/python/systray/eggtrayicon.h delete mode 100755 examples/python/systray/network_tray.py delete mode 100644 examples/python/systray/trayicon.override delete mode 100644 examples/python/systray/trayiconmodule.c diff --git a/examples/python/NMTester.py b/examples/python/NMTester.py deleted file mode 100755 index 3eb54dfcf9..0000000000 --- a/examples/python/NMTester.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/python - -from NetworkManager import NetworkManager -import gtk - -class NMTester(NetworkManager): - - def __init__(self): - NetworkManager.__init__(self) - - for signal in self.NM_SIGNALS: - self.nm_object.connect_to_signal(signal, - self.nm_signal_handler) - for signal in self.NMI_SIGNALS: - self.nmi_object.connect_to_signal(signal, - self.nmi_signal_handler) - self.print_device_list() - - def print_device_list(self): - d_list = self.get_devices() - print - print "=========================================================" - print - for d in d_list: - for k,v in d.iteritems(): - print "%s: %s" % (k,v) - print - print "=========================================================" - print - - def nm_signal_handler(self, interface, signal_name, - service, path, message): - self.print_device_list() - - def nmi_signal_handler(self, interface, signal_name, - service, path, message): - print ("Received signal '%s.%s' from object '%s%s' with message %s" - % (interface, signal_name, service, path, message)) - -if __name__ == "__main__": - nmt = NMTester() - gtk.main() - - diff --git a/examples/python/NetworkManager.py b/examples/python/NetworkManager.py deleted file mode 100755 index be26c5c4a0..0000000000 --- a/examples/python/NetworkManager.py +++ /dev/null @@ -1,214 +0,0 @@ -#!/usr/bin/python - -import dbus -from dbus_bindings import DBusException - -NM_SERVICE="org.freedesktop.NetworkManager" -NM_PATH="/org/freedesktop/NetworkManager" -NM_INTERFACE=NM_SERVICE - -# i can append device names like eth0 to this path to get more info -NM_PATH_DEVICES="/org/freedesktop/NetworkManager/Devices" -NM_INTERFACE_DEVICES="org.freedesktop.NetworkManager.Devices" - -NMI_SERVICE="org.freedesktop.NetworkManagerInfo" -NMI_PATH="/org/freedesktop/NetworkManagerInfo" -NMI_INTERFACE=NMI_SERVICE - -HAL_SERVICE="org.freedesktop.Hal" -HAL_PATH="/org/freedesktop/Hal/Manager" -HAL_INTERFACE="org.freedesktop.Hal.Manager" -HAL_INTERFACE_DEVICE="org.freedesktop.Hal.Device" - -class NetworkManager: - WIRED_DEVICE = 1 - WIRELESS_DEVICE = 2 - - CONNECTED = "connected" - CONNECTING = "connecting" - DISCONNECTED = "disconnected" - - NM_SIGNALS = [ "DeviceNoLongerActive", - "DeviceNowActive", - "DeviceActivating", - "DevicesChanged", - "DeviceIP4AddressChange", - "WirelessNetworkDisappeared", - "WirelessNetworkAppeared" - ] - - NMI_SIGNALS = [ "TrustedNetworkUpdate", - "PreferredNetworkUpdate" - ] - - def __init__(self): - self.__init_dbus__() - - # dictionary of devices - self.__devices = {} - - def __init_dbus__(self): - try: - self._bus = dbus.SystemBus() - try: - self._nm_service = self._bus.get_service(NM_SERVICE) - self.nm_object = self._nm_service.get_object(NM_PATH, - NM_INTERFACE) - except Exception, e: - print "Counldn't get the %s service" % NM_SERVICE - print e - - try: - self._nmi_service = self._bus.get_service(NMI_SERVICE) - self.nmi_object = self._nmi_service.get_object(NMI_PATH, - NMI_INTERFACE) - except Exception, e: - print "Counldn't get the %s service" % NMI_SERVICE - print e - - try: - self._hal_service = self._bus.get_service(HAL_SERVICE) - self._hal_manager = self._hal_service.get_object(HAL_PATH, - HAL_INTERFACE) - except Exception, e: - print "Counldn't get the %s service" % HAL_SERVICE - print e - - except Exception, e: - print e - - """ - returns dictionary of the active device information - if device does not exist returns get_device failure method - """ - def get_active_device(self): - active_device = self.nm_object.getActiveDevice() - return self.get_device(active_device) - - """ - pass device string /org/freedesktop/NetworkManager/Device/eth0 - returns dictionary of device information - if device does not exist returns None - """ - def get_device(self, device): - try: - nm_dev_obj = self._nm_service.get_object(device, - NM_INTERFACE_DEVICES) - d = {} - d["nm.device"] = device - d["nm.name"] = nm_dev_obj.getName(device) - d["nm.type"] = nm_dev_obj.getType(device) - d["nm.udi"] = nm_dev_obj.getHalUdi(device) - d["nm.ip4"] = nm_dev_obj.getIP4Address(device) - d["nm.link_active"] = nm_dev_obj.getLinkActive(device) - - try: - d["nm.active_network"] = nm_dev_obj.getActiveNetwork(device) - d["nm.strength"] = nm_dev_obj.getStrength(device) - except DBusException, e: - pass - - try: - d["nm.networks"] = {} - networks = nm_dev_obj.getNetworks(device) - for network in networks: - nm_network_object = self._nm_service.get_object(network, - NM_INTERFACE_DEVICES) - n = {} - n["network"] = network - n["name"] = nm_network_object.getName() - n["address"] = nm_network_object.getAddress() - n["strength"] = nm_network_object.getStrength() - n["frequency"] = nm_network_object.getFrequency() - n["rate"] = nm_network_object.getRate() - n["encrypted"] = nm_network_object.getEncrypted() - - d["nm.networks"][network] = n - - except DBusException, e: - pass - - active_device = self.nm_object.getActiveDevice() - - if device == active_device: - d["nm.status"] = self.nm_object.status() - else: - d["nm.status"] = self.DISCONNECTED - - # we already have this device cached, so just update the status - if device in self.__devices: - for k,v in d.iteritems(): - self.__devices[device][k] = v - # it's a new device so get the info from HAL - else: - hal = self._get_hal_info(d["nm.udi"]) - for k,v in hal.iteritems(): - d[k] = v - self.__devices[device] = d - - return self.__devices[device] - - except Exception, e: - print e - return None - - """ - Returns list of dictionary objects of all active devices - Returns empty list if no active devices - """ - def get_devices(self): - - active_devices = self.nm_object.getDevices() - devices = [] - - for device in active_devices: - devices.append(self.get_device(device)) - - return devices - - """ - Returns list of dictionary objects of all devices active or not - Returns empty list if no active devices - """ - def get_all_devices(self): - return self.__devices.values() - - def has_type_device (self, type): - for device in self.get_devices(): - if device["nm.type"] == type: - return True - return False - - def number_device_types(self, type): - count = 0 - for device in self.get_devices(): - if device["nm.type"] == type: - count = count + 1 - return count - - def number_wired_devices(self): - return self.number_device_types(self.WIRED_DEVICE) - - def number_wireless_devices(self): - return self.number_device_types(self.WIRELESS_DEVICE) - - def has_wired_device(self): - return self.has_type_device(self.WIRED_DEVICE) - - def has_wireless_device(self): - return self.has_type_device(self.WIRELESS_DEVICE) - - def _get_hal_info(self, udi): - hal_devices = self._hal_manager.FindDeviceStringMatch("info.udi", - udi) - for hal_device in hal_devices: - device_dbus_obj = self._hal_service.get_object(hal_device, - HAL_INTERFACE_DEVICE) - properties = device_dbus_obj.GetAllProperties() - return properties - -if __name__ == "__main__": - nm = NetworkManager() - - - diff --git a/examples/python/README b/examples/python/README deleted file mode 100644 index 7ab5478f96..0000000000 --- a/examples/python/README +++ /dev/null @@ -1,21 +0,0 @@ -Python Examples - -You'll need equivalent versions of these packages in order to run most of these examples. - -hal-0.2.97.cvs20040823 -dbus-0.22-4 -pygtk2-2.3.96-2 -python-2.3.4-8 -gnome-python2-2.0.2-1 - - -NMTester.py -=============================================================================== - -This is a simple command line program that sub classes the NetworkManager class. The tester prints out the network devices objects that are returned from the NetworkManager class. The code hangs in the gtk.main() loop once run and will listen for any events from the NetworkManager - - -NetworkManager.py -=============================================================================== -This object hooks into the NetworkManger and HAL service through D-BUS. The get_device_list code will return a python list [] of dictionary objects representing the devices that the NetworkManger services is aware of. - diff --git a/examples/python/systray/Makefile b/examples/python/systray/Makefile deleted file mode 100644 index c7d31cf3a3..0000000000 --- a/examples/python/systray/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# Set the C flags to include the GTK+ and Python libraries -CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I/usr/include/python2.3/ -I. -LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` - -# Build the shared object -trayicon.so: trayicon.o eggtrayicon.o trayiconmodule.o - $(CC) $(LDFLAGS) -shared $^ -o $@ - - -# The path to the GTK+ python types -DEFS=`pkg-config --variable=defsdir pygtk-2.0` - -# Generate the C wrapper from the defs and our override file -trayicon.c: trayicon.defs trayicon.override - pygtk-codegen-2.0 --prefix trayicon \ - --register $(DEFS)/gdk-types.defs \ - --register $(DEFS)/gtk-types.defs \ - --override trayicon.override \ - trayicon.defs > $@ - -trayicon.defs: eggtrayicon.h config.h - python \ - /usr/share/pygtk/2.0/codegen/h2def.py \ - eggtrayicon.h > trayicon.defs - -config.h: - touch config.h - ln -s ../NetworkManager.py . - -# A rule to clean the generated files -clean: - rm -f trayicon.so *.o trayicon.c trayicon.defs *~ config.h NetworkManager.py* - -.PHONY: clean diff --git a/examples/python/systray/eggtrayicon.c b/examples/python/systray/eggtrayicon.c deleted file mode 100644 index cfabfe5743..0000000000 --- a/examples/python/systray/eggtrayicon.c +++ /dev/null @@ -1,513 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* eggtrayicon.c - * Copyright (C) 2002 Anders Carlsson - * - * 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 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include -#include -#include - -#include "eggtrayicon.h" - -#include -#if defined (GDK_WINDOWING_X11) -#include -#include -#elif defined (GDK_WINDOWING_WIN32) -#include -#endif - -#ifndef EGG_COMPILATION -#ifndef _ -#define _(x) dgettext (GETTEXT_PACKAGE, x) -#define N_(x) x -#endif -#else -#define _(x) x -#define N_(x) x -#endif - -#define SYSTEM_TRAY_REQUEST_DOCK 0 -#define SYSTEM_TRAY_BEGIN_MESSAGE 1 -#define SYSTEM_TRAY_CANCEL_MESSAGE 2 - -#define SYSTEM_TRAY_ORIENTATION_HORZ 0 -#define SYSTEM_TRAY_ORIENTATION_VERT 1 - -enum { - PROP_0, - PROP_ORIENTATION -}; - -static GtkPlugClass *parent_class = NULL; - -static void egg_tray_icon_init (EggTrayIcon *icon); -static void egg_tray_icon_class_init (EggTrayIconClass *klass); - -static void egg_tray_icon_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); - -static void egg_tray_icon_realize (GtkWidget *widget); -static void egg_tray_icon_unrealize (GtkWidget *widget); - -#ifdef GDK_WINDOWING_X11 -static void egg_tray_icon_update_manager_window (EggTrayIcon *icon, - gboolean dock_if_realized); -static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon); -#endif - -GType -egg_tray_icon_get_type (void) -{ - static GType our_type = 0; - - if (our_type == 0) - { - static const GTypeInfo our_info = - { - sizeof (EggTrayIconClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) egg_tray_icon_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (EggTrayIcon), - 0, /* n_preallocs */ - (GInstanceInitFunc) egg_tray_icon_init - }; - - our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0); - } - - return our_type; -} - -static void -egg_tray_icon_init (EggTrayIcon *icon) -{ - icon->stamp = 1; - icon->orientation = GTK_ORIENTATION_HORIZONTAL; - - gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK); -} - -static void -egg_tray_icon_class_init (EggTrayIconClass *klass) -{ - GObjectClass *gobject_class = (GObjectClass *)klass; - GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; - - parent_class = g_type_class_peek_parent (klass); - - gobject_class->get_property = egg_tray_icon_get_property; - - widget_class->realize = egg_tray_icon_realize; - widget_class->unrealize = egg_tray_icon_unrealize; - - g_object_class_install_property (gobject_class, - PROP_ORIENTATION, - g_param_spec_enum ("orientation", - _("Orientation"), - _("The orientation of the tray."), - GTK_TYPE_ORIENTATION, - GTK_ORIENTATION_HORIZONTAL, - G_PARAM_READABLE)); - -#if defined (GDK_WINDOWING_X11) - /* Nothing */ -#elif defined (GDK_WINDOWING_WIN32) - g_warning ("Port eggtrayicon to Win32"); -#else - g_warning ("Port eggtrayicon to this GTK+ backend"); -#endif -} - -static void -egg_tray_icon_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - EggTrayIcon *icon = EGG_TRAY_ICON (object); - - switch (prop_id) - { - case PROP_ORIENTATION: - g_value_set_enum (value, icon->orientation); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -#ifdef GDK_WINDOWING_X11 - -static void -egg_tray_icon_get_orientation_property (EggTrayIcon *icon) -{ - Display *xdisplay; - Atom type; - int format; - union { - gulong *prop; - guchar *prop_ch; - } prop = { NULL }; - gulong nitems; - gulong bytes_after; - int error, result; - - g_assert (icon->manager_window != None); - - xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - gdk_error_trap_push (); - type = None; - result = XGetWindowProperty (xdisplay, - icon->manager_window, - icon->orientation_atom, - 0, G_MAXLONG, FALSE, - XA_CARDINAL, - &type, &format, &nitems, - &bytes_after, &(prop.prop_ch)); - error = gdk_error_trap_pop (); - - if (error || result != Success) - return; - - if (type == XA_CARDINAL) - { - GtkOrientation orientation; - - orientation = (prop.prop [0] == SYSTEM_TRAY_ORIENTATION_HORZ) ? - GTK_ORIENTATION_HORIZONTAL : - GTK_ORIENTATION_VERTICAL; - - if (icon->orientation != orientation) - { - icon->orientation = orientation; - - g_object_notify (G_OBJECT (icon), "orientation"); - } - } - - if (prop.prop) - XFree (prop.prop); -} - -static GdkFilterReturn -egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data) -{ - EggTrayIcon *icon = user_data; - XEvent *xev = (XEvent *)xevent; - - if (xev->xany.type == ClientMessage && - xev->xclient.message_type == icon->manager_atom && - xev->xclient.data.l[1] == icon->selection_atom) - { - egg_tray_icon_update_manager_window (icon, TRUE); - } - else if (xev->xany.window == icon->manager_window) - { - if (xev->xany.type == PropertyNotify && - xev->xproperty.atom == icon->orientation_atom) - { - egg_tray_icon_get_orientation_property (icon); - } - if (xev->xany.type == DestroyNotify) - { - egg_tray_icon_manager_window_destroyed (icon); - } - } - return GDK_FILTER_CONTINUE; -} - -#endif - -static void -egg_tray_icon_unrealize (GtkWidget *widget) -{ -#ifdef GDK_WINDOWING_X11 - EggTrayIcon *icon = EGG_TRAY_ICON (widget); - GdkWindow *root_window; - - if (icon->manager_window != None) - { - GdkWindow *gdkwin; - - gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget), - icon->manager_window); - - gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); - } - - root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget)); - - gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon); - - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); -#endif -} - -#ifdef GDK_WINDOWING_X11 - -static void -egg_tray_icon_send_manager_message (EggTrayIcon *icon, - long message, - Window window, - long data1, - long data2, - long data3) -{ - XClientMessageEvent ev; - Display *display; - - ev.type = ClientMessage; - ev.window = window; - ev.message_type = icon->system_tray_opcode_atom; - ev.format = 32; - ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window); - ev.data.l[1] = message; - ev.data.l[2] = data1; - ev.data.l[3] = data2; - ev.data.l[4] = data3; - - display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - gdk_error_trap_push (); - XSendEvent (display, - icon->manager_window, False, NoEventMask, (XEvent *)&ev); - XSync (display, False); - gdk_error_trap_pop (); -} - -static void -egg_tray_icon_send_dock_request (EggTrayIcon *icon) -{ - egg_tray_icon_send_manager_message (icon, - SYSTEM_TRAY_REQUEST_DOCK, - icon->manager_window, - gtk_plug_get_id (GTK_PLUG (icon)), - 0, 0); -} - -static void -egg_tray_icon_update_manager_window (EggTrayIcon *icon, - gboolean dock_if_realized) -{ - Display *xdisplay; - - if (icon->manager_window != None) - return; - - xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - XGrabServer (xdisplay); - - icon->manager_window = XGetSelectionOwner (xdisplay, - icon->selection_atom); - - if (icon->manager_window != None) - XSelectInput (xdisplay, - icon->manager_window, StructureNotifyMask|PropertyChangeMask); - - XUngrabServer (xdisplay); - XFlush (xdisplay); - - if (icon->manager_window != None) - { - GdkWindow *gdkwin; - - gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), - icon->manager_window); - - gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon); - - if (dock_if_realized && GTK_WIDGET_REALIZED (icon)) - egg_tray_icon_send_dock_request (icon); - - egg_tray_icon_get_orientation_property (icon); - } -} - -static void -egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon) -{ - GdkWindow *gdkwin; - - g_return_if_fail (icon->manager_window != None); - - gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), - icon->manager_window); - - gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); - - icon->manager_window = None; - - egg_tray_icon_update_manager_window (icon, TRUE); -} - -#endif - -static void -egg_tray_icon_realize (GtkWidget *widget) -{ -#ifdef GDK_WINDOWING_X11 - EggTrayIcon *icon = EGG_TRAY_ICON (widget); - GdkScreen *screen; - GdkDisplay *display; - Display *xdisplay; - char buffer[256]; - GdkWindow *root_window; - - if (GTK_WIDGET_CLASS (parent_class)->realize) - GTK_WIDGET_CLASS (parent_class)->realize (widget); - - screen = gtk_widget_get_screen (widget); - display = gdk_screen_get_display (screen); - xdisplay = gdk_x11_display_get_xdisplay (display); - - /* Now see if there's a manager window around */ - g_snprintf (buffer, sizeof (buffer), - "_NET_SYSTEM_TRAY_S%d", - gdk_screen_get_number (screen)); - - icon->selection_atom = XInternAtom (xdisplay, buffer, False); - - icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False); - - icon->system_tray_opcode_atom = XInternAtom (xdisplay, - "_NET_SYSTEM_TRAY_OPCODE", - False); - - icon->orientation_atom = XInternAtom (xdisplay, - "_NET_SYSTEM_TRAY_ORIENTATION", - False); - - egg_tray_icon_update_manager_window (icon, FALSE); - egg_tray_icon_send_dock_request (icon); - - root_window = gdk_screen_get_root_window (screen); - - /* Add a root window filter so that we get changes on MANAGER */ - gdk_window_add_filter (root_window, - egg_tray_icon_manager_filter, icon); -#endif -} - -EggTrayIcon * -egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name) -{ - g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); - - return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name, NULL); -} - -EggTrayIcon* -egg_tray_icon_new (const gchar *name) -{ - return g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL); -} - -guint -egg_tray_icon_send_message (EggTrayIcon *icon, - gint timeout, - const gchar *message, - gint len) -{ - guint stamp; - - g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0); - g_return_val_if_fail (timeout >= 0, 0); - g_return_val_if_fail (message != NULL, 0); - -#ifdef GDK_WINDOWING_X11 - if (icon->manager_window == None) - return 0; -#endif - - if (len < 0) - len = strlen (message); - - stamp = icon->stamp++; - -#ifdef GDK_WINDOWING_X11 - /* Get ready to send the message */ - egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE, - (Window)gtk_plug_get_id (GTK_PLUG (icon)), - timeout, len, stamp); - - /* Now to send the actual message */ - gdk_error_trap_push (); - while (len > 0) - { - XClientMessageEvent ev; - Display *xdisplay; - - xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); - - ev.type = ClientMessage; - ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon)); - ev.format = 8; - ev.message_type = XInternAtom (xdisplay, - "_NET_SYSTEM_TRAY_MESSAGE_DATA", False); - if (len > 20) - { - memcpy (&ev.data, message, 20); - len -= 20; - message += 20; - } - else - { - memcpy (&ev.data, message, len); - len = 0; - } - - XSendEvent (xdisplay, - icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev); - XSync (xdisplay, False); - } - gdk_error_trap_pop (); -#endif - - return stamp; -} - -void -egg_tray_icon_cancel_message (EggTrayIcon *icon, - guint id) -{ - g_return_if_fail (EGG_IS_TRAY_ICON (icon)); - g_return_if_fail (id > 0); -#ifdef GDK_WINDOWING_X11 - egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE, - (Window)gtk_plug_get_id (GTK_PLUG (icon)), - id, 0, 0); -#endif -} - -GtkOrientation -egg_tray_icon_get_orientation (EggTrayIcon *icon) -{ - g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), GTK_ORIENTATION_HORIZONTAL); - - return icon->orientation; -} diff --git a/examples/python/systray/eggtrayicon.h b/examples/python/systray/eggtrayicon.h deleted file mode 100644 index e6664fcb08..0000000000 --- a/examples/python/systray/eggtrayicon.h +++ /dev/null @@ -1,80 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* eggtrayicon.h - * Copyright (C) 2002 Anders Carlsson - * - * 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 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EGG_TRAY_ICON_H__ -#define __EGG_TRAY_ICON_H__ - -#include -#ifdef GDK_WINDOWING_X11 -#include -#endif - -G_BEGIN_DECLS - -#define EGG_TYPE_TRAY_ICON (egg_tray_icon_get_type ()) -#define EGG_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon)) -#define EGG_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass)) -#define EGG_IS_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON)) -#define EGG_IS_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON)) -#define EGG_TRAY_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass)) - -typedef struct _EggTrayIcon EggTrayIcon; -typedef struct _EggTrayIconClass EggTrayIconClass; - -struct _EggTrayIcon -{ - GtkPlug parent_instance; - - guint stamp; - -#ifdef GDK_WINDOWING_X11 - Atom selection_atom; - Atom manager_atom; - Atom system_tray_opcode_atom; - Atom orientation_atom; - Window manager_window; -#endif - GtkOrientation orientation; -}; - -struct _EggTrayIconClass -{ - GtkPlugClass parent_class; -}; - -GType egg_tray_icon_get_type (void); - -EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen *screen, - const gchar *name); - -EggTrayIcon *egg_tray_icon_new (const gchar *name); - -guint egg_tray_icon_send_message (EggTrayIcon *icon, - gint timeout, - const char *message, - gint len); -void egg_tray_icon_cancel_message (EggTrayIcon *icon, - guint id); - -GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon); - -G_END_DECLS - -#endif /* __EGG_TRAY_ICON_H__ */ diff --git a/examples/python/systray/network_tray.py b/examples/python/systray/network_tray.py deleted file mode 100755 index 946e2ffcd9..0000000000 --- a/examples/python/systray/network_tray.py +++ /dev/null @@ -1,327 +0,0 @@ -#! /usr/bin/python -import pygtk; pygtk.require("2.0") -import gtk -import gtk.gdk - -try: - import trayicon - from NetworkManager import NetworkManager -except ImportError, e: - print e - print "type 'make' make the necessary modules to run this example" - import sys - sys.exit(1) - - -class network_tray: - - def __init__(self): - self._make_menu() - self._make_tray() - - self._nm = NetworkManager() - for signal in self._nm.NM_SIGNALS: - self._nm.nm_object.connect_to_signal(signal, - self._network_event) - - self._network_event(None, None, None,None,None) - - def _wired_network_cb(self, menuitem, event, device_name): - return - print menuitem, event, device_name - try: - self._nm.nm_object.setActiveDevice(device_name) - except Exception, e: - print e - - def _wireless_network_cb(self, menuitem, event, device_name, network_name): - return - print menuitem, event, device_name, network_name - try: - self._nm.nm_object.setActiveDevice(device_name, network_name) - except Exception, e: - print e - - def _add_separator_item(self): - sep = gtk.SeparatorMenuItem() - sep.show() - self._menu.append(sep) - - def _add_label_item(self, label): - menuitem = gtk.MenuItem() - menuitem.set_sensitive(gtk.FALSE) - gtklabel = gtk.Label() - - gtklabel.set_markup("%s" % label) - gtklabel.set_selectable(gtk.FALSE) - hbox = gtk.HBox(homogeneous=gtk.TRUE, spacing=6) - hbox.pack_end(gtklabel,expand=gtk.TRUE, fill=gtk.TRUE, padding=0) - menuitem.add(hbox) - self._menu.append(menuitem) - menuitem.show_all() - - def _add_other_wireless_item(self): - menuitem = gtk.MenuItem() - menuitem.set_sensitive(gtk.TRUE) - gtklabel = gtk.Label() - gtklabel.set_alignment(0,0) - gtklabel.set_label("Other Wireless Networks...") - hbox = gtk.HBox(homogeneous=gtk.TRUE, spacing=6) - hbox.pack_end(gtklabel,expand=gtk.TRUE, fill=gtk.TRUE, padding=6) - menuitem.add(hbox) - tt = "Add a wireless network that does not appear on the list" - self._tooltips.set_tip(menuitem,tt) - self._menu.append(menuitem) - menuitem.show_all() - - def _add_wired_device_menu_item(self, device): - menuitem = gtk.RadioMenuItem(group=self.__radio_group) - if self._is_active(device): - menuitem.set_active(1) - - menuitem.connect("button-press-event",self._wired_network_cb, - device["nm.device"]) - - hbox = gtk.HBox(homogeneous=gtk.FALSE, spacing=6) - hbox.pack_start(self._get_icon(device), expand=gtk.FALSE, fill=gtk.FALSE, padding=6) - label = gtk.Label() - label.set_justify(gtk.JUSTIFY_LEFT) - label.set_text(self._get_device_name(device)) - hbox.pack_start(label, expand=gtk.FALSE, fill=gtk.FALSE, padding=6) - menuitem.add(hbox) - hbox.show() - self._menu.append(menuitem) - try: - tt = "IP: %d\nProduct Name: %s\nVendor: %s\nDevice Name: %s" % (device["nm.ip4"], device["pci.product"], device["info.vendor"], device["nm.name"] ) - self._tooltips.set_tip(menuitem,tt) - except: - pass - menuitem.show_all() - - def _add_wireless_device_menu_item(self, device, generic=gtk.FALSE): - menuitem = gtk.MenuItem() - - hbox = gtk.HBox(homogeneous=gtk.FALSE, spacing=6) - hbox.pack_start(self._get_icon(device), expand=gtk.FALSE, fill=gtk.FALSE, padding=6) - label = gtk.Label() - label.set_justify(gtk.JUSTIFY_LEFT) - label.set_markup("%s" % self._get_device_name(device)) - label.set_selectable(gtk.FALSE) - hbox.pack_start(label, expand=gtk.FALSE, fill=gtk.FALSE, padding=6) - menuitem.add(hbox) - hbox.show() - self._menu.append(menuitem) - try: - tt = "IP: %d\nProduct Name: %s\nVendor: %s\nDevice Name: %s" % (device["nm.ip4"], device["pci.product"], device["info.vendor"], device["nm.name"] ) - self._tooltips.set_tip(menuitem,tt) - except: - pass - menuitem.show_all() - - def _add_vpn_menu_item(self): - menuitem = gtk.CheckMenuItem() - - hbox = gtk.HBox(homogeneous=gtk.FALSE, spacing=6) - hbox.pack_start(self._get_vpn_icon(), expand=gtk.FALSE, fill=gtk.FALSE, padding=6) - label = gtk.Label() - label.set_justify(gtk.JUSTIFY_LEFT) - label.set_text("Virtual Private Network") - hbox.pack_start(label, expand=gtk.FALSE, fill=gtk.FALSE, padding=6) - menuitem.add(hbox) - hbox.show() - self._menu.append(menuitem) - tt = "Use a Virtual Private Network to securely connect to your companies internal system" - self._tooltips.set_tip(menuitem,tt) - menuitem.show_all() - - def _add_network_menu_item(self, device, network, active_network): - menuitem = gtk.RadioMenuItem(group=self.__radio_group) - menuitem.set_right_justified(gtk.FALSE) - if active_network == gtk.TRUE: - menuitem.set_active(1) - - hbox = gtk.HBox(homogeneous=gtk.FALSE, spacing=6) - menuitem.add(hbox) - label = gtk.Label(network["name"]) - label.set_alignment(0.1,0.5) - label.show() - hbox.pack_start(label,expand=gtk.TRUE, fill=gtk.TRUE) - progress = gtk.ProgressBar() - progress.set_orientation(gtk.PROGRESS_LEFT_TO_RIGHT) - strength = float(network["strength"] * .01) - progress.set_fraction(strength) -# progress.set_text("%s%%" % int(strength*100)) - progress.show() - hbox.pack_start(progress, expand=gtk.FALSE, fill=gtk.FALSE) - icon = self._get_encrypted_icon() - if network["encrypted"] == 1: - icon.hide() - hbox.pack_start(icon,expand=gtk.FALSE, fill=gtk.FALSE) - else: - icon.show() - - hbox.show() - self._menu.append(menuitem) - tt = "Name: %s\nEncrypted: %d\nRate: %d\nFrequency: %f\nAddress: %s\nStrength: %1.2f" % (network['name'], network['encrypted'], network['rate'],network['frequency'], network['address'], strength) - self._tooltips.set_tip(menuitem,tt) - menuitem.connect("button-press-event", self._wireless_network_cb, - device["nm.device"], network["network"]) - menuitem.show() - - def _get_device_name(self, device): - - if self._is_wireless(device): - try: - if self._nm.number_wireless_devices() > 1: - return device["pci.subsys_vendor"] - else: - return "Wireless Network" - except: - return "Wireless PCMCIA Card" - else: - try: - if self._nm.number_wired_devices() > 1: - return device["info.product"] - except: - pass - return "Wired Network" - - def _is_wireless(self,dev): - if dev["nm.type"] == self._nm.WIRELESS_DEVICE: - return gtk.TRUE - return gtk.FALSE - - def _is_active(self, dev): - try: - if dev["nm.link_active"] == 1: - return gtk.TRUE - except: - return gtk.FALSE - - def _network_event(self, interface, signal_name, - service, path, message): - - for child in self._menu.get_children(): - self._menu.remove(child) - - devices = self._nm.get_devices() - active_device = self._nm.get_active_device() - - def sort_devs(x, y): - if x["nm.type"] > y["nm.type"]: - return 1 - elif x["nm.type"] < y["nm.type"]: - return -1 - elif x["nm.link_active"] > y["nm.link_active"]: - return 1 - elif x["nm.link_active"] < y["nm.link_active"]: - return -1 - return 0 - - def sort_networks(x, y): - if x.lower() < y.lower(): - return 1 - return -1 - - type = 0 - devices.sort(sort_devs) - for device in devices: - - if self._is_wireless(device): - type = device["nm.type"] - if self._nm.number_wireless_devices() > 1: - self._add_wireless_device_menu_item(device) - else: - self._add_wireless_device_menu_item(device, gtk.FALSE) - - device["nm.networks"].keys().sort(sort_networks) - for name, network in device["nm.networks"].iteritems(): - try: - if device["nm.active_network"] == name: - active_network = gtk.TRUE - else: - active_network = gtk.FALSE - except: - active_network = gtk.FALSE - self._add_network_menu_item(device,network,active_network) - - else: - if type == self._nm.WIRELESS_DEVICE: - self._add_separator_item() - self._add_wired_device_menu_item(device) - - - self._add_other_wireless_item() -# self._add_vpn_menu_item() - - self._current_icon = self._get_icon(active_device) - - self._current_icon.show() - self._top_level_menu.show() - - def _get_encrypted_icon(self): - pb = gtk.gdk.pixbuf_new_from_file("/usr/share/icons/hicolor/16x16/stock/generic/stock_keyring.png") - pb = pb.scale_simple(16,16,gtk.gdk.INTERP_NEAREST) - _keyring = gtk.Image() - _keyring.set_from_pixbuf(pb) - return _keyring - - def _get_vpn_icon(self): - return self._get_encrypted_icon() - - def _get_icon(self, active_device): - - if active_device: - if active_device["nm.type"] == self._nm.WIRED_DEVICE: - pb = gtk.gdk.pixbuf_new_from_file("../../../panel-applet/icons/nm-device-wired.png") - pb = pb.scale_simple(16,16,gtk.gdk.INTERP_NEAREST) - _wired_icon = gtk.Image() - _wired_icon.set_from_pixbuf(pb) - return _wired_icon - elif active_device["nm.type"] == self._nm.WIRELESS_DEVICE: - pb = gtk.gdk.pixbuf_new_from_file("../../../panel-applet/icons/nm-device-wireless.png") - pb = pb.scale_simple(16,16,gtk.gdk.INTERP_NEAREST) - _wireless_icon = gtk.Image() - _wireless_icon.set_from_pixbuf(pb) - return _wireless_icon - else: - pb = gtk.gdk.pixbuf_new_from_file("../../../panel-applet/icons/nm-device-wireless.png") - pb = pb.scale_simple(16,16,gtk.gdk.INTERP_NEAREST) - _nothing_icon = gtk.Image() - _nothing_icon.set_from_pixbuf(pb) - return _nothing_icon - - - def _make_tray(self): - self._tray = trayicon.TrayIcon("NetworkManager") - - self._tooltips = gtk.Tooltips() - tooltip = "Getting Network Information" - self._tooltips.set_tip(self._menu,tooltip) - - self._tray.add(self._menu_bar) - self._tray.show() - - def _make_menu(self): - self._menu_bar = gtk.MenuBar() - - self._top_level_menu = gtk.MenuItem() - self._menu_bar.append(self._top_level_menu) - - self._menu = gtk.Menu() - self._top_level_menu.set_submenu(self._menu) - - self._current_icon = self._get_icon(None) - self._current_icon.show() - - self._top_level_menu.add(self._current_icon) - self._menu_bar.show() - self._top_level_menu.show() - self._menu.show() - - self.__radio_group = gtk.RadioMenuItem() - - -if __name__ == "__main__": - nt = network_tray() - gtk.main() diff --git a/examples/python/systray/trayicon.override b/examples/python/systray/trayicon.override deleted file mode 100644 index 6752c2850a..0000000000 --- a/examples/python/systray/trayicon.override +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C; c-basic-offset: 4 -*- */ -%% -headers -#include - -#include "pygobject.h" -#include "eggtrayicon.h" -%% -modulename trayicon -%% -import gtk.Plug as PyGtkPlug_Type -import gtk.gdk.Screen as PyGdkScreen_Type -%% -ignore-glob - *_get_type -%% -override egg_tray_icon_send_message kwargs -static PyObject* -_wrap_egg_tray_icon_send_message(PyGObject *self, PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = {"timeout", "message", NULL}; - int timeout, len, ret; - char *message; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "is#:TrayIcon.send_message", kwlist, &timeout, &message, &len)) - return NULL; - ret = egg_tray_icon_send_message(EGG_TRAY_ICON(self->obj), timeout, message, len); - return PyInt_FromLong(ret); -} diff --git a/examples/python/systray/trayiconmodule.c b/examples/python/systray/trayiconmodule.c deleted file mode 100644 index c2959a4854..0000000000 --- a/examples/python/systray/trayiconmodule.c +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C; c-basic-offset: 4 -*- */ - -/* include this first, before NO_IMPORT_PYGOBJECT is defined */ -#include - -void trayicon_register_classes (PyObject *d); - -extern PyMethodDef trayicon_functions[]; - -DL_EXPORT(void) -inittrayicon(void) -{ - PyObject *m, *d; - - init_pygobject (); - - m = Py_InitModule ("trayicon", trayicon_functions); - d = PyModule_GetDict (m); - - trayicon_register_classes (d); - - if (PyErr_Occurred ()) { - Py_FatalError ("can't initialise module trayicon :("); - } -} From 4ca66db72127829747eeee5e9497326e2efd5fee Mon Sep 17 00:00:00 2001 From: Jan Kantert Date: Wed, 31 Dec 2008 18:57:36 -0500 Subject: [PATCH 08/45] Use g_timeout_add_seconds() to reduce wakeups (and refine the older glib compat mechanism, by Dan) --- callouts/nm-dispatcher-action.c | 5 ++- gfilemonitor/inotify-missing.c | 4 ++ include/Makefile.am | 3 +- include/nm-glib-compat.h | 37 +++++++++++++++++++ libnm-glib/nm-vpn-plugin.c | 25 +++++++------ src/dhcp-manager/nm-dhcp-manager.c | 7 ++-- src/dnsmasq-manager/nm-dnsmasq-manager.c | 3 +- src/nm-dbus-manager.c | 3 +- src/nm-device-ethernet.c | 5 ++- src/nm-device-wifi.c | 15 ++++---- src/nm-device.c | 5 ++- src/nm-gsm-device.c | 3 +- src/nm-hal-manager.c | 3 +- src/nm-manager.c | 7 ++-- src/nm-serial-device.c | 11 +++--- src/ppp-manager/nm-ppp-manager.c | 9 +++-- .../nm-supplicant-interface.c | 3 +- .../nm-supplicant-manager.c | 5 ++- src/vpn-manager/nm-vpn-connection.c | 3 +- src/vpn-manager/nm-vpn-service.c | 7 ++-- system-settings/src/main.c | 3 +- test/nm-online.c | 3 +- 22 files changed, 115 insertions(+), 54 deletions(-) create mode 100644 include/nm-glib-compat.h diff --git a/callouts/nm-dispatcher-action.c b/callouts/nm-dispatcher-action.c index 198ffd2f16..b2fba04815 100644 --- a/callouts/nm-dispatcher-action.c +++ b/callouts/nm-dispatcher-action.c @@ -36,6 +36,7 @@ #include #include +#include "nm-glib-compat.h" #include #include #include @@ -486,7 +487,7 @@ nm_dispatcher_action (Handler *h, if (d->quit_timeout) g_source_remove (d->quit_timeout); if (!d->persist) - d->quit_timeout = g_timeout_add (10000, quit_timeout_cb, NULL); + d->quit_timeout = g_timeout_add_seconds (10, quit_timeout_cb, NULL); connection = nm_connection_new_from_hash (connection_hash, error); if (connection) { @@ -780,7 +781,7 @@ main (int argc, char **argv) G_OBJECT (d->handler)); if (!persist) - d->quit_timeout = g_timeout_add (10000, quit_timeout_cb, NULL); + d->quit_timeout = g_timeout_add_seconds (10, quit_timeout_cb, NULL); g_main_loop_run (loop); diff --git a/gfilemonitor/inotify-missing.c b/gfilemonitor/inotify-missing.c index 6010c18f22..13b3d50208 100644 --- a/gfilemonitor/inotify-missing.c +++ b/gfilemonitor/inotify-missing.c @@ -71,7 +71,11 @@ _im_add (inotify_sub *sub) if (!scan_missing_running) { scan_missing_running = TRUE; +#if !GLIB_CHECK_VERSION(2,14,0) + g_timeout_add (SCAN_MISSING_TIME * G_USEC_PER_SEC, im_scan_missing, NULL); +#else g_timeout_add_seconds (SCAN_MISSING_TIME, im_scan_missing, NULL); +#endif } } diff --git a/include/Makefile.am b/include/Makefile.am index 5e466a26fe..d02c5f84d1 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,7 +2,8 @@ EXTRA_DIST = \ NetworkManager.h \ NetworkManagerVPN.h \ wireless-helper.h \ - nm-dbus-glib-types.h + nm-dbus-glib-types.h \ + nm-glib-compat.h NetworkManagerincludedir=$(includedir)/NetworkManager diff --git a/include/nm-glib-compat.h b/include/nm-glib-compat.h new file mode 100644 index 0000000000..9c1fe347a4 --- /dev/null +++ b/include/nm-glib-compat.h @@ -0,0 +1,37 @@ +/* NetworkManager -- Network link manager + * + * Dan Williams + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (C) Copyright 2008 Red Hat, Inc. + */ + +#ifndef NM_GLIB_COMPAT_H +#define NM_GLIB_COMPAT_H + +#include + +#if !GLIB_CHECK_VERSION(2,14,0) + +#define g_timeout_add_seconds(i, f, d) \ + g_timeout_add (i * G_USEC_PER_SEC, f, d) + +#define g_timeout_add_seconds_full(p, i, f, d, n) \ + g_timeout_add_full (p, i * G_USEC_PER_SEC, f, d, n) + +#endif /* !GLIB_CHECK_VERSION(2,14,0) */ + +#endif /* NM_GLIB_COMPAT_H */ diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index a95bea491f..fe7a2b635a 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -22,6 +22,7 @@ */ #include +#include "nm-glib-compat.h" #include "nm-vpn-plugin.h" #include "nm-utils.h" #include "nm-connection.h" @@ -49,8 +50,8 @@ static gboolean impl_vpn_plugin_set_failure (NMVPNPlugin *plugin, #include "nm-vpn-plugin-glue.h" -#define NM_VPN_PLUGIN_CONNECT_TIMER 60000 -#define NM_VPN_PLUGIN_QUIT_TIMER 20000 +#define NM_VPN_PLUGIN_CONNECT_TIMER 60 +#define NM_VPN_PLUGIN_QUIT_TIMER 20 G_DEFINE_ABSTRACT_TYPE (NMVPNPlugin, nm_vpn_plugin, G_TYPE_OBJECT) @@ -680,18 +681,18 @@ state_changed (NMVPNPlugin *plugin, NMVPNServiceState state) } /* Add a timer to make sure we do not wait indefinitely for the successful connect. */ - priv->connect_timer = g_timeout_add_full (G_PRIORITY_DEFAULT, - NM_VPN_PLUGIN_CONNECT_TIMER, - connect_timer_expired, - plugin, - connect_timer_removed); + priv->connect_timer = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, + NM_VPN_PLUGIN_CONNECT_TIMER, + connect_timer_expired, + plugin, + connect_timer_removed); break; case NM_VPN_SERVICE_STATE_STOPPED: - priv->quit_timer = g_timeout_add_full (G_PRIORITY_DEFAULT, - NM_VPN_PLUGIN_QUIT_TIMER, - quit_timer_expired, - plugin, - quit_timer_removed); + priv->quit_timer = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, + NM_VPN_PLUGIN_QUIT_TIMER, + quit_timer_expired, + plugin, + quit_timer_removed); break; default: /* Clean up all timers we might have set up. */ diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index e5535a346b..ba221d1f27 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -41,6 +41,7 @@ #include "nm-utils.h" #include "nm-dbus-manager.h" #include "nm-dbus-glib-types.h" +#include "nm-glib-compat.h" #define NM_DHCP_CLIENT_DBUS_SERVICE "org.freedesktop.nm_dhcp_client" #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client" @@ -603,9 +604,9 @@ nm_dhcp_manager_begin_transaction (NMDHCPManager *manager, timeout = NM_DHCP_TIMEOUT; /* Set up a timeout on the transaction to kill it after the timeout */ - device->timeout_id = g_timeout_add (timeout * 1000, - nm_dhcp_manager_handle_timeout, - device); + device->timeout_id = g_timeout_add_seconds (timeout, + nm_dhcp_manager_handle_timeout, + device); nm_dhcp_client_start (device, s_ip4); device->watch_id = g_child_watch_add (device->pid, diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c index 5f231020f2..6ad66b7ec5 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -28,6 +28,7 @@ #include "nm-dnsmasq-manager.h" #include "nm-utils.h" +#include "nm-glib-compat.h" typedef struct { char *iface; @@ -450,7 +451,7 @@ nm_dnsmasq_manager_stop (NMDnsMasqManager *manager) if (priv->pid) { if (kill (priv->pid, SIGTERM) == 0) - g_timeout_add (2000, ensure_killed, GINT_TO_POINTER (priv->pid)); + g_timeout_add_seconds (2, ensure_killed, GINT_TO_POINTER (priv->pid)); else { kill (priv->pid, SIGKILL); diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index f8d48f5875..358182ec2b 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -23,6 +23,7 @@ #include "NetworkManager.h" #include "nm-dbus-manager.h" #include "nm-marshal.h" +#include "nm-glib-compat.h" #include #include @@ -158,7 +159,7 @@ static void start_reconnection_timeout (NMDBusManager *self) { /* Schedule timeout for reconnection attempts */ - g_timeout_add (3000, nm_dbus_manager_reconnect, self); + g_timeout_add_seconds (3, nm_dbus_manager_reconnect, self); } char * diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c index d62f3f3d1a..393390315c 100644 --- a/src/nm-device-ethernet.c +++ b/src/nm-device-ethernet.c @@ -34,6 +34,7 @@ #include #include +#include "nm-glib-compat.h" #include "nm-device-ethernet.h" #include "nm-device-interface.h" #include "nm-device-private.h" @@ -991,7 +992,7 @@ supplicant_iface_connection_state_cb_handler (gpointer user_data) /* Start the link timeout so we allow some time for reauthentication */ if (!priv->link_timeout_id) - priv->link_timeout_id = g_timeout_add (15000, link_timeout_cb, dev); + priv->link_timeout_id = g_timeout_add_seconds (15, link_timeout_cb, dev); } } @@ -1156,7 +1157,7 @@ supplicant_interface_init (NMDeviceEthernet *self) self); /* Set up a timeout on the connection attempt to fail it after 25 seconds */ - priv->supplicant.con_timeout_id = g_timeout_add (25000, supplicant_connection_timeout_cb, self); + priv->supplicant.con_timeout_id = g_timeout_add_seconds (25, supplicant_connection_timeout_cb, self); return TRUE; } diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index d7cc2f399f..0e8555ec8f 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -31,6 +31,7 @@ #include #include +#include "nm-glib-compat.h" #include "nm-device.h" #include "nm-device-wifi.h" #include "nm-device-interface.h" @@ -910,7 +911,7 @@ real_bring_up (NMDevice *dev) NMDeviceWifi *self = NM_DEVICE_WIFI (dev); NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self); - priv->periodic_source_id = g_timeout_add (6000, nm_device_wifi_periodic_update, self); + priv->periodic_source_id = g_timeout_add_seconds (6, nm_device_wifi_periodic_update, self); return TRUE; } @@ -1717,9 +1718,9 @@ schedule_scan (NMDeviceWifi *self, gboolean backoff) || (nm_device_get_state (NM_DEVICE (self)) == NM_DEVICE_STATE_ACTIVATED)) factor = 1; - priv->pending_scan_id = g_timeout_add (priv->scan_interval * 1000, - request_wireless_scan, - self); + priv->pending_scan_id = g_timeout_add_seconds (priv->scan_interval, + request_wireless_scan, + self); priv->scheduled_scan_time = now.tv_sec + priv->scan_interval; if (backoff && (priv->scan_interval < (SCAN_INTERVAL_MAX / factor))) { @@ -2274,8 +2275,8 @@ supplicant_iface_connection_state_cb_handler (gpointer user_data) * while to scan. */ if (!priv->link_timeout_id) { - priv->link_timeout_id = g_timeout_add (priv->scanning ? 30000 : 15000, - link_timeout_cb, self); + priv->link_timeout_id = g_timeout_add_seconds (priv->scanning ? 30 : 15, + link_timeout_cb, self); } } } @@ -2573,7 +2574,7 @@ start_supplicant_connection_timeout (NMDeviceWifi *self) priv = NM_DEVICE_WIFI_GET_PRIVATE (self); /* Set up a timeout on the connection attempt to fail it after 25 seconds */ - id = g_timeout_add (25000, supplicant_connection_timeout_cb, self); + id = g_timeout_add_seconds (25, supplicant_connection_timeout_cb, self); if (id <= 0) { nm_warning ("Activation (%s/wireless): couldn't start supplicant " "timeout timer.", diff --git a/src/nm-device.c b/src/nm-device.c index 02e4fc19cf..7dc4047598 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -34,6 +34,7 @@ #include #include +#include "nm-glib-compat.h" #include "nm-device-interface.h" #include "nm-device.h" #include "nm-device-private.h" @@ -204,7 +205,7 @@ constructor (GType type, * system settings service a chance to figure out whether the device is * managed or not. */ - priv->start_timer = g_timeout_add (4000, device_start, dev); + priv->start_timer = g_timeout_add_seconds (4, device_start, dev); priv->initialized = TRUE; return object; @@ -830,7 +831,7 @@ aipd_exec (NMDevice *self, GError **error) priv->aipd_watch = g_child_watch_add (priv->aipd_pid, aipd_watch_cb, self); /* Start a timeout to bound the address attempt */ - priv->aipd_timeout = g_timeout_add (20000, aipd_timeout_cb, self); + priv->aipd_timeout = g_timeout_add_seconds (20, aipd_timeout_cb, self); return TRUE; } diff --git a/src/nm-gsm-device.c b/src/nm-gsm-device.c index e01a477534..d8d15459a9 100644 --- a/src/nm-gsm-device.c +++ b/src/nm-gsm-device.c @@ -21,6 +21,7 @@ #include #include +#include "nm-glib-compat.h" #include "nm-gsm-device.h" #include "nm-device-interface.h" #include "nm-device-private.h" @@ -354,7 +355,7 @@ schedule_automatic_registration_again (NMGsmDevice *self) if (priv->pending_id) g_source_remove (priv->pending_id); - priv->pending_id = g_timeout_add (1000, automatic_registration_again, self); + priv->pending_id = g_timeout_add_seconds (1, automatic_registration_again, self); } static void diff --git a/src/nm-hal-manager.c b/src/nm-hal-manager.c index 2a97e5969a..e7179c028f 100644 --- a/src/nm-hal-manager.c +++ b/src/nm-hal-manager.c @@ -26,6 +26,7 @@ #include #include +#include "nm-glib-compat.h" #include "nm-hal-manager.h" #include "nm-marshal.h" #include "nm-dbus-manager.h" @@ -500,7 +501,7 @@ killswitch_getpower_done (gpointer user_data) killswitch_poll_cleanup (self); /* Schedule next poll */ - priv->killswitch_poll_id = g_timeout_add (RFKILL_POLL_FREQUENCY * 1000, + priv->killswitch_poll_id = g_timeout_add_seconds (RFKILL_POLL_FREQUENCY, poll_killswitches, self); } diff --git a/src/nm-manager.c b/src/nm-manager.c index e5ebdb2829..1b40834432 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -24,6 +24,7 @@ #include #include +#include "nm-glib-compat.h" #include "nm-manager.h" #include "nm-utils.h" #include "nm-dbus-manager.h" @@ -95,7 +96,7 @@ static void system_settings_properties_changed_cb (DBusGProxy *proxy, GHashTable *properties, gpointer user_data); -#define SSD_POKE_INTERVAL 120000 +#define SSD_POKE_INTERVAL 120 typedef struct { DBusGMethodInvocation *context; @@ -1389,7 +1390,7 @@ poke_system_settings_daemon_cb (gpointer user_data) out: /* Reschedule the poke */ - priv->poke_id = g_timeout_add (SSD_POKE_INTERVAL, poke_system_settings_daemon_cb, (gpointer) manager); + priv->poke_id = g_timeout_add_seconds (SSD_POKE_INTERVAL, poke_system_settings_daemon_cb, (gpointer) manager); return FALSE; } @@ -2134,7 +2135,7 @@ impl_manager_activate_connection (NMManager *manager, info->scope = scope; info->connection_path = g_strdup (connection_path); info->specific_object_path = g_strdup (real_sop); - info->timeout_id = g_timeout_add (5000, wait_for_connection_expired, manager); + info->timeout_id = g_timeout_add_seconds (5, wait_for_connection_expired, manager); // FIXME: should probably be per-device, not global to the manager NM_MANAGER_GET_PRIVATE (manager)->pending_connection_info = info; diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c index 184c67c6fd..75bd615271 100644 --- a/src/nm-serial-device.c +++ b/src/nm-serial-device.c @@ -32,6 +32,7 @@ #include #include +#include "nm-glib-compat.h" #include "nm-serial-device.h" #include "nm-device-interface.h" #include "nm-device-private.h" @@ -285,11 +286,11 @@ nm_serial_device_add_timeout (NMSerialDevice *self, guint timeout) g_source_remove (priv->timeout_id); } - priv->timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT, - timeout * 1000, - nm_serial_device_timed_out, - self, - nm_serial_device_timeout_removed); + priv->timeout_id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, + timeout, + nm_serial_device_timed_out, + self, + nm_serial_device_timeout_removed); if (G_UNLIKELY (priv->timeout_id == 0)) nm_warning ("Registering serial device time out failed."); } diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 0a9c951ce2..93b8d28b74 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -41,6 +41,7 @@ #include #include "NetworkManager.h" +#include "nm-glib-compat.h" #include "nm-ppp-manager.h" #include "nm-setting-connection.h" #include "nm-setting-ppp.h" @@ -65,7 +66,7 @@ static gboolean impl_ppp_manager_set_ip4_config (NMPPPManager *manager, #include "nm-ppp-manager-glue.h" #define NM_PPPD_PLUGIN PLUGINDIR "/nm-pppd-plugin.so" -#define NM_PPP_WAIT_PPPD 15000 /* 10 seconds */ +#define NM_PPP_WAIT_PPPD 15 /* 15 seconds */ #define PPP_MANAGER_SECRET_TRIES "ppp-manager-secret-tries" typedef struct { @@ -342,7 +343,7 @@ monitor_stats (NMPPPManager *manager) priv->monitor_fd = socket (AF_INET, SOCK_DGRAM, 0); if (priv->monitor_fd > 0) - priv->monitor_id = g_timeout_add (5000, monitor_cb, manager); + priv->monitor_id = g_timeout_add_seconds (5, monitor_cb, manager); else nm_warning ("Could not open pppd monitor: %s", strerror (errno)); } @@ -936,7 +937,7 @@ nm_ppp_manager_start (NMPPPManager *manager, nm_debug ("ppp started with pid %d", priv->pid); priv->ppp_watch_id = g_child_watch_add (priv->pid, (GChildWatchFunc) ppp_watch_cb, manager); - priv->ppp_timeout_handler = g_timeout_add (NM_PPP_WAIT_PPPD, pppd_timed_out, manager); + priv->ppp_timeout_handler = g_timeout_add_seconds (NM_PPP_WAIT_PPPD, pppd_timed_out, manager); priv->act_req = g_object_ref (req); out: @@ -1035,7 +1036,7 @@ nm_ppp_manager_stop (NMPPPManager *manager) if (priv->pid) { if (kill (priv->pid, SIGTERM) == 0) - g_timeout_add (2000, ensure_killed, GINT_TO_POINTER (priv->pid)); + g_timeout_add_seconds (2, ensure_killed, GINT_TO_POINTER (priv->pid)); else { kill (priv->pid, SIGKILL); diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 5fb522d4fa..2076936b58 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -31,6 +31,7 @@ #include "nm-dbus-manager.h" #include "nm-call-store.h" #include "nm-dbus-glib-types.h" +#include "nm-glib-compat.h" #define WPAS_DBUS_IFACE_INTERFACE WPAS_DBUS_INTERFACE ".Interface" #define WPAS_DBUS_IFACE_BSSID WPAS_DBUS_INTERFACE ".BSSID" @@ -579,7 +580,7 @@ wpas_iface_query_scan_results (DBusGProxy *proxy, gpointer user_data) return; /* Only fetch scan results every 4s max, but initially do it right away */ - priv->scan_results_timeout = g_timeout_add (priv->last_scan ? 4000 : 0, + priv->scan_results_timeout = g_timeout_add_seconds (priv->last_scan ? 4 : 0, request_scan_results, user_data); } diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c index 98fcde9cd1..7a177ab181 100644 --- a/src/supplicant-manager/nm-supplicant-manager.c +++ b/src/supplicant-manager/nm-supplicant-manager.c @@ -28,8 +28,9 @@ #include "nm-dbus-manager.h" #include "nm-marshal.h" #include "nm-utils.h" +#include "nm-glib-compat.h" -#define SUPPLICANT_POKE_INTERVAL 120000 +#define SUPPLICANT_POKE_INTERVAL 120 typedef struct { NMDBusManager * dbus_mgr; @@ -106,7 +107,7 @@ poke_supplicant_cb (gpointer user_data) out: /* Reschedule the poke */ - priv->poke_id = g_timeout_add (SUPPLICANT_POKE_INTERVAL, + priv->poke_id = g_timeout_add_seconds (SUPPLICANT_POKE_INTERVAL, poke_supplicant_cb, (gpointer) self); diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 693ef44db6..e2d7a3b2c5 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -45,6 +45,7 @@ #include "NetworkManagerUtils.h" #include "nm-named-manager.h" #include "nm-netlink.h" +#include "nm-glib-compat.h" #include "nm-vpn-connection-glue.h" @@ -570,7 +571,7 @@ nm_vpn_connection_connect_cb (DBusGProxy *proxy, GError *err, gpointer user_data NM_VPN_CONNECTION_STATE_REASON_NONE); /* 40 second timeout waiting for IP config signal from VPN service */ - priv->ipconfig_timeout = g_timeout_add (40000, nm_vpn_connection_ip_config_timeout, connection); + priv->ipconfig_timeout = g_timeout_add_seconds (40, nm_vpn_connection_ip_config_timeout, connection); } } diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c index 33c4c51752..d8b2082288 100644 --- a/src/vpn-manager/nm-vpn-service.c +++ b/src/vpn-manager/nm-vpn-service.c @@ -31,6 +31,7 @@ #include "nm-dbus-manager.h" #include "nm-utils.h" #include "nm-vpn-manager.h" +#include "nm-glib-compat.h" G_DEFINE_TYPE (NMVPNService, nm_vpn_service, G_TYPE_OBJECT) @@ -249,7 +250,7 @@ nm_vpn_service_daemon_exec (NMVPNService *service, GError **error) nm_vpn_service_get_name (service), priv->dbus_service, priv->pid); priv->service_child_watch = g_child_watch_add (priv->pid, vpn_service_watch_cb, service); - priv->service_start_timeout = g_timeout_add (5000, nm_vpn_service_timeout, service); + priv->service_start_timeout = g_timeout_add_seconds (5, nm_vpn_service_timeout, service); } else { nm_warning ("VPN service '%s': could not launch the VPN service. error: (%d) %s.", nm_vpn_service_get_name (service), spawn_error->code, spawn_error->message); @@ -291,7 +292,7 @@ connection_vpn_state_changed (NMVPNConnection *connection, if (priv->connections == NULL) { /* schedule a timeout (10 seconds) to destroy the service */ - g_timeout_add (10000, destroy_service, user_data); + g_timeout_add_seconds (10, destroy_service, user_data); } break; default: @@ -436,7 +437,7 @@ finalize (GObject *object) if (priv->pid) { if (kill (priv->pid, SIGTERM) == 0) - g_timeout_add (2000, ensure_killed, GINT_TO_POINTER (priv->pid)); + g_timeout_add_seconds (2, ensure_killed, GINT_TO_POINTER (priv->pid)); else { kill (priv->pid, SIGKILL); diff --git a/system-settings/src/main.c b/system-settings/src/main.c index 9162ad221e..d308c44ac4 100644 --- a/system-settings/src/main.c +++ b/system-settings/src/main.c @@ -43,6 +43,7 @@ #include #include #include +#include "nm-glib-compat.h" #include "dbus-settings.h" #include "nm-system-config-hal-manager.h" @@ -426,7 +427,7 @@ device_added_cb (DBusGProxy *proxy, const char *udi, NMDeviceType devtype, gpoin /* Wait for a plugin to figure out if the device should be managed or not */ info = g_malloc0 (sizeof (WiredDeviceInfo)); info->app = app; - info->add_id = g_timeout_add (4000, add_default_dhcp_connection, info); + info->add_id = g_timeout_add_seconds (4, add_default_dhcp_connection, info); info->udi = g_strdup (udi); g_hash_table_insert (app->wired_devices, info->udi, info); } diff --git a/test/nm-online.c b/test/nm-online.c index af80962df3..2e400897be 100644 --- a/test/nm-online.c +++ b/test/nm-online.c @@ -44,6 +44,7 @@ #include #include "NetworkManager.h" +#include "nm-glib-compat.h" typedef struct { @@ -200,7 +201,7 @@ int main (int argc, char *argv[]) if (timeout.value) { timeout.norm = (double) timeout.value / (double) PROGRESS_STEPS; - g_timeout_add (1000, handle_timeout, &timeout); + g_timeout_add_seconds (1, handle_timeout, &timeout); } timeout.quiet = quiet; From 3d81c82e58f61da463a6bd945cd5ef2cddbd8a3a Mon Sep 17 00:00:00 2001 From: Chuck Anderson Date: Thu, 8 Jan 2009 12:51:13 -0500 Subject: [PATCH 09/45] ifcfg-rh: fix IP4 address fallbacks Previous code forgot to clear a temporary variable when reading IPv4 addresses from ifcfg files, and when the value being read wasn't in the ifcfg file, it could set wrong values in the connection for that variable even though it didn't exist. --- system-settings/plugins/ifcfg-rh/reader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system-settings/plugins/ifcfg-rh/reader.c b/system-settings/plugins/ifcfg-rh/reader.c index 931e0911aa..4d65915274 100644 --- a/system-settings/plugins/ifcfg-rh/reader.c +++ b/system-settings/plugins/ifcfg-rh/reader.c @@ -222,11 +222,13 @@ make_ip4_setting (shvarFile *ifcfg, GError **error) if (!strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) { addr = nm_ip4_address_new (); + tmp = 0; get_one_ip4_addr (ifcfg, "IPADDR", &tmp, error); if (*error) goto error; nm_ip4_address_set_address (addr, tmp); + tmp = 0; get_one_ip4_addr (ifcfg, "GATEWAY", &tmp, error); if (*error) goto error; @@ -236,6 +238,7 @@ make_ip4_setting (shvarFile *ifcfg, GError **error) if (!nm_ip4_address_get_gateway (addr)) { network_ifcfg = svNewFile (SYSCONFDIR "/sysconfig/network"); if (network_ifcfg) { + tmp = 0; get_one_ip4_addr (network_ifcfg, "GATEWAY", &tmp, error); svCloseFile (network_ifcfg); if (*error) @@ -262,6 +265,7 @@ make_ip4_setting (shvarFile *ifcfg, GError **error) /* Fall back to NETMASK if no PREFIX was specified */ if (!nm_ip4_address_get_prefix (addr)) { + netmask = 0; get_one_ip4_addr (ifcfg, "NETMASK", &netmask, error); if (*error) goto error; From 6bd0fce1c99267da03bcaff48b99be599667c4e4 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 12 Jan 2009 10:31:00 -0500 Subject: [PATCH 10/45] libnm-util: validate PSK and LEAP passwords If they exist, they shouldn't be zero-length. --- libnm-util/nm-setting-wireless-security.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 9f1604855c..f9c6ac020c 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -590,6 +590,13 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); return FALSE; } + if (priv->leap_password && !strlen (priv->leap_password)) { + g_set_error (error, + NM_SETTING_WIRELESS_SECURITY_ERROR, + NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, + NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD); + return FALSE; + } } else { if ( (strcmp (priv->key_mgmt, "ieee8021x") == 0) || (strcmp (priv->key_mgmt, "wpa-eap") == 0)) { @@ -657,6 +664,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return FALSE; } + if (priv->psk && !strlen (priv->psk)) { + g_set_error (error, + NM_SETTING_WIRELESS_SECURITY_ERROR, + NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, + NM_SETTING_WIRELESS_SECURITY_PSK); + return FALSE; + } + if (priv->proto && !_nm_utils_string_slist_validate (priv->proto, valid_protos)) { g_set_error (error, NM_SETTING_WIRELESS_SECURITY_ERROR, From 0400af7d038afa758f1270f2960f9c8b5a727a58 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 12 Jan 2009 10:44:00 -0500 Subject: [PATCH 11/45] Clarify variable name --- src/nm-activation-request.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 5680a6d9d7..9775041db6 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -402,7 +402,7 @@ free_get_secrets_info (gpointer data) } static void -update_one_setting (const char* key, +update_one_setting (const char* setting_name, GHashTable *setting_hash, NMConnection *connection, GSList **updated) @@ -415,7 +415,7 @@ update_one_setting (const char* key, * yes, replace the setting object in the connection. If not, just try * updating the secrets. */ - type = nm_connection_lookup_setting_type (key); + type = nm_connection_lookup_setting_type (setting_name); if (type == 0) return; @@ -443,7 +443,7 @@ update_one_setting (const char* key, if (setting) nm_connection_add_setting (connection, setting); else { - if (!nm_connection_update_secrets (connection, key, setting_hash, &error)) { + if (!nm_connection_update_secrets (connection, setting_name, setting_hash, &error)) { nm_warning ("Failed to update connection secrets: %d %s", error ? error->code : -1, error && error->message ? error->message : "(none)"); @@ -451,7 +451,7 @@ update_one_setting (const char* key, } } - *updated = g_slist_append (*updated, (gpointer) key); + *updated = g_slist_append (*updated, (gpointer) setting_name); } static void From 45f2f1144d75bb8477dafd525a9cb81736bfab70 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 12 Jan 2009 14:21:44 -0500 Subject: [PATCH 12/45] keyfile: read MAC addresses and a test framework Clean up handling of "special" keys in keyfiles, ie ones that need more processing than the basic GKeyFile API supports. Add MAC address reading (writing support to come). Additionally, add some test bits for the keyfile plugin that get run on 'make check'. --- Makefile.am | 3 +- configure.in | 20 + system-settings/plugins/keyfile/Makefile.am | 21 +- .../plugins/keyfile/io/Makefile.am | 20 + .../plugins/keyfile/{ => io}/reader.c | 263 ++++++++---- .../plugins/keyfile/{ => io}/reader.h | 0 .../plugins/keyfile/{ => io}/writer.c | 32 +- .../plugins/keyfile/{ => io}/writer.h | 7 +- .../plugins/keyfile/nm-keyfile-connection.c | 4 +- system-settings/plugins/keyfile/plugin.c | 2 +- .../plugins/keyfile/tests/Makefile.am | 32 ++ .../keyfile/tests/keyfiles/Makefile.am | 9 + .../tests/keyfiles/Test_GSM_Connection | 41 ++ .../tests/keyfiles/Test_Wired_Connection | 22 + .../plugins/keyfile/tests/test-keyfile.c | 404 ++++++++++++++++++ 15 files changed, 783 insertions(+), 97 deletions(-) create mode 100644 system-settings/plugins/keyfile/io/Makefile.am rename system-settings/plugins/keyfile/{ => io}/reader.c (68%) rename system-settings/plugins/keyfile/{ => io}/reader.h (100%) rename system-settings/plugins/keyfile/{ => io}/writer.c (91%) rename system-settings/plugins/keyfile/{ => io}/writer.h (80%) create mode 100644 system-settings/plugins/keyfile/tests/Makefile.am create mode 100644 system-settings/plugins/keyfile/tests/keyfiles/Makefile.am create mode 100644 system-settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection create mode 100644 system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection create mode 100644 system-settings/plugins/keyfile/tests/test-keyfile.c diff --git a/Makefile.am b/Makefile.am index 6bbddac6ec..8ff0683c8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,9 +51,10 @@ EXTRA_DIST = \ intltool-merge.in \ intltool-update.in -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-tests=yes DISTCLEANFILES = intltool-extract intltool-merge intltool-update pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = NetworkManager.pc + diff --git a/configure.in b/configure.in index 008c2f20c9..e75cbdb28f 100644 --- a/configure.in +++ b/configure.in @@ -477,6 +477,21 @@ fi GTK_DOC_CHECK(1.0) +dnl +dnl Tests +dnl +AC_ARG_WITH(tests, AC_HELP_STRING([--with-tests], [Build NetworkManager documentation])) +AM_CONDITIONAL(WITH_TESTS, test "x$with_tests" = "xyes") +case $with_tests in + yes) + with_tests=yes + ;; + *) + with_tests=no + ;; +esac + + AC_CONFIG_FILES([ Makefile include/Makefile @@ -504,6 +519,9 @@ system-settings/plugins/ifupdown/Makefile system-settings/plugins/ifcfg-rh/Makefile system-settings/plugins/ifcfg-suse/Makefile system-settings/plugins/keyfile/Makefile +system-settings/plugins/keyfile/io/Makefile +system-settings/plugins/keyfile/tests/Makefile +system-settings/plugins/keyfile/tests/keyfiles/Makefile test/Makefile initscript/Makefile initscript/RedHat/Makefile @@ -541,4 +559,6 @@ echo 'if this is not correct, please specifiy your distro with --with-distro=DIS echo echo Building documentation: ${with_docs} echo +echo Building tests: ${with_tests} +echo diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am index 053729c598..e904577aba 100644 --- a/system-settings/plugins/keyfile/Makefile.am +++ b/system-settings/plugins/keyfile/Makefile.am @@ -1,3 +1,11 @@ +SUBDIRS=io tests + +INCLUDES = \ + -I$(top_srcdir)/system-settings/src \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/libnm-util \ + -I$(top_srcdir)/libnm-glib \ + -I$(top_srcdir)/system-settings/plugins/keyfile/io pkglib_LTLIBRARIES = libnm-settings-plugin-keyfile.la @@ -5,11 +13,7 @@ libnm_settings_plugin_keyfile_la_SOURCES = \ nm-keyfile-connection.c \ nm-keyfile-connection.h \ plugin.c \ - plugin.h \ - reader.c \ - reader.h \ - writer.c \ - writer.h + plugin.h keyfiledir=$(sysconfdir)/NetworkManager/system-connections @@ -19,10 +23,6 @@ libnm_settings_plugin_keyfile_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DG_DISABLE_DEPRECATED \ - -I${top_srcdir}/system-settings/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/libnm-util \ - -I${top_srcdir}/libnm-glib \ -DKEYFILE_DIR=\""$(keyfiledir)"\" libnm_settings_plugin_keyfile_la_LDFLAGS = -module -avoid-version @@ -31,7 +31,8 @@ libnm_settings_plugin_keyfile_la_LIBADD = \ $(GMODULE_LIBS) \ $(DBUS_LIBS) \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm_glib.la + $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la if NO_GIO libnm_settings_plugin_keyfile_la_LIBADD += \ diff --git a/system-settings/plugins/keyfile/io/Makefile.am b/system-settings/plugins/keyfile/io/Makefile.am new file mode 100644 index 0000000000..2c3df8432d --- /dev/null +++ b/system-settings/plugins/keyfile/io/Makefile.am @@ -0,0 +1,20 @@ +INCLUDES = \ + -I$(top_srcdir)/system-settings/src \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/libnm-util \ + -I$(top_srcdir)/libnm-glib + +noinst_LTLIBRARIES = libkeyfile-io.la + +libkeyfile_io_la_SOURCES = \ + reader.h \ + reader.c \ + writer.h \ + writer.c + +libkeyfile_io_la_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) + +libkeyfile_io_la_LIBADD = $(GTHREAD_LIBS) + diff --git a/system-settings/plugins/keyfile/reader.c b/system-settings/plugins/keyfile/io/reader.c similarity index 68% rename from system-settings/plugins/keyfile/reader.c rename to system-settings/plugins/keyfile/io/reader.c index 9efd1307bd..c34a0692c7 100644 --- a/system-settings/plugins/keyfile/reader.c +++ b/system-settings/plugins/keyfile/io/reader.c @@ -29,7 +29,10 @@ #include #include #include +#include +#include #include +#include #include #include "nm-dbus-glib-types.h" @@ -43,36 +46,12 @@ read_array_of_uint (GKeyFile *file, GArray *array = NULL; gsize length; int i; + gint *tmp; - if (NM_IS_SETTING_IP4_CONFIG (setting) && !strcmp (key, NM_SETTING_IP4_CONFIG_DNS)) { - char **list, **iter; - int ret; - - list = g_key_file_get_string_list (file, nm_setting_get_name (setting), key, &length, NULL); - if (!list || !g_strv_length (list)) - return TRUE; - - array = g_array_sized_new (FALSE, FALSE, sizeof (guint32), length); - for (iter = list; *iter; iter++) { - struct in_addr addr; - - ret = inet_pton (AF_INET, *iter, &addr); - if (ret <= 0) { - g_warning ("%s: ignoring invalid DNS server address '%s'", __func__, *iter); - continue; - } - - g_array_append_val (array, addr.s_addr); - } - } else { - gint *tmp; - - tmp = g_key_file_get_integer_list (file, nm_setting_get_name (setting), key, &length, NULL); - - array = g_array_sized_new (FALSE, FALSE, sizeof (guint32), length); - for (i = 0; i < length; i++) - g_array_append_val (array, tmp[i]); - } + tmp = g_key_file_get_integer_list (file, nm_setting_get_name (setting), key, &length, NULL); + array = g_array_sized_new (FALSE, FALSE, sizeof (guint32), length); + for (i = 0; i < length; i++) + g_array_append_val (array, tmp[i]); if (array) { g_object_set (setting, key, array, NULL); @@ -181,6 +160,25 @@ next: return addresses; } +static void +ip4_addr_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) +{ + GPtrArray *addresses; + const char *setting_name = nm_setting_get_name (setting); + + addresses = read_addresses (keyfile, setting_name, key); + + /* Work around for previous syntax */ + if (!addresses && !strcmp (key, NM_SETTING_IP4_CONFIG_ADDRESSES)) + addresses = read_addresses (keyfile, setting_name, "address"); + + if (addresses) { + g_object_set (setting, key, addresses, NULL); + g_ptr_array_foreach (addresses, free_one_address, NULL); + g_ptr_array_free (addresses, TRUE); + } +} + static void free_one_route (gpointer data, gpointer user_data) { @@ -236,7 +234,7 @@ read_routes (GKeyFile *file, } else if (j == 3) { guint32 metric = 0; - /* prefix */ + /* metric */ if (!get_one_int (*iter, G_MAXUINT32, key_name, &metric)) { g_array_free (route, TRUE); goto next; @@ -268,48 +266,110 @@ next: return routes; } -static gboolean -read_array_of_array_of_uint (GKeyFile *file, - NMSetting *setting, - const char *key) +static void +ip4_route_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) { - gboolean success = FALSE; - const char *setting_name; + GPtrArray *routes; + const char *setting_name = nm_setting_get_name (setting); - /* Only handle IPv4 addresses and routes for now */ - if (!NM_IS_SETTING_IP4_CONFIG (setting)) - return FALSE; + routes = read_routes (keyfile, setting_name, key); + if (routes) { + g_object_set (setting, key, routes, NULL); + g_ptr_array_foreach (routes, free_one_route, NULL); + g_ptr_array_free (routes, TRUE); + } +} - setting_name = nm_setting_get_name (setting); +static void +ip4_dns_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) +{ + const char *setting_name = nm_setting_get_name (setting); + GArray *array = NULL; + gsize length; + char **list, **iter; + int ret; - if (!strcmp (key, NM_SETTING_IP4_CONFIG_ADDRESSES)) { - GPtrArray *addresses; + list = g_key_file_get_string_list (keyfile, setting_name, key, &length, NULL); + if (!list || !g_strv_length (list)) + return; - addresses = read_addresses (file, setting_name, key); + array = g_array_sized_new (FALSE, FALSE, sizeof (guint32), length); + for (iter = list; *iter; iter++) { + struct in_addr addr; - /* Work around for previous syntax */ - if (!addresses && !strcmp (key, NM_SETTING_IP4_CONFIG_ADDRESSES)) - addresses = read_addresses (file, setting_name, "address"); - - if (addresses) { - g_object_set (setting, key, addresses, NULL); - g_ptr_array_foreach (addresses, free_one_address, NULL); - g_ptr_array_free (addresses, TRUE); + ret = inet_pton (AF_INET, *iter, &addr); + if (ret <= 0) { + g_warning ("%s: ignoring invalid DNS server address '%s'", __func__, *iter); + continue; } - success = TRUE; - } else if (!strcmp (key, NM_SETTING_IP4_CONFIG_ROUTES)) { - GPtrArray *routes; - routes = read_routes (file, setting_name, key); - if (routes) { - g_object_set (setting, key, routes, NULL); - g_ptr_array_foreach (routes, free_one_route, NULL); - g_ptr_array_free (routes, TRUE); - } - success = TRUE; + g_array_append_val (array, addr.s_addr); } - return success; + if (array) { + g_object_set (setting, key, array, NULL); + g_array_free (array, TRUE); + } +} + + +static void +mac_address_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) +{ + const char *setting_name = nm_setting_get_name (setting); + struct ether_addr *eth; + char *tmp_string = NULL, *p; + gint *tmp_list; + GByteArray *array = NULL; + gsize length; + int i; + + p = tmp_string = g_key_file_get_string (keyfile, setting_name, key, NULL); + if (tmp_string) { + /* Look for enough ':' characters to signify a MAC address */ + i = 0; + while (*p) { + if (*p == ':') + i++; + p++; + } + if (i == 5) { + /* parse as a MAC address */ + eth = ether_aton (tmp_string); + if (eth) { + g_free (tmp_string); + array = g_byte_array_sized_new (ETH_ALEN); + g_byte_array_append (array, eth->ether_addr_octet, ETH_ALEN); + goto done; + } + } + } + g_free (tmp_string); + + /* Old format; list of ints */ + tmp_list = g_key_file_get_integer_list (keyfile, setting_name, key, &length, NULL); + array = g_byte_array_sized_new (length); + for (i = 0; i < length; i++) { + int val = tmp_list[i]; + unsigned char v = (unsigned char) (val & 0xFF); + + if (val < 0 || val > 255) { + g_warning ("%s: %s / %s ignoring invalid byte element '%d' (not " + " between 0 and 255 inclusive)", __func__, setting_name, + key, val); + } else + g_byte_array_append (array, (const unsigned char *) &v, sizeof (v)); + } + g_free (tmp_list); + +done: + if (array->len == ETH_ALEN) { + g_object_set (setting, key, array, NULL); + } else { + g_warning ("%s: ignoring invalid MAC address for %s / %s", + __func__, setting_name, key); + } + g_byte_array_free (array, TRUE); } static void @@ -337,11 +397,48 @@ read_hash_of_string (GKeyFile *file, NMSetting *setting, const char *key) g_strfreev (keys); } + typedef struct { GKeyFile *keyfile; gboolean secrets; } ReadSettingInfo; +typedef struct { + const char *setting_name; + const char *key; + gboolean check_for_key; + void (*parser) (NMSetting *setting, const char *key, GKeyFile *keyfile); +} KeyParser; + +/* A table of keys that require further parsing/conversion becuase they are + * stored in a format that can't be automatically read using the key's type. + * i.e. IP addresses, which are stored in NetworkManager as guint32, but are + * stored in keyfiles as strings, eg "10.1.1.2". + */ +static KeyParser key_parsers[] = { + { NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES, + FALSE, + ip4_addr_parser }, + { NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ROUTES, + FALSE, + ip4_route_parser }, + { NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_DNS, + FALSE, + ip4_dns_parser }, + { NM_SETTING_WIRED_SETTING_NAME, + NM_SETTING_WIRED_MAC_ADDRESS, + TRUE, + mac_address_parser }, + { NM_SETTING_WIRELESS_SETTING_NAME, + NM_SETTING_WIRELESS_MAC_ADDRESS, + TRUE, + mac_address_parser }, + { NULL, NULL, FALSE } +}; + static void read_one_setting_value (NMSetting *setting, const char *key, @@ -355,6 +452,7 @@ read_one_setting_value (NMSetting *setting, GType type; GError *err = NULL; gboolean check_for_key = TRUE; + KeyParser *parser = &key_parsers[0]; /* Property is not writable */ if (!(flags & G_PARAM_WRITABLE)) @@ -375,18 +473,38 @@ read_one_setting_value (NMSetting *setting, setting_name = nm_setting_get_name (setting); - /* IPv4 addresses and VPN properties don't have the exact key name */ - if (NM_IS_SETTING_IP4_CONFIG (setting) && !strcmp (key, NM_SETTING_IP4_CONFIG_ADDRESSES)) - check_for_key = FALSE; - else if (NM_IS_SETTING_VPN (setting)) + /* Look through the list of handlers for non-standard format key values */ + while (parser->setting_name) { + if (!strcmp (parser->setting_name, setting_name) && !strcmp (parser->key, key)) { + check_for_key = parser->check_for_key; + break; + } + parser++; + } + + /* VPN properties don't have the exact key name */ + if (NM_IS_SETTING_VPN (setting)) check_for_key = FALSE; + /* Check for the exact key in the GKeyFile if required. Most setting + * properties map 1:1 to a key in the GKeyFile, but for those properties + * like IP addresses and routes where more than one value is actually + * encoded by the setting property, this won't be true. + */ if (check_for_key && !g_key_file_has_key (file, setting_name, key, &err)) { + /* Key doesn't exist or an error ocurred, thus nothing to do. */ if (err) { g_warning ("Error loading setting '%s' value: %s", setting_name, err->message); g_error_free (err); } + return; + } + /* If there's a custom parser for this key, handle that before the generic + * parsers below. + */ + if (parser && parser->setting_name) { + (*parser->parser) (setting, key, file); return; } @@ -444,9 +562,11 @@ read_one_setting_value (NMSetting *setting, int val = tmp[i]; unsigned char v = (unsigned char) (val & 0xFF); - if (val < 0 || val > 255) - g_warning ("Value out of range for a byte value"); - else + if (val < 0 || val > 255) { + g_warning ("%s: %s / %s ignoring invalid byte element '%d' (not " + " between 0 and 255 inclusive)", __func__, setting_name, + key, val); + } else g_byte_array_append (array, (const unsigned char *) &v, sizeof (v)); } @@ -475,11 +595,6 @@ read_one_setting_value (NMSetting *setting, g_warning ("Unhandled setting property type (read): '%s/%s' : '%s'", setting_name, key, G_VALUE_TYPE_NAME (value)); } - } else if (type == DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT) { - if (!read_array_of_array_of_uint (file, setting, key)) { - g_warning ("Unhandled setting property type (read): '%s/%s' : '%s'", - setting_name, key, G_VALUE_TYPE_NAME (value)); - } } else { g_warning ("Unhandled setting property type (read): '%s/%s' : '%s'", setting_name, key, G_VALUE_TYPE_NAME (value)); diff --git a/system-settings/plugins/keyfile/reader.h b/system-settings/plugins/keyfile/io/reader.h similarity index 100% rename from system-settings/plugins/keyfile/reader.h rename to system-settings/plugins/keyfile/io/reader.h diff --git a/system-settings/plugins/keyfile/writer.c b/system-settings/plugins/keyfile/io/writer.c similarity index 91% rename from system-settings/plugins/keyfile/writer.c rename to system-settings/plugins/keyfile/io/writer.c index da5c5b09a5..7f1bb17cec 100644 --- a/system-settings/plugins/keyfile/writer.c +++ b/system-settings/plugins/keyfile/io/writer.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "nm-dbus-glib-types.h" #include "writer.h" @@ -315,7 +316,12 @@ writer_id_to_filename (const char *id) } gboolean -write_connection (NMConnection *connection, char **out_path, GError **error) +write_connection (NMConnection *connection, + const char *keyfile_dir, + uid_t owner_uid, + pid_t owner_grp, + char **out_path, + GError **error) { NMSettingConnection *s_con; GKeyFile *key_file; @@ -323,6 +329,7 @@ write_connection (NMConnection *connection, char **out_path, GError **error) gsize len; gboolean success = FALSE; char *filename, *path; + int err; if (out_path) g_return_val_if_fail (*out_path == NULL, FALSE); @@ -338,18 +345,27 @@ write_connection (NMConnection *connection, char **out_path, GError **error) goto out; filename = writer_id_to_filename (nm_setting_connection_get_id (s_con)); - path = g_build_filename (KEYFILE_DIR, filename, NULL); + path = g_build_filename (keyfile_dir, filename, NULL); g_free (filename); g_file_set_contents (path, data, len, error); - chmod (path, S_IRUSR | S_IWUSR); - if (chown (path, 0, 0) < 0) { - g_warning ("Error chowning '%s': %d", path, errno); + if (chown (path, owner_uid, owner_grp) < 0) { + g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INTERNAL_ERROR, + "%s.%d: error chowning '%s': %d", __FILE__, __LINE__, + path, errno); unlink (path); } else { - if (out_path) - *out_path = g_strdup (path); - success = TRUE; + err = chmod (path, S_IRUSR | S_IWUSR); + if (err > 0) { + g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INTERNAL_ERROR, + "%s.%d: error setting permissions on '%s': %d", __FILE__, + __LINE__, path, errno); + unlink (path); + } else { + if (out_path) + *out_path = g_strdup (path); + success = TRUE; + } } g_free (path); diff --git a/system-settings/plugins/keyfile/writer.h b/system-settings/plugins/keyfile/io/writer.h similarity index 80% rename from system-settings/plugins/keyfile/writer.h rename to system-settings/plugins/keyfile/io/writer.h index f9afb46c7d..5cd7e68b98 100644 --- a/system-settings/plugins/keyfile/writer.h +++ b/system-settings/plugins/keyfile/io/writer.h @@ -25,7 +25,12 @@ #include #include -gboolean write_connection (NMConnection *connection, char **out_path, GError **error); +gboolean write_connection (NMConnection *connection, + const char *keyfile_dir, + uid_t owner_uid, + pid_t owner_grp, + char **out_path, + GError **error); char *writer_id_to_filename (const char *id); diff --git a/system-settings/plugins/keyfile/nm-keyfile-connection.c b/system-settings/plugins/keyfile/nm-keyfile-connection.c index 0e4031b074..a202209c57 100644 --- a/system-settings/plugins/keyfile/nm-keyfile-connection.c +++ b/system-settings/plugins/keyfile/nm-keyfile-connection.c @@ -224,7 +224,7 @@ update (NMExportedConnection *exported, connection = nm_exported_connection_get_connection (exported); success = nm_connection_replace_settings (connection, new_settings, error); if (success) { - success = write_connection (connection, &filename, error); + success = write_connection (connection, KEYFILE_DIR, 0, 0, &filename, error); if (success && filename && strcmp (priv->filename, filename)) { /* Update the filename if it changed */ g_free (priv->filename); @@ -294,7 +294,7 @@ constructor (GType type, g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL); g_free (uuid); - if (!write_connection (wrapped, NULL, &error)) { + if (!write_connection (wrapped, KEYFILE_DIR, 0, 0, NULL, &error)) { g_warning ("Couldn't update connection %s with a UUID: (%d) %s", nm_setting_connection_get_id (s_con), error ? error->code : 0, error ? error->message : "unknown"); diff --git a/system-settings/plugins/keyfile/plugin.c b/system-settings/plugins/keyfile/plugin.c index a2d4918d14..3a3f6ff7f2 100644 --- a/system-settings/plugins/keyfile/plugin.c +++ b/system-settings/plugins/keyfile/plugin.c @@ -350,7 +350,7 @@ add_connection (NMSystemConfigInterface *config, NMConnection *connection, GError **error) { - return write_connection (connection, NULL, error); + return write_connection (connection, KEYFILE_DIR, 0, 0, NULL, error); } static GSList * diff --git a/system-settings/plugins/keyfile/tests/Makefile.am b/system-settings/plugins/keyfile/tests/Makefile.am new file mode 100644 index 0000000000..6d8666c0c5 --- /dev/null +++ b/system-settings/plugins/keyfile/tests/Makefile.am @@ -0,0 +1,32 @@ +SUBDIRS=keyfiles + +INCLUDES = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/libnm-util \ + -I$(top_srcdir)/libnm-glib \ + -I$(top_srcdir)/system-settings/plugins/keyfile/io + +noinst_PROGRAMS = test-keyfile + +test_keyfile_SOURCES = \ + test-keyfile.c + +test_keyfile_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) \ + -DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \ + -DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" + +test_keyfile_LDADD = \ + $(DBUS_LIBS) \ + $(top_builddir)/libnm-glib/libnm_glib.la \ + $(top_builddir)/libnm-util/libnm-util.la \ + $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la + +if WITH_TESTS + +check-local: test-keyfile + $(abs_builddir)/test-keyfile + +endif + diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am b/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am new file mode 100644 index 0000000000..8e6650721b --- /dev/null +++ b/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am @@ -0,0 +1,9 @@ +EXTRA_DIST = \ + Test_Wired_Connection \ + Test_GSM_Connection + +check-local: + @for f in $(EXTRA_DIST); do \ + chmod 0600 $(abs_srcdir)/$$f; \ + done + diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection b/system-settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection new file mode 100644 index 0000000000..3d58fee041 --- /dev/null +++ b/system-settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection @@ -0,0 +1,41 @@ + +[serial] +baud=115200 +bits=8 +parity=110 +stopbits=1 +send-delay=0 + +[connection] +id=Test GSM Connection +uuid=05a5ec81-fa72-4b7c-9f85-4a0dfd36c84f +type=gsm +autoconnect=false +timestamp=0 + +[gsm] +number=*99# +username=username +apn=my.apn +network-type=0 +band=0 + +[ppp] +noauth=false +refuse-eap=false +refuse-pap=false +refuse-chap=false +refuse-mschap=false +refuse-mschapv2=false +nobsdcomp=false +nodeflate=false +no-vj-comp=false +require-mppe=false +require-mppe-128=false +mppe-stateful=false +crtscts=false +baud=0 +mru=0 +mtu=0 +lcp-echo-failure=5 +lcp-echo-interval=30 diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection b/system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection new file mode 100644 index 0000000000..f542811551 --- /dev/null +++ b/system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection @@ -0,0 +1,22 @@ + +[connection] +id=Test Wired Connection +uuid=4e80a56d-c99f-4aad-a6dd-b449bc398c57 +type=802-3-ethernet +autoconnect=true +timestamp=6654332 + +[802-3-ethernet] +mac-address=00:11:22:33:44:55 +speed=0 +duplex=full +auto-negotiate=true +mtu=1400 + +[ipv4] +method=manual +dns=4.2.2.1;4.2.2.2; +addresses1=192.168.0.5;24;192.168.0.1; +addresses2=1.2.3.4;16;1.2.1.1; +ignore-auto-routes=false +ignore-auto-dns=false diff --git a/system-settings/plugins/keyfile/tests/test-keyfile.c b/system-settings/plugins/keyfile/tests/test-keyfile.c new file mode 100644 index 0000000000..31e2a60b16 --- /dev/null +++ b/system-settings/plugins/keyfile/tests/test-keyfile.c @@ -0,0 +1,404 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager system settings service - keyfile plugin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2008 Red Hat, Inc. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +#include "reader.h" +#include "writer.h" + +#define TEST_WIRED_FILE TEST_KEYFILES_DIR"/Test_Wired_Connection" + +static void +FAIL(const char *test_name, const char *fmt, ...) +{ + va_list args; + char buf[500]; + + snprintf (buf, 500, "FAIL: (%s) %s\n", test_name, fmt); + + va_start (args, fmt); + vfprintf (stderr, buf, args); + va_end (args); + _exit (1); +} + +#define ASSERT(x, test_name, fmt, ...) \ + if (!(x)) { \ + FAIL (test_name, fmt, ## __VA_ARGS__); \ + } + +static void +test_read_valid_wired_connection (void) +{ + NMConnection *connection; + NMSettingConnection *s_con; + NMSettingWired *s_wired; + NMSettingIP4Config *s_ip4; + GError *error = NULL; + const GByteArray *array; + char expected_mac_address[ETH_ALEN] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 }; + const char *tmp; + const char *expected_id = "Test Wired Connection"; + const char *expected_uuid = "4e80a56d-c99f-4aad-a6dd-b449bc398c57"; + const guint64 expected_timestamp = 6654332; + guint64 timestamp; + const char *expected_dns1 = "4.2.2.1"; + const char *expected_dns2 = "4.2.2.2"; + struct in_addr addr; + const char *expected_address1 = "192.168.0.5"; + const char *expected_address2 = "1.2.3.4"; + const char *expected_address1_gw = "192.168.0.1"; + const char *expected_address2_gw = "1.2.1.1"; + NMIP4Address *ip4_addr; + + connection = connection_from_file (TEST_WIRED_FILE, TRUE); + ASSERT (connection != NULL, + "connection-read", "failed to read %s", TEST_WIRED_FILE); + + ASSERT (nm_connection_verify (connection, &error), + "connection-verify", "failed to verify %s: %s", TEST_WIRED_FILE, error->message); + + /* ===== CONNECTION SETTING ===== */ + + s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); + ASSERT (s_con != NULL, + "connection-verify-connection", "failed to verify %s: missing %s setting", + TEST_WIRED_FILE, + NM_SETTING_CONNECTION_SETTING_NAME); + + /* ID */ + tmp = nm_setting_connection_get_id (s_con); + ASSERT (tmp != NULL, + "connection-verify-connection", "failed to verify %s: missing %s / %s key", + TEST_WIRED_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_ID); + ASSERT (strcmp (tmp, expected_id) == 0, + "connection-verify-connection", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_ID); + + /* UUID */ + tmp = nm_setting_connection_get_uuid (s_con); + ASSERT (tmp != NULL, + "connection-verify-connection", "failed to verify %s: missing %s / %s key", + TEST_WIRED_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_UUID); + ASSERT (strcmp (tmp, expected_uuid) == 0, + "connection-verify-connection", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_UUID); + + /* Timestamp */ + timestamp = nm_setting_connection_get_timestamp (s_con); + ASSERT (timestamp == expected_timestamp, + "connection-verify-connection", "failed to verify %s: unexpected %s /%s key value", + TEST_WIRED_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_TIMESTAMP); + + /* Autoconnect */ + ASSERT (nm_setting_connection_get_autoconnect (s_con) == TRUE, + "connection-verify-connection", "failed to verify %s: unexpected %s /%s key value", + TEST_WIRED_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_AUTOCONNECT); + + /* ===== WIRED SETTING ===== */ + + s_wired = NM_SETTING_WIRED (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRED)); + ASSERT (s_wired != NULL, + "connection-verify-wired", "failed to verify %s: missing %s setting", + TEST_WIRED_FILE, + NM_SETTING_WIRED_SETTING_NAME); + + /* MAC address */ + array = nm_setting_wired_get_mac_address (s_wired); + ASSERT (array != NULL, + "connection-verify-wired", "failed to verify %s: missing %s / %s key", + TEST_WIRED_FILE, + NM_SETTING_WIRED_SETTING_NAME, + NM_SETTING_WIRED_MAC_ADDRESS); + ASSERT (array->len == ETH_ALEN, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value length", + TEST_WIRED_FILE, + NM_SETTING_WIRED_SETTING_NAME, + NM_SETTING_WIRED_MAC_ADDRESS); + ASSERT (memcmp (array->data, &expected_mac_address[0], sizeof (expected_mac_address)) == 0, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_WIRED_SETTING_NAME, + NM_SETTING_WIRED_MAC_ADDRESS); + + ASSERT (nm_setting_wired_get_mtu (s_wired) == 1400, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_WIRED_SETTING_NAME, + NM_SETTING_WIRED_MTU); + + /* ===== IPv4 SETTING ===== */ + + s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG)); + ASSERT (s_ip4 != NULL, + "connection-verify-ip4", "failed to verify %s: missing %s setting", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME); + + /* Method */ + tmp = nm_setting_ip4_config_get_method (s_ip4); + ASSERT (strcmp (tmp, NM_SETTING_IP4_CONFIG_METHOD_MANUAL) == 0, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_METHOD); + + /* DNS Addresses */ + ASSERT (nm_setting_ip4_config_get_num_dns (s_ip4) == 2, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_DNS); + + ASSERT (inet_pton (AF_INET, expected_dns1, &addr) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert DNS IP address #1", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_DNS); + ASSERT (nm_setting_ip4_config_get_dns (s_ip4, 0) == addr.s_addr, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value #1", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_DNS); + + ASSERT (inet_pton (AF_INET, expected_dns2, &addr) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert DNS IP address #2", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_DNS); + ASSERT (nm_setting_ip4_config_get_dns (s_ip4, 1) == addr.s_addr, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value #2", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_DNS); + + ASSERT (nm_setting_ip4_config_get_num_addresses (s_ip4) == 2, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_DNS); + + /* Address #1 */ + ip4_addr = nm_setting_ip4_config_get_address (s_ip4, 0); + ASSERT (ip4_addr, + "connection-verify-wired", "failed to verify %s: missing IP4 address #1", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + + ASSERT (nm_ip4_address_get_prefix (ip4_addr) == 24, + "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1 gateway", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + + ASSERT (inet_pton (AF_INET, expected_address1, &addr) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert IP address #1", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_DNS); + ASSERT (nm_ip4_address_get_address (ip4_addr) == addr.s_addr, + "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + + ASSERT (inet_pton (AF_INET, expected_address1_gw, &addr) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert IP address #1 gateway", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + ASSERT (nm_ip4_address_get_gateway (ip4_addr) == addr.s_addr, + "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1 gateway", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + + /* Address #2 */ + ip4_addr = nm_setting_ip4_config_get_address (s_ip4, 1); + ASSERT (ip4_addr, + "connection-verify-wired", "failed to verify %s: missing IP4 address #2", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + + ASSERT (nm_ip4_address_get_prefix (ip4_addr) == 16, + "connection-verify-wired", "failed to verify %s: unexpected IP4 address #2 gateway", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + + ASSERT (inet_pton (AF_INET, expected_address2, &addr) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert IP address #2", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_DNS); + ASSERT (nm_ip4_address_get_address (ip4_addr) == addr.s_addr, + "connection-verify-wired", "failed to verify %s: unexpected IP4 address #2", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + + ASSERT (inet_pton (AF_INET, expected_address2_gw, &addr) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert IP address #2 gateway", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + ASSERT (nm_ip4_address_get_gateway (ip4_addr) == addr.s_addr, + "connection-verify-wired", "failed to verify %s: unexpected IP4 address #2 gateway", + TEST_WIRED_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + + g_object_unref (connection); +} + +static void +test_write_wired_connection (void) +{ + NMConnection *connection; + NMSettingConnection *s_con; + NMSettingWired *s_wired; + NMSettingIP4Config *s_ip4; + char *uuid; + GByteArray *mac; + unsigned char tmpmac[] = { 0x99, 0x88, 0x77, 0x66, 0x55, 0x44 }; + gboolean success; + NMConnection *reread; + char *testfile = NULL; + GError *error = NULL; + pid_t owner_grp; + uid_t owner_uid; + + connection = nm_connection_new (); + ASSERT (connection != NULL, + "connection-write", "failed to allocate new connection"); + + s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ()); + ASSERT (s_con != NULL, + "connection-write", "failed to allocate new %s setting", + NM_SETTING_CONNECTION_SETTING_NAME); + nm_connection_add_setting (connection, NM_SETTING (s_con)); + + uuid = nm_utils_uuid_generate (); + g_object_set (s_con, + NM_SETTING_CONNECTION_ID, "Work Wireless", + NM_SETTING_CONNECTION_UUID, uuid, + NM_SETTING_CONNECTION_AUTOCONNECT, FALSE, + NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, + NM_SETTING_CONNECTION_TIMESTAMP, 0x12345678L, + NULL); + g_free (uuid); + + s_wired = NM_SETTING_WIRED (nm_setting_wired_new ()); + ASSERT (s_wired != NULL, + "connection-write", "failed to allocate new %s setting", + NM_SETTING_WIRED_SETTING_NAME); + nm_connection_add_setting (connection, NM_SETTING (s_wired)); + + mac = g_byte_array_sized_new (ETH_ALEN); + g_byte_array_append (mac, &tmpmac[0], sizeof (tmpmac)); + g_object_set (s_wired, + NM_SETTING_WIRED_MAC_ADDRESS, mac, + NM_SETTING_WIRED_MTU, 900, + NULL); + g_byte_array_free (mac, TRUE); + + s_ip4 = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ()); + ASSERT (s_ip4 != NULL, + "connection-write", "failed to allocate new %s setting", + NM_SETTING_WIRED_SETTING_NAME); + nm_connection_add_setting (connection, NM_SETTING (s_ip4)); + + /* Write out the connection */ + owner_uid = geteuid (); + owner_grp = getegid (); + success = write_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); + ASSERT (success == TRUE, + "connection-write", "failed to allocate write keyfile: %s", + error ? error->message : "(none)"); + + ASSERT (testfile != NULL, + "connection-write", "didn't get keyfile name back after writing connection"); + + /* Read the connection back in and compare it to the one we just wrote out */ + reread = connection_from_file (testfile, TRUE); + ASSERT (reread != NULL, "connection-write", "failed to re-read test connection"); + + ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE, + "connection-write", "written and re-read connection weren't the same"); + + g_clear_error (&error); + unlink (testfile); + g_free (testfile); + + g_object_unref (reread); + g_object_unref (connection); +} + +int main (int argc, char **argv) +{ + GError *error = NULL; + DBusGConnection *bus; + char *basename; + + g_type_init (); + bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); + + if (!nm_utils_init (&error)) + FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message); + + /* The tests */ + test_read_valid_wired_connection (); + test_write_wired_connection (); + + basename = g_path_get_basename (argv[0]); + fprintf (stdout, "%s: SUCCESS\n", basename); + g_free (basename); + return 0; +} + From 07d3ffbcec1c717c8cc71bffd6ebc01769e08d2a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 12 Jan 2009 18:23:30 -0500 Subject: [PATCH 13/45] keyfile: write nicely formatted MAC addresses; clean up "special" key handling Add testcases for keyfile ip4-config setting writing too. --- system-settings/plugins/keyfile/io/writer.c | 182 +++++++++++++----- .../plugins/keyfile/tests/test-keyfile.c | 81 ++++++++ 2 files changed, 214 insertions(+), 49 deletions(-) diff --git a/system-settings/plugins/keyfile/io/writer.c b/system-settings/plugins/keyfile/io/writer.c index 7f1bb17cec..ab4b15e39d 100644 --- a/system-settings/plugins/keyfile/io/writer.c +++ b/system-settings/plugins/keyfile/io/writer.c @@ -27,9 +27,13 @@ #include #include #include +#include +#include +#include #include #include #include +#include #include #include "nm-dbus-glib-types.h" @@ -44,44 +48,53 @@ write_array_of_uint (GKeyFile *file, { GArray *array; int i; + int *tmp_array; array = (GArray *) g_value_get_boxed (value); if (!array || !array->len) return TRUE; - if (NM_IS_SETTING_IP4_CONFIG (setting) && !strcmp (key, NM_SETTING_IP4_CONFIG_DNS)) { - char **list; + tmp_array = g_new (gint, array->len); + for (i = 0; i < array->len; i++) + tmp_array[i] = g_array_index (array, int, i); - list = g_new0 (char *, array->len + 1); + g_key_file_set_integer_list (file, nm_setting_get_name (setting), key, tmp_array, array->len); + g_free (tmp_array); + return TRUE; +} - for (i = 0; i < array->len; i++) { - char buf[INET_ADDRSTRLEN + 1]; - struct in_addr addr; +static void +ip4_dns_writer (GKeyFile *file, + NMSetting *setting, + const char *key, + const GValue *value) +{ + GArray *array; + char **list; + int i, num = 0; - addr.s_addr = g_array_index (array, guint32, i); - if (!inet_ntop (AF_INET, &addr, buf, sizeof (buf))) { - nm_warning ("%s: error converting IP4 address 0x%X", - __func__, ntohl (addr.s_addr)); - list[i] = NULL; - } else { - list[i] = g_strdup (buf); - } - } + g_return_if_fail (G_VALUE_HOLDS (value, DBUS_TYPE_G_UINT_ARRAY)); - g_key_file_set_string_list (file, nm_setting_get_name (setting), key, (const char **) list, array->len); - g_strfreev (list); - } else { - int *tmp_array; + array = (GArray *) g_value_get_boxed (value); + if (!array || !array->len) + return; - tmp_array = g_new (gint, array->len); - for (i = 0; i < array->len; i++) - tmp_array[i] = g_array_index (array, int, i); + list = g_new0 (char *, array->len + 1); - g_key_file_set_integer_list (file, nm_setting_get_name (setting), key, tmp_array, array->len); - g_free (tmp_array); + for (i = 0; i < array->len; i++) { + char buf[INET_ADDRSTRLEN + 1]; + struct in_addr addr; + + addr.s_addr = g_array_index (array, guint32, i); + if (!inet_ntop (AF_INET, &addr, buf, sizeof (buf))) { + nm_warning ("%s: error converting IP4 address 0x%X", + __func__, ntohl (addr.s_addr)); + } else + list[num++] = g_strdup (buf); } - return TRUE; + g_key_file_set_string_list (file, nm_setting_get_name (setting), key, (const char **) list, num); + g_strfreev (list); } static void @@ -96,7 +109,7 @@ write_ip4_values (GKeyFile *file, char **list = NULL; int i, j; - list = g_malloc (tuple_len); + list = g_new (char *, tuple_len); for (i = 0, j = 0; i < array->len; i++, j++) { GArray *tuple = g_ptr_array_index (array, i); @@ -104,7 +117,7 @@ write_ip4_values (GKeyFile *file, char *key_name; int k; - memset (list, 0, tuple_len); + memset (list, 0, tuple_len * sizeof (char *)); for (k = 0; k < tuple_len; k++) { if (k == addr1_pos || k == addr2_pos) { @@ -139,28 +152,64 @@ write_ip4_values (GKeyFile *file, g_free (list); } -static gboolean -write_array_of_array_of_uint (GKeyFile *file, - NMSetting *setting, - const char *key, - const GValue *value) +static void +ip4_addr_writer (GKeyFile *file, + NMSetting *setting, + const char *key, + const GValue *value) { GPtrArray *array; + const char *setting_name = nm_setting_get_name (setting); - /* Only handle IPv4 addresses and routes for now */ - if (!NM_IS_SETTING_IP4_CONFIG (setting)) - return FALSE; + g_return_if_fail (G_VALUE_HOLDS (value, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT)); array = (GPtrArray *) g_value_get_boxed (value); - if (!array || !array->len) - return TRUE; + if (array && array->len) + write_ip4_values (file, setting_name, key, array, 3, 0, 2); +} - if (!strcmp (key, NM_SETTING_IP4_CONFIG_ADDRESSES)) - write_ip4_values (file, nm_setting_get_name (setting), key, array, 3, 0, 2); - else if (!strcmp (key, NM_SETTING_IP4_CONFIG_ROUTES)) - write_ip4_values (file, nm_setting_get_name (setting), key, array, 4, 0, 2); +static void +ip4_route_writer (GKeyFile *file, + NMSetting *setting, + const char *key, + const GValue *value) +{ + GPtrArray *array; + const char *setting_name = nm_setting_get_name (setting); - return TRUE; + g_return_if_fail (G_VALUE_HOLDS (value, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT)); + + array = (GPtrArray *) g_value_get_boxed (value); + if (array && array->len) + write_ip4_values (file, setting_name, key, array, 4, 0, 2); +} + +static void +mac_address_writer (GKeyFile *file, + NMSetting *setting, + const char *key, + const GValue *value) +{ + GByteArray *array; + const char *setting_name = nm_setting_get_name (setting); + char *mac; + struct ether_addr tmp; + + g_return_if_fail (G_VALUE_HOLDS (value, DBUS_TYPE_G_UCHAR_ARRAY)); + + array = (GByteArray *) g_value_get_boxed (value); + if (!array) + return; + + if (array->len != ETH_ALEN) { + nm_warning ("%s: invalid %s / %s MAC address length %d", + __func__, setting_name, key, array->len); + return; + } + + memcpy (tmp.ether_addr_octet, array->data, ETH_ALEN); + mac = ether_ntoa (&tmp); + g_key_file_set_string (file, setting_name, key, mac); } typedef struct { @@ -202,6 +251,36 @@ write_hash_of_string (GKeyFile *file, g_hash_table_foreach (hash, write_hash_of_string_helper, &info); } +typedef struct { + const char *setting_name; + const char *key; + void (*writer) (GKeyFile *keyfile, NMSetting *setting, const char *key, const GValue *value); +} KeyWriter; + +/* A table of keys that require further parsing/conversion becuase they are + * stored in a format that can't be automatically read using the key's type. + * i.e. IP addresses, which are stored in NetworkManager as guint32, but are + * stored in keyfiles as strings, eg "10.1.1.2". + */ +static KeyWriter key_writers[] = { + { NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES, + ip4_addr_writer }, + { NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ROUTES, + ip4_route_writer }, + { NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_DNS, + ip4_dns_writer }, + { NM_SETTING_WIRED_SETTING_NAME, + NM_SETTING_WIRED_MAC_ADDRESS, + mac_address_writer }, + { NM_SETTING_WIRELESS_SETTING_NAME, + NM_SETTING_WIRELESS_MAC_ADDRESS, + mac_address_writer }, + { NULL, NULL, NULL } +}; + static void write_setting_value (NMSetting *setting, const char *key, @@ -212,6 +291,7 @@ write_setting_value (NMSetting *setting, GKeyFile *file = (GKeyFile *) user_data; const char *setting_name; GType type; + KeyWriter *writer = &key_writers[0]; type = G_VALUE_TYPE (value); @@ -226,6 +306,15 @@ write_setting_value (NMSetting *setting, setting_name = nm_setting_get_name (setting); + /* Look through the list of handlers for non-standard format key values */ + while (writer->setting_name) { + if (!strcmp (writer->setting_name, setting_name) && !strcmp (writer->key, key)) { + (*writer->writer) (file, setting, key, value); + return; + } + writer++; + } + if (type == G_TYPE_STRING) { const char *str; @@ -261,7 +350,7 @@ write_setting_value (NMSetting *setting, g_key_file_set_integer_list (file, setting_name, key, tmp_array, array->len); g_free (tmp_array); } - } else if (type == dbus_g_type_get_collection ("GSList", G_TYPE_STRING)) { + } else if (type == DBUS_TYPE_G_LIST_OF_STRING) { GSList *list; GSList *iter; @@ -277,18 +366,13 @@ write_setting_value (NMSetting *setting, g_key_file_set_string_list (file, setting_name, key, (const gchar **const) array, i); g_free (array); } - } else if (type == dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING)) { + } else if (type == DBUS_TYPE_G_MAP_OF_STRING) { write_hash_of_string (file, setting, key, value); } else if (type == DBUS_TYPE_G_UINT_ARRAY) { if (!write_array_of_uint (file, setting, key, value)) { g_warning ("Unhandled setting property type (write) '%s/%s' : '%s'", setting_name, key, g_type_name (type)); } - } else if (type == DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT) { - if (!write_array_of_array_of_uint (file, setting, key, value)) { - g_warning ("Unhandled setting property type (write) '%s/%s' : '%s'", - setting_name, key, g_type_name (type)); - } } else { g_warning ("Unhandled setting property type (write) '%s/%s' : '%s'", setting_name, key, g_type_name (type)); diff --git a/system-settings/plugins/keyfile/tests/test-keyfile.c b/system-settings/plugins/keyfile/tests/test-keyfile.c index 31e2a60b16..01668cbf18 100644 --- a/system-settings/plugins/keyfile/tests/test-keyfile.c +++ b/system-settings/plugins/keyfile/tests/test-keyfile.c @@ -297,6 +297,52 @@ test_read_valid_wired_connection (void) g_object_unref (connection); } +static void +add_one_ip4_address (NMSettingIP4Config *s_ip4, + const char *addr, + const char *gw, + guint32 prefix) +{ + struct in_addr tmp; + NMIP4Address *ip4_addr; + + ip4_addr = nm_ip4_address_new (); + nm_ip4_address_set_prefix (ip4_addr, prefix); + + inet_pton (AF_INET, addr, &tmp); + nm_ip4_address_set_address (ip4_addr, tmp.s_addr); + + inet_pton (AF_INET, gw, &tmp); + nm_ip4_address_set_gateway (ip4_addr, tmp.s_addr); + + nm_setting_ip4_config_add_address (s_ip4, ip4_addr); + nm_ip4_address_unref (ip4_addr); +} + +static void +add_one_ip4_route (NMSettingIP4Config *s_ip4, + const char *dest, + const char *nh, + guint32 prefix, + guint32 metric) +{ + struct in_addr addr; + NMIP4Route *route; + + route = nm_ip4_route_new (); + nm_ip4_route_set_prefix (route, prefix); + nm_ip4_route_set_metric (route, metric); + + inet_pton (AF_INET, dest, &addr); + nm_ip4_route_set_dest (route, addr.s_addr); + + inet_pton (AF_INET, nh, &addr); + nm_ip4_route_set_next_hop (route, addr.s_addr); + + nm_setting_ip4_config_add_route (s_ip4, route); + nm_ip4_route_unref (route); +} + static void test_write_wired_connection (void) { @@ -313,11 +359,24 @@ test_write_wired_connection (void) GError *error = NULL; pid_t owner_grp; uid_t owner_uid; + struct in_addr addr; + const char *dns1 = "4.2.2.1"; + const char *dns2 = "4.2.2.2"; + const char *address1 = "192.168.0.5"; + const char *address1_gw = "192.168.0.1"; + const char *address2 = "1.2.3.4"; + const char *address2_gw = "1.2.1.1"; + const char *route1 = "10.10.10.2"; + const char *route1_nh = "10.10.10.1"; + const char *route2 = "0.0.0.0"; + const char *route2_nh = "1.2.1.1"; connection = nm_connection_new (); ASSERT (connection != NULL, "connection-write", "failed to allocate new connection"); + /* Connection setting */ + s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ()); ASSERT (s_con != NULL, "connection-write", "failed to allocate new %s setting", @@ -334,6 +393,8 @@ test_write_wired_connection (void) NULL); g_free (uuid); + /* Wired setting */ + s_wired = NM_SETTING_WIRED (nm_setting_wired_new ()); ASSERT (s_wired != NULL, "connection-write", "failed to allocate new %s setting", @@ -348,12 +409,32 @@ test_write_wired_connection (void) NULL); g_byte_array_free (mac, TRUE); + /* IP4 setting */ + s_ip4 = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ()); ASSERT (s_ip4 != NULL, "connection-write", "failed to allocate new %s setting", NM_SETTING_WIRED_SETTING_NAME); nm_connection_add_setting (connection, NM_SETTING (s_ip4)); + g_object_set (s_ip4, + NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, + NULL); + + /* Addresses */ + add_one_ip4_address (s_ip4, address1, address1_gw, 24); + add_one_ip4_address (s_ip4, address2, address2_gw, 8); + + /* Routes */ + add_one_ip4_route (s_ip4, route1, route1_nh, 24, 3); + add_one_ip4_route (s_ip4, route2, route2_nh, 8, 1); + + /* DNS servers */ + inet_pton (AF_INET, dns1, &addr); + nm_setting_ip4_config_add_dns (s_ip4, addr.s_addr); + inet_pton (AF_INET, dns2, &addr); + nm_setting_ip4_config_add_dns (s_ip4, addr.s_addr); + /* Write out the connection */ owner_uid = geteuid (); owner_grp = getegid (); From e207a458c407011e378316343299c4aceaae6482 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 12 Jan 2009 19:05:24 -0500 Subject: [PATCH 14/45] keyfile: read & write nicely formatted BSSIDs --- system-settings/plugins/keyfile/io/reader.c | 4 + system-settings/plugins/keyfile/io/writer.c | 3 + .../keyfile/tests/keyfiles/Makefile.am | 3 +- .../tests/keyfiles/Test_Wireless_Connection | 22 ++ .../plugins/keyfile/tests/test-keyfile.c | 233 +++++++++++++++++- 5 files changed, 260 insertions(+), 5 deletions(-) create mode 100644 system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection diff --git a/system-settings/plugins/keyfile/io/reader.c b/system-settings/plugins/keyfile/io/reader.c index c34a0692c7..afa5418489 100644 --- a/system-settings/plugins/keyfile/io/reader.c +++ b/system-settings/plugins/keyfile/io/reader.c @@ -436,6 +436,10 @@ static KeyParser key_parsers[] = { NM_SETTING_WIRELESS_MAC_ADDRESS, TRUE, mac_address_parser }, + { NM_SETTING_WIRELESS_SETTING_NAME, + NM_SETTING_WIRELESS_BSSID, + TRUE, + mac_address_parser }, { NULL, NULL, FALSE } }; diff --git a/system-settings/plugins/keyfile/io/writer.c b/system-settings/plugins/keyfile/io/writer.c index ab4b15e39d..5a7813aed1 100644 --- a/system-settings/plugins/keyfile/io/writer.c +++ b/system-settings/plugins/keyfile/io/writer.c @@ -278,6 +278,9 @@ static KeyWriter key_writers[] = { { NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_MAC_ADDRESS, mac_address_writer }, + { NM_SETTING_WIRELESS_SETTING_NAME, + NM_SETTING_WIRELESS_BSSID, + mac_address_writer }, { NULL, NULL, NULL } }; diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am b/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am index 8e6650721b..ed2acb96f1 100644 --- a/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am +++ b/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am @@ -1,6 +1,7 @@ EXTRA_DIST = \ Test_Wired_Connection \ - Test_GSM_Connection + Test_GSM_Connection \ + Test_Wireless_Connection check-local: @for f in $(EXTRA_DIST); do \ diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection b/system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection new file mode 100644 index 0000000000..b1949d0dd6 --- /dev/null +++ b/system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection @@ -0,0 +1,22 @@ +[connection] +id=Test Wireless Connection +uuid=2f962388-e5f3-45af-a62c-ac220b8f7baa +type=802-11-wireless +autoconnect=false +timestamp=1226604314 + +[802-11-wireless] +ssid=110;109;45;116;101;115;116;45;97;112; +mode=infrastructure +channel=0 +rate=0 +tx-power=0 +mtu=0 +bssid=00:1a:33:44:99:82 + +[ipv4] +method=auto +ignore-auto-routes=false +ignore-auto-dns=false +never-default=false + diff --git a/system-settings/plugins/keyfile/tests/test-keyfile.c b/system-settings/plugins/keyfile/tests/test-keyfile.c index 01668cbf18..cbd73f1eab 100644 --- a/system-settings/plugins/keyfile/tests/test-keyfile.c +++ b/system-settings/plugins/keyfile/tests/test-keyfile.c @@ -38,7 +38,8 @@ #include "reader.h" #include "writer.h" -#define TEST_WIRED_FILE TEST_KEYFILES_DIR"/Test_Wired_Connection" +#define TEST_WIRED_FILE TEST_KEYFILES_DIR"/Test_Wired_Connection" +#define TEST_WIRELESS_FILE TEST_KEYFILES_DIR"/Test_Wireless_Connection" static void FAIL(const char *test_name, const char *fmt, ...) @@ -370,6 +371,7 @@ test_write_wired_connection (void) const char *route1_nh = "10.10.10.1"; const char *route2 = "0.0.0.0"; const char *route2_nh = "1.2.1.1"; + guint64 timestamp = 0x12345678L; connection = nm_connection_new (); ASSERT (connection != NULL, @@ -385,11 +387,11 @@ test_write_wired_connection (void) uuid = nm_utils_uuid_generate (); g_object_set (s_con, - NM_SETTING_CONNECTION_ID, "Work Wireless", + NM_SETTING_CONNECTION_ID, "Work Wired", NM_SETTING_CONNECTION_UUID, uuid, NM_SETTING_CONNECTION_AUTOCONNECT, FALSE, NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, - NM_SETTING_CONNECTION_TIMESTAMP, 0x12345678L, + NM_SETTING_CONNECTION_TIMESTAMP, timestamp, NULL); g_free (uuid); @@ -414,7 +416,7 @@ test_write_wired_connection (void) s_ip4 = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ()); ASSERT (s_ip4 != NULL, "connection-write", "failed to allocate new %s setting", - NM_SETTING_WIRED_SETTING_NAME); + NM_SETTING_IP4_CONFIG_SETTING_NAME); nm_connection_add_setting (connection, NM_SETTING (s_ip4)); g_object_set (s_ip4, @@ -461,6 +463,226 @@ test_write_wired_connection (void) g_object_unref (connection); } +static void +test_read_valid_wireless_connection (void) +{ + NMConnection *connection; + NMSettingConnection *s_con; + NMSettingWireless *s_wireless; + NMSettingIP4Config *s_ip4; + GError *error = NULL; + const GByteArray *array; + char expected_bssid[ETH_ALEN] = { 0x00, 0x1a, 0x33, 0x44, 0x99, 0x82 }; + const char *tmp; + const char *expected_id = "Test Wireless Connection"; + const char *expected_uuid = "2f962388-e5f3-45af-a62c-ac220b8f7baa"; + const guint64 expected_timestamp = 1226604314; + guint64 timestamp; + + connection = connection_from_file (TEST_WIRELESS_FILE, TRUE); + ASSERT (connection != NULL, + "connection-read", "failed to read %s", TEST_WIRELESS_FILE); + + ASSERT (nm_connection_verify (connection, &error), + "connection-verify", "failed to verify %s: %s", TEST_WIRELESS_FILE, error->message); + + /* ===== CONNECTION SETTING ===== */ + + s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); + ASSERT (s_con != NULL, + "connection-verify-connection", "failed to verify %s: missing %s setting", + TEST_WIRELESS_FILE, + NM_SETTING_CONNECTION_SETTING_NAME); + + /* ID */ + tmp = nm_setting_connection_get_id (s_con); + ASSERT (tmp != NULL, + "connection-verify-connection", "failed to verify %s: missing %s / %s key", + TEST_WIRELESS_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_ID); + ASSERT (strcmp (tmp, expected_id) == 0, + "connection-verify-connection", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRELESS_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_ID); + + /* UUID */ + tmp = nm_setting_connection_get_uuid (s_con); + ASSERT (tmp != NULL, + "connection-verify-connection", "failed to verify %s: missing %s / %s key", + TEST_WIRELESS_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_UUID); + ASSERT (strcmp (tmp, expected_uuid) == 0, + "connection-verify-connection", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRELESS_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_UUID); + + /* Timestamp */ + timestamp = nm_setting_connection_get_timestamp (s_con); + ASSERT (timestamp == expected_timestamp, + "connection-verify-connection", "failed to verify %s: unexpected %s /%s key value", + TEST_WIRELESS_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_TIMESTAMP); + + /* Autoconnect */ + ASSERT (nm_setting_connection_get_autoconnect (s_con) == FALSE, + "connection-verify-connection", "failed to verify %s: unexpected %s /%s key value", + TEST_WIRELESS_FILE, + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_AUTOCONNECT); + + /* ===== WIRED SETTING ===== */ + + s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS)); + ASSERT (s_wireless != NULL, + "connection-verify-wireless", "failed to verify %s: missing %s setting", + TEST_WIRELESS_FILE, + NM_SETTING_WIRED_SETTING_NAME); + + /* BSSID */ + array = nm_setting_wireless_get_bssid (s_wireless); + ASSERT (array != NULL, + "connection-verify-wireless", "failed to verify %s: missing %s / %s key", + TEST_WIRELESS_FILE, + NM_SETTING_WIRELESS_SETTING_NAME, + NM_SETTING_WIRELESS_BSSID); + ASSERT (array->len == ETH_ALEN, + "connection-verify-wireless", "failed to verify %s: unexpected %s / %s key value length", + TEST_WIRELESS_FILE, + NM_SETTING_WIRELESS_SETTING_NAME, + NM_SETTING_WIRELESS_BSSID); + ASSERT (memcmp (array->data, &expected_bssid[0], sizeof (expected_bssid)) == 0, + "connection-verify-wireless", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRELESS_FILE, + NM_SETTING_WIRELESS_SETTING_NAME, + NM_SETTING_WIRELESS_BSSID); + + /* ===== IPv4 SETTING ===== */ + + s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG)); + ASSERT (s_ip4 != NULL, + "connection-verify-ip4", "failed to verify %s: missing %s setting", + TEST_WIRELESS_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME); + + /* Method */ + tmp = nm_setting_ip4_config_get_method (s_ip4); + ASSERT (strcmp (tmp, NM_SETTING_IP4_CONFIG_METHOD_AUTO) == 0, + "connection-verify-wireless", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRELESS_FILE, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_METHOD); + + g_object_unref (connection); +} + +static void +test_write_wireless_connection (void) +{ + NMConnection *connection; + NMSettingConnection *s_con; + NMSettingWireless *s_wireless; + NMSettingIP4Config *s_ip4; + char *uuid; + GByteArray *bssid; + unsigned char tmpbssid[] = { 0xaa, 0xb9, 0xa1, 0x74, 0x55, 0x44 }; + GByteArray *ssid; + unsigned char tmpssid[] = { 0x31, 0x33, 0x33, 0x37 }; + gboolean success; + NMConnection *reread; + char *testfile = NULL; + GError *error = NULL; + pid_t owner_grp; + uid_t owner_uid; + guint64 timestamp = 0x12344433L; + + connection = nm_connection_new (); + ASSERT (connection != NULL, + "connection-write", "failed to allocate new connection"); + + /* Connection setting */ + + s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ()); + ASSERT (s_con != NULL, + "connection-write", "failed to allocate new %s setting", + NM_SETTING_CONNECTION_SETTING_NAME); + nm_connection_add_setting (connection, NM_SETTING (s_con)); + + uuid = nm_utils_uuid_generate (); + g_object_set (s_con, + NM_SETTING_CONNECTION_ID, "Work Wireless", + NM_SETTING_CONNECTION_UUID, uuid, + NM_SETTING_CONNECTION_AUTOCONNECT, FALSE, + NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRELESS_SETTING_NAME, + NM_SETTING_CONNECTION_TIMESTAMP, timestamp, + NULL); + g_free (uuid); + + /* Wireless setting */ + + s_wireless = NM_SETTING_WIRELESS (nm_setting_wireless_new ()); + ASSERT (s_wireless != NULL, + "connection-write", "failed to allocate new %s setting", + NM_SETTING_WIRELESS_SETTING_NAME); + nm_connection_add_setting (connection, NM_SETTING (s_wireless)); + + bssid = g_byte_array_sized_new (ETH_ALEN); + g_byte_array_append (bssid, &tmpbssid[0], sizeof (tmpbssid)); + + ssid = g_byte_array_sized_new (sizeof (tmpssid)); + g_byte_array_append (ssid, &tmpssid[0], sizeof (tmpssid)); + + g_object_set (s_wireless, + NM_SETTING_WIRELESS_BSSID, bssid, + NM_SETTING_WIRELESS_SSID, ssid, + NM_SETTING_WIRED_MTU, 1000, + NULL); + + g_byte_array_free (bssid, TRUE); + g_byte_array_free (ssid, TRUE); + + /* IP4 setting */ + + s_ip4 = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ()); + ASSERT (s_ip4 != NULL, + "connection-write", "failed to allocate new %s setting", + NM_SETTING_IP4_CONFIG_SETTING_NAME); + nm_connection_add_setting (connection, NM_SETTING (s_ip4)); + + g_object_set (s_ip4, + NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, + NULL); + + /* Write out the connection */ + owner_uid = geteuid (); + owner_grp = getegid (); + success = write_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error); + ASSERT (success == TRUE, + "connection-write", "failed to allocate write keyfile: %s", + error ? error->message : "(none)"); + + ASSERT (testfile != NULL, + "connection-write", "didn't get keyfile name back after writing connection"); + + /* Read the connection back in and compare it to the one we just wrote out */ + reread = connection_from_file (testfile, TRUE); + ASSERT (reread != NULL, "connection-write", "failed to re-read test connection"); + + ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE, + "connection-write", "written and re-read connection weren't the same"); + + g_clear_error (&error); + unlink (testfile); + g_free (testfile); + + g_object_unref (reread); + g_object_unref (connection); +} + int main (int argc, char **argv) { GError *error = NULL; @@ -477,6 +699,9 @@ int main (int argc, char **argv) test_read_valid_wired_connection (); test_write_wired_connection (); + test_read_valid_wireless_connection (); + test_write_wireless_connection (); + basename = g_path_get_basename (argv[0]); fprintf (stdout, "%s: SUCCESS\n", basename); g_free (basename); From 94575f511dcc745781e51ca4d16ae5077631d2d5 Mon Sep 17 00:00:00 2001 From: Simos Xenitellis Date: Fri, 16 Jan 2009 16:28:52 -0500 Subject: [PATCH 15/45] Updated greek translation (bgo #566372) --- po/el.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/el.po b/po/el.po index 5b38084c98..8a36618ff1 100644 --- a/po/el.po +++ b/po/el.po @@ -8,9 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: NetworkManager.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-07 22:30+0000\n" -"PO-Revision-Date: 2008-12-07 01:52+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=NetworkManager&component=general\n" +"POT-Creation-Date: 2008-12-07 22:31+0000\n" +"PO-Revision-Date: 2008-12-18 16:53+0100\n" "Last-Translator: Jennie Petoumenou \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" @@ -308,7 +309,7 @@ msgstr "σφάλμα κατά την αναμονή για δεδομένα στ #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" msgstr "" -"Άκυρη επιλογή. Παρακαλώ χρησιμοποιείστε --help για να δείτε τη λίστα των " +"Άκυρη επιλογή. Παρακαλώ χρησιμοποιήστε --help για να δείτε τη λίστα των " "έγκυρων επιλογών.\n" #: ../src/dhcp-manager/nm-dhcp-dhclient.c:88 @@ -338,3 +339,4 @@ msgstr "Οι κάτωθι εξυπηρετητές ονομάτων ίσως ν #, c-format msgid "Auto %s" msgstr "Αυτόματο %s" + From c96333de17e2a9af570be0433de1c1bb1e6c1ee9 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Fri, 16 Jan 2009 16:40:59 -0500 Subject: [PATCH 16/45] gsm: handle different modem init sequences more elegantly Change the encoding on the channel to binary too, since modems usually don't send UTF-8. --- src/nm-gsm-device.c | 46 ++++++++++++++++++++++-------------------- src/nm-serial-device.c | 1 + 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/nm-gsm-device.c b/src/nm-gsm-device.c index d8d15459a9..31ca25f7e3 100644 --- a/src/nm-gsm-device.c +++ b/src/nm-gsm-device.c @@ -67,10 +67,20 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; +/* Various possible init sequences */ +const gchar *modem_init_sequences[] = { + "ATZ E0 V1 X4 &C1 +FCLASS=0", + "ATZ E0 V1 &C1", + "AT&F E0 V1 X4 &C1 +FCLASS=0", + "AT&F E0 V1 &C1", + "AT&F E0 V1", + NULL +}; + static void enter_pin (NMGsmDevice *device, NMGsmSecret secret_type, gboolean retry); static void manual_registration (NMGsmDevice *device); static void automatic_registration (NMGsmDevice *device); -static void init_modem (NMSerialDevice *device, gpointer user_data); +static void init_modem (NMSerialDevice *device); NMGsmDevice * nm_gsm_device_new (const char *udi, @@ -497,13 +507,14 @@ init_full_done (NMSerialDevice *device, static void init_modem_full (NMGsmDevice *device) { + NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (device); const char *responses[] = { "OK", "ERROR", "ERR", NULL }; /* Send E0 too because some devices turn echo back on after CPIN which * just breaks stuff since echo-ed commands are interpreted as replies. * rh #456770 */ - modem_wait_for_reply (device, "ATZ E0 V1 X4 &C1 +FCLASS=0", 10, responses, responses, init_full_done, NULL); + modem_wait_for_reply (device, modem_init_sequences[priv->init_tries], 10, responses, responses, init_full_done, NULL); } static void @@ -648,7 +659,6 @@ init_done (NMSerialDevice *device, switch (reply_index) { case 0: - priv->init_tries = 0; check_pin (NM_GSM_DEVICE (device)); break; case -1: @@ -658,35 +668,27 @@ init_done (NMSerialDevice *device, NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED); break; default: - switch (priv->init_tries) { - case 0: - nm_warning ("Trying alternate modem initialization"); - init_modem (device, "ATZ E0 V1 &C1"); - break; - case 1: - nm_warning ("Trying second alternate modem initialization"); - init_modem (device, "AT&F E0 V1"); - break; - default: + priv->init_tries++; + if (modem_init_sequences[priv->init_tries] != NULL) { + nm_warning ("Trying alternate modem initialization (%d)", + priv->init_tries); + init_modem (device); + } else { nm_warning ("Modem initialization failed"); nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED); - break; } - priv->init_tries++; - return; + break; } } static void -init_modem (NMSerialDevice *device, gpointer user_data) +init_modem (NMSerialDevice *device) { + NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (device); const char *responses[] = { "OK", "ERROR", "ERR", NULL }; - const char *init_string = user_data; - - if (!init_string) - init_string = "ATZ E0 V1 X4 &C1 +FCLASS=0"; + const char *init_string = modem_init_sequences[priv->init_tries]; modem_wait_for_reply (NM_GSM_DEVICE (device), init_string, 10, responses, responses, init_done, NULL); } @@ -707,7 +709,7 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason) NM_GSM_DEVICE_GET_PRIVATE (device)->init_tries = 0; - id = nm_serial_device_flash (serial_device, 100, init_modem, NULL); + id = nm_serial_device_flash (serial_device, 100, (NMSerialFlashFn) init_modem, NULL); if (!id) *reason = NM_DEVICE_STATE_REASON_UNKNOWN; diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c index 75bd615271..18cd2d8d13 100644 --- a/src/nm-serial-device.c +++ b/src/nm-serial-device.c @@ -416,6 +416,7 @@ nm_serial_device_open (NMSerialDevice *device, } priv->channel = g_io_channel_unix_new (priv->fd); + g_io_channel_set_encoding (priv->channel, NULL, NULL); return TRUE; } From 4aab9ff55609712a683b6296f75ed1e3dffa6330 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 16 Jan 2009 16:41:54 -0500 Subject: [PATCH 17/45] gsm: add init string for USBModem by MobileStream for Palm devices --- src/nm-gsm-device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nm-gsm-device.c b/src/nm-gsm-device.c index 31ca25f7e3..b0337f4761 100644 --- a/src/nm-gsm-device.c +++ b/src/nm-gsm-device.c @@ -74,6 +74,7 @@ const gchar *modem_init_sequences[] = { "AT&F E0 V1 X4 &C1 +FCLASS=0", "AT&F E0 V1 &C1", "AT&F E0 V1", + "\rAT&F E0 V1 X4 &C1 +CREG=0 +FCLASS=0", /* USBModem by MobileStream for Palm */ NULL }; From 59bc300ceeaa7f1836696cf23da03936b7792031 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 18 Jan 2009 18:43:18 -0500 Subject: [PATCH 18/45] move test functions somewhere commonly accessible --- include/Makefile.am | 3 +- include/nm-test-helpers.h | 48 +++++++++++++++++++ .../plugins/keyfile/tests/test-keyfile.c | 21 +------- 3 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 include/nm-test-helpers.h diff --git a/include/Makefile.am b/include/Makefile.am index d02c5f84d1..54c4d1dc80 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -3,7 +3,8 @@ EXTRA_DIST = \ NetworkManagerVPN.h \ wireless-helper.h \ nm-dbus-glib-types.h \ - nm-glib-compat.h + nm-glib-compat.h \ + nm-test-helpers.h NetworkManagerincludedir=$(includedir)/NetworkManager diff --git a/include/nm-test-helpers.h b/include/nm-test-helpers.h new file mode 100644 index 0000000000..0dac481dc2 --- /dev/null +++ b/include/nm-test-helpers.h @@ -0,0 +1,48 @@ +/* NetworkManager -- Network link manager + * + * Dan Williams + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (C) Copyright 2008 Red Hat, Inc. + */ + +#ifndef NM_TEST_HELPERS_H +#define NM_TEST_HELPERS_H + +#include +#include + +static void +FAIL(const char *test_name, const char *fmt, ...) +{ + va_list args; + char buf[500]; + + snprintf (buf, 500, "FAIL: (%s) %s\n", test_name, fmt); + + va_start (args, fmt); + vfprintf (stderr, buf, args); + va_end (args); + _exit (1); +} + +#define ASSERT(x, test_name, fmt, ...) \ + if (!(x)) { \ + FAIL (test_name, fmt, ## __VA_ARGS__); \ + } + +#endif /* NM_TEST_HELPERS_H */ + diff --git a/system-settings/plugins/keyfile/tests/test-keyfile.c b/system-settings/plugins/keyfile/tests/test-keyfile.c index cbd73f1eab..bd1ee02af3 100644 --- a/system-settings/plugins/keyfile/tests/test-keyfile.c +++ b/system-settings/plugins/keyfile/tests/test-keyfile.c @@ -35,31 +35,14 @@ #include #include +#include "nm-test-helpers.h" + #include "reader.h" #include "writer.h" #define TEST_WIRED_FILE TEST_KEYFILES_DIR"/Test_Wired_Connection" #define TEST_WIRELESS_FILE TEST_KEYFILES_DIR"/Test_Wireless_Connection" -static void -FAIL(const char *test_name, const char *fmt, ...) -{ - va_list args; - char buf[500]; - - snprintf (buf, 500, "FAIL: (%s) %s\n", test_name, fmt); - - va_start (args, fmt); - vfprintf (stderr, buf, args); - va_end (args); - _exit (1); -} - -#define ASSERT(x, test_name, fmt, ...) \ - if (!(x)) { \ - FAIL (test_name, fmt, ## __VA_ARGS__); \ - } - static void test_read_valid_wired_connection (void) { From f06a136a99affc018d66949b1a3aee438a4604e5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 18 Jan 2009 20:04:14 -0500 Subject: [PATCH 19/45] move nm_utils_ip4_addr_to_nl_addr() to nm-ip4-config.c Since that's the only place it's used. --- src/NetworkManagerUtils.c | 14 -------------- src/NetworkManagerUtils.h | 2 -- src/nm-ip4-config.c | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 874d4bd54c..c27fc2e33e 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -133,20 +133,6 @@ nm_print_device_capabilities (NMDevice *dev) } } - -struct nl_addr * -nm_utils_ip4_addr_to_nl_addr (guint32 ip4_addr) -{ - struct nl_addr * nla = NULL; - - if (!(nla = nl_addr_alloc (sizeof (in_addr_t)))) - return NULL; - nl_addr_set_family (nla, AF_INET); - nl_addr_set_binary_addr (nla, &ip4_addr, sizeof (guint32)); - - return nla; -} - /* * nm_utils_ip4_netmask_to_prefix * diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index f408c69bd4..147a972a78 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -37,8 +37,6 @@ int nm_spawn_process (const char *args); void nm_print_device_capabilities (NMDevice *dev); -struct nl_addr *nm_utils_ip4_addr_to_nl_addr (guint32 ip4_addr); - char *nm_utils_hexstr2bin (const char *hex, size_t len); char *nm_ether_ntop (const struct ether_addr *mac); diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index b9c2df7e4b..1c14ccb647 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -74,6 +74,20 @@ enum { }; +static struct nl_addr * +nm_utils_ip4_addr_to_nl_addr (guint32 ip4_addr) +{ + struct nl_addr * nla = NULL; + + if (!(nla = nl_addr_alloc (sizeof (in_addr_t)))) + return NULL; + nl_addr_set_family (nla, AF_INET); + nl_addr_set_binary_addr (nla, &ip4_addr, sizeof (guint32)); + + return nla; +} + + NMIP4Config * nm_ip4_config_new (void) { From f2e8870338fbe7056bf511e8d2cd895b0e9335a8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 18 Jan 2009 23:19:09 -0500 Subject: [PATCH 20/45] dhcp: handle classless static routes (bgo #567246) Based on patches by Johan Bilien , nick loeve , and Roy Marples with significant changes for dhclient formatting and test cases. Note that dhclient needs help before it can actually parse classless static routes by adding the following to the dhclient.conf file: option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; --- configure.in | 1 + src/Makefile.am | 29 +- src/dhcp-manager/nm-dhcp-dhclient.c | 132 +++++++ src/dhcp-manager/nm-dhcp-dhcpcd.c | 79 ++++ src/dhcp-manager/nm-dhcp-manager.c | 400 +++++++++++--------- src/dhcp-manager/nm-dhcp-manager.h | 16 +- src/nm-device.c | 25 +- src/tests/Makefile.am | 33 ++ src/tests/test-dhcp-options.c | 549 ++++++++++++++++++++++++++++ 9 files changed, 1065 insertions(+), 199 deletions(-) create mode 100644 src/tests/Makefile.am create mode 100644 src/tests/test-dhcp-options.c diff --git a/configure.in b/configure.in index e75cbdb28f..2e1e3f40d1 100644 --- a/configure.in +++ b/configure.in @@ -496,6 +496,7 @@ AC_CONFIG_FILES([ Makefile include/Makefile src/Makefile +src/tests/Makefile marshallers/Makefile src/named-manager/Makefile src/vpn-manager/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 3c4ce75278..3211bce862 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,8 @@ SUBDIRS= \ supplicant-manager \ ppp-manager \ backends \ - dnsmasq-manager + dnsmasq-manager \ + tests INCLUDES = -I${top_srcdir} \ -I${top_srcdir}/include \ @@ -139,19 +140,19 @@ NetworkManager_CPPFLAGS = \ -DARP_DEBUG NetworkManager_LDADD = \ - $(DBUS_LIBS) \ - $(GTHREAD_LIBS) \ - $(HAL_LIBS) \ - $(LIBNL_LIBS) \ - $(top_builddir)/marshallers/libmarshallers.la \ - ./named-manager/libnamed-manager.la \ - ./vpn-manager/libvpn-manager.la \ - ./dhcp-manager/libdhcp-manager.la \ - ./supplicant-manager/libsupplicant-manager.la \ - ./dnsmasq-manager/libdnsmasq-manager.la \ - ./ppp-manager/libppp-manager.la \ - ./backends/libnmbackend.la \ - $(top_builddir)/libnm-util/libnm-util.la + $(DBUS_LIBS) \ + $(GTHREAD_LIBS) \ + $(HAL_LIBS) \ + $(LIBNL_LIBS) \ + $(top_builddir)/marshallers/libmarshallers.la \ + ./named-manager/libnamed-manager.la \ + ./vpn-manager/libvpn-manager.la \ + ./dhcp-manager/libdhcp-manager.la \ + ./supplicant-manager/libsupplicant-manager.la \ + ./dnsmasq-manager/libdnsmasq-manager.la \ + ./ppp-manager/libppp-manager.la \ + ./backends/libnmbackend.la \ + $(top_builddir)/libnm-util/libnm-util.la NetworkManager_LDFLAGS = -rdynamic diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 846058d80c..552014e0e6 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include @@ -288,3 +290,133 @@ out: g_ptr_array_free (dhclient_argv, TRUE); return success; } + +static const char ** +process_rfc3442_route (const char **octets, NMIP4Route **out_route) +{ + const char **o = octets; + int addr_len = 0, i = 0; + long int tmp; + NMIP4Route *route; + char *next_hop; + struct in_addr tmp_addr; + + if (!*o) + return o; /* no prefix */ + + tmp = strtol (*o, NULL, 10); + if (tmp < 0 || tmp > 32) /* 32 == max IP4 prefix length */ + return o; + + route = nm_ip4_route_new (); + nm_ip4_route_set_prefix (route, (guint32) tmp); + o++; + + if (tmp > 0) + addr_len = ((tmp - 1) / 8) + 1; + + /* ensure there's at least the address + next hop left */ + if (g_strv_length ((char **) o) < addr_len + 4) + goto error; + + if (tmp) { + const char *addr[4] = { "0", "0", "0", "0" }; + char *str_addr; + + for (i = 0; i < addr_len; i++) + addr[i] = *o++; + + str_addr = g_strjoin (".", addr[0], addr[1], addr[2], addr[3], NULL); + if (inet_pton (AF_INET, str_addr, &tmp_addr) <= 0) { + g_free (str_addr); + goto error; + } + tmp_addr.s_addr &= nm_utils_ip4_prefix_to_netmask ((guint32) tmp); + nm_ip4_route_set_dest (route, tmp_addr.s_addr); + } + + /* Handle next hop */ + next_hop = g_strjoin (".", o[0], o[1], o[2], o[3], NULL); + if (inet_pton (AF_INET, next_hop, &tmp_addr) <= 0) { + g_free (next_hop); + goto error; + } + nm_ip4_route_set_next_hop (route, tmp_addr.s_addr); + g_free (next_hop); + + *out_route = route; + return o + 4; /* advance to past the next hop */ + +error: + nm_ip4_route_unref (route); + return o; +} + +gboolean +nm_dhcp_client_process_classless_routes (GHashTable *options, + NMIP4Config *ip4_config, + guint32 *gwaddr) +{ + const char *str; + char **octets, **o; + gboolean have_routes = FALSE; + NMIP4Route *route = NULL; + + /* dhclient doesn't have actual support for rfc3442 classless static routes + * upstream. Thus, people resort to defining the option in dhclient.conf + * and using arbitrary formats like so: + * + * option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; + * + * See https://lists.isc.org/pipermail/dhcp-users/2008-December/007629.html + */ + + str = g_hash_table_lookup (options, "new_rfc3442_classless_static_routes"); + /* Microsoft version; same as rfc3442 but with a different option # (249) */ + if (!str) + str = g_hash_table_lookup (options, "new_ms_classless_static_routes"); + + if (!str || !strlen (str)) + return FALSE; + + o = octets = g_strsplit (str, " ", 0); + if (g_strv_length (octets) < 5) { + nm_warning ("Ignoring invalid classless static routes '%s'", str); + goto out; + } + + while (*o) { + route = NULL; + o = (char **) process_rfc3442_route ((const char **) o, &route); + if (!route) { + nm_warning ("Ignoring invalid classless static routes"); + break; + } + + have_routes = TRUE; + if (nm_ip4_route_get_prefix (route) == 0) { + /* gateway passed as classless static route */ + *gwaddr = nm_ip4_route_get_next_hop (route); + nm_ip4_route_unref (route); + } else { + char addr[INET_ADDRSTRLEN + 1]; + char nh[INET_ADDRSTRLEN + 1]; + struct in_addr tmp; + + /* normal route */ + nm_ip4_config_take_route (ip4_config, route); + + tmp.s_addr = nm_ip4_route_get_dest (route); + inet_ntop (AF_INET, &tmp, addr, sizeof (addr)); + tmp.s_addr = nm_ip4_route_get_next_hop (route); + inet_ntop (AF_INET, &tmp, nh, sizeof (nh)); + nm_info (" classless static route %s/%d gw %s", + addr, nm_ip4_route_get_prefix (route), nh); + } + } + +out: + g_strfreev (octets); + return have_routes; +} + diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index 18d2b51614..62f09688a4 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -28,6 +28,8 @@ #include #include #include +#include +#include #include "nm-dhcp-manager.h" #include "nm-utils.h" @@ -118,3 +120,80 @@ out: g_ptr_array_free (argv, TRUE); return success; } + +gboolean +nm_dhcp_client_process_classless_routes (GHashTable *options, + NMIP4Config *ip4_config, + guint32 *gwaddr) +{ + const char *str; + char **routes, **r; + gboolean have_routes = FALSE; + + /* Classless static routes over-ride any static routes and routers + * provided. We should also check for MS classless static routes as + * they implemented the draft RFC using their own code. + */ + str = g_hash_table_lookup (options, "new_classless_static_routes"); + if (!str) + str = g_hash_table_lookup (options, "new_ms_classless_static_routes"); + + if (!str || !strlen (str)) + return FALSE; + + routes = g_strsplit (str, " ", 0); + if (g_strv_length (routes) == 0) + goto out; + + if ((g_strv_length (routes) % 2) != 0) { + nm_info (" classless static routes provided, but invalid"); + goto out; + } + + for (r = routes; *r; r += 2) { + char *slash; + NMIP4Route *route; + int rt_cidr = 32; + struct in_addr rt_addr; + struct in_addr rt_route; + + slash = strchr(*r, '/'); + if (slash) { + *slash = '\0'; + errno = 0; + rt_cidr = strtol (slash + 1, NULL, 10); + if ((errno == EINVAL) || (errno == ERANGE)) { + nm_warning ("DHCP provided invalid classless static route cidr: '%s'", slash + 1); + continue; + } + } + if (inet_pton (AF_INET, *r, &rt_addr) <= 0) { + nm_warning ("DHCP provided invalid classless static route address: '%s'", *r); + continue; + } + if (inet_pton (AF_INET, *(r + 1), &rt_route) <= 0) { + nm_warning ("DHCP provided invalid classless static route gateway: '%s'", *(r + 1)); + continue; + } + + have_routes = TRUE; + if (rt_cidr == 0 && rt_addr.s_addr == 0) { + /* FIXME: how to handle multiple routers? */ + *gwaddr = rt_addr.s_addr; + } else { + route = nm_ip4_route_new (); + nm_ip4_route_set_dest (route, (guint32) rt_addr.s_addr); + nm_ip4_route_set_prefix (route, rt_cidr); + nm_ip4_route_set_next_hop (route, (guint32) rt_route.s_addr); + + + nm_ip4_config_take_route (ip4_config, route); + nm_info (" classless static route %s/%d gw %s", *r, rt_cidr, *(r + 1)); + } + } + +out: + g_strfreev (routes); + return have_routes; +} + diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index cf21ab38fe..44e49a9c67 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -720,6 +720,209 @@ nm_dhcp_manager_cancel_transaction (NMDHCPManager *manager, nm_dhcp_manager_cancel_transaction_real (device); } +static void +process_classful_routes (GHashTable *options, NMIP4Config *ip4_config) +{ + const char *str; + char **searches, **s; + + str = g_hash_table_lookup (options, "new_static_routes"); + if (!str) + return; + + searches = g_strsplit (str, " ", 0); + if ((g_strv_length (searches) % 2)) { + nm_info (" static routes provided, but invalid"); + goto out; + } + + for (s = searches; *s; s += 2) { + NMIP4Route *route; + struct in_addr rt_addr; + struct in_addr rt_route; + + if (inet_pton (AF_INET, *s, &rt_addr) <= 0) { + nm_warning ("DHCP provided invalid static route address: '%s'", *s); + continue; + } + if (inet_pton (AF_INET, *(s + 1), &rt_route) <= 0) { + nm_warning ("DHCP provided invalid static route gateway: '%s'", *(s + 1)); + continue; + } + + // FIXME: ensure the IP addresse and route are sane + + route = nm_ip4_route_new (); + nm_ip4_route_set_dest (route, (guint32) rt_addr.s_addr); + nm_ip4_route_set_prefix (route, 32); /* 255.255.255.255 */ + nm_ip4_route_set_next_hop (route, (guint32) rt_route.s_addr); + + nm_ip4_config_take_route (ip4_config, route); + nm_info (" static route %s gw %s", *s, *(s + 1)); + } + +out: + g_strfreev (searches); +} + +/* Given a table of DHCP options from the client, convert into an IP4Config */ +NMIP4Config * +nm_dhcp_manager_options_to_ip4_config (const char *iface, GHashTable *options) +{ + NMIP4Config *ip4_config = NULL; + struct in_addr tmp_addr; + NMIP4Address *addr = NULL; + char *str = NULL; + guint32 gwaddr = 0; + gboolean have_classless = FALSE; + + g_return_val_if_fail (iface != NULL, NULL); + g_return_val_if_fail (options != NULL, NULL); + + ip4_config = nm_ip4_config_new (); + if (!ip4_config) { + nm_warning ("%s: couldn't allocate memory for an IP4Config!", iface); + return NULL; + } + + addr = nm_ip4_address_new (); + if (!addr) { + nm_warning ("%s: couldn't allocate memory for an IP4 Address!", iface); + goto error; + } + + str = g_hash_table_lookup (options, "new_ip_address"); + if (str && (inet_pton (AF_INET, str, &tmp_addr) > 0)) { + nm_ip4_address_set_address (addr, tmp_addr.s_addr); + nm_info (" address %s", str); + } else + goto error; + + str = g_hash_table_lookup (options, "new_subnet_mask"); + if (str && (inet_pton (AF_INET, str, &tmp_addr) > 0)) { + nm_ip4_address_set_prefix (addr, nm_utils_ip4_netmask_to_prefix (tmp_addr.s_addr)); + nm_info (" prefix %d (%s)", nm_ip4_address_get_prefix (addr), str); + } + + /* Routes: if the server returns classless static routes, we MUST ignore + * the 'static_routes' option. + */ + have_classless = nm_dhcp_client_process_classless_routes (options, ip4_config, &gwaddr); + if (!have_classless) { + gwaddr = 0; /* Ensure client code doesn't lie */ + process_classful_routes (options, ip4_config); + } + + if (gwaddr) { + char buf[INET_ADDRSTRLEN + 1]; + + inet_ntop (AF_INET, &gwaddr, buf, sizeof (buf)); + nm_info (" gateway %s", buf); + nm_ip4_address_set_gateway (addr, gwaddr); + } else { + /* If the gateway wasn't provided as a classless static route with a + * subnet length of 0, try to find it using the old-style 'routers' option. + */ + str = g_hash_table_lookup (options, "new_routers"); + if (str) { + char **routers = g_strsplit (str, " ", 0); + char **s; + + for (s = routers; *s; s++) { + /* FIXME: how to handle multiple routers? */ + if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { + nm_ip4_address_set_gateway (addr, tmp_addr.s_addr); + nm_info (" gateway %s", *s); + break; + } else + nm_warning ("Ignoring invalid gateway '%s'", *s); + } + g_strfreev (routers); + } + } + + nm_ip4_config_take_address (ip4_config, addr); + addr = NULL; + + str = g_hash_table_lookup (options, "new_host_name"); + if (str) + nm_info (" hostname '%s'", str); + + str = g_hash_table_lookup (options, "new_domain_name_servers"); + if (str) { + char **searches = g_strsplit (str, " ", 0); + char **s; + + for (s = searches; *s; s++) { + if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { + nm_ip4_config_add_nameserver (ip4_config, tmp_addr.s_addr); + nm_info (" nameserver '%s'", *s); + } else + nm_warning ("Ignoring invalid nameserver '%s'", *s); + } + g_strfreev (searches); + } + + str = g_hash_table_lookup (options, "new_domain_name"); + if (str) { + char **domains = g_strsplit (str, " ", 0); + char **s; + + for (s = domains; *s; s++) { + nm_info (" domain name '%s'", *s); + nm_ip4_config_add_domain (ip4_config, *s); + } + g_strfreev (domains); + } + + str = g_hash_table_lookup (options, "new_domain_search"); + if (str) { + char **searches = g_strsplit (str, " ", 0); + char **s; + + for (s = searches; *s; s++) { + nm_info (" domain search '%s'", *s); + nm_ip4_config_add_search (ip4_config, *s); + } + g_strfreev (searches); + } + + str = g_hash_table_lookup (options, "new_netbios_name_servers"); + if (str) { + char **searches = g_strsplit (str, " ", 0); + char **s; + + for (s = searches; *s; s++) { + if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { + nm_ip4_config_add_wins (ip4_config, tmp_addr.s_addr); + nm_info (" wins '%s'", *s); + } else + nm_warning ("Ignoring invalid WINS server '%s'", *s); + } + g_strfreev (searches); + } + + str = g_hash_table_lookup (options, "new_interface_mtu"); + if (str) { + int int_mtu; + + errno = 0; + int_mtu = strtol (str, NULL, 10); + if ((errno == EINVAL) || (errno == ERANGE)) + goto error; + + if (int_mtu) + nm_ip4_config_set_mtu (ip4_config, int_mtu); + } + + return ip4_config; + +error: + if (addr) + nm_ip4_address_unref (addr); + g_object_unref (ip4_config); + return NULL; +} /* * nm_dhcp_manager_get_ip4_config @@ -733,10 +936,6 @@ nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, { NMDHCPManagerPrivate *priv; NMDHCPDevice *device; - NMIP4Config *ip4_config = NULL; - struct in_addr tmp_addr; - NMIP4Address *addr = NULL; - char *str = NULL; g_return_val_if_fail (NM_IS_DHCP_MANAGER (manager), NULL); g_return_val_if_fail (iface != NULL, NULL); @@ -754,179 +953,23 @@ nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, return NULL; } - ip4_config = nm_ip4_config_new (); - if (!ip4_config) { - nm_warning ("%s: couldn't allocate memory for an IP4Config!", device->iface); - return NULL; - } - - addr = nm_ip4_address_new (); - if (!addr) { - nm_warning ("%s: couldn't allocate memory for an IP4 Address!", device->iface); - goto error; - } - - str = g_hash_table_lookup (device->options, "new_ip_address"); - if (str && (inet_pton (AF_INET, str, &tmp_addr) > 0)) { - nm_ip4_address_set_address (addr, tmp_addr.s_addr); - nm_info (" address %s", str); - } else - goto error; - - str = g_hash_table_lookup (device->options, "new_subnet_mask"); - if (str && (inet_pton (AF_INET, str, &tmp_addr) > 0)) { - nm_ip4_address_set_prefix (addr, nm_utils_ip4_netmask_to_prefix (tmp_addr.s_addr)); - nm_info (" prefix %d (%s)", nm_ip4_address_get_prefix (addr), str); - } - - str = g_hash_table_lookup (device->options, "new_routers"); - if (str) { - char **routers = g_strsplit (str, " ", 0); - char **s; - - for (s = routers; *s; s++) { - /* FIXME: how to handle multiple routers? */ - if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { - nm_ip4_address_set_gateway (addr, tmp_addr.s_addr); - nm_info (" gateway %s", *s); - break; - } else - nm_warning ("Ignoring invalid gateway '%s'", *s); - } - g_strfreev (routers); - } - - nm_ip4_config_take_address (ip4_config, addr); - addr = NULL; - - str = g_hash_table_lookup (device->options, "new_host_name"); - if (str) - nm_info (" hostname '%s'", str); - - str = g_hash_table_lookup (device->options, "new_domain_name_servers"); - if (str) { - char **searches = g_strsplit (str, " ", 0); - char **s; - - for (s = searches; *s; s++) { - if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { - nm_ip4_config_add_nameserver (ip4_config, tmp_addr.s_addr); - nm_info (" nameserver '%s'", *s); - } else - nm_warning ("Ignoring invalid nameserver '%s'", *s); - } - g_strfreev (searches); - } - - str = g_hash_table_lookup (device->options, "new_domain_name"); - if (str) { - char **domains = g_strsplit (str, " ", 0); - char **s; - - for (s = domains; *s; s++) { - nm_info (" domain name '%s'", *s); - nm_ip4_config_add_domain (ip4_config, *s); - } - g_strfreev (domains); - } - - str = g_hash_table_lookup (device->options, "new_domain_search"); - if (str) { - char **searches = g_strsplit (str, " ", 0); - char **s; - - for (s = searches; *s; s++) { - nm_info (" domain search '%s'", *s); - nm_ip4_config_add_search (ip4_config, *s); - } - g_strfreev (searches); - } - - str = g_hash_table_lookup (device->options, "new_netbios_name_servers"); - if (str) { - char **searches = g_strsplit (str, " ", 0); - char **s; - - for (s = searches; *s; s++) { - if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { - nm_ip4_config_add_wins (ip4_config, tmp_addr.s_addr); - nm_info (" wins '%s'", *s); - } else - nm_warning ("Ignoring invalid WINS server '%s'", *s); - } - g_strfreev (searches); - } - - str = g_hash_table_lookup (device->options, "new_static_routes"); - if (str) { - char **searches = g_strsplit (str, " ", 0); - - if ((g_strv_length (searches) % 2) == 0) { - char **s; - - for (s = searches; *s; s += 2) { - NMIP4Route *route; - struct in_addr rt_addr; - struct in_addr rt_route; - - if (inet_pton (AF_INET, *s, &rt_addr) <= 0) { - nm_warning ("DHCP provided invalid static route address: '%s'", *s); - continue; - } - if (inet_pton (AF_INET, *(s + 1), &rt_route) <= 0) { - nm_warning ("DHCP provided invalid static route gateway: '%s'", *(s + 1)); - continue; - } - - // FIXME: ensure the IP addresse and route are sane - - route = nm_ip4_route_new (); - nm_ip4_route_set_dest (route, (guint32) rt_addr.s_addr); - nm_ip4_route_set_prefix (route, 32); /* 255.255.255.255 */ - nm_ip4_route_set_next_hop (route, (guint32) rt_route.s_addr); - - nm_ip4_config_take_route (ip4_config, route); - nm_info (" static route %s gw %s", *s, *(s + 1)); - } - } else { - nm_info (" static routes provided, but invalid"); - } - g_strfreev (searches); - } - - str = g_hash_table_lookup (device->options, "new_interface_mtu"); - if (str) { - int int_mtu; - - errno = 0; - int_mtu = strtol (str, NULL, 10); - if ((errno == EINVAL) || (errno == ERANGE)) - goto error; - - if (int_mtu) - nm_ip4_config_set_mtu (ip4_config, int_mtu); - } - - return ip4_config; - -error: - if (addr) - g_free (addr); - - g_object_unref (ip4_config); - - return NULL; + return nm_dhcp_manager_options_to_ip4_config (iface, device->options); } #define NEW_TAG "new_" #define OLD_TAG "old_" +typedef struct { + GHFunc func; + gpointer user_data; +} Dhcp4ForeachInfo; + static void -copy_dhcp4_config_option (gpointer key, - gpointer value, - gpointer user_data) +iterate_dhcp4_config_option (gpointer key, + gpointer value, + gpointer user_data) { - NMDHCP4Config *config = NM_DHCP4_CONFIG (user_data); + Dhcp4ForeachInfo *info = (Dhcp4ForeachInfo *) user_data; char *tmp_key = NULL; const char **p; static const char *filter_options[] = { @@ -947,21 +990,23 @@ copy_dhcp4_config_option (gpointer key, else tmp_key = g_strdup ((const char *) key); - nm_dhcp4_config_add_option (config, tmp_key, (const char *) value); + (*info->func) ((gpointer) tmp_key, value, info->user_data); g_free (tmp_key); } gboolean -nm_dhcp_manager_set_dhcp4_config (NMDHCPManager *self, - const char *iface, - NMDHCP4Config *config) +nm_dhcp_manager_foreach_dhcp4_option (NMDHCPManager *self, + const char *iface, + GHFunc func, + gpointer user_data) { NMDHCPManagerPrivate *priv; NMDHCPDevice *device; + Dhcp4ForeachInfo info = { NULL, NULL }; g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), FALSE); g_return_val_if_fail (iface != NULL, FALSE); - g_return_val_if_fail (config != NULL, FALSE); + g_return_val_if_fail (func != NULL, FALSE); priv = NM_DHCP_MANAGER_GET_PRIVATE (self); @@ -976,8 +1021,9 @@ nm_dhcp_manager_set_dhcp4_config (NMDHCPManager *self, return FALSE; } - nm_dhcp4_config_reset (config); - g_hash_table_foreach (device->options, copy_dhcp4_config_option, config); + info.func = func; + info.user_data = user_data; + g_hash_table_foreach (device->options, iterate_dhcp4_config_option, &info); return TRUE; } diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index 291e1b0193..8a8713c906 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -96,13 +96,21 @@ void nm_dhcp_manager_cancel_transaction (NMDHCPManager *manager, NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, const char *iface); NMDHCPState nm_dhcp_manager_get_state_for_device (NMDHCPManager *manager, const char *iface); -gboolean nm_dhcp_manager_set_dhcp4_config (NMDHCPManager *manager, +gboolean nm_dhcp_manager_foreach_dhcp4_option (NMDHCPManager *self, const char *iface, - NMDHCP4Config *config); - -gboolean nm_dhcp_manager_process_signal (NMDHCPManager *manager, DBusMessage *message); + GHFunc func, + gpointer user_data); +/* The following are implemented by the DHCP client backends */ gboolean nm_dhcp_client_start (NMDHCPDevice *device, NMSettingIP4Config *s_ip4); void nm_dhcp_client_stop (const char *iface, pid_t pid); +gboolean nm_dhcp_client_process_classless_routes (GHashTable *options, + NMIP4Config *ip4_config, + guint32 *gwaddr); + +/* Test functions */ +NMIP4Config *nm_dhcp_manager_options_to_ip4_config (const char *iface, + GHashTable *options); + #endif /* NM_DHCP_MANAGER_H */ diff --git a/src/nm-device.c b/src/nm-device.c index 7dc4047598..bb24b8b8af 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -1020,6 +1020,14 @@ nm_device_new_ip4_shared_config (NMDevice *self, NMDeviceStateReason *reason) return config; } +static void +dhcp4_add_option_cb (gpointer key, gpointer value, gpointer user_data) +{ + nm_dhcp4_config_add_option (NM_DHCP4_CONFIG (user_data), + (const char *) key, + (const char *) value); +} + static NMActStageReturn real_act_stage4_get_ip4_config (NMDevice *self, NMIP4Config **config, @@ -1048,7 +1056,12 @@ real_act_stage4_get_ip4_config (NMDevice *self, if (*config) { nm_utils_merge_ip4_config (*config, s_ip4); - nm_dhcp_manager_set_dhcp4_config (priv->dhcp_manager, ip_iface, priv->dhcp4_config); + nm_dhcp4_config_reset (priv->dhcp4_config); + nm_dhcp_manager_foreach_dhcp4_option (priv->dhcp_manager, + ip_iface, + dhcp4_add_option_cb, + priv->dhcp4_config); + /* Notify of new DHCP4 config */ g_object_notify (G_OBJECT (self), NM_DEVICE_INTERFACE_DHCP4_CONFIG); } else @@ -1757,9 +1770,13 @@ handle_dhcp_lease_change (NMDevice *device) g_object_set_data (G_OBJECT (req), NM_ACT_REQUEST_IP4_CONFIG, config); - if (nm_device_set_ip4_config (device, config, &reason)) - nm_dhcp_manager_set_dhcp4_config (priv->dhcp_manager, ip_iface, priv->dhcp4_config); - else { + if (nm_device_set_ip4_config (device, config, &reason)) { + nm_dhcp4_config_reset (priv->dhcp4_config); + nm_dhcp_manager_foreach_dhcp4_option (priv->dhcp_manager, + ip_iface, + dhcp4_add_option_cb, + priv->dhcp4_config); + } else { nm_warning ("Failed to update IP4 config in response to DHCP event."); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, reason); } diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am new file mode 100644 index 0000000000..ae069095a5 --- /dev/null +++ b/src/tests/Makefile.am @@ -0,0 +1,33 @@ +INCLUDES = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/libnm-util \ + -I$(top_srcdir)/src/dhcp-manager \ + -I$(top_srcdir)/marshallers \ + -I$(top_srcdir)/src + +noinst_PROGRAMS = test-dhcp-options + +test_dhcp_options_SOURCES = \ + test-dhcp-options.c \ + ../nm-ip4-config.c \ + ../nm-dbus-manager.c + +test_dhcp_options_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBNL_CFLAGS) + +test_dhcp_options_LDADD = \ + $(GTHREAD_LIBS) \ + $(DBUS_LIBS) \ + $(LIBNL_LIBS) \ + $(top_builddir)/libnm-util/libnm-util.la \ + $(top_builddir)/src/dhcp-manager/libdhcp-manager.la + +if WITH_TESTS + +check-local: test-dhcp-options + $(abs_builddir)/test-dhcp-options + +endif + diff --git a/src/tests/test-dhcp-options.c b/src/tests/test-dhcp-options.c new file mode 100644 index 0000000000..e1782237f9 --- /dev/null +++ b/src/tests/test-dhcp-options.c @@ -0,0 +1,549 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* nm-dhcp-manager.c - Handle the DHCP daemon for NetworkManager + * + * 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, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2008 Red Hat, Inc. + * + */ + +#include +#include +#include +#include +#include + +#include "nm-test-helpers.h" +#include + +#include "nm-dhcp-manager.h" + +typedef struct { + const char *name; + const char *value; +} Option; + +static GHashTable * +fill_table (Option *test_options, GHashTable *table) +{ + Option *opt; + + if (!table) + table = g_hash_table_new (g_str_hash, g_str_equal); + for (opt = test_options; opt->name; opt++) + g_hash_table_insert (table, (gpointer) opt->name, (gpointer) opt->value); + return table; +} + +static Option generic_options[] = { + { "new_subnet_mask", "255.255.255.0" }, + { "new_ip_address", "192.168.1.106" }, + { "new_network_number", "192.168.1.0" }, + { "interface", "eth0" }, + { "reason", "BOUND" }, + { "new_expiry", "1232324877" }, + { "new_dhcp_lease_time", "3600" }, + { "new_dhcp_server_identifier", "192.168.1.1" }, + { "new_routers", "192.168.1.1" }, + { "new_domain_name_servers", "216.254.95.2 216.231.41.2" }, + { "new_dhcp_message_type", "5" }, + { "new_broadcast_address", "192.168.1.255" }, + { "new_domain_search", "foobar.com blah.foobar.com" }, + { "new_host_name", "nmreallywhipsthe" }, + { "new_domain_name", "lamasass.com" }, + { "new_interface_mtu", "987" }, + { "new_static_routes", "10.1.1.5 10.1.1.1 100.99.88.56 10.1.1.1" }, + { NULL, NULL } +}; + +static void +test_generic_options (void) +{ + GHashTable *options; + NMIP4Config *ip4_config; + NMIP4Address *addr; + NMIP4Route *route; + struct in_addr tmp; + const char *expected_addr = "192.168.1.106"; + const char *expected_gw = "192.168.1.1"; + const char *expected_dns1 = "216.254.95.2"; + const char *expected_dns2 = "216.231.41.2"; + const char *expected_search1 = "foobar.com"; + const char *expected_search2 = "blah.foobar.com"; + const char *expected_route1_dest = "10.1.1.5"; + const char *expected_route1_gw = "10.1.1.1"; + const char *expected_route2_dest = "100.99.88.56"; + const char *expected_route2_gw = "10.1.1.1"; + + options = fill_table (generic_options, NULL); + ip4_config = nm_dhcp_manager_options_to_ip4_config ("eth0", options); + ASSERT (ip4_config != NULL, + "dhcp-generic", "failed to parse DHCP4 options"); + + /* IP4 address */ + ASSERT (nm_ip4_config_get_num_addresses (ip4_config) == 1, + "dhcp-generic", "unexpected number of IP addresses"); + addr = nm_ip4_config_get_address (ip4_config, 0); + + ASSERT (inet_pton (AF_INET, expected_addr, &tmp) > 0, + "dhcp-generic", "couldn't convert expected IP address"); + ASSERT (nm_ip4_address_get_address (addr) == tmp.s_addr, + "dhcp-generic", "unexpected IP address"); + + ASSERT (nm_ip4_address_get_prefix (addr) == 24, + "dhcp-generic", "unexpected IP address prefix length"); + + /* Gateway */ + ASSERT (inet_pton (AF_INET, expected_gw, &tmp) > 0, + "dhcp-generic", "couldn't convert expected IP gateway"); + ASSERT (nm_ip4_address_get_gateway (addr) == tmp.s_addr, + "dhcp-generic", "unexpected IP gateway"); + + ASSERT (nm_ip4_config_get_ptp_address (ip4_config) == 0, + "dhcp-generic", "unexpected PTP address"); + + ASSERT (nm_ip4_config_get_num_wins (ip4_config) == 0, + "dhcp-generic", "unexpected number of WINS servers"); + + ASSERT (nm_ip4_config_get_mtu (ip4_config) == 987, + "dhcp-generic", "unexpected MTU"); + + /* Domain searches */ + ASSERT (nm_ip4_config_get_num_searches (ip4_config) == 2, + "dhcp-generic", "unexpected number of domain searches"); + ASSERT (strcmp (nm_ip4_config_get_search (ip4_config, 0), expected_search1) == 0, + "dhcp-generic", "unexpected domain search #1"); + ASSERT (strcmp (nm_ip4_config_get_search (ip4_config, 1), expected_search2) == 0, + "dhcp-generic", "unexpected domain search #2"); + + /* DNS servers */ + ASSERT (nm_ip4_config_get_num_nameservers (ip4_config) == 2, + "dhcp-generic", "unexpected number of domain name servers"); + ASSERT (inet_pton (AF_INET, expected_dns1, &tmp) > 0, + "dhcp-generic", "couldn't convert expected DNS server address #1"); + ASSERT (nm_ip4_config_get_nameserver (ip4_config, 0) == tmp.s_addr, + "dhcp-generic", "unexpected domain name server #1"); + ASSERT (inet_pton (AF_INET, expected_dns2, &tmp) > 0, + "dhcp-generic", "couldn't convert expected DNS server address #2"); + ASSERT (nm_ip4_config_get_nameserver (ip4_config, 1) == tmp.s_addr, + "dhcp-generic", "unexpected domain name server #2"); + + /* Routes */ + ASSERT (nm_ip4_config_get_num_routes (ip4_config) == 2, + "dhcp-generic", "unexpected number of routes"); + + /* Route #1 */ + route = nm_ip4_config_get_route (ip4_config, 0); + ASSERT (inet_pton (AF_INET, expected_route1_dest, &tmp) > 0, + "dhcp-generic", "couldn't convert expected route destination #1"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "dhcp-generic", "unexpected route #1 destination"); + + ASSERT (inet_pton (AF_INET, expected_route1_gw, &tmp) > 0, + "dhcp-generic", "couldn't convert expected route next hop #1"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "dhcp-generic", "unexpected route #1 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 32, + "dhcp-generic", "unexpected route #1 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "dhcp-generic", "unexpected route #1 metric"); + + /* Route #2 */ + route = nm_ip4_config_get_route (ip4_config, 1); + ASSERT (inet_pton (AF_INET, expected_route2_dest, &tmp) > 0, + "dhcp-generic", "couldn't convert expected route destination #2"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "dhcp-generic", "unexpected route #2 destination"); + + ASSERT (inet_pton (AF_INET, expected_route2_gw, &tmp) > 0, + "dhcp-generic", "couldn't convert expected route next hop #2"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "dhcp-generic", "unexpected route #2 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 32, + "dhcp-generic", "unexpected route #2 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "dhcp-generic", "unexpected route #2 metric"); + + g_hash_table_destroy (options); +} + +static Option wins_options[] = { + { "new_netbios_name_servers", "63.12.199.5 150.4.88.120" }, + { NULL, NULL } +}; + +static void +test_wins_options (void) +{ + GHashTable *options; + NMIP4Config *ip4_config; + NMIP4Address *addr; + struct in_addr tmp; + const char *expected_wins1 = "63.12.199.5"; + const char *expected_wins2 = "150.4.88.120"; + + options = fill_table (generic_options, NULL); + options = fill_table (wins_options, options); + + ip4_config = nm_dhcp_manager_options_to_ip4_config ("eth0", options); + ASSERT (ip4_config != NULL, + "dhcp-wins", "failed to parse DHCP4 options"); + + /* IP4 address */ + ASSERT (nm_ip4_config_get_num_addresses (ip4_config) == 1, + "dhcp-wins", "unexpected number of IP addresses"); + addr = nm_ip4_config_get_address (ip4_config, 0); + + ASSERT (nm_ip4_config_get_num_wins (ip4_config) == 2, + "dhcp-wins", "unexpected number of WINS servers"); + ASSERT (inet_pton (AF_INET, expected_wins1, &tmp) > 0, + "dhcp-wins", "couldn't convert expected WINS server address #1"); + ASSERT (nm_ip4_config_get_wins (ip4_config, 0) == tmp.s_addr, + "dhcp-wins", "unexpected WINS server #1"); + ASSERT (inet_pton (AF_INET, expected_wins2, &tmp) > 0, + "dhcp-wins", "couldn't convert expected WINS server address #1"); + ASSERT (nm_ip4_config_get_wins (ip4_config, 1) == tmp.s_addr, + "dhcp-wins", "unexpected WINS server #1"); + + g_hash_table_destroy (options); +} + +static Option classless_routes_options[] = { + /* For dhclient */ + { "new_rfc3442_classless_static_routes", "24 192 168 10 192 168 1 1 8 10 10 17 66 41" }, + /* For dhcpcd */ + { "new_classless_static_routes", "192.168.10.0/24 192.168.1.1 10.0.0.0/8 10.17.66.41" }, + { NULL, NULL } +}; + +static void +test_classless_static_routes (void) +{ + GHashTable *options; + NMIP4Config *ip4_config; + NMIP4Route *route; + struct in_addr tmp; + const char *expected_route1_dest = "192.168.10.0"; + const char *expected_route1_gw = "192.168.1.1"; + const char *expected_route2_dest = "10.0.0.0"; + const char *expected_route2_gw = "10.17.66.41"; + + options = fill_table (generic_options, NULL); + options = fill_table (classless_routes_options, options); + + ip4_config = nm_dhcp_manager_options_to_ip4_config ("eth0", options); + ASSERT (ip4_config != NULL, + "dhcp-rfc3442", "failed to parse DHCP4 options"); + + /* IP4 routes */ + ASSERT (nm_ip4_config_get_num_routes (ip4_config) == 2, + "dhcp-rfc3442", "unexpected number of IP routes"); + + /* Route #1 */ + route = nm_ip4_config_get_route (ip4_config, 0); + ASSERT (inet_pton (AF_INET, expected_route1_dest, &tmp) > 0, + "dhcp-rfc3442", "couldn't convert expected route destination #1"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "dhcp-rfc3442", "unexpected route #1 destination"); + + ASSERT (inet_pton (AF_INET, expected_route1_gw, &tmp) > 0, + "dhcp-rfc3442", "couldn't convert expected route next hop #1"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "dhcp-rfc3442", "unexpected route #1 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 24, + "dhcp-rfc3442", "unexpected route #1 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "dhcp-rfc3442", "unexpected route #1 metric"); + + /* Route #2 */ + route = nm_ip4_config_get_route (ip4_config, 1); + ASSERT (inet_pton (AF_INET, expected_route2_dest, &tmp) > 0, + "dhcp-rfc3442", "couldn't convert expected route destination #2"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "dhcp-rfc3442", "unexpected route #2 destination"); + + ASSERT (inet_pton (AF_INET, expected_route2_gw, &tmp) > 0, + "dhcp-rfc3442", "couldn't convert expected route next hop #2"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "dhcp-rfc3442", "unexpected route #2 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 8, + "dhcp-rfc3442", "unexpected route #2 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "dhcp-rfc3442", "unexpected route #2 metric"); + + g_hash_table_destroy (options); +} + +static Option invalid_classless_routes1[] = { + /* For dhclient */ + { "new_rfc3442_classless_static_routes", "24 192 168 10 192 168 1 1 45 10 17 66 41" }, + /* For dhcpcd */ + { "new_classless_static_routes", "192.168.10.0/24 192.168.1.1 10.0.adfadf/44 10.17.66.41" }, + { NULL, NULL } +}; + +static void +test_invalid_classless_routes1 (void) +{ + GHashTable *options; + NMIP4Config *ip4_config; + NMIP4Route *route; + struct in_addr tmp; + const char *expected_route1_dest = "192.168.10.0"; + const char *expected_route1_gw = "192.168.1.1"; + + options = fill_table (generic_options, NULL); + options = fill_table (invalid_classless_routes1, options); + + ip4_config = nm_dhcp_manager_options_to_ip4_config ("eth0", options); + ASSERT (ip4_config != NULL, + "dhcp-rfc3442-invalid-1", "failed to parse DHCP4 options"); + + /* IP4 routes */ + ASSERT (nm_ip4_config_get_num_routes (ip4_config) == 1, + "dhcp-rfc3442-invalid-1", "unexpected number of IP routes"); + + /* Route #1 */ + route = nm_ip4_config_get_route (ip4_config, 0); + ASSERT (inet_pton (AF_INET, expected_route1_dest, &tmp) > 0, + "dhcp-rfc3442-invalid-1", "couldn't convert expected route destination #1"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "dhcp-rfc3442-invalid-1", "unexpected route #1 destination"); + + ASSERT (inet_pton (AF_INET, expected_route1_gw, &tmp) > 0, + "dhcp-rfc3442-invalid-1", "couldn't convert expected route next hop #1"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "dhcp-rfc3442-invalid-1", "unexpected route #1 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 24, + "dhcp-rfc3442-invalid-1", "unexpected route #1 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "dhcp-rfc3442-invalid-1", "unexpected route #1 metric"); + + g_hash_table_destroy (options); +} + +static Option invalid_classless_routes2[] = { + /* For dhclient */ + { "new_rfc3442_classless_static_routes", "45 10 17 66 41 24 192 168 10 192 168 1 1" }, + /* For dhcpcd */ + { "new_classless_static_routes", "10.0.adfadf/44 10.17.66.41 192.168.10.0/24 192.168.1.1" }, + { NULL, NULL } +}; + +static void +test_invalid_classless_routes2 (void) +{ + GHashTable *options; + NMIP4Config *ip4_config; + NMIP4Route *route; + struct in_addr tmp; + const char *expected_route1_dest = "10.1.1.5"; + const char *expected_route1_gw = "10.1.1.1"; + const char *expected_route2_dest = "100.99.88.56"; + const char *expected_route2_gw = "10.1.1.1"; + + options = fill_table (generic_options, NULL); + options = fill_table (invalid_classless_routes2, options); + + ip4_config = nm_dhcp_manager_options_to_ip4_config ("eth0", options); + ASSERT (ip4_config != NULL, + "dhcp-rfc3442-invalid-2", "failed to parse DHCP4 options"); + + /* Test falling back to old-style static routes if the classless static + * routes are invalid. + */ + + /* Routes */ + ASSERT (nm_ip4_config_get_num_routes (ip4_config) == 2, + "dhcp-rfc3442-invalid-2", "unexpected number of routes"); + + /* Route #1 */ + route = nm_ip4_config_get_route (ip4_config, 0); + ASSERT (inet_pton (AF_INET, expected_route1_dest, &tmp) > 0, + "dhcp-rfc3442-invalid-2", "couldn't convert expected route destination #1"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "dhcp-rfc3442-invalid-2", "unexpected route #1 destination"); + + ASSERT (inet_pton (AF_INET, expected_route1_gw, &tmp) > 0, + "dhcp-rfc3442-invalid-2", "couldn't convert expected route next hop #1"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "dhcp-rfc3442-invalid-2", "unexpected route #1 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 32, + "dhcp-rfc3442-invalid-2", "unexpected route #1 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "dhcp-rfc3442-invalid-2", "unexpected route #1 metric"); + + /* Route #2 */ + route = nm_ip4_config_get_route (ip4_config, 1); + ASSERT (inet_pton (AF_INET, expected_route2_dest, &tmp) > 0, + "dhcp-rfc3442-invalid-2", "couldn't convert expected route destination #2"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "dhcp-rfc3442-invalid-2", "unexpected route #2 destination"); + + ASSERT (inet_pton (AF_INET, expected_route2_gw, &tmp) > 0, + "dhcp-rfc3442-invalid-2", "couldn't convert expected route next hop #2"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "dhcp-rfc3442-invalid-2", "unexpected route #2 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 32, + "dhcp-rfc3442-invalid-2", "unexpected route #2 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "dhcp-rfc3442-invalid-2", "unexpected route #2 metric"); + + g_hash_table_destroy (options); +} + +static Option invalid_classless_routes3[] = { + /* For dhclient */ + { "new_rfc3442_classless_static_routes", "24 192 168 10 192 168 1 1 32 128 10 17 66 41" }, + /* For dhcpcd */ + { "new_classless_static_routes", "192.168.10.0/24 192.168.1.1 128/32 10.17.66.41" }, + { NULL, NULL } +}; + +static void +test_invalid_classless_routes3 (void) +{ + GHashTable *options; + NMIP4Config *ip4_config; + NMIP4Route *route; + struct in_addr tmp; + const char *expected_route1_dest = "192.168.10.0"; + const char *expected_route1_gw = "192.168.1.1"; + + options = fill_table (generic_options, NULL); + options = fill_table (invalid_classless_routes3, options); + + ip4_config = nm_dhcp_manager_options_to_ip4_config ("eth0", options); + ASSERT (ip4_config != NULL, + "dhcp-rfc3442-invalid-3", "failed to parse DHCP4 options"); + + /* IP4 routes */ + ASSERT (nm_ip4_config_get_num_routes (ip4_config) == 1, + "dhcp-rfc3442-invalid-3", "unexpected number of IP routes"); + + /* Route #1 */ + route = nm_ip4_config_get_route (ip4_config, 0); + ASSERT (inet_pton (AF_INET, expected_route1_dest, &tmp) > 0, + "dhcp-rfc3442-invalid-3", "couldn't convert expected route destination #1"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "dhcp-rfc3442-invalid-3", "unexpected route #1 destination"); + + ASSERT (inet_pton (AF_INET, expected_route1_gw, &tmp) > 0, + "dhcp-rfc3442-invalid-3", "couldn't convert expected route next hop #1"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "dhcp-rfc3442-invalid-3", "unexpected route #1 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 24, + "dhcp-rfc3442-invalid-3", "unexpected route #1 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "dhcp-rfc3442-invalid-3", "unexpected route #1 metric"); + + g_hash_table_destroy (options); +} + +static Option gw_in_classless_routes[] = { + /* For dhclient */ + { "new_rfc3442_classless_static_routes", "24 192 168 10 192 168 1 1 0 192 2 3 4" }, + /* For dhcpcd */ + { "new_classless_static_routes", "192.168.10.0/24 192.168.1.1 0.0.0.0/0 192.2.3.4" }, + { NULL, NULL } +}; + +static void +test_gateway_in_classless_routes (void) +{ + GHashTable *options; + NMIP4Config *ip4_config; + NMIP4Address *addr; + NMIP4Route *route; + struct in_addr tmp; + const char *expected_route1_dest = "192.168.10.0"; + const char *expected_route1_gw = "192.168.1.1"; + const char *expected_gateway = "192.2.3.4"; + + options = fill_table (generic_options, NULL); + options = fill_table (gw_in_classless_routes, options); + + ip4_config = nm_dhcp_manager_options_to_ip4_config ("eth0", options); + ASSERT (ip4_config != NULL, + "dhcp-rfc3442-gateway", "failed to parse DHCP4 options"); + + /* IP4 routes */ + ASSERT (nm_ip4_config_get_num_routes (ip4_config) == 1, + "dhcp-rfc3442-gateway", "unexpected number of IP routes"); + + /* Route #1 */ + route = nm_ip4_config_get_route (ip4_config, 0); + ASSERT (inet_pton (AF_INET, expected_route1_dest, &tmp) > 0, + "dhcp-rfc3442-gateway", "couldn't convert expected route destination #1"); + ASSERT (nm_ip4_route_get_dest (route) == tmp.s_addr, + "dhcp-rfc3442-gateway", "unexpected route #1 destination"); + + ASSERT (inet_pton (AF_INET, expected_route1_gw, &tmp) > 0, + "dhcp-rfc3442-gateway", "couldn't convert expected route next hop #1"); + ASSERT (nm_ip4_route_get_next_hop (route) == tmp.s_addr, + "dhcp-rfc3442-gateway", "unexpected route #1 next hop"); + + ASSERT (nm_ip4_route_get_prefix (route) == 24, + "dhcp-rfc3442-gateway", "unexpected route #1 prefix"); + ASSERT (nm_ip4_route_get_metric (route) == 0, + "dhcp-rfc3442-gateway", "unexpected route #1 metric"); + + /* Address */ + ASSERT (nm_ip4_config_get_num_addresses (ip4_config) == 1, + "dhcp-rfc3442-gateway", "unexpected number of IP addresses"); + addr = nm_ip4_config_get_address (ip4_config, 0); + ASSERT (inet_pton (AF_INET, expected_gateway, &tmp) > 0, + "dhcp-rfc3442-gateway", "couldn't convert expected IP gateway"); + ASSERT (nm_ip4_address_get_gateway (addr) == tmp.s_addr, + "dhcp-rfc3442-gateway", "unexpected IP gateway"); + + g_hash_table_destroy (options); +} + +int main (int argc, char **argv) +{ + GError *error = NULL; + DBusGConnection *bus; + char *basename; + + g_type_init (); + bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); + + if (!nm_utils_init (&error)) + FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message); + + /* The tests */ + test_generic_options (); + test_wins_options (); + test_classless_static_routes (); + test_invalid_classless_routes1 (); + test_invalid_classless_routes2 (); + test_invalid_classless_routes3 (); + test_gateway_in_classless_routes (); + + basename = g_path_get_basename (argv[0]); + fprintf (stdout, "%s: SUCCESS\n", basename); + g_free (basename); + return 0; +} + From bac45aa0d57064a9b05a898ad6a4938e6af40d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Grzegorczyk?= Date: Mon, 19 Jan 2009 00:16:40 -0500 Subject: [PATCH 21/45] clean up glib includes (bgo #564376) Only and need to be included. --- libnm-glib/nm-access-point.h | 2 +- libnm-glib/nm-active-connection.h | 2 +- libnm-glib/nm-client.h | 2 +- libnm-glib/nm-device.h | 2 +- libnm-glib/nm-dhcp4-config.h | 2 +- libnm-glib/nm-ip4-config.h | 2 +- libnm-glib/nm-object-cache.h | 2 +- libnm-glib/nm-object.h | 2 +- libnm-glib/nm-vpn-connection.h | 2 +- libnm-glib/nm-vpn-plugin.h | 2 +- libnm-util/nm-setting.h | 2 +- src/NetworkManagerAP.h | 1 - src/dhcp-manager/nm-dhcp-manager.h | 2 +- src/dnsmasq-manager/nm-dnsmasq-manager.h | 2 +- src/nm-activation-request.h | 2 +- src/nm-dhcp4-config.h | 2 +- src/nm-hal-manager.h | 2 +- src/nm-ip4-config.h | 2 +- src/nm-manager.h | 2 +- src/ppp-manager/nm-ppp-manager.h | 2 +- src/ppp-manager/nm-pppd-plugin.c | 2 +- src/vpn-manager/nm-vpn-connection.h | 2 +- src/vpn-manager/nm-vpn-manager.h | 2 +- src/vpn-manager/nm-vpn-service.h | 2 +- system-settings/plugins/ifupdown/plugin.c | 2 +- system-settings/src/nm-system-config-error.h | 2 +- system-settings/src/nm-system-config-hal-manager.h | 2 +- 27 files changed, 26 insertions(+), 27 deletions(-) diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h index c5017bd2e0..865218b22f 100644 --- a/libnm-glib/nm-access-point.h +++ b/libnm-glib/nm-access-point.h @@ -24,7 +24,7 @@ #ifndef NM_ACCESS_POINT_H #define NM_ACCESS_POINT_H -#include +#include #include #include #include "nm-object.h" diff --git a/libnm-glib/nm-active-connection.h b/libnm-glib/nm-active-connection.h index f75bfbc11b..e7b34a34b3 100644 --- a/libnm-glib/nm-active-connection.h +++ b/libnm-glib/nm-active-connection.h @@ -24,7 +24,7 @@ #ifndef NM_ACTIVE_CONNECTION_H #define NM_ACTIVE_CONNECTION_H -#include +#include #include #include "nm-object.h" #include diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h index 5820ea566d..5af95d40bc 100644 --- a/libnm-glib/nm-client.h +++ b/libnm-glib/nm-client.h @@ -24,7 +24,7 @@ #ifndef NM_CLIENT_H #define NM_CLIENT_H -#include +#include #include #include #include diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h index 39c1e1a7c0..1087afb7ea 100644 --- a/libnm-glib/nm-device.h +++ b/libnm-glib/nm-device.h @@ -24,7 +24,7 @@ #ifndef NM_DEVICE_H #define NM_DEVICE_H -#include +#include #include #include #include "nm-object.h" diff --git a/libnm-glib/nm-dhcp4-config.h b/libnm-glib/nm-dhcp4-config.h index 76903ce2b2..14e3274e37 100644 --- a/libnm-glib/nm-dhcp4-config.h +++ b/libnm-glib/nm-dhcp4-config.h @@ -24,7 +24,7 @@ #ifndef NM_DHCP4_CONFIG_H #define NM_DHCP4_CONFIG_H -#include +#include #include #include #include "nm-object.h" diff --git a/libnm-glib/nm-ip4-config.h b/libnm-glib/nm-ip4-config.h index 5b17b80a83..233be68d64 100644 --- a/libnm-glib/nm-ip4-config.h +++ b/libnm-glib/nm-ip4-config.h @@ -24,7 +24,7 @@ #ifndef NM_IP4_CONFIG_H #define NM_IP4_CONFIG_H -#include +#include #include #include #include "nm-object.h" diff --git a/libnm-glib/nm-object-cache.h b/libnm-glib/nm-object-cache.h index 72ed0604ab..b8cf2121b6 100644 --- a/libnm-glib/nm-object-cache.h +++ b/libnm-glib/nm-object-cache.h @@ -23,7 +23,7 @@ #ifndef NM_OBJECT_CACHE_H #define NM_OBJECT_CACHE_H -#include +#include #include #include "nm-object.h" diff --git a/libnm-glib/nm-object.h b/libnm-glib/nm-object.h index da34d3ae7b..06cb512fcc 100644 --- a/libnm-glib/nm-object.h +++ b/libnm-glib/nm-object.h @@ -24,7 +24,7 @@ #ifndef NM_OBJECT_H #define NM_OBJECT_H -#include +#include #include #include diff --git a/libnm-glib/nm-vpn-connection.h b/libnm-glib/nm-vpn-connection.h index 3c18477ef0..8be8eef970 100644 --- a/libnm-glib/nm-vpn-connection.h +++ b/libnm-glib/nm-vpn-connection.h @@ -24,7 +24,7 @@ #ifndef NM_VPN_CONNECTION_H #define NM_VPN_CONNECTION_H -#include +#include #include #include #include "nm-active-connection.h" diff --git a/libnm-glib/nm-vpn-plugin.h b/libnm-glib/nm-vpn-plugin.h index 3dc2408483..88eb1e6575 100644 --- a/libnm-glib/nm-vpn-plugin.h +++ b/libnm-glib/nm-vpn-plugin.h @@ -24,7 +24,7 @@ #ifndef NM_VPN_PLUGIN_H #define NM_VPN_PLUGIN_H -#include +#include #include #include #include diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index 474d3f6e24..680636306a 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -26,7 +26,7 @@ #ifndef NM_SETTING_H #define NM_SETTING_H -#include +#include #include G_BEGIN_DECLS diff --git a/src/NetworkManagerAP.h b/src/NetworkManagerAP.h index 4ad4fd7837..3f2bc617e0 100644 --- a/src/NetworkManagerAP.h +++ b/src/NetworkManagerAP.h @@ -23,7 +23,6 @@ #define NM_ACCESS_POINT_H #include -#include #include #include #include "NetworkManager.h" diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index 8a8713c906..74bdd087d0 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -22,7 +22,7 @@ #ifndef NM_DHCP_MANAGER_H #define NM_DHCP_MANAGER_H -#include +#include #include #include diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.h b/src/dnsmasq-manager/nm-dnsmasq-manager.h index 9c73db5f12..1214d06b41 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.h +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.h @@ -21,7 +21,7 @@ #ifndef NM_DNSMASQ_MANAGER_H #define NM_DNSMASQ_MANAGER_H -#include +#include #include #include "nm-ip4-config.h" diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h index 3f3d93aca2..bce0dfce5f 100644 --- a/src/nm-activation-request.h +++ b/src/nm-activation-request.h @@ -21,7 +21,7 @@ #ifndef NM_ACTIVATION_REQUEST_H #define NM_ACTIVATION_REQUEST_H -#include +#include #include #include "nm-connection.h" #include "nm-active-connection.h" diff --git a/src/nm-dhcp4-config.h b/src/nm-dhcp4-config.h index 9a97445646..ffaa84304d 100644 --- a/src/nm-dhcp4-config.h +++ b/src/nm-dhcp4-config.h @@ -21,7 +21,7 @@ #ifndef NM_DHCP4_CONFIG_H #define NM_DHCP4_CONFIG_H -#include +#include #include #define NM_TYPE_DHCP4_CONFIG (nm_dhcp4_config_get_type ()) diff --git a/src/nm-hal-manager.h b/src/nm-hal-manager.h index d2203a20a9..73d9ce8339 100644 --- a/src/nm-hal-manager.h +++ b/src/nm-hal-manager.h @@ -22,7 +22,7 @@ #ifndef NM_HAL_MANAGER_H #define NM_HAL_MANAGER_H -#include +#include #include G_BEGIN_DECLS diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index 1c435adb60..c2244b80af 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -21,7 +21,7 @@ #ifndef NM_IP4_CONFIG_H #define NM_IP4_CONFIG_H -#include +#include #include #include "nm-setting-ip4-config.h" diff --git a/src/nm-manager.h b/src/nm-manager.h index 3b87e8dd40..486dd15d20 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -22,7 +22,7 @@ #ifndef NM_MANAGER_H #define NM_MANAGER_H 1 -#include +#include #include #include #include "nm-device.h" diff --git a/src/ppp-manager/nm-ppp-manager.h b/src/ppp-manager/nm-ppp-manager.h index 293d2b4ba4..30de95b7c0 100644 --- a/src/ppp-manager/nm-ppp-manager.h +++ b/src/ppp-manager/nm-ppp-manager.h @@ -22,7 +22,7 @@ #ifndef NM_PPP_MANAGER_H #define NM_PPP_MANAGER_H -#include +#include #include #include "nm-ppp-status.h" diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c index fcc7a03fec..67d46d580c 100644 --- a/src/ppp-manager/nm-pppd-plugin.c +++ b/src/ppp-manager/nm-pppd-plugin.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h index 0d26eeaef8..31a2618cb2 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn-manager/nm-vpn-connection.h @@ -22,7 +22,7 @@ #ifndef NM_VPN_CONNECTION_H #define NM_VPN_CONNECTION_H -#include +#include #include #include "NetworkManagerVPN.h" #include "nm-device.h" diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index 3ab7709315..3500c6d494 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -22,7 +22,7 @@ #ifndef NM_VPN_MANAGER_H #define NM_VPN_MANAGER_H -#include +#include #include #include "nm-vpn-connection.h" #include "nm-activation-request.h" diff --git a/src/vpn-manager/nm-vpn-service.h b/src/vpn-manager/nm-vpn-service.h index 6a1ebed886..9c5e0eefc9 100644 --- a/src/vpn-manager/nm-vpn-service.h +++ b/src/vpn-manager/nm-vpn-service.h @@ -22,7 +22,7 @@ #ifndef NM_VPN_SERVICE_H #define NM_VPN_SERVICE_H -#include +#include #include #include "nm-device.h" #include "nm-vpn-connection.h" diff --git a/system-settings/plugins/ifupdown/plugin.c b/system-settings/plugins/ifupdown/plugin.c index 8c2a1e64bd..d3794929fa 100644 --- a/system-settings/plugins/ifupdown/plugin.c +++ b/system-settings/plugins/ifupdown/plugin.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include "interface_parser.h" diff --git a/system-settings/src/nm-system-config-error.h b/system-settings/src/nm-system-config-error.h index dbfcfed354..63896fcd09 100644 --- a/system-settings/src/nm-system-config-error.h +++ b/system-settings/src/nm-system-config-error.h @@ -22,7 +22,7 @@ #ifndef NM_SYSTEM_CONFIG_ERROR_H #define NM_SYSTEM_CONFIG_ERROR_H -#include +#include #include enum { diff --git a/system-settings/src/nm-system-config-hal-manager.h b/system-settings/src/nm-system-config-hal-manager.h index cdf854edff..0ffdfdd9d4 100644 --- a/system-settings/src/nm-system-config-hal-manager.h +++ b/system-settings/src/nm-system-config-hal-manager.h @@ -22,7 +22,7 @@ #ifndef NM_SYSTEM_CONFIG_HAL_MANAGER_H #define NM_SYSTEM_CONFIG_HAL_MANAGER_H -#include +#include #include #include #include "NetworkManager.h" From fbb20f04ad9ef0816489e9e6c3d8f39819f96563 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 19 Jan 2009 10:31:24 -0500 Subject: [PATCH 22/45] ifcfg-rh: help prevent rh#476089 in the future --- system-settings/plugins/ifcfg-rh/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/system-settings/plugins/ifcfg-rh/reader.c b/system-settings/plugins/ifcfg-rh/reader.c index 4d65915274..0fedcbe5df 100644 --- a/system-settings/plugins/ifcfg-rh/reader.c +++ b/system-settings/plugins/ifcfg-rh/reader.c @@ -143,6 +143,7 @@ get_one_ip4_addr (shvarFile *ifcfg, g_return_if_fail (ifcfg != NULL); g_return_if_fail (tag != NULL); g_return_if_fail (out_addr != NULL); + g_return_if_fail (*out_addr == 0); g_return_if_fail (error != NULL); g_return_if_fail (*error == NULL); From d7e671ddadd83adfe1c2dcd3b1978bdc707d0d41 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 22 Jan 2009 19:38:53 -0500 Subject: [PATCH 23/45] make distcheck happier (but still not completely happy) --- src/tests/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index ae069095a5..e73243f18b 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -2,8 +2,9 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/src/dhcp-manager \ - -I$(top_srcdir)/marshallers \ - -I$(top_srcdir)/src + -I$(top_builddir)/marshallers \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src noinst_PROGRAMS = test-dhcp-options From 8a1e437ecaefeb916a9824c902edc7b64e6a073c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 26 Jan 2009 11:22:11 -0500 Subject: [PATCH 24/45] spec: clarify behavior of Update() --- introspection/nm-exported-connection.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/introspection/nm-exported-connection.xml b/introspection/nm-exported-connection.xml index 0f2feeadf2..f742e7d92c 100644 --- a/introspection/nm-exported-connection.xml +++ b/introspection/nm-exported-connection.xml @@ -9,7 +9,7 @@ - Update the connection. + Update the connection with new settings and properties, replacing all previous settings and properties. From 4a7bfefeecc367a42410fa59904cd76688a86868 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 26 Jan 2009 16:10:19 -0500 Subject: [PATCH 25/45] ppp: honor MTU from PPP setting --- src/ppp-manager/nm-ppp-manager.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 60f462e278..6badbeb5e6 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -466,6 +466,7 @@ impl_ppp_manager_set_ip4_config (NMPPPManager *manager, { NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (manager); NMConnection *connection; + NMSettingPPP *s_ppp; NMIP4Config *config; NMIP4Address *addr; GValue *val; @@ -529,6 +530,15 @@ impl_ppp_manager_set_ip4_config (NMPPPManager *manager, g_assert (connection); g_object_set_data (G_OBJECT (connection), PPP_MANAGER_SECRET_TRIES, NULL); + /* Merge in custom MTU */ + s_ppp = (NMSettingPPP *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP); + if (s_ppp) { + guint32 mtu = nm_setting_ppp_get_mtu (s_ppp); + + if (mtu) + nm_ip4_config_set_mtu (config, mtu); + } + /* Push the IP4 config up to the device */ g_signal_emit (manager, signals[IP4_CONFIG], 0, priv->ip_iface, config); From 154f2f45343f99dc6b258b49a83e40dfe9b1ecc8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 27 Jan 2009 11:31:21 -0500 Subject: [PATCH 26/45] libnm-util: default 'autoconnect' to true Like the NetworkManagerConfigurationSpecification wiki page has stated for quite a long time. --- libnm-util/nm-setting-connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index a1dd5d8cfe..c0f246faa6 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -431,14 +431,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * Whether or not the connection should be automatically connected by * NetworkManager when the resources for the connection are available. * %TRUE to automatically activate the connection, %FALSE to require manual - * intervention to activate the connection. + * intervention to activate the connection. Defaults to %TRUE. **/ g_object_class_install_property (object_class, PROP_AUTOCONNECT, g_param_spec_boolean (NM_SETTING_CONNECTION_AUTOCONNECT, "Autoconnect", "Connection autoconnect", - FALSE, + TRUE, G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** From 468ca67a1fd088494693a110d01ce1d5e5c2517a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 28 Jan 2009 11:49:28 -0500 Subject: [PATCH 27/45] ppp: always use 'noauth' Since NM is really only a client of the provider's PPP server, and since NM doesn't have any authentication information to authenticate the remote peer anyway. Some providers don't set up their servers to allow clients to ask for authentication from the remote peer either. --- src/ppp-manager/nm-ppp-manager.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 6badbeb5e6..e2f58f5094 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -804,8 +804,12 @@ create_pppd_cmd_line (NMPPPManager *self, if (nm_setting_ppp_get_baud (setting)) nm_cmd_line_add_int (cmd, nm_setting_ppp_get_baud (setting)); - if (nm_setting_ppp_get_noauth (setting)) - nm_cmd_line_add_string (cmd, "noauth"); + /* noauth by default, because we certainly don't have any information + * with which to verify anything the peer gives us if we ask it to + * authenticate itself, which is what 'auth' really means. + */ + nm_cmd_line_add_string (cmd, "noauth"); + if (nm_setting_ppp_get_refuse_eap (setting)) nm_cmd_line_add_string (cmd, "refuse-eap"); if (nm_setting_ppp_get_refuse_pap (setting)) From 0e6c557bce178022c2f70de6952582f256ec41d5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 28 Jan 2009 11:53:16 -0500 Subject: [PATCH 28/45] ppp: fix interpretation of 'noauth' and default to TRUE MPPE has nothing to do with noauth, since auth/noauth is for asking the remote server to authenticate itself to the local pppd, which is pointless. Default 'noauth' to true. --- libnm-util/nm-setting-ppp.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c index d9c18fcf87..7d6aeecd2f 100644 --- a/libnm-util/nm-setting-ppp.c +++ b/libnm-util/nm-setting-ppp.c @@ -51,7 +51,7 @@ nm_setting_ppp_error_get_type (void) ENUM_ENTRY (NM_SETTING_PPP_ERROR_INVALID_PROPERTY, "InvalidProperty"), /* The specified property was missing and is required. */ ENUM_ENTRY (NM_SETTING_PPP_ERROR_MISSING_PROPERTY, "MissingProperty"), - /* The 'require-mppe' option is not allowed in conjunction with 'noauth'. */ + /* The 'require-mppe' option is not allowed in conjunction with the specified authentication. */ ENUM_ENTRY (NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED, "RequireMPPENotAllowed"), { 0, 0, 0 } }; @@ -263,18 +263,6 @@ nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting) static gboolean verify (NMSetting *setting, GSList *all_settings, GError **error) { - NMSettingPPPPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (setting); - - if (priv->noauth) { - if (priv->require_mppe) { - g_set_error (error, - NM_SETTING_PPP_ERROR, - NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED, - NM_SETTING_PPP_REQUIRE_MPPE); - return FALSE; - } - } - /* FIXME: Do we even want this or can we just let pppd evaluate the options? */ return TRUE; } @@ -438,7 +426,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) g_param_spec_boolean (NM_SETTING_PPP_NOAUTH, "NoAuth", "NoAuth", - FALSE, + TRUE, G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property From 8a2393ade219b57790eb9facf0f0058956c6173f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 30 Jan 2009 00:00:12 -0500 Subject: [PATCH 29/45] vpn: ignore VPN service files that don't end in .name --- src/vpn-manager/nm-vpn-service.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c index d8b2082288..15aa56db5e 100644 --- a/src/vpn-manager/nm-vpn-service.c +++ b/src/vpn-manager/nm-vpn-service.c @@ -67,6 +67,10 @@ find_service_file (const char *name) char *path; gboolean found = FALSE; + /* only parse filenames that end with .name */ + if (!g_str_has_suffix (fn, ".name")) + continue; + key_file = g_key_file_new (); path = g_build_filename (VPN_NAME_FILES_DIR, fn, NULL); From b61b19977634ffb34a350d5f990d37e617ff6307 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 1 Feb 2009 20:18:21 -0500 Subject: [PATCH 30/45] libnm-util: flag properties with G_PARAM_CONSTRUCT so default values get set This caused the 'autoconnect' property of NMSettingConnection to not get updated in some cases (as when a system setting plugin noticed a change to autoconnect=true and emitted the Updated signal, which wouldn't contain the new value). Add a testcase for setting default values too. --- configure.in | 1 + libnm-util/Makefile.am | 2 + libnm-util/nm-setting-8021x.c | 2 +- libnm-util/nm-setting-connection.c | 6 +- libnm-util/nm-setting-gsm.c | 4 +- libnm-util/nm-setting-ip4-config.c | 6 +- libnm-util/nm-setting-ip6-config.c | 4 +- libnm-util/nm-setting-ppp.c | 36 +++--- libnm-util/nm-setting-wired.c | 6 +- libnm-util/nm-setting-wireless-security.c | 2 +- libnm-util/nm-setting-wireless.c | 8 +- libnm-util/tests/Makefile.am | 25 ++++ libnm-util/tests/test-settings-defaults.c | 135 ++++++++++++++++++++++ 13 files changed, 200 insertions(+), 37 deletions(-) create mode 100644 libnm-util/tests/Makefile.am create mode 100644 libnm-util/tests/test-settings-defaults.c diff --git a/configure.in b/configure.in index 2e1e3f40d1..0343a5e2e9 100644 --- a/configure.in +++ b/configure.in @@ -507,6 +507,7 @@ src/dnsmasq-manager/Makefile src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile +libnm-util/tests/Makefile libnm-glib/libnm_glib.pc libnm-glib/libnm_glib_vpn.pc libnm-glib/Makefile diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 5e96865fe8..95d46b5ec6 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS=. tests + INCLUDES = -I${top_srcdir} -I${top_srcdir}/include lib_LTLIBRARIES=libnm-util.la diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 062cb7af84..9fba2dfe4d 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -1512,7 +1512,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "Use system CA certificates", "Use system CA certificates", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); /* Initialize crypto lbrary. */ if (!nm_utils_init (&error)) { diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index c0f246faa6..86cb8fb2d8 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -439,7 +439,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "Autoconnect", "Connection autoconnect", TRUE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:timestamp: @@ -453,7 +453,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "Timestamp", "Connection timestamp", 0, G_MAXUINT64, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:read-only: @@ -468,5 +468,5 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "Read-Only", "Read-Only", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); } diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c index a035bccf8d..d43160bfb8 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -455,7 +455,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) NM_GSM_NETWORK_ANY, NM_GSM_NETWORK_PREFER_UMTS_HSPA, NM_GSM_NETWORK_ANY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_BAND, @@ -463,7 +463,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) "Band", "Band", -1, 5, -1, /* FIXME: Use an enum for it */ - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_PIN, diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 7157886a31..7808bbef69 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -735,7 +735,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "Ignore automatic routes", "Ignore automatic routes", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_IGNORE_AUTO_DNS, @@ -743,7 +743,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "Ignore automatic DNS", "Ignore automatic DNS", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_DHCP_CLIENT_ID, @@ -767,7 +767,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "Never default", "Never make this connection the default IPv4 connection", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); } diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 8492da7ab5..66defb38c6 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -654,7 +654,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "Ignore DHCPv6 DNS", "Ignore DHCPv6 DNS", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_IGNORE_ROUTER_ADV, @@ -662,7 +662,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "Ignore Router Advertisements", "Ignore Router Advertisements", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_DHCP_MODE, diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c index 7d6aeecd2f..2b39a54395 100644 --- a/libnm-util/nm-setting-ppp.c +++ b/libnm-util/nm-setting-ppp.c @@ -427,7 +427,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "NoAuth", "NoAuth", TRUE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_REFUSE_EAP, @@ -435,7 +435,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Refuse EAP", "Refuse EAP", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_REFUSE_PAP, @@ -443,7 +443,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Refuse PAP", "Refuse PAP", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_REFUSE_CHAP, @@ -451,7 +451,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Refuse CHAP", "Refuse CHAP", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_REFUSE_MSCHAP, @@ -459,7 +459,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Refuse MSCHAP", "Refuse MSCHAP", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_REFUSE_MSCHAPV2, @@ -467,7 +467,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Refuse MSCHAPv2", "Refuse MSCHAPv2", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_NOBSDCOMP, @@ -475,7 +475,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "No BSD compression", "No BSD compression", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); g_object_class_install_property (object_class, PROP_NODEFLATE, @@ -483,7 +483,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "No deflate", "No deflate", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); g_object_class_install_property (object_class, PROP_NO_VJ_COMP, @@ -491,7 +491,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "No VJ compression", "No VJ compression", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); g_object_class_install_property (object_class, PROP_REQUIRE_MPPE, @@ -499,7 +499,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Require MPPE", "Require MPPE", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_REQUIRE_MPPE_128, @@ -507,7 +507,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Require MPPE 128", "Require MPPE 128", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT| NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_MPPE_STATEFUL, @@ -515,7 +515,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "MPPE stateful", "MPPE stateful", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_CRTSCTS, @@ -523,7 +523,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "CRTSCTS", "CRTSCTS", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_BAUD, @@ -531,7 +531,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Baud", "Baud", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); g_object_class_install_property (object_class, PROP_MRU, @@ -539,7 +539,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "MRU", "MRU", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_MTU, @@ -547,7 +547,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "MTU", "MTU", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); g_object_class_install_property (object_class, PROP_LCP_ECHO_FAILURE, @@ -555,7 +555,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "LCP echo failure", "LCP echo failure", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); g_object_class_install_property (object_class, PROP_LCP_ECHO_INTERVAL, @@ -563,5 +563,5 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "LCP echo interval", "LCP echo interval", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); } diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index 2912b15316..30be70d11a 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -292,7 +292,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "Speed", "Speed", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_DUPLEX, @@ -308,7 +308,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "AutoNegotiate", "Auto negotiate", TRUE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_MAC_ADDRESS, @@ -324,6 +324,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "MTU", "MTU", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); } diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index f9c6ac020c..548d9f1c1d 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -916,7 +916,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "WEP TX key index", "WEP TX key index", 0, 3, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_AUTH_ALG, diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index b3b178b584..c3e9010998 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -726,7 +726,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "Channel", "Channel", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); g_object_class_install_property (object_class, PROP_BSSID, @@ -742,7 +742,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "Rate", "Rate", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); g_object_class_install_property (object_class, PROP_TX_POWER, @@ -750,7 +750,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "TX Power", "TX Power", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); g_object_class_install_property (object_class, PROP_MAC_ADDRESS, @@ -774,7 +774,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "MTU", "MTU", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); g_object_class_install_property (object_class, PROP_SEC, diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am new file mode 100644 index 0000000000..4dfe175abf --- /dev/null +++ b/libnm-util/tests/Makefile.am @@ -0,0 +1,25 @@ +INCLUDES = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/libnm-util + +noinst_PROGRAMS = test-settings-defaults + +test_settings_defaults_SOURCES = \ + test-settings-defaults.c + +test_settings_defaults_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) + +test_settings_defaults_LDADD = \ + $(GTHREAD_LIBS) \ + $(DBUS_LIBS) \ + $(top_builddir)/libnm-util/libnm-util.la + +if WITH_TESTS + +check-local: test-settings-defaults + $(abs_builddir)/test-settings-defaults + +endif + diff --git a/libnm-util/tests/test-settings-defaults.c b/libnm-util/tests/test-settings-defaults.c new file mode 100644 index 0000000000..2f82038989 --- /dev/null +++ b/libnm-util/tests/test-settings-defaults.c @@ -0,0 +1,135 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * + * 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, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2008 Red Hat, Inc. + * + */ + +#include +#include +#include + +#include "nm-test-helpers.h" +#include + +#include "nm-setting-8021x.h" +#include "nm-setting-cdma.h" +#include "nm-setting-connection.h" +#include "nm-setting-gsm.h" +#include "nm-setting-ip4-config.h" +#include "nm-setting-ip6-config.h" +#include "nm-setting-ppp.h" +#include "nm-setting-pppoe.h" +#include "nm-setting-serial.h" +#include "nm-setting-vpn.h" +#include "nm-setting-wired.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" + + +static void +test_defaults (GType type, const char *name) +{ + GParamSpec **property_specs; + guint n_property_specs; + GObject *setting; + int i; + + setting = g_object_new (type, NULL); + + property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (setting), &n_property_specs); + ASSERT (property_specs != NULL, + name, "couldn't find property specs for object of type '%s'", + g_type_name (G_OBJECT_TYPE (setting))); + + for (i = 0; i < n_property_specs; i++) { + GParamSpec *prop_spec = property_specs[i]; + GValue value = { 0, }; + GValue defvalue = { 0, }; + char *actual, *expected; + gboolean ok = FALSE; + + /* Ignore non-fundamental types since they won't really have + * defaults. + */ + if (!G_TYPE_IS_FUNDAMENTAL (prop_spec->value_type)) + continue; + + g_value_init (&value, prop_spec->value_type); + g_object_get_property (G_OBJECT (setting), prop_spec->name, &value); + + g_value_init (&defvalue, prop_spec->value_type); + g_param_value_set_default (prop_spec, &defvalue); + + actual = g_strdup_value_contents (&value); + expected = g_strdup_value_contents (&defvalue); + + if (!strcmp (prop_spec->name, NM_SETTING_NAME)) { + /* 'name' is always the setting name, not the default value */ + ok = !strcmp (nm_setting_get_name (NM_SETTING (setting)), name); + g_free (expected); + expected = g_strdup (name); + } else + ok = g_param_value_defaults (prop_spec, &value); + + ASSERT (ok, + name, "property '%s' value '%s' not the expected default value '%s'", + prop_spec->name, actual, expected); + + g_free (actual); + g_free (expected); + g_value_unset (&value); + g_value_unset (&defvalue); + } + + g_free (property_specs); + g_object_unref (setting); +} + +int main (int argc, char **argv) +{ + GError *error = NULL; + DBusGConnection *bus; + char *basename; + + g_type_init (); + bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); + + if (!nm_utils_init (&error)) + FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message); + + /* The tests */ + test_defaults (NM_TYPE_SETTING_CONNECTION, NM_SETTING_CONNECTION_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_802_1X, NM_SETTING_802_1X_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_CDMA, NM_SETTING_CDMA_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_GSM, NM_SETTING_GSM_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_IP4_CONFIG, NM_SETTING_IP4_CONFIG_SETTING_NAME); +// test_defaults (NM_TYPE_SETTING_IP6_CONFIG, NM_SETTING_IP6_CONFIG_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_PPP, NM_SETTING_PPP_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_PPPOE, NM_SETTING_PPPOE_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_SERIAL, NM_SETTING_SERIAL_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_VPN, NM_SETTING_VPN_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_WIRED, NM_SETTING_WIRED_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_WIRELESS, NM_SETTING_WIRELESS_SETTING_NAME); + test_defaults (NM_TYPE_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME); + + basename = g_path_get_basename (argv[0]); + fprintf (stdout, "%s: SUCCESS\n", basename); + g_free (basename); + return 0; +} + From 203cff4d834510408c3ae312bbbc4ce2157d82c0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 2 Feb 2009 01:03:15 -0500 Subject: [PATCH 31/45] libnm-util: move crypto tests to libnm-util/tests/ Add testing certs and keys; run crypto tests on 'make check' --- configure.in | 1 + libnm-util/Makefile.am | 31 ++- libnm-util/crypto.c | 22 +- libnm-util/test-crypto.c | 200 -------------- libnm-util/tests/Makefile.am | 25 +- libnm-util/tests/certs/Makefile.am | 14 + libnm-util/tests/certs/test-cert.p12 | Bin 0 -> 4092 bytes libnm-util/tests/certs/test_ca_cert.pem | 27 ++ libnm-util/tests/certs/test_key_and_cert.pem | 119 +++++++++ libnm-util/tests/test-crypto.c | 260 +++++++++++++++++++ 10 files changed, 476 insertions(+), 223 deletions(-) delete mode 100644 libnm-util/test-crypto.c create mode 100644 libnm-util/tests/certs/Makefile.am create mode 100644 libnm-util/tests/certs/test-cert.p12 create mode 100644 libnm-util/tests/certs/test_ca_cert.pem create mode 100644 libnm-util/tests/certs/test_key_and_cert.pem create mode 100644 libnm-util/tests/test-crypto.c diff --git a/configure.in b/configure.in index 0343a5e2e9..a338983dd7 100644 --- a/configure.in +++ b/configure.in @@ -508,6 +508,7 @@ src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile +libnm-util/tests/certs/Makefile libnm-glib/libnm_glib.pc libnm-glib/libnm_glib_vpn.pc libnm-glib/Makefile diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 95d46b5ec6..177e3b3181 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -71,24 +71,35 @@ endif libnm_util_includedir=$(includedir)/NetworkManager -noinst_PROGRAMS = test-crypto -test_crypto_SOURCES = test-crypto.c crypto.c -test_crypto_CPPFLAGS = $(GLIB_CFLAGS) -D_GNU_SOURCE -test_crypto_LDADD = $(GLIB_LIBS) libnm-util.la +########################################### +# Crypto test library +########################################### + +noinst_LTLIBRARIES = libtest-crypto.la + +libtest_crypto_la_SOURCES = crypto.c + +libtest_crypto_la_CPPFLAGS = \ + $(GLIB_CFLAGS) + +libtest_crypto_la_LIBADD = \ + $(GLIB_LIBS) if WITH_GNUTLS -test_crypto_SOURCES += crypto_gnutls.c -test_crypto_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(GNUTLS_CFLAGS) -test_crypto_LDADD += $(LIBGCRYPT_LIBS) $(GNUTLS_LIBS) +libtest_crypto_la_SOURCES += crypto_gnutls.c +libtest_crypto_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(GNUTLS_CFLAGS) +libtest_crypto_la_LIBADD += $(LIBGCRYPT_LIBS) $(GNUTLS_LIBS) endif if WITH_NSS -test_crypto_SOURCES += crypto_nss.c -test_crypto_CPPFLAGS += $(NSS_CFLAGS) -test_crypto_LDADD += $(NSS_LIBS) +libtest_crypto_la_SOURCES += crypto_nss.c +libtest_crypto_la_CPPFLAGS += $(NSS_CFLAGS) +libtest_crypto_la_LIBADD += $(NSS_LIBS) endif + + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnm-util.pc diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 3bd7405cc4..9f4ccd48a5 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -311,9 +311,9 @@ convert_iv (const char *src, GError **error) { int num; - int i; - char conv[3]; - char *c; + int i; + char conv[3]; + char *c; g_return_val_if_fail (src != NULL, NULL); @@ -326,16 +326,16 @@ convert_iv (const char *src, } num /= 2; - c = g_malloc0 (num + 1); - if (c == NULL) { + c = g_malloc0 (num + 1); + if (c == NULL) { g_set_error (error, NM_CRYPTO_ERROR, NM_CRYPTO_ERR_OUT_OF_MEMORY, _("Not enough memory to store the IV.")); return NULL; } - conv[2] = '\0'; - for (i = 0; i < num; i++) { + conv[2] = '\0'; + for (i = 0; i < num; i++) { conv[0] = src[(i * 2)]; conv[1] = src[(i * 2) + 1]; if (!g_ascii_isxdigit (conv[0]) || !g_ascii_isxdigit (conv[1])) { @@ -345,10 +345,10 @@ convert_iv (const char *src, goto error; } - c[i] = strtol(conv, NULL, 16); - } - *out_len = num; - return c; + c[i] = strtol(conv, NULL, 16); + } + *out_len = num; + return c; error: g_free (c); diff --git a/libnm-util/test-crypto.c b/libnm-util/test-crypto.c deleted file mode 100644 index 6134a0d2c9..0000000000 --- a/libnm-util/test-crypto.c +++ /dev/null @@ -1,200 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -/* - * Dan Williams - * - * 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 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. - * - * (C) Copyright 2007 - 2008 Red Hat, Inc. - */ - -#include -#include -#include -#include -#include -#include - -#include "crypto.h" - -static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----"; -static const char *pem_rsa_key_end = "-----END RSA PRIVATE KEY-----"; - -static const char *pem_dsa_key_begin = "-----BEGIN DSA PRIVATE KEY-----"; -static const char *pem_dsa_key_end = "-----END DSA PRIVATE KEY-----"; - -static void -dump_key_to_pem (const char *key, gsize key_len, int key_type) -{ - char *b64 = NULL; - GString *str = NULL; - const char *start_tag; - const char *end_tag; - char *p; - - switch (key_type) { - case NM_CRYPTO_KEY_TYPE_RSA: - start_tag = pem_rsa_key_begin; - end_tag = pem_rsa_key_end; - break; - case NM_CRYPTO_KEY_TYPE_DSA: - start_tag = pem_dsa_key_begin; - end_tag = pem_dsa_key_end; - break; - default: - g_warning ("Unknown key type %d", key_type); - return; - } - - b64 = g_base64_encode ((const unsigned char *) key, key_len); - if (!b64) { - g_warning ("Couldn't base64 encode the key."); - goto out; - } - - str = g_string_new (NULL); - if (!str) { - g_warning ("Couldn't allocate buffer to write out key."); - goto out; - } - - g_string_append (str, start_tag); - g_string_append_c (str, '\n'); - - for (p = b64; p < (b64 + strlen (b64)); p += 64) { - g_string_append_len (str, p, strnlen (p, 64)); - g_string_append_c (str, '\n'); - } - - g_string_append (str, end_tag); - g_string_append_c (str, '\n'); - - g_message ("Decrypted private key:\n\n%s", str->str); - -out: - g_free (b64); - if (str) - g_string_free (str, TRUE); -} - -static void -usage (const char *prgname) -{ - fprintf (stderr, "Usage: %s cert \n" - " %s key \n", - prgname, prgname); -} - -#define MODE_CERT 1 -#define MODE_KEY 2 - -int main (int argc, char **argv) -{ - int mode = 0; - const char *file; - GError *error = NULL; - - if (argc < 2) { - usage (argv[0]); - return 1; - } - - if (!strcmp (argv[1], "key")) { - if (argc < 4) { - usage (argv[0]); - return 1; - } - mode = MODE_KEY; - } else if (!strcmp (argv[1], "cert")) { - if (argc < 3) { - usage (argv[0]); - return 1; - } - mode = MODE_CERT; - } else { - usage (argv[0]); - return 1; - } - - if (!crypto_init (&error)) { - g_warning ("Couldn't initialize crypto library: %d %s.", - error->code, error->message); - return 1; - } - - file = argv[2]; - - if (mode == MODE_CERT) { - GByteArray *array; - NMCryptoFileFormat format = NM_CRYPTO_FILE_FORMAT_UNKNOWN; - - array = crypto_load_and_verify_certificate (file, &format, &error); - if (!array) { - g_warning ("Couldn't read certificate file '%s': %d %s", - file, error->code, error->message); - goto out; - } - - switch (format) { - case NM_CRYPTO_FILE_FORMAT_X509: - g_message ("Format: pkcs#1"); - break; - case NM_CRYPTO_FILE_FORMAT_PKCS12: - g_message ("Format: pkcs#12"); - break; - default: - g_message ("Format: unknown"); - break; - } - - g_byte_array_free (array, TRUE); - } else if (mode == MODE_KEY) { - NMCryptoKeyType key_type = NM_CRYPTO_KEY_TYPE_UNKNOWN; - NMCryptoFileFormat format = NM_CRYPTO_FILE_FORMAT_UNKNOWN; - const char *password = argv[3]; - GByteArray *array; - - array = crypto_get_private_key (file, password, &key_type, &format, &error); - if (!array) { - g_warning ("Couldn't read key file '%s': %d %s", - file, error->code, error->message); - goto out; - } - - switch (format) { - case NM_CRYPTO_FILE_FORMAT_RAW_KEY: - g_message ("Original format: pkcs#1\n"); - dump_key_to_pem ((const char *) array->data, array->len, key_type); - break; - case NM_CRYPTO_FILE_FORMAT_PKCS12: - g_message ("Original format: pkcs#12"); - break; - default: - g_message ("Original format: unknown"); - break; - } - - g_byte_array_free (array, TRUE); - } else { - g_assert_not_reached (); - } - -out: - crypto_deinit (); - - return 0; -} - diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am index 4dfe175abf..c550f74899 100644 --- a/libnm-util/tests/Makefile.am +++ b/libnm-util/tests/Makefile.am @@ -1,8 +1,10 @@ +SUBDIRS=certs + INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-util -noinst_PROGRAMS = test-settings-defaults +noinst_PROGRAMS = test-settings-defaults test-crypto test_settings_defaults_SOURCES = \ test-settings-defaults.c @@ -16,10 +18,29 @@ test_settings_defaults_LDADD = \ $(DBUS_LIBS) \ $(top_builddir)/libnm-util/libnm-util.la +test_crypto_SOURCES = \ + test-crypto.c + +test_crypto_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + -D_GNU_SOURCE + +test_crypto_LDADD = \ + $(GTHREAD_LIBS) \ + $(top_builddir)/libnm-util/libtest-crypto.la + + if WITH_TESTS -check-local: test-settings-defaults +check-local: test-settings-defaults test-crypto $(abs_builddir)/test-settings-defaults + $(abs_builddir)/test-crypto \ + $(top_srcdir)/libnm-util/tests/certs/test_ca_cert.pem \ + $(top_srcdir)/libnm-util/tests/certs/test_key_and_cert.pem \ + $(top_srcdir)/libnm-util/tests/certs/test_key_and_cert.pem \ + "test" \ + $(top_srcdir)/libnm-util/tests/certs/test-cert.p12 \ + "test" endif diff --git a/libnm-util/tests/certs/Makefile.am b/libnm-util/tests/certs/Makefile.am new file mode 100644 index 0000000000..50f066aaec --- /dev/null +++ b/libnm-util/tests/certs/Makefile.am @@ -0,0 +1,14 @@ +# test-cert.p12 created with: +# +# openssl pkcs12 -export \ +# -in test_key_and_cert.pem \ +# -inkey test_key_and_cert.pem \ +# -certfile test_ca_cert.pem \ +# -name "test-pkcs12" \ +# -out test-cert.p12 + +EXTRA_DIST = \ + test_ca_cert.pem \ + test_key_and_cert.pem \ + test-cert.p12 + diff --git a/libnm-util/tests/certs/test-cert.p12 b/libnm-util/tests/certs/test-cert.p12 new file mode 100644 index 0000000000000000000000000000000000000000..ae4a68304973f7e8fec78c8e8f53d169df2afe59 GIT binary patch literal 4092 zcmY+GbyO1!+r~$1glrD!l7>kRP#OtAx)}ma2`Om>aVq5~ky0240wa{JF_3n2OV+?{&*z-)`=0mxJ4XYH~BThq(0VhSFJCm_yqN2ye*m(=5D+EJ%3CftWZt_&Ve&OUDWNf za}UZPveG_kaaQA#6dcwiD)I;Y(l0mqWBa>f)2OG2=WEHyX}aNL{}&pzz2C4(_wn?L z%|{B>*WANgaW9uHLTV)5G#7C1|H@SF!&5r!epnS98!4Z8HC4=H%y@#1N)*V4a&gFx z)vT<0FL5Y7d3f|zT`^x}LFo#}m2W|PhRrZ7d=ODtWD#hx<`UHw{;&e>>7vv~e23Ap zWGJpLDcb=kg5>Q?J(Csqh)geVrUe)uvsYfAs&@M;Cj4ytm$YZXBn|Ego1!(NcQXl{ zmr_<_Q&d#FiIt zR%>3cv!~$0F5;%vKAMl|uKzxb=FG`yUEn!eZrfGZAX$&*Z2-l-{#y_cU)+Sw2QfdRhx#;(g z*^KOeCKS6E7avXBVYkr)+IVI{BkKwgbs{|~$g5#dyl;&H?lh#(NX>X=%YHPedG#2o z%^Px`6K&wyex)L-+ksEsDj&3L<(}Mu%=HLXkcPS}RGlNX6UNjhm>X#%zFdggcx*H6 zCJD;gUSS1iWj+u{U_ua<`f~L&Or^4S6H0m9yrVc@D#ii?p9@^lAGJ?Qq}K zTHtoLp^vAG@1VL6ME9i`@?r_~G3SOwtB59T_O&;IBy{l*f}l){s+40H6T%<^l&>%PMzhq)Pa zaqi0UO{JB$U*?v%N zxJl6u2lLTo!%NeIE)O4(QfmfGGnH zlS6;u0QHr2Zg97E5QM2DYl`Ta`#v66kp1ND!j)ko!$=C2rPR1c_!!plMeF_E&+^jd zYq}%Ff;?)+YSY1(GrmZOg`f!A0ra7`$7&k`o>lHLE_jpf`+nL|Z_k{9&eQjK@jKh5 zAGZF;A1i5iGW17!)C`2UVU&U!!JG2>BE4(-)d5Su=hiMNmoq+BrEc8Ap!G@qcTWYN z?h7+9?Iz;xt`y3w!KXkI*GDqY_;3t>2gcv8|LpruiNFVQiu%L)^P|`zH^`!ps`Dte zKl)VeEH4b0{fS?^!VAw^#PgQz%dlU?TJGy_dwa^#cC{9%GOa;Tw=jnRW{0ahI=5nL z=?QS%E9$YSr{BA`4@FB0d$hW^cP{1BC^2qd&BHYu+%uhq)YNqPX}v=@X860_?0v7YRfei^4sZ)mPi|%_B!wwR^!>IqH#st* z1FGeS(!?4R>fh`+4){F(JP$!lnq?Ynn~W0;fJe;wHaakvUwieI5Dhk)|2j*O=4Z*@ zEFh#aQ07>CC*+usLgMpTxLGnpl&H>eExw#{Z?$Zj{VF@}PIn2Di0ZL9b)OlRUuG;y z)JMVd;jmvkr#@EC^+9aOZ|28pIVnK9016$fG)AQQ;;T`5h0j;Zp`2(BO{(}t=Jlab zA*2wraNuc@${n8>#^DL(j8OZLP=euG{+#9OD{0xf3>{QwEkAqSHaQdj9GZpYic(0x z%N+I~hjP8tupVH<$xQusi0HR1xa{1p4gR|D&L<*=x6El0yR!-pbio-(zME^+i;T$JGTFDifmZS;{cpJ zY)0kSPT=k-2Dl(KA-GB*jg{i;s{J824(9zW)`$Eg$p_vjvh1nz1zZ)k>;+cOly+4F z-=se55%i)xPw|v@al;r_HYwhJ8yp9vxhKhh5DlCDk^TmvPrqd!VU_8mC7Je%K`Y%r z%?5As;O zyIoaqCjkLy`!xN8$SGd<#=vO0`JrG#Pg-*KCt0PjE^6Q3$yaMm-*`PV)BQhb-erPK z5lobMYkU1E^}0|R!!>nW0_(gUhC<30%6#17f?-&nLC4xquv_Tew0Vg>+ZFVRWoi8( zbDeaVRiVS;uk|YGgr+0*O`3Bk1yfn~M~`Q*buKR+0N}W|Hb+1oi%;x0Cokp*js`ma z2OwskftKWGAmXoV{I~Q$*ZvO|sYysP(B#{2H2L~}Q6$+v6uC!gz&}?SS@I7>lB3Bx zaW_=t5o%|x&<`f{yrV2O8u$46z|5oERmHKtc<-&i?oR~o-SJTSjh#NlcE;K?QJiZ> zLBW{xl)<+{4RsCR$xE0C_zgeOJ0|*mj`wV-LG(jBF@T!q^~Er1`9pOA$!nZEVS(A^ zemvs?x*Xy+f$~DTMCl2ykdAvH8Z~ddP+6-;i$lNf9^Qi9Xzl^o?kX0O+mj4AP(R4VFyQQ%_%L(M^iwt8CKc6OCo?*w*l7eL7r6g1;P2xsb+ z&sF^#5UR;xZQUOI9JZvLV!P6mCo{;3qO|dupcjXiNa+{=^D=%CZ)e~A7D+luCv54w zPLz`-`WcSi#fBFc(DU^2%-{+UR@MQ@&T~XJZIlc0m)Lk^=_9_IFIBv@X=!#ub{eoR zgYpkp+vdHCB}&BH55P;==2N(hwO^2vdOL4smbuA7O3~E?&kk-qaSh8qp`;K{iQYWt zQ|<>H2LaqMNlARkxml6=1D;OhkMDDr4G(kj^48#N!MxBZV3fNNO;oTjS4t zRYxO7&4x7X+K(cAIGS)zCPDW8-uGaML|YDa_BfFGyxNDR1`V@=Hs4(nM=0a4%;)3_ z%Gk$?yb&zQJB^j#$muJIT-p+@ZO@c!VKFV7UA8qq)`M+v2^yZ2Eix@@;ej|XoXr0m zqmx@I?zo);QMUL>A?+LPoavC5Z1in%>$ELqjN1MIU4O%mjv*biD2vtm2>sM6rZ_dU z&51MV`lFL8fv677FAtcI#z&gfg&y6~&u?*I=WhTQK$qG~Gl_s#Z&DMV{w%RL?esU= z7h~lLGM!r)0e*VpmP%&Y8IU08Rr(RORZ~0AU7O2PetT%@xPVt13)&^fBE7v@sdI6* zF@4jf=T}bnX=NnqbxHhAE%^(XB}~`wOjZ4-ihvEpM2*CYkI|43K2?%=cfv-?Fjeh= zq&Pr&*&8YWL$j_ZEFvGXa(=>5L`T}_s=Sx6V*P`#hH$zzp>qA^4M_! zV{TEsT_ssX+iuE9`<^Wm>4O+?3Z>6^-vj$u)*%sFxz*x}1pIy-ihXcyP?kD|5@XxG zeh(z%e^Q|CLlqsKMpC+hSa0=waaV^zl~H?Y(d9&1@dMB6`cF1Y$i? zhK!i@vLQY(z)`NpsI_+OU|=jru2E&I6d`93oOcq!PYV!ooU@ObfP~q+Aj}W@{l4MK zIm|ZeD9m5c(rw^`xxY(8TZ7W!*|g=&zfxil9-GsHzNnDb`T9=ta~ze~A&j^lbiVF; z?{;a({^#`xtd@aEQ0lQW-%704X|;@{hMsC^%ZKa2Dv6#LYx=+(5hk_g&(vLnMXF}} zSi)xS_b?M~O@c9WS;&u_b1~YM{w*Wtmd0cfdT`$VPe&>S2}W}IL@r^hc{1U90RdK$ zvK1IXw9np!^Z$E9FTs415#R%G0C@lHq5v;|E8xlBT>>Bpmw + * + * 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 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. + * + * (C) Copyright 2007 - 2008 Red Hat, Inc. + */ + +#include +#include +#include +#include +#include +#include + +#include "nm-test-helpers.h" +#include "crypto.h" + +#if 0 +static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----"; +static const char *pem_rsa_key_end = "-----END RSA PRIVATE KEY-----"; + +static const char *pem_dsa_key_begin = "-----BEGIN DSA PRIVATE KEY-----"; +static const char *pem_dsa_key_end = "-----END DSA PRIVATE KEY-----"; + +static void +dump_key_to_pem (const char *key, gsize key_len, int key_type) +{ + char *b64 = NULL; + GString *str = NULL; + const char *start_tag; + const char *end_tag; + char *p; + + switch (key_type) { + case NM_CRYPTO_KEY_TYPE_RSA: + start_tag = pem_rsa_key_begin; + end_tag = pem_rsa_key_end; + break; + case NM_CRYPTO_KEY_TYPE_DSA: + start_tag = pem_dsa_key_begin; + end_tag = pem_dsa_key_end; + break; + default: + g_warning ("Unknown key type %d", key_type); + return; + } + + b64 = g_base64_encode ((const unsigned char *) key, key_len); + if (!b64) { + g_warning ("Couldn't base64 encode the key."); + goto out; + } + + str = g_string_new (NULL); + if (!str) { + g_warning ("Couldn't allocate buffer to write out key."); + goto out; + } + + g_string_append (str, start_tag); + g_string_append_c (str, '\n'); + + for (p = b64; p < (b64 + strlen (b64)); p += 64) { + g_string_append_len (str, p, strnlen (p, 64)); + g_string_append_c (str, '\n'); + } + + g_string_append (str, end_tag); + g_string_append_c (str, '\n'); + + g_message ("Decrypted private key:\n\n%s", str->str); + +out: + g_free (b64); + if (str) + g_string_free (str, TRUE); +} +#endif + +static void +test_load_cert (const char *path, const char *desc) +{ + GByteArray *array; + NMCryptoFileFormat format = NM_CRYPTO_FILE_FORMAT_UNKNOWN; + GError *error = NULL; + + array = crypto_load_and_verify_certificate (path, &format, &error); + ASSERT (array != NULL, desc, + "couldn't read certificate file '%s': %d %s", + path, error->code, error->message); + + ASSERT (format == NM_CRYPTO_FILE_FORMAT_X509, desc, + "%s: unexpected certificate format (expected %d, got %d)", + path, NM_CRYPTO_FILE_FORMAT_X509, format); + + g_byte_array_free (array, TRUE); +} + +static void +test_load_private_key (const char *path, + const char *password, + gboolean expect_fail, + const char *desc) +{ + NMCryptoKeyType key_type = NM_CRYPTO_KEY_TYPE_UNKNOWN; + NMCryptoFileFormat format = NM_CRYPTO_FILE_FORMAT_UNKNOWN; + GByteArray *array; + GError *error = NULL; + + array = crypto_get_private_key (path, password, &key_type, &format, &error); + if (expect_fail) { + ASSERT (array == NULL, desc, + "unexpected success reading private key file '%s' with " + "invalid password", + path); + + ASSERT (format == NM_CRYPTO_FILE_FORMAT_UNKNOWN, desc, + "unexpected success determining private key file '%s' " + "format with invalid password (expected %d, got %d)", + path, NM_CRYPTO_FILE_FORMAT_UNKNOWN, format); + return; + } + + ASSERT (array != NULL, desc, + "couldn't read private key file '%s': %d %s", + path, error->code, error->message); + + ASSERT (format == NM_CRYPTO_FILE_FORMAT_RAW_KEY, desc, + "%s: unexpected private key file format (expected %d, got %d)", + path, NM_CRYPTO_FILE_FORMAT_RAW_KEY, format); + + ASSERT (key_type == NM_CRYPTO_KEY_TYPE_RSA, desc, + "%s: unexpected private key type (expected %d, got %d)", + path, NM_CRYPTO_KEY_TYPE_RSA, format); + + g_byte_array_free (array, TRUE); +} + +static void +test_load_pkcs12 (const char *path, + const char *password, + gboolean expect_fail, + const char *desc) +{ + NMCryptoKeyType key_type = NM_CRYPTO_KEY_TYPE_UNKNOWN; + NMCryptoFileFormat format = NM_CRYPTO_FILE_FORMAT_UNKNOWN; + GByteArray *array; + GError *error = NULL; + + array = crypto_get_private_key (path, password, &key_type, &format, &error); + if (expect_fail) { + ASSERT (array == NULL, desc, + "unexpected success reading PKCS#12 private key file " + "'%s' with invalid password", + path); + + /* PKCS#12 file format can be determined even if the password + * is wrong; check that. + */ + ASSERT (format == NM_CRYPTO_FILE_FORMAT_UNKNOWN, desc, + "unexpected success determining PKCS#12 private key " + "'%s' file format with invalid password (expected %d, " + "got %d)", + path, NM_CRYPTO_FILE_FORMAT_UNKNOWN, format); + ASSERT (key_type == NM_CRYPTO_KEY_TYPE_UNKNOWN, desc, + "unexpected success determining PKCS#12 private key " + "'%s' type with invalid password (expected %d, got %d)", + path, NM_CRYPTO_KEY_TYPE_UNKNOWN, key_type); + return; + } + + ASSERT (array != NULL, desc, + "couldn't read PKCS#12 private key file '%s': %d %s", + path, error->code, error->message); + + ASSERT (format == NM_CRYPTO_FILE_FORMAT_PKCS12, desc, + "%s: unexpected PKCS#12 private key file format (expected %d, got %d)", + path, NM_CRYPTO_FILE_FORMAT_RAW_KEY, format); + + ASSERT (key_type == NM_CRYPTO_KEY_TYPE_ENCRYPTED, desc, + "%s: unexpected PKCS#12 private key type (expected %d, got %d)", + path, NM_CRYPTO_KEY_TYPE_ENCRYPTED, format); + + g_byte_array_free (array, TRUE); +} + +static void +test_is_pkcs12 (const char *path, gboolean expect_fail, const char *desc) +{ + gboolean is_pkcs12; + + is_pkcs12 = crypto_is_pkcs12_file (path); + if (expect_fail) { + ASSERT (is_pkcs12 == FALSE, desc, + "unexpected success reading non-PKCS#12 file '%s'", + path); + return; + } + + ASSERT (is_pkcs12 == TRUE, desc, "couldn't read PKCS#12 file '%s'", path); +} + +int main (int argc, char **argv) +{ + GError *error = NULL; + char *progname; + const char *ca_cert; + const char *client_cert; + const char *priv_key; + const char *priv_key_password; + const char *pk12; + const char *pk12_password; + + ASSERT (argc == 7, "test-crypto", + "wrong number of arguments (expected ca-cert, client-cert, " + "private-key, private-key-password, pkcs12-cert, pkcs12-password)"); + + if (!crypto_init (&error)) + FAIL ("crypto-init", "failed to initialize crypto: %s", error->message); + + ca_cert = argv[1]; + client_cert = argv[2]; + priv_key = argv[3]; + priv_key_password = argv[4]; + pk12 = argv[5]; + pk12_password = argv[6]; + + test_load_cert (ca_cert, "ca-cert"); + test_load_cert (client_cert, "client-cert"); + test_load_private_key (priv_key, priv_key_password, FALSE, "private-key"); + test_load_private_key (priv_key, "blahblahblah", TRUE, "private-key-bad-password"); + test_load_pkcs12 (pk12, pk12_password, FALSE, "pkcs12-private-key"); + test_load_pkcs12 (pk12, "blahblahblah", TRUE, "pkcs12-private-key-bad-password"); + test_is_pkcs12 (pk12, FALSE, "is-pkcs12"); + test_is_pkcs12 (priv_key, TRUE, "is-pkcs12-not-pkcs12"); + + crypto_deinit (); + + progname = g_path_get_basename (argv[0]); + fprintf (stdout, "%s: SUCCESS\n", progname); + g_free (progname); + return 0; +} + From 718debc2cd2905eb27e559a15d5edbaee26e9bf8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 2 Feb 2009 01:36:43 -0500 Subject: [PATCH 32/45] fix distcheck for real --- src/Makefile.am | 27 +++++++++++++++++++++++++++ src/tests/Makefile.am | 11 ++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3211bce862..68ed5e8ded 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,7 @@ SUBDIRS= \ ppp-manager \ backends \ dnsmasq-manager \ + . \ tests INCLUDES = -I${top_srcdir} \ @@ -19,6 +20,32 @@ INCLUDES = -I${top_srcdir} \ -I${top_srcdir}/libnm-util \ -I${top_srcdir}/callouts +########################################### +# DHCP test library +########################################### + +noinst_LTLIBRARIES = libtest-dhcp.la + +libtest_dhcp_la_SOURCES = \ + nm-ip4-config.c \ + nm-dbus-manager.c + +libtest_dhcp_la_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBNL_CFLAGS) + +libtest_dhcp_la_LIBADD = \ + $(GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(LIBNL_LIBS) \ + $(top_builddir)/libnm-util/libnm-util.la + + +########################################### +# NetworkManager +########################################### + sbin_PROGRAMS = NetworkManager NetworkManager_SOURCES = \ diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index e73243f18b..b9066112ac 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -9,21 +9,18 @@ INCLUDES = \ noinst_PROGRAMS = test-dhcp-options test_dhcp_options_SOURCES = \ - test-dhcp-options.c \ - ../nm-ip4-config.c \ - ../nm-dbus-manager.c + test-dhcp-options.c test_dhcp_options_CPPFLAGS = \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBNL_CFLAGS) + $(DBUS_CFLAGS) test_dhcp_options_LDADD = \ $(GTHREAD_LIBS) \ $(DBUS_LIBS) \ - $(LIBNL_LIBS) \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/src/dhcp-manager/libdhcp-manager.la + $(top_builddir)/src/dhcp-manager/libdhcp-manager.la \ + $(top_builddir)/src/libtest-dhcp.la if WITH_TESTS From 5405a26b407126eae31c0f21569ea35e44346741 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 3 Feb 2009 06:09:23 -0500 Subject: [PATCH 33/45] libnm-glib: use correct D-Bus interface for getting ActiveConnections (bgo #569933) --- libnm-glib/nm-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index e52d6317bb..07f77cedde 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -806,7 +806,7 @@ nm_client_get_active_connections (NMClient *client) return NULL; if (!_nm_object_get_property (NM_OBJECT (client), - "org.freedesktop.DBus.Properties", + "org.freedesktop.NetworkManager", "ActiveConnections", &value)) { return NULL; From 5f7cbe5ee9444734ac4267787571472ace994904 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 3 Feb 2009 06:14:49 -0500 Subject: [PATCH 34/45] libnm-glib: use correct D-Bus interface for getting devices (bgo #570031) --- libnm-glib/nm-active-connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c index 5df33deb6b..df8bb98271 100644 --- a/libnm-glib/nm-active-connection.c +++ b/libnm-glib/nm-active-connection.c @@ -222,7 +222,7 @@ nm_active_connection_get_devices (NMActiveConnection *connection) return handle_ptr_array_return (priv->devices); if (!_nm_object_get_property (NM_OBJECT (connection), - NM_DBUS_INTERFACE, + NM_DBUS_INTERFACE_ACTIVE_CONNECTION, DBUS_PROP_DEVICES, &value)) { return NULL; From 65c4eff1859d483dc7c064b9d2c369b4daa9eac0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 3 Feb 2009 06:24:15 -0500 Subject: [PATCH 35/45] introspection: add missing NMDeviceType enum (bgo #569934) --- introspection/nm-device.xml | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 8671cd3598..376c0ebb3c 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -47,11 +47,9 @@ Whether or not this device is managed by NetworkManager. - - - + + The general type of the network device; ie Ethernet, WiFi, etc. @@ -127,6 +125,34 @@ + + + + The device type is unknown. + + + + + The device is wired Ethernet device. + + + + + The device is an 802.11 WiFi device. + + + + + The device is a GSM-based cellular WAN device. + + + + + The device is a CDMA/IS-95-based cellular WAN device. + + + + Null capability. From 196c2055c725a0c298a854d0541dd4c2706ffa33 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 3 Feb 2009 06:27:33 -0500 Subject: [PATCH 36/45] introspection: add missing "Vpn" property on ActiveConnection interface (bgo #570030) --- introspection/nm-active-connection.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml index d938854ffc..ff55f63885 100644 --- a/introspection/nm-active-connection.xml +++ b/introspection/nm-active-connection.xml @@ -20,6 +20,9 @@ Whether this active connection is the default connection, i.e. whether it currently owns the default route. + + Whether this active connection is also a VPN connection. + From c2f228e7b721bd051489b66c02380a63e8e388f4 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 4 Feb 2009 09:07:58 -0500 Subject: [PATCH 37/45] nm-tool: add carrier property to wired devices; remove "supported" "supported" was always yes anyway. --- test/nm-tool.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/test/nm-tool.c b/test/nm-tool.c index 2819655644..c8ce91835a 100644 --- a/test/nm-tool.c +++ b/test/nm-tool.c @@ -266,10 +266,6 @@ detail_device (gpointer data, gpointer user_data) /* Capabilities */ caps = nm_device_get_capabilities (device); printf ("\n Capabilities:\n"); - if (caps & NM_DEVICE_CAP_NM_SUPPORTED) - print_string (" Supported", "yes"); - else - print_string (" Supported", "no"); if (caps & NM_DEVICE_CAP_CARRIER_DETECT) print_string (" Carrier Detect", "yes"); @@ -298,7 +294,7 @@ detail_device (gpointer data, gpointer user_data) const char *active_bssid = NULL; const GPtrArray *aps; - printf ("\n Wireless Settings\n"); + printf ("\n Wireless Properties\n"); wcaps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (device)); @@ -320,14 +316,12 @@ detail_device (gpointer data, gpointer user_data) if (aps && aps->len) g_ptr_array_foreach ((GPtrArray *) aps, detail_access_point, (gpointer) active_bssid); } else if (NM_IS_DEVICE_ETHERNET (device)) { - printf ("\n Wired Settings\n"); - /* FIXME */ -#if 0 - if (link_active) - print_string (" Hardware Link", "yes"); + printf ("\n Wired Properties\n"); + + if (nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (device))) + print_string (" Carrier", "on"); else - print_string (" Hardware Link", "no"); -#endif + print_string (" Carrier", "off"); } /* IP Setup info */ From 47f4d9945e6c2d9df174ad4e6ffbe46852b3d1a3 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 4 Feb 2009 11:28:27 -0500 Subject: [PATCH 38/45] ifcfg-rh: silence message about ignoring loopback config (rh #484060) --- .../plugins/ifcfg-rh/nm-ifcfg-connection.c | 5 ++-- .../plugins/ifcfg-rh/nm-ifcfg-connection.h | 3 ++- system-settings/plugins/ifcfg-rh/plugin.c | 25 ++++++++++++------- system-settings/plugins/ifcfg-rh/reader.c | 4 ++- system-settings/plugins/ifcfg-rh/reader.h | 3 ++- 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c index 14468b02ff..3589cffd63 100644 --- a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c @@ -242,7 +242,8 @@ NMIfcfgConnection * nm_ifcfg_connection_new (const char *filename, DBusGConnection *g_connection, NMSystemConfigHalManager *hal_mgr, - GError **error) + GError **error, + gboolean *ignore_error) { GObject *object; NMIfcfgConnectionPrivate *priv; @@ -254,7 +255,7 @@ nm_ifcfg_connection_new (const char *filename, g_return_val_if_fail (filename != NULL, NULL); - wrapped = connection_from_file (filename, &unmanaged, &keyfile, error); + wrapped = connection_from_file (filename, &unmanaged, &keyfile, error, ignore_error); if (!wrapped) return NULL; diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h index 84ee4d2e5b..9a6e7c5e5d 100644 --- a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h +++ b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h @@ -50,7 +50,8 @@ GType nm_ifcfg_connection_get_type (void); NMIfcfgConnection *nm_ifcfg_connection_new (const char *filename, DBusGConnection *g_connection, NMSystemConfigHalManager *hal_mgr, - GError **error); + GError **error, + gboolean *ignore_error); const char *nm_ifcfg_connection_get_filename (NMIfcfgConnection *self); diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c index 6efd673a72..e4f5bcfd7c 100644 --- a/system-settings/plugins/ifcfg-rh/plugin.c +++ b/system-settings/plugins/ifcfg-rh/plugin.c @@ -160,10 +160,11 @@ read_one_connection (SCPluginIfcfg *plugin, const char *filename) SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin); NMIfcfgConnection *connection; GError *error = NULL; + gboolean ignore_error = FALSE; PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "parsing %s ... ", filename); - connection = nm_ifcfg_connection_new (filename, priv->g_connection, priv->hal_mgr, &error); + connection = nm_ifcfg_connection_new (filename, priv->g_connection, priv->hal_mgr, &error, &ignore_error); if (connection) { NMConnection *wrapped; NMSettingConnection *s_con; @@ -198,8 +199,10 @@ read_one_connection (SCPluginIfcfg *plugin, const char *filename) g_signal_connect (G_OBJECT (connection), "ifcfg-changed", G_CALLBACK (connection_ifcfg_changed), plugin); } else { - PLUGIN_PRINT (IFCFG_PLUGIN_NAME, " error: %s", - (error && error->message) ? error->message : "(unknown)"); + if (!ignore_error) { + PLUGIN_PRINT (IFCFG_PLUGIN_NAME, " error: %s", + (error && error->message) ? error->message : "(unknown)"); + } g_error_free (error); } @@ -284,7 +287,7 @@ connection_changed_handler (SCPluginIfcfg *plugin, NMIfcfgConnection *tmp; GError *error = NULL; GHashTable *settings; - gboolean new_unmanaged, old_unmanaged; + gboolean new_unmanaged, old_unmanaged, ignore_error = FALSE; g_return_if_fail (plugin != NULL); g_return_if_fail (path != NULL); @@ -294,12 +297,16 @@ connection_changed_handler (SCPluginIfcfg *plugin, PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "updating %s", path); - tmp = (NMIfcfgConnection *) nm_ifcfg_connection_new (path, priv->g_connection, priv->hal_mgr, &error); + tmp = (NMIfcfgConnection *) nm_ifcfg_connection_new (path, priv->g_connection, + priv->hal_mgr, + &error, + &ignore_error); if (!tmp) { - /* couldn't read connection; remove it */ - - PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: %s", - error->message ? error->message : "(unknown)"); + /* errors reading connection; remove it */ + if (!ignore_error) { + PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: %s", + error->message ? error->message : "(unknown)"); + } g_error_free (error); PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "removed %s.", path); diff --git a/system-settings/plugins/ifcfg-rh/reader.c b/system-settings/plugins/ifcfg-rh/reader.c index 0fedcbe5df..ded790bb03 100644 --- a/system-settings/plugins/ifcfg-rh/reader.c +++ b/system-settings/plugins/ifcfg-rh/reader.c @@ -938,7 +938,8 @@ NMConnection * connection_from_file (const char *filename, gboolean *ignored, char **keyfile, - GError **error) + GError **error, + gboolean *ignore_error) { NMConnection *connection = NULL; NMSettingConnection *s_con; @@ -983,6 +984,7 @@ connection_from_file (const char *filename, } if (!strcmp (device, "lo")) { + *ignore_error = TRUE; g_set_error (error, ifcfg_plugin_error_quark (), 0, "Ignoring loopback device config."); g_free (device); diff --git a/system-settings/plugins/ifcfg-rh/reader.h b/system-settings/plugins/ifcfg-rh/reader.h index fa51215afb..11eb6fc83e 100644 --- a/system-settings/plugins/ifcfg-rh/reader.h +++ b/system-settings/plugins/ifcfg-rh/reader.h @@ -27,6 +27,7 @@ NMConnection *connection_from_file (const char *filename, gboolean *ignored, char **keyfile, - GError **error); + GError **error, + gboolean *ignore_error); #endif /* __READER_H__ */ From 345fd870fa8bc1c0ecd5698e57ed74888a3f2a20 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 4 Feb 2009 15:27:48 -0500 Subject: [PATCH 39/45] nm-tool: show minimal VPN information (bgo #569562) --- test/nm-tool.c | 317 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 289 insertions(+), 28 deletions(-) diff --git a/test/nm-tool.c b/test/nm-tool.c index c8ce91835a..cc00a1debb 100644 --- a/test/nm-tool.c +++ b/test/nm-tool.c @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2005 Red Hat, Inc. + * (C) Copyright 2005 - 2009 Red Hat, Inc. + * (C) Copyright 2007 Novell, Inc. */ #include @@ -38,6 +39,13 @@ #include #include #include +#include +#include + +#include "nm-dbus-glib-types.h" + +static GHashTable *user_connections = NULL; +static GHashTable *system_connections = NULL; static gboolean get_nm_state (NMClient *client) @@ -77,6 +85,26 @@ get_nm_state (NMClient *client) return success; } +static void +print_header (const char *label, const char *iface, const char *connection) +{ + GString *string; + + string = g_string_sized_new (79); + g_string_append_printf (string, "- %s: ", label); + if (iface) + g_string_append_printf (string, "%s ", iface); + if (connection) + g_string_append_printf (string, " [%s] ", connection); + + while (string->len < 80) + g_string_append_c (string, '-'); + + printf ("%s\n", string->str); + + g_string_free (string, TRUE); +} + static void print_string (const char *label, const char *data) { @@ -122,12 +150,12 @@ detail_access_point (gpointer data, gpointer user_data) str = g_string_new (NULL); g_string_append_printf (str, - "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d", - (nm_access_point_get_mode (ap) == NM_802_11_MODE_INFRA) ? "Infra" : "Ad-Hoc", - nm_access_point_get_hw_address (ap), - nm_access_point_get_frequency (ap), - nm_access_point_get_max_bitrate (ap) / 1000, - nm_access_point_get_strength (ap)); + "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d", + (nm_access_point_get_mode (ap) == NM_802_11_MODE_INFRA) ? "Infra" : "Ad-Hoc", + nm_access_point_get_hw_address (ap), + nm_access_point_get_frequency (ap), + nm_access_point_get_max_bitrate (ap) / 1000, + nm_access_point_get_strength (ap)); if ( !(flags & NM_802_11_AP_FLAGS_PRIVACY) && (wpa_flags != NM_802_11_AP_SEC_NONE) @@ -200,24 +228,75 @@ get_dev_state_string (NMDeviceState state) return "unknown"; } +static NMConnection * +get_connection_for_active (NMActiveConnection *active) +{ + NMConnectionScope scope; + const char *path; + + g_return_val_if_fail (active != NULL, NULL); + + path = nm_active_connection_get_connection (active); + g_return_val_if_fail (path != NULL, NULL); + + scope = nm_active_connection_get_scope (active); + if (scope == NM_CONNECTION_SCOPE_USER) + return (NMConnection *) g_hash_table_lookup (user_connections, path); + else if (scope == NM_CONNECTION_SCOPE_SYSTEM) + return (NMConnection *) g_hash_table_lookup (system_connections, path); + + g_warning ("error: unknown connection scope"); + return NULL; +} + +struct cb_info { + NMClient *client; + const GPtrArray *active; +}; + static void detail_device (gpointer data, gpointer user_data) { NMDevice *device = NM_DEVICE (data); - NMClient *client = NM_CLIENT (user_data); + struct cb_info *info = user_data; char *tmp; NMDeviceState state; guint32 caps; guint32 speed; const GArray *array; - const GPtrArray *connections; int j; gboolean is_default = FALSE; + const char *id = NULL; state = nm_device_get_state (device); - printf ("- Device: %s ----------------------------------------------------------------\n", - nm_device_get_iface (device)); + for (j = 0; info->active && (j < info->active->len); j++) { + NMActiveConnection *candidate = g_ptr_array_index (info->active, j); + const GPtrArray *devices = nm_active_connection_get_devices (candidate); + NMDevice *candidate_dev; + NMConnection *connection; + NMSettingConnection *s_con; + + if (!devices || !devices->len) + continue; + candidate_dev = g_ptr_array_index (devices, 0); + + if (candidate_dev == device) { + if (nm_active_connection_get_default (candidate)) + is_default = TRUE; + + connection = get_connection_for_active (candidate); + if (!connection) + break; + + s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); + if (s_con) + id = nm_setting_connection_get_id (s_con); + break; + } + } + + print_header ("Device", nm_device_get_iface (device), id); /* General information */ if (NM_IS_DEVICE_ETHERNET (device)) @@ -233,20 +312,6 @@ detail_device (gpointer data, gpointer user_data) print_string ("State", get_dev_state_string (state)); - connections = nm_client_get_active_connections (client); - for (j = 0; connections && (j < connections->len); j++) { - NMActiveConnection *candidate = g_ptr_array_index (connections, j); - const GPtrArray *devices = nm_active_connection_get_devices (candidate); - NMDevice *candidate_dev; - - if (!devices || !devices->len) - continue; - candidate_dev = g_ptr_array_index (devices, 0); - - if ((candidate_dev == device) && nm_active_connection_get_default(candidate)) - is_default = TRUE; - } - if (is_default) print_string ("Default", "yes"); else @@ -310,7 +375,7 @@ detail_device (gpointer data, gpointer user_data) active_bssid = active_ap ? nm_access_point_get_hw_address (active_ap) : NULL; } - printf ("\n Wireless Access Points%s\n", active_ap ? "(* = Current AP)" : ""); + printf ("\n Wireless Access Points %s\n", active_ap ? "(* = current AP)" : ""); aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device)); if (aps && aps->len) @@ -367,12 +432,195 @@ detail_device (gpointer data, gpointer user_data) printf ("\n\n"); } +static const char * +get_vpn_state_string (NMVPNConnectionState state) +{ + switch (state) { + case NM_VPN_CONNECTION_STATE_PREPARE: + return "connecting (prepare)"; + case NM_VPN_CONNECTION_STATE_NEED_AUTH: + return "connecting (need authentication)"; + case NM_VPN_CONNECTION_STATE_CONNECT: + return "connecting"; + case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: + return "connecting (getting IP configuration)"; + case NM_VPN_CONNECTION_STATE_ACTIVATED: + return "connected"; + case NM_VPN_CONNECTION_STATE_FAILED: + return "connection failed"; + case NM_VPN_CONNECTION_STATE_DISCONNECTED: + return "disconnected"; + default: + break; + } + + return "unknown"; +} + +static void +detail_vpn (gpointer data, gpointer user_data) +{ + NMActiveConnection *active = NM_ACTIVE_CONNECTION (data); + NMConnection *connection; + NMSettingConnection *s_con; + NMVPNConnectionState state; + const char *banner; + + if (!NM_IS_VPN_CONNECTION (active)) + return; + + connection = get_connection_for_active (active); + g_return_if_fail (connection != NULL); + + s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); + g_return_if_fail (connection != NULL); + + print_header ("VPN", NULL, nm_setting_connection_get_id (s_con)); + + state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (active)); + print_string ("State", get_vpn_state_string (state)); + + if (nm_active_connection_get_default (active)) + print_string ("Default", "yes"); + else + print_string ("Default", "no"); + + banner = nm_vpn_connection_get_banner (NM_VPN_CONNECTION (active)); + if (banner) { + char **lines, **iter; + + printf ("\n Message:\n"); + lines = g_strsplit_set (banner, "\n\r", -1); + for (iter = lines; *iter; iter++) { + if (*iter && strlen (*iter)) + printf (" %s\n", *iter); + } + g_strfreev (lines); + } + + printf ("\n\n"); +} + +static void +get_one_connection (DBusGConnection *bus, + const char *path, + NMConnectionScope scope, + GHashTable *table) +{ + DBusGProxy *proxy; + NMConnection *connection; + const char *service; + GError *error = NULL; + GHashTable *settings = NULL; + + g_return_if_fail (bus != NULL); + g_return_if_fail (path != NULL); + g_return_if_fail (table != NULL); + + service = (scope == NM_CONNECTION_SCOPE_SYSTEM) ? + NM_DBUS_SERVICE_SYSTEM_SETTINGS : NM_DBUS_SERVICE_USER_SETTINGS; + + proxy = dbus_g_proxy_new_for_name (bus, service, path, NM_DBUS_IFACE_SETTINGS_CONNECTION); + if (!proxy) + return; + + if (!dbus_g_proxy_call (proxy, "GetSettings", &error, + G_TYPE_INVALID, + DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, &settings, + G_TYPE_INVALID)) { + nm_warning ("error: cannot retrieve connection: %s", error ? error->message : "(unknown)"); + goto out; + } + + connection = nm_connection_new_from_hash (settings, &error); + g_hash_table_destroy (settings); + + if (!connection) { + nm_warning ("error: invalid connection: '%s' / '%s' invalid: %d", + error ? g_type_name (nm_connection_lookup_setting_type_by_quark (error->domain)) : "(unknown)", + error ? error->message : "(unknown)", + error ? error->code : -1); + goto out; + } + + nm_connection_set_scope (connection, scope); + nm_connection_set_path (connection, path); + g_hash_table_insert (table, g_strdup (path), g_object_ref (connection)); + +out: + g_clear_error (&error); + g_object_unref (connection); + g_object_unref (proxy); +} + +static void +get_connections_for_service (DBusGConnection *bus, + NMConnectionScope scope, + GHashTable *table) +{ + GError *error = NULL; + DBusGProxy *proxy; + GPtrArray *paths = NULL; + int i; + const char *service; + + service = (scope == NM_CONNECTION_SCOPE_SYSTEM) ? + NM_DBUS_SERVICE_SYSTEM_SETTINGS : NM_DBUS_SERVICE_USER_SETTINGS; + + proxy = dbus_g_proxy_new_for_name (bus, + service, + NM_DBUS_PATH_SETTINGS, + NM_DBUS_IFACE_SETTINGS); + if (!proxy) { + g_warning ("error: failed to create DBus proxy for %s", service); + return; + } + + if (!dbus_g_proxy_call (proxy, "ListConnections", &error, + G_TYPE_INVALID, + DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, &paths, + G_TYPE_INVALID)) { + g_warning ("error: failed to read connections from %s:\n %s", + service, error ? error->message : "(unknown)"); + g_clear_error (&error); + goto out; + } + + for (i = 0; paths && (i < paths->len); i++) + get_one_connection (bus, g_ptr_array_index (paths, i), scope, table); + +out: + g_object_unref (proxy); +} + +static gboolean +get_all_connections (void) +{ + DBusGConnection *bus; + GError *error = NULL; + + bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); + if (error || !bus) { + g_warning ("error: could not connect to dbus"); + return FALSE; + } + + user_connections = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); + get_connections_for_service (bus, NM_CONNECTION_SCOPE_USER, user_connections); + + system_connections = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); + get_connections_for_service (bus, NM_CONNECTION_SCOPE_SYSTEM, system_connections); + + dbus_g_connection_unref (bus); + return TRUE; +} int main (int argc, char *argv[]) { NMClient *client; const GPtrArray *devices; + struct cb_info info; g_type_init (); @@ -384,14 +632,27 @@ main (int argc, char *argv[]) printf ("\nNetworkManager Tool\n\n"); if (!get_nm_state (client)) { - fprintf (stderr, "\n\nNetworkManager appears not to be running (could not get its state).\n"); + g_warning ("error: could not connect to NetworkManager"); exit (1); } + if (!get_all_connections ()) + exit (1); + + info.client = client; + info.active = nm_client_get_active_connections (client); + + devices = nm_client_get_devices (client); - g_ptr_array_foreach ((GPtrArray *) devices, detail_device, client); + if (devices) + g_ptr_array_foreach ((GPtrArray *) devices, detail_device, &info); + + if (info.active) + g_ptr_array_foreach ((GPtrArray *) info.active, detail_vpn, &info); g_object_unref (client); + g_hash_table_unref (user_connections); + g_hash_table_unref (system_connections); return 0; } From 6f5560f9b775d6f595a2e02e6043b87aeaafb1a4 Mon Sep 17 00:00:00 2001 From: Henrique P Machado Date: Wed, 4 Feb 2009 15:52:15 -0500 Subject: [PATCH 40/45] po: update pt_BR translation --- po/pt_BR.po | 193 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 118 insertions(+), 75 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 1c48c1c90a..33e0a1eea3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10,54 +10,48 @@ msgid "" msgstr "" "Project-Id-Version: NetworkManager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-22 21:13-0400\n" -"PO-Revision-Date: 2008-10-04 23:43-0300\n" -"Last-Translator: Fabrício Godoy \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n" +"POT-Creation-Date: 2008-11-13 21:19+0000\n" +"PO-Revision-Date: 2008-12-04 17:34-0300\n" +"Last-Translator: Henrique P Machado \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/nm-netlink-monitor.c:193 ../src/nm-netlink-monitor.c:474 +#: ../src/nm-netlink-monitor.c:195 +#: ../src/nm-netlink-monitor.c:476 #, c-format msgid "error processing netlink message: %s" msgstr "erro ao processar mensagem do netlink: %s" -#: ../src/nm-netlink-monitor.c:250 +#: ../src/nm-netlink-monitor.c:252 #, c-format msgid "unable to allocate netlink handle for monitoring link status: %s" -msgstr "" -"não foi possível alocar o manipulador do netlink para monitoração de status " -"do link: %s" +msgstr "não foi possível alocar o manipulador do netlink para monitoração de status do link: %s" -#: ../src/nm-netlink-monitor.c:260 +#: ../src/nm-netlink-monitor.c:262 #, c-format msgid "unable to connect to netlink for monitoring link status: %s" -msgstr "" -"não foi possível conectar ao netlink para monitoração de status do link: %s" +msgstr "não foi possível conectar ao netlink para monitoração de status do link: %s" -#: ../src/nm-netlink-monitor.c:268 +#: ../src/nm-netlink-monitor.c:270 #, c-format msgid "unable to join netlink group for monitoring link status: %s" -msgstr "" -"não foi possível associar-se ao grupo do netlink para monitoração de status " -"do link: %s" +msgstr "não foi possível associar-se ao grupo do netlink para monitoração de status do link: %s" -#: ../src/nm-netlink-monitor.c:276 +#: ../src/nm-netlink-monitor.c:278 #, c-format msgid "unable to allocate netlink link cache for monitoring link status: %s" -msgstr "" -"não foi possível alocar o cache de link do netlink para monitoração de " -"status do link: %s" +msgstr "não foi possível alocar o cache de link do netlink para monitoração de status do link: %s" -#: ../src/nm-netlink-monitor.c:439 +#: ../src/nm-netlink-monitor.c:441 #, c-format msgid "error updating link cache: %s" msgstr "erro ao atualizar o cache de link: %s" -#: ../src/nm-netlink-monitor.c:497 +#: ../src/nm-netlink-monitor.c:499 #, c-format msgid "error occurred while waiting for data on socket" msgstr "ocorreu um erro ao esperar pelos dados da conexão" @@ -65,14 +59,13 @@ msgstr "ocorreu um erro ao esperar pelos dados da conexão" #: ../src/NetworkManager.c:252 #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" -msgstr "" -"Opção inválida. Por favor, use --help para ver uma lista de opções válidas.\n" +msgstr "Opção inválida. Por favor, use --help para ver uma lista de opções válidas.\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient.c:89 +#: ../src/dhcp-manager/nm-dhcp-dhclient.c:88 msgid "# Created by NetworkManager\n" msgstr "# Criado pelo NetworkManager\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient.c:95 +#: ../src/dhcp-manager/nm-dhcp-dhclient.c:94 #, c-format msgid "" "# Merged from %s\n" @@ -83,126 +76,135 @@ msgstr "" #: ../src/named-manager/nm-named-manager.c:256 msgid "NOTE: the libc resolver may not support more than 3 nameservers." -msgstr "" -"NOTA: o resolvedor da libc não tem suporte a mais do que 3 servidores de " -"nomes." +msgstr "NOTA: o resolvedor da libc não tem suporte a mais do que 3 servidores de nomes." #: ../src/named-manager/nm-named-manager.c:258 msgid "The nameservers listed below may not be recognized." msgstr "Os servidores de nomes listados abaixo podem não ser reconhecidos." -#: ../system-settings/src/main.c:366 +#: ../system-settings/src/main.c:376 #, c-format msgid "Auto %s" msgstr "Auto %s" -#: ../libnm-util/crypto.c:125 +#: ../libnm-util/crypto.c:120 #, c-format msgid "PEM key file had no end tag '%s'." msgstr "A chave do arquivo PEM não tinha a marca de finalização \"%s\"." -#: ../libnm-util/crypto.c:135 +#: ../libnm-util/crypto.c:130 #, c-format msgid "Doesn't look like a PEM private key file." msgstr "Não se parece com um arquivo de chave privada PEM." -#: ../libnm-util/crypto.c:143 +#: ../libnm-util/crypto.c:138 #, c-format msgid "Not enough memory to store PEM file data." msgstr "Memória insuficiente para armazenar os dados do arquivo PEM." -#: ../libnm-util/crypto.c:159 +#: ../libnm-util/crypto.c:154 #, c-format msgid "Malformed PEM file: Proc-Type was not first tag." msgstr "Arquivo PEM defeituoso: Proc-Type não era a primeira marca." -#: ../libnm-util/crypto.c:167 +#: ../libnm-util/crypto.c:162 #, c-format msgid "Malformed PEM file: unknown Proc-Type tag '%s'." msgstr "Arquivo PEM defeituoso: marca Proc-Type desconhecida: \"%s\"." -#: ../libnm-util/crypto.c:177 +#: ../libnm-util/crypto.c:172 #, c-format msgid "Malformed PEM file: DEK-Info was not the second tag." msgstr "Arquivo PEM defeituoso: DEK-Info não era a segunda marca." -#: ../libnm-util/crypto.c:188 +#: ../libnm-util/crypto.c:183 #, c-format msgid "Malformed PEM file: no IV found in DEK-Info tag." msgstr "Arquivo PEM defeituoso: nenhum IV localizado na marca DEK-Info." -#: ../libnm-util/crypto.c:195 +#: ../libnm-util/crypto.c:190 #, c-format msgid "Malformed PEM file: invalid format of IV in DEK-Info tag." msgstr "Arquivo PEM defeituoso: formato inválido do IV na marca DEK-Info." -#: ../libnm-util/crypto.c:208 +#: ../libnm-util/crypto.c:203 #, c-format msgid "Malformed PEM file: unknown private key cipher '%s'." msgstr "Arquivo PEM defeituoso: cifra de chave privada desconhecida \"%s\"." -#: ../libnm-util/crypto.c:227 +#: ../libnm-util/crypto.c:222 #, c-format msgid "Could not decode private key." msgstr "Não foi possível decodificar chave privada." -#: ../libnm-util/crypto.c:271 +#: ../libnm-util/crypto.c:267 #, c-format msgid "PEM certificate '%s' had no end tag '%s'." msgstr "Certificado PEM \"%s\" não tinha a marca de finalização \"%s\"." -#: ../libnm-util/crypto.c:281 +#: ../libnm-util/crypto.c:277 #, c-format msgid "Failed to decode certificate." msgstr "Falha ao decodificar o certificado." -#: ../libnm-util/crypto.c:290 ../libnm-util/crypto.c:298 +#: ../libnm-util/crypto.c:286 #, c-format msgid "Not enough memory to store certificate data." msgstr "Memória insuficiente para armazenar os dados do certificado." -#: ../libnm-util/crypto.c:328 +#: ../libnm-util/crypto.c:294 +#, c-format +msgid "Not enough memory to store file data." +msgstr "Memória insuficiente para armazenar dados no arquivo." + +#: ../libnm-util/crypto.c:324 #, c-format msgid "IV must be an even number of bytes in length." msgstr "O tamanho do IV deve ser um número par de bytes." -#: ../libnm-util/crypto.c:337 +#: ../libnm-util/crypto.c:333 #, c-format msgid "Not enough memory to store the IV." msgstr "Memória insuficiente para armazenar o IV." -#: ../libnm-util/crypto.c:348 +#: ../libnm-util/crypto.c:344 #, c-format msgid "IV contains non-hexadecimal digits." msgstr "IV contém dígitos não-hexadecimais." -#: ../libnm-util/crypto.c:386 ../libnm-util/crypto_gnutls.c:143 -#: ../libnm-util/crypto_nss.c:157 +#: ../libnm-util/crypto.c:382 +#: ../libnm-util/crypto_gnutls.c:143 +#: ../libnm-util/crypto_nss.c:169 #, c-format msgid "Private key cipher '%s' was unknown." -msgstr "Cifra da chave privada \"%s\" não foi reconhecida." +msgstr "A cifra da chave privada \"%s\" era desconhecida." -#: ../libnm-util/crypto.c:395 +#: ../libnm-util/crypto.c:391 #, c-format msgid "Not enough memory to decrypt private key." msgstr "Memória insuficiente para descriptografar a chave privada." -#: ../libnm-util/crypto.c:513 +#: ../libnm-util/crypto.c:511 +#, c-format +msgid "Unable to determine private key type." +msgstr "Não foi possível determinar o tipo da chave privada." + +#: ../libnm-util/crypto.c:530 #, c-format msgid "Not enough memory to store decrypted private key." -msgstr "" -"Memória insuficiente para armazenar a chave privada de descriptografia." +msgstr "Memória insuficiente para armazenar a chave privada de descriptografia." -#: ../libnm-util/crypto_gnutls.c:45 +#: ../libnm-util/crypto_gnutls.c:46 msgid "Failed to initialize the crypto engine." -msgstr "Falha ao iniciar o motor de criptografia." +msgstr "Falha ao inicializar o motor de criptografia." -#: ../libnm-util/crypto_gnutls.c:89 +#: ../libnm-util/crypto_gnutls.c:90 #, c-format msgid "Failed to initialize the MD5 engine: %s / %s." -msgstr "Falha ao iniciar o motor MD5: %s / %s." +msgstr "Falha ao inicializar o motor MD5: %s / %s." -#: ../libnm-util/crypto_gnutls.c:152 ../libnm-util/crypto_nss.c:166 +#: ../libnm-util/crypto_gnutls.c:152 +#: ../libnm-util/crypto_nss.c:178 #, c-format msgid "Not enough memory for decrypted key buffer." msgstr "Memória insuficiente para o buffer da chave descriptografada." @@ -210,7 +212,7 @@ msgstr "Memória insuficiente para o buffer da chave descriptografada." #: ../libnm-util/crypto_gnutls.c:160 #, c-format msgid "Failed to initialize the decryption cipher context: %s / %s." -msgstr "Falha ao iniciar o contexto da cifra de descriptografia: %s / %s." +msgstr "Falha ao inicializar o contexto da cifra de descriptografia: %s / %s." #: ../libnm-util/crypto_gnutls.c:169 #, c-format @@ -227,60 +229,101 @@ msgstr "Falha ao definir IV para descriptografia: %s / %s." msgid "Failed to decrypt the private key: %s / %s." msgstr "Falha ao descriptografar a chave privada: %s / %s." -#: ../libnm-util/crypto_gnutls.c:225 +#: ../libnm-util/crypto_gnutls.c:200 +#, c-format +msgid "Failed to decrypt the private key." +msgstr "Falha ao descriptografar a chave privada." + +#: ../libnm-util/crypto_gnutls.c:235 #, c-format msgid "Error initializing certificate data: %s" -msgstr "Erro ao iniciar os dados do certificado: %s" +msgstr "Erro ao inicializar os dados do certificado: %s" -#: ../libnm-util/crypto_gnutls.c:237 +#: ../libnm-util/crypto_gnutls.c:257 #, c-format msgid "Couldn't decode certificate: %s" msgstr "Não foi possível decodificar o certificado: %s" -#: ../libnm-util/crypto_nss.c:52 +#: ../libnm-util/crypto_gnutls.c:281 +#, c-format +msgid "Couldn't initialize PKCS#12 decoder: %s" +msgstr "Não foi possível inicializar o decodificador PKCS#12: %s" + +#: ../libnm-util/crypto_gnutls.c:294 +#, c-format +msgid "Couldn't decode PKCS#12 file: %s" +msgstr "Não foi possível decodificar o arquivo PKCS#12: %s" + +#: ../libnm-util/crypto_gnutls.c:306 +#, c-format +msgid "Couldn't verify PKCS#12 file: %s" +msgstr "Não foi possível verificar o arquivo PKCS#12: %s" + +#: ../libnm-util/crypto_nss.c:57 #, c-format msgid "Failed to initialize the crypto engine: %d." -msgstr "Falha ao iniciar o motor de criptografia: %d." +msgstr "Falha ao inicializar o motor de criptografia: %d." -#: ../libnm-util/crypto_nss.c:98 +#: ../libnm-util/crypto_nss.c:111 #, c-format msgid "Failed to initialize the MD5 context: %d." -msgstr "Falha ao iniciar o contexto MD5: %d." +msgstr "Falha ao inicializar o contexto MD5: %d." -#: ../libnm-util/crypto_nss.c:174 +#: ../libnm-util/crypto_nss.c:186 #, c-format msgid "Failed to initialize the decryption cipher slot." -msgstr "Falha ao iniciar o espaço de cifra de descriptografia." +msgstr "Falha ao inicializar o espaço de cifra de descriptografia." -#: ../libnm-util/crypto_nss.c:184 +#: ../libnm-util/crypto_nss.c:196 #, c-format msgid "Failed to set symmetric key for decryption." msgstr "Falha ao definir chave simétrica para descriptografia." -#: ../libnm-util/crypto_nss.c:194 +#: ../libnm-util/crypto_nss.c:206 #, c-format msgid "Failed to set IV for decryption." msgstr "Falha ao definir IV para descriptografia." -#: ../libnm-util/crypto_nss.c:202 +#: ../libnm-util/crypto_nss.c:214 #, c-format msgid "Failed to initialize the decryption context." -msgstr "Falha ao iniciar o contexto de descriptografia." +msgstr "Falha ao inicializar o contexto de descriptografia." -#: ../libnm-util/crypto_nss.c:215 +#: ../libnm-util/crypto_nss.c:227 #, c-format msgid "Failed to decrypt the private key: %d." msgstr "Falha ao descriptografar a chave privada: %d." -#: ../libnm-util/crypto_nss.c:227 +#: ../libnm-util/crypto_nss.c:239 #, c-format msgid "Failed to finalize decryption of the private key: %d." msgstr "Falha ao finalizar a descriptografia da chave privada: %d." -#: ../libnm-util/crypto_nss.c:271 +#: ../libnm-util/crypto_nss.c:284 #, c-format msgid "Couldn't decode certificate: %d" msgstr "Não foi possível decodificar o certificado: %d" +#: ../libnm-util/crypto_nss.c:317 +#, c-format +msgid "Couldn't convert password to UCS2: %d" +msgstr "Não foi possível converter senha para o formato UCS2: %d" + +#: ../libnm-util/crypto_nss.c:345 +#, c-format +msgid "Couldn't initialize PKCS#12 decoder: %d" +msgstr "Não foi possível inicializar o decodificador PKCS#12: %d" + +#: ../libnm-util/crypto_nss.c:354 +#, c-format +msgid "Couldn't decode PKCS#12 file: %d" +msgstr "Não foi possível decodificar o arquivo PKCS#12: %d" + +#: ../libnm-util/crypto_nss.c:363 +#, c-format +msgid "Couldn't verify PKCS#12 file: %d" +msgstr "Não foi possível verificar o arquivo PKCS#12: %d" + #~ msgid "Not enough memory to create private key decryption key." #~ msgstr "Memória insuficiente para descriptografar a chave privada." + From 7c3063faea6f162fa3725abf98085bf8567219bd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 5 Feb 2009 06:05:10 -0500 Subject: [PATCH 41/45] ppp: don't require separate bus name for pppd plugin communication Not actually needed, and actually makes securing the daemon harder from a D-Bus perspective, since both bus names resolve to the same unique name anyway, and the unique name is what actually gets matched on inside dbus. Suggestion from Colin Walters. --- src/NetworkManager.conf | 10 ++++----- src/ppp-manager/nm-ppp-manager.c | 35 +++----------------------------- src/ppp-manager/nm-pppd-plugin.c | 6 ++---- src/ppp-manager/nm-pppd-plugin.h | 1 - 4 files changed, 9 insertions(+), 43 deletions(-) diff --git a/src/NetworkManager.conf b/src/NetworkManager.conf index 01dfee2590..5f804f9958 100644 --- a/src/NetworkManager.conf +++ b/src/NetworkManager.conf @@ -7,9 +7,8 @@ - - - + + send_interface="org.freedesktop.NetworkManager.PPP"/> @@ -20,9 +19,8 @@ - - - + + send_interface="org.freedesktop.NetworkManager.PPP"/> 512 diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index e2f58f5094..73fd1ed880 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -136,12 +136,11 @@ constructor (GType type, GObject *object; NMPPPManagerPrivate *priv; DBusGConnection *connection; - static gboolean name_requested = FALSE; static guint32 counter = 0; object = G_OBJECT_CLASS (nm_ppp_manager_parent_class)->constructor (type, - n_construct_params, - construct_params); + n_construct_params, + construct_params); if (!object) return NULL; @@ -151,36 +150,8 @@ constructor (GType type, g_object_unref (object); return NULL; } + connection = nm_dbus_manager_get_connection (priv->dbus_manager); - - /* Only need to request bus name the first time */ - if (!name_requested) { - DBusGProxy *proxy; - gboolean success; - guint request_name_result; - GError *err = NULL; - - proxy = dbus_g_proxy_new_for_name (connection, - "org.freedesktop.DBus", - "/org/freedesktop/DBus", - "org.freedesktop.DBus"); - success = dbus_g_proxy_call (proxy, "RequestName", &err, - G_TYPE_STRING, NM_DBUS_SERVICE_PPP, - G_TYPE_UINT, 0, - G_TYPE_INVALID, - G_TYPE_UINT, &request_name_result, - G_TYPE_INVALID); - g_object_unref (proxy); - - if (!success) { - nm_warning ("Failed to acquire PPP manager service: %s", err->message); - g_object_unref (object); - return NULL; - } - - name_requested = TRUE; - } - priv->dbus_path = g_strdup_printf (NM_DBUS_PATH "/PPP/%d", counter++); dbus_g_connection_register_g_object (connection, priv->dbus_path, object); diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c index 67d46d580c..34701c3499 100644 --- a/src/ppp-manager/nm-pppd-plugin.c +++ b/src/ppp-manager/nm-pppd-plugin.c @@ -30,6 +30,7 @@ #include #include +#include "NetworkManager.h" #include "nm-pppd-plugin.h" #include "nm-ppp-status.h" #include "nm-dbus-glib-types.h" @@ -319,10 +320,7 @@ plugin_init (void) /* NM passes in the object path of the corresponding PPPManager * object as the 'ipparam' argument to pppd. */ - proxy = dbus_g_proxy_new_for_name (bus, - NM_DBUS_SERVICE_PPP, - ipparam, - NM_DBUS_INTERFACE_PPP); + proxy = dbus_g_proxy_new_for_name (bus, NM_DBUS_SERVICE, ipparam, NM_DBUS_INTERFACE_PPP); dbus_g_connection_unref (bus); diff --git a/src/ppp-manager/nm-pppd-plugin.h b/src/ppp-manager/nm-pppd-plugin.h index b2acd5e5bc..95a2a18291 100644 --- a/src/ppp-manager/nm-pppd-plugin.h +++ b/src/ppp-manager/nm-pppd-plugin.h @@ -19,7 +19,6 @@ * Copyright (C) 2008 Red Hat, Inc. */ -#define NM_DBUS_SERVICE_PPP "org.freedesktop.NetworkManager.PPP" #define NM_DBUS_INTERFACE_PPP "org.freedesktop.NetworkManager.PPP" #define NM_PPP_IP4_CONFIG_INTERFACE "interface" From 675a01ab9a33364d72ec1045c1956719302e255f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 5 Feb 2009 07:15:04 -0500 Subject: [PATCH 42/45] fix dbus conf file broken by 7c3063faea6f162fa3725abf98085bf8567219bd --- src/NetworkManager.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NetworkManager.conf b/src/NetworkManager.conf index 5f804f9958..0d1e0377a6 100644 --- a/src/NetworkManager.conf +++ b/src/NetworkManager.conf @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + From 12f20e29ff78819aa610cbd9d54c464dc6e2794a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 5 Feb 2009 14:29:45 -0500 Subject: [PATCH 43/45] fix --with-tests info message --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index a338983dd7..a235e227c5 100644 --- a/configure.in +++ b/configure.in @@ -480,7 +480,7 @@ GTK_DOC_CHECK(1.0) dnl dnl Tests dnl -AC_ARG_WITH(tests, AC_HELP_STRING([--with-tests], [Build NetworkManager documentation])) +AC_ARG_WITH(tests, AC_HELP_STRING([--with-tests], [Build NetworkManager tests])) AM_CONDITIONAL(WITH_TESTS, test "x$with_tests" = "xyes") case $with_tests in yes) From ce3473dc90ccd8536f3030d67d35a6a7729e2473 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 6 Feb 2009 15:38:09 -0500 Subject: [PATCH 44/45] clear pending activation checks on device removal Found by Drew Moseley --- src/NetworkManagerPolicy.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c index 2de01f897d..6bba92f2b1 100644 --- a/src/NetworkManagerPolicy.c +++ b/src/NetworkManagerPolicy.c @@ -860,19 +860,33 @@ static void device_removed (NMManager *manager, NMDevice *device, gpointer user_data) { NMPolicy *policy = (NMPolicy *) user_data; - GSList *iter = policy->dev_signal_ids; + GSList *iter; + + /* Clear any idle callbacks for this device */ + iter = policy->pending_activation_checks; + while (iter) { + ActivateData *data = (ActivateData *) iter->data; + GSList *next = g_slist_next (iter); + + if (data->device == device) { + g_source_remove (data->id); + g_object_unref (data->device); + g_free (data); + policy->pending_activation_checks = g_slist_delete_link (policy->pending_activation_checks, iter); + } + iter = next; + } /* Clear any signal handlers for this device */ + iter = policy->dev_signal_ids; while (iter) { DeviceSignalID *data = (DeviceSignalID *) iter->data; GSList *next = g_slist_next (iter); if (data->device == device) { - policy->dev_signal_ids = g_slist_remove_link (policy->dev_signal_ids, iter); - g_signal_handler_disconnect (data->device, data->id); g_free (data); - g_slist_free (iter); + policy->dev_signal_ids = g_slist_delete_link (policy->dev_signal_ids, iter); } iter = next; } From a734c836a56f3170202f0555f1a03c9b2835775c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 6 Feb 2009 17:32:56 -0500 Subject: [PATCH 45/45] libnm-util: ignore Privacy for APs broadcasting WPA & RSN IEs (rh #445369) While broadcasting WPA and RSN IEs with the Privacy bit set to 0 is technically illegal, some networks using older Cisco equipment do it (I'm looking at you, Eduroam) and there's no reason not to support it. Since the AP is broadcasting WPA/RSN IEs, assume that means WPA and RSN is supported (duh). --- libnm-util/nm-setting-wireless.c | 3 --- libnm-util/nm-utils.c | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index c3e9010998..0daf859fef 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -233,9 +233,6 @@ nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless, if ( !strcmp (key_mgmt, "wpa-psk") || !strcmp (key_mgmt, "wpa-eap")) { - if (!(ap_flags & NM_802_11_AP_FLAGS_PRIVACY)) - return FALSE; - if (!strcmp (key_mgmt, "wpa-psk")) { if ( !(ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) && !(ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK)) diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index d449e789b3..e8a3027ed0 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -904,9 +904,6 @@ nm_utils_security_valid (NMUtilsSecurityType type, if (!(wifi_caps & NM_WIFI_DEVICE_CAP_WPA)) return FALSE; if (have_ap) { - if (!(ap_flags & NM_802_11_AP_FLAGS_PRIVACY)) - return FALSE; - if (ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) { if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_TKIP) && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) @@ -922,9 +919,6 @@ nm_utils_security_valid (NMUtilsSecurityType type, if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN)) return FALSE; if (have_ap) { - if (!(ap_flags & NM_802_11_AP_FLAGS_PRIVACY)) - return FALSE; - if (ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) { if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP) && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) @@ -942,8 +936,6 @@ nm_utils_security_valid (NMUtilsSecurityType type, if (!(wifi_caps & NM_WIFI_DEVICE_CAP_WPA)) return FALSE; if (have_ap) { - if (!(ap_flags & NM_802_11_AP_FLAGS_PRIVACY)) - return FALSE; if (!(ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) return FALSE; /* Ensure at least one WPA cipher is supported */ @@ -957,8 +949,6 @@ nm_utils_security_valid (NMUtilsSecurityType type, if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN)) return FALSE; if (have_ap) { - if (!(ap_flags & NM_802_11_AP_FLAGS_PRIVACY)) - return FALSE; if (!(ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) return FALSE; /* Ensure at least one WPA cipher is supported */