← Back to branch summary

~cyphermox/ubuntu/vivid/ppp/merge-2.4.6

« back to all changes in this revision

Viewing changes to debian/po/templates.pot

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2014-11-05 05:35:43 UTC
  • mfrom: (2.1.16 sid)
  • Revision ID: mathieu-tl@ubuntu.com-20141105053543-pwkdzpn4zae420uw
* Merge with Debian unstable; remaining changes:
  - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel
    module if needed.
  - add EAP-TLS/MPPE support patch from Jan Just Keijser.
  - debian/control: add libssl-dev to Build-Depends for the EAP-TLS patch.
* debian/patches/ppp-2.4.5-eaptls-mppe-0.994.patch,
  debian/patches/ppp-2.4.6-eaptls-mppe-0.997.patch: updated the EAP-TLS/MPPE
  support patch to the latest version from its upstream (also refreshed it).
* debian/ppp.preinst: deal with the change in LSB headers start runlevels
  of pppd-dns due to dropping our changes (which are no longer necessary
  since resolvconf is installed in most systems and has been for a while);
  this should probably be kept until the next LTS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/po/templates.pot
6
6
#, fuzzy
7
7
msgid ""
8
8
msgstr ""
9
 
"Project-Id-Version: PACKAGE VERSION\n"
10
 
"Report-Msgid-Bugs-To: md@linux.it\n"
11
 
"POT-Creation-Date: 2007-10-24 07:31+0200\n"
 
9
"Project-Id-Version: ppp\n"
 
10
"Report-Msgid-Bugs-To: ppp@packages.debian.org\n"
 
11
"POT-Creation-Date: 2012-09-02 11:02-0400\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
 
15
"Language: \n"
15
16
"MIME-Version: 1.0\n"
16
17
"Content-Type: text/plain; charset=CHARSET\n"
17
18
"Content-Transfer-Encoding: 8bit\n"
54
55
 
55
56
#. Type: string
56
57
#. Description
 
58
#: ../ppp-udeb.templates:4001
 
59
msgid "Interface name:"
 
60
msgstr ""
 
61
 
 
62
#. Type: string
 
63
#. Description
 
64
#: ../ppp-udeb.templates:4001
 
65
msgid ""
 
66
"Please enter the name of the network interface connected to the PPPoE modem."
 
67
msgstr ""
 
68
 
 
69
#. Type: string
 
70
#. Description
57
71
#: ../ppp-udeb.templates:5001
58
72
msgid "ISP account username:"
59
73
msgstr ""