From mboxrd@z Thu Jan 1 00:00:00 1970 From: Larsen To: development@lists.ipfire.org Subject: Fix hardcoded strings in pppsetup.cgi Date: Sat, 30 May 2015 12:46:00 +0200 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2429640907175120819==" List-Id: --===============2429640907175120819== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit I noticed that some strings were hardcoded instead of using "$Lang::tr". Patch against next-branch attached. Lars --===============2429640907175120819== Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="pptp_settings_i18n.patch" MIME-Version: 1.0 IGh0bWwvY2dpLWJpbi9wcHBzZXR1cC5jZ2kgfCA2ICsrKy0tLQogbGFuZ3MvZGUvY2dpLWJpbi9k ZS5wbCAgICB8IDMgKysrCiBsYW5ncy9lbi9jZ2ktYmluL2VuLnBsICAgIHwgMyArKysKIGxhbmdz L2VzL2NnaS1iaW4vZXMucGwgICAgfCAzICsrKwogbGFuZ3MvZnIvY2dpLWJpbi9mci5wbCAgICB8 IDMgKysrCiBsYW5ncy9pdC9jZ2ktYmluL2l0LnBsICAgIHwgMyArKysKIGxhbmdzL25sL2NnaS1i aW4vbmwucGwgICAgfCAzICsrKwogbGFuZ3MvcGwvY2dpLWJpbi9wbC5wbCAgICB8IDMgKysrCiBs YW5ncy9ydS9jZ2ktYmluL3J1LnBsICAgIHwgMyArKysKIGxhbmdzL3RyL2NnaS1iaW4vdHIucGwg ICAgfCAzICsrKwogMTAgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9odG1sL2NnaS1iaW4vcHBwc2V0dXAuY2dpIGIvaHRtbC9jZ2kt YmluL3BwcHNldHVwLmNnaQppbmRleCAzM2Y1MjFlLi41OTY3N2E0IDEwMDY0NAotLS0gYS9odG1s L2NnaS1iaW4vcHBwc2V0dXAuY2dpCisrKyBiL2h0bWwvY2dpLWJpbi9wcHBzZXR1cC5jZ2kKQEAg LTc5MywxNSArNzkzLDE1IEBAIHByaW50IDw8RU5ECiAgICAgICAgIDx0ZCBjb2xzcGFuPSc0JyB3 aWR0aD0nMTAwJScgYmdjb2xvcj0nJGNvbG9yeydjb2xvcjIwJ30nPjxiPiRMYW5nOjp0cnsncHB0 cCBzZXR0aW5ncyd9PC9iPjwvdGQ+CiA8L3RyPgogPHRyPgotICAgICAgICA8dGQgd2lkdGg9JzI1 JSc+UGVlcjwvdGQ+CisgICAgICAgIDx0ZCB3aWR0aD0nMjUlJz4kTGFuZzo6dHJ7J3BwdHAgcGVl cid9OjwvdGQ+CiAgICAgICAgIDx0ZCBjb2xzcGFuPSczJz48aW5wdXQgc2l6ZT01MCB0eXBlPSd0 ZXh0JyBuYW1lPSdQUFRQX1BFRVInIHZhbHVlPSckcHBwc2V0dGluZ3N7J1BQVFBfUEVFUid9JyAv PjwvdGQ+CiA8L3RyPgogPHRyPgotICAgICAgICA8dGQgd2lkdGg9JzI1JSc+TXkgTmV0Y29uZmln PC90ZD4KKyAgICAgICAgPHRkIHdpZHRoPScyNSUnPiRMYW5nOjp0cnsncHB0cCBuZXRjb25maWcn fTo8L3RkPgogICAgICAgICA8dGQgY29sc3Bhbj0nMyc+PGlucHV0IHNpemU9NTAgdHlwZT0ndGV4 dCcgbmFtZT0nUFBUUF9OSUNDRkcnIHZhbHVlPSckcHBwc2V0dGluZ3N7J1BQVFBfTklDQ0ZHJ30n IC8+PC90ZD4KIDwvdHI+CiA8dHI+Ci0gICAgICAgIDx0ZCB3aWR0aD0nMjUlJz5QUFRQIFJvdXRl Jm5ic3A7PGltZyBzcmM9Jy9ibG9iLmdpZicgYWx0PScqJyAvPjwvdGQ+CisgICAgICAgIDx0ZCB3 aWR0aD0nMjUlJz4kTGFuZzo6dHJ7J3BwdHAgcm91dGUnfTombmJzcDs8aW1nIHNyYz0nL2Jsb2Iu Z2lmJyBhbHQ9JyonIC8+PC90ZD4KICAgICAgICAgPHRkIGNvbHNwYW49JzMnPjxpbnB1dCBzaXpl PTUwIHR5cGU9J3RleHQnIG5hbWU9J1BQVFBfUk9VVEUnIHZhbHVlPSckcHBwc2V0dGluZ3N7J1BQ VFBfUk9VVEUnfScgLz48L3RkPgogPC90cj4KIApkaWZmIC0tZ2l0IGEvbGFuZ3MvZGUvY2dpLWJp bi9kZS5wbCBiL2xhbmdzL2RlL2NnaS1iaW4vZGUucGwKaW5kZXggOGFkZWZkZi4uNjUyNzdhOSAx MDA2NDQKLS0tIGEvbGFuZ3MvZGUvY2dpLWJpbi9kZS5wbAorKysgYi9sYW5ncy9kZS9jZ2ktYmlu L2RlLnBsCkBAIC0xODIyLDYgKzE4MjIsOSBAQAogJ3BwcCBzZXR1cCcgPT4gJ1BQUC1FaW5zdGVs bHVuZ2VuJywKICdwcHBvZScgPT4gJ1BQUG9FJywKICdwcHBvZSBzZXR0aW5ncycgPT4gJ1p1c8Ok dHpsaWNoZSBQUFBvRS1FaW5zdGVsbHVuZ2VuOicsCisncHB0cCBuZXRjb25maWcnID0+ICdFaWdl bmUgTmV0emtvbmZpZ3VyYXRpb24nLAorJ3BwdHAgcGVlcicgPT4gJ0dlZ2Vuc3RlbGxlJywKKydw cHRwIHJvdXRlJyA9PiAnUFBUUCBSb3V0ZScsCiAncHB0cCBzZXR0aW5ncycgPT4gJ1p1c8OkdHps aWNoZSBQUFRQLUVpbnN0ZWxsdW5nZW46JywKICdwcmUtc2hhcmVkIGtleSBpcyB0b28gc2hvcnQn ID0+ICdQcmUtc2hhcmVkIFNjaGzDvHNlbCBpc3QgenUga3VyeicsCiAncHJlZmVyZWQgbWFzdGVy JyA9PiAnUHJlZmVyZWQgTWFzdGVyJywKZGlmZiAtLWdpdCBhL2xhbmdzL2VuL2NnaS1iaW4vZW4u cGwgYi9sYW5ncy9lbi9jZ2ktYmluL2VuLnBsCmluZGV4IDQzNjAxYzguLjNlNjBiMDAgMTAwNjQ0 Ci0tLSBhL2xhbmdzL2VuL2NnaS1iaW4vZW4ucGwKKysrIGIvbGFuZ3MvZW4vY2dpLWJpbi9lbi5w bApAQCAtMTg1Miw2ICsxODUyLDkgQEAKICdwcHAgc2V0dXAnID0+ICdQUFAgc2V0dXAnLAogJ3Bw cG9lJyA9PiAnUFBQb0UnLAogJ3BwcG9lIHNldHRpbmdzJyA9PiAnQWRkaXRpb25hbCBQUFBvRSBz ZXR0aW5nczonLAorJ3BwdHAgbmV0Y29uZmlnJyA9PiAnTXkgTmV0Y29uZmlnJywKKydwcHRwIHBl ZXInID0+ICdQZWVyJywKKydwcHRwIHJvdXRlJyA9PiAnUFBUUCBSb3V0ZScsCiAncHB0cCBzZXR0 aW5ncycgPT4gJ0FkZGl0aW9uYWwgUFBUUCBzZXR0aW5nczonLAogJ3ByZS1zaGFyZWQga2V5IGlz IHRvbyBzaG9ydCcgPT4gJ1ByZS1zaGFyZWQga2V5IGlzIHRvbyBzaG9ydC4nLAogJ3ByZWZlcmVk IG1hc3RlcicgPT4gJ1ByZWZlcmVkIE1hc3RlcicsCmRpZmYgLS1naXQgYS9sYW5ncy9lcy9jZ2kt YmluL2VzLnBsIGIvbGFuZ3MvZXMvY2dpLWJpbi9lcy5wbAppbmRleCA5MGY0MjM3Li40NTkxZWQ2 IDEwMDY0NAotLS0gYS9sYW5ncy9lcy9jZ2ktYmluL2VzLnBsCisrKyBiL2xhbmdzL2VzL2NnaS1i aW4vZXMucGwKQEAgLTE0MTcsNiArMTQxNyw5IEBACiAncHBwIHNldHVwJyA9PiAnQ29uZmlndXJh Y2nDs24gUFBQJywKICdwcHBvZScgPT4gJ1BQUG9lJywKICdwcHBvZSBzZXR0aW5ncycgPT4gJ0Nv bmZpZ3VyYWNpb25lcyBQUFBvRSBhZGljaW9uYWxlcycsCisncHB0cCBuZXRjb25maWcnID0+ICdN eSBOZXRjb25maWcnLAorJ3BwdHAgcGVlcicgPT4gJ1BlZXInLAorJ3BwdHAgcm91dGUnID0+ICdQ UFRQIFJvdXRlJywKICdwcHRwIHNldHRpbmdzJyA9PiAnQ29uZmlndXJhY2lvbiBQUFRQIGFkaWNp b25hbGVzJywKICdwcmUtc2hhcmVkIGtleSBpcyB0b28gc2hvcnQnID0+ICdMYSBjbGF2ZSBwcmUt Y29tcGFydGlkYSBlcyBkZW1hc2lhZG8gY29ydGEuJywKICdwcmVmZXJlZCBtYXN0ZXInID0+ICdN YXN0ZXIgcHJlZmVyaWRvJywKZGlmZiAtLWdpdCBhL2xhbmdzL2ZyL2NnaS1iaW4vZnIucGwgYi9s YW5ncy9mci9jZ2ktYmluL2ZyLnBsCmluZGV4IDQwMDUzYTAuLmNhNWRkN2MgMTAwNjQ0Ci0tLSBh L2xhbmdzL2ZyL2NnaS1iaW4vZnIucGwKKysrIGIvbGFuZ3MvZnIvY2dpLWJpbi9mci5wbApAQCAt MTQyMyw2ICsxNDIzLDkgQEAKICdwcHAgc2V0dXAnID0+ICdJbnN0YWxsYXRpb24gUFBQJywKICdw cHBvZScgPT4gJ1BQUG9FJywKICdwcHBvZSBzZXR0aW5ncycgPT4gJ1BhcmFtw6h0cmVzIHN1cHBs w6ltZW50YWlyZXMgUFBQb0UgOicsCisncHB0cCBuZXRjb25maWcnID0+ICdNeSBOZXRjb25maWcn LAorJ3BwdHAgcGVlcicgPT4gJ1BlZXInLAorJ3BwdHAgcm91dGUnID0+ICdQUFRQIFJvdXRlJywK ICdwcHRwIHNldHRpbmdzJyA9PiAnUGFyYW3DqHRyZXMgc3VwcGzDqW1lbnRhaXJlcyBQUFRQIDon LAogJ3ByZS1zaGFyZWQga2V5IGlzIHRvbyBzaG9ydCcgPT4gJ0xhIGNsZWYgcGFydGFnw6llIHBy w6lsaW1pbmFpcmUgZXN0IHRyb3AgY291cnRlLicsCiAncHJlZmVyZWQgbWFzdGVyJyA9PiAnTWHD rnRyZSBwcsOpZsOpcsOpJywKZGlmZiAtLWdpdCBhL2xhbmdzL2l0L2NnaS1iaW4vaXQucGwgYi9s YW5ncy9pdC9jZ2ktYmluL2l0LnBsCmluZGV4IDRmZGUzMTMuLmQyZGNlNzEgMTAwNjQ0Ci0tLSBh L2xhbmdzL2l0L2NnaS1iaW4vaXQucGwKKysrIGIvbGFuZ3MvaXQvY2dpLWJpbi9pdC5wbApAQCAt MTgwOCw2ICsxODA4LDkgQEAKICdwcHAgc2V0dXAnID0+ICdQUFAgc2V0dXAnLAogJ3BwcG9lJyA9 PiAnUFBQb0UnLAogJ3BwcG9lIHNldHRpbmdzJyA9PiAnQWRkaXRpb25hbCBQUFBvRSBzZXR0aW5n czonLAorJ3BwdHAgbmV0Y29uZmlnJyA9PiAnTXkgTmV0Y29uZmlnJywKKydwcHRwIHBlZXInID0+ ICdQZWVyJywKKydwcHRwIHJvdXRlJyA9PiAnUFBUUCBSb3V0ZScsCiAncHB0cCBzZXR0aW5ncycg PT4gJ0FkZGl0aW9uYWwgUFBUUCBzZXR0aW5nczonLAogJ3ByZS1zaGFyZWQga2V5IGlzIHRvbyBz aG9ydCcgPT4gJ1ByZS1zaGFyZWQga2V5IGlzIHRvbyBzaG9ydC4nLAogJ3ByZWZlcmVkIG1hc3Rl cicgPT4gJ1ByZWZlcmVkIE1hc3RlcicsCmRpZmYgLS1naXQgYS9sYW5ncy9ubC9jZ2ktYmluL25s LnBsIGIvbGFuZ3MvbmwvY2dpLWJpbi9ubC5wbAppbmRleCA3NDY4ZWI5Li40NTk2ODRkIDEwMDY0 NAotLS0gYS9sYW5ncy9ubC9jZ2ktYmluL25sLnBsCisrKyBiL2xhbmdzL25sL2NnaS1iaW4vbmwu cGwKQEAgLTE3NjAsNiArMTc2MCw5IEBACiAncHBwIHNldHVwJyA9PiAnUFBQIHNldHVwJywKICdw cHBvZScgPT4gJ1BQUG9FJywKICdwcHBvZSBzZXR0aW5ncycgPT4gJ0V4dHJhIFBQUG9FIGluc3Rl bGxpbmdlbjonLAorJ3BwdHAgbmV0Y29uZmlnJyA9PiAnTXkgTmV0Y29uZmlnJywKKydwcHRwIHBl ZXInID0+ICdQZWVyJywKKydwcHRwIHJvdXRlJyA9PiAnUFBUUCBSb3V0ZScsCiAncHB0cCBzZXR0 aW5ncycgPT4gJ0V4dHJhIFBQVFAgaW5zdGVsbGluZ2VuOicsCiAncHJlLXNoYXJlZCBrZXkgaXMg dG9vIHNob3J0JyA9PiAnUHJlLXNoYXJlZCBzbGV1dGVsIGlzIHRlIGtvcnQuJywKICdwcmVmZXJl ZCBtYXN0ZXInID0+ICdWb29ya2V1ciBtYXN0ZXInLApkaWZmIC0tZ2l0IGEvbGFuZ3MvcGwvY2dp LWJpbi9wbC5wbCBiL2xhbmdzL3BsL2NnaS1iaW4vcGwucGwKaW5kZXggMDJmYjUzMS4uZDM1Y2Uz NCAxMDA2NDQKLS0tIGEvbGFuZ3MvcGwvY2dpLWJpbi9wbC5wbAorKysgYi9sYW5ncy9wbC9jZ2kt YmluL3BsLnBsCkBAIC0xNDI5LDYgKzE0MjksOSBAQAogJ3BwcCBzZXR1cCcgPT4gJ0tvbmZpZ3Vy YWNqYSBQUFAnLAogJ3BwcG9lJyA9PiAnUFBQb0UnLAogJ3BwcG9lIHNldHRpbmdzJyA9PiAnRG9k YXRrb3dlIHVzdGF3aWVuaWEgUFBQb0U6JywKKydwcHRwIG5ldGNvbmZpZycgPT4gJ015IE5ldGNv bmZpZycsCisncHB0cCBwZWVyJyA9PiAnUGVlcicsCisncHB0cCByb3V0ZScgPT4gJ1BQVFAgUm91 dGUnLAogJ3BwdHAgc2V0dGluZ3MnID0+ICdEb2RhdGtvd2UgdXN0YXdpZW5pYSBQUFRQOicsCiAn cHJlLXNoYXJlZCBrZXkgaXMgdG9vIHNob3J0JyA9PiAnS2x1Y3ogd3Nww7PFgmR6aWVsb255IGpl c3QgemEga3LDs3RraS4nLAogJ3ByZWZlcmVkIG1hc3RlcicgPT4gJ1ByZWZlcm93YW55IE1hc3Rl cicsCmRpZmYgLS1naXQgYS9sYW5ncy9ydS9jZ2ktYmluL3J1LnBsIGIvbGFuZ3MvcnUvY2dpLWJp bi9ydS5wbAppbmRleCBhMmEzNjkzLi5kNDY4NmVhIDEwMDY0NAotLS0gYS9sYW5ncy9ydS9jZ2kt YmluL3J1LnBsCisrKyBiL2xhbmdzL3J1L2NnaS1iaW4vcnUucGwKQEAgLTE0MjQsNiArMTQyNCw5 IEBACiAncHBwIHNldHVwJyA9PiAn0J3QsNGB0YLRgNC+0LnQutC4IFBQUCcsCiAncHBwb2UnID0+ ICdQUFBvRScsCiAncHBwb2Ugc2V0dGluZ3MnID0+ICfQlNC+0L/QvtC70L3QuNGC0LXQu9GM0L3R i9C1INC90LDRgdGC0YDQvtC50LrQuCBQUFBvRTonLAorJ3BwdHAgbmV0Y29uZmlnJyA9PiAnTXkg TmV0Y29uZmlnJywKKydwcHRwIHBlZXInID0+ICdQZWVyJywKKydwcHRwIHJvdXRlJyA9PiAnUFBU UCBSb3V0ZScsCiAncHB0cCBzZXR0aW5ncycgPT4gJ9CU0L7Qv9C+0LvQvdC40YLQtdC70YzQvdGL 0LUg0L3QsNGB0YLRgNC+0LnQutC4IFBQVFA6JywKICdwcmUtc2hhcmVkIGtleSBpcyB0b28gc2hv cnQnID0+ICdQcmUtc2hhcmVkIGtleSBpcyB0b28gc2hvcnQuJywKICdwcmVmZXJlZCBtYXN0ZXIn ID0+ICdQcmVmZXJlZCBNYXN0ZXInLApkaWZmIC0tZ2l0IGEvbGFuZ3MvdHIvY2dpLWJpbi90ci5w bCBiL2xhbmdzL3RyL2NnaS1iaW4vdHIucGwKaW5kZXggODlmNzUzZS4uNjkyMThlYyAxMDA2NDQK LS0tIGEvbGFuZ3MvdHIvY2dpLWJpbi90ci5wbAorKysgYi9sYW5ncy90ci9jZ2ktYmluL3RyLnBs CkBAIC0xODI5LDYgKzE4MjksOSBAQAogJ3BwcCBzZXR1cCcgPT4gJ1BQUCBrdXJ1bHVtdScsCiAn cHBwb2UnID0+ICdQUFBvRScsCiAncHBwb2Ugc2V0dGluZ3MnID0+ICdFayBQUFBvRSBheWFybGFy xLE6JywKKydwcHRwIG5ldGNvbmZpZycgPT4gJ015IE5ldGNvbmZpZycsCisncHB0cCBwZWVyJyA9 PiAnUGVlcicsCisncHB0cCByb3V0ZScgPT4gJ1BQVFAgUm91dGUnLAogJ3BwdHAgc2V0dGluZ3Mn ID0+ICdFayBQUFRQIGF5YXJsYXLEsTonLAogJ3ByZS1zaGFyZWQga2V5IGlzIHRvbyBzaG9ydCcg PT4gJ8OWbiBwYXlsYcWfxLFtbMSxIGFuYWh0YXIgw6dvayBrxLFzYS4nLAogJ3ByZWZlcmVkIG1h c3RlcicgPT4gJ1RlcmNpaCBlZGlsZW4gecO2bmV0aWNpJywK --===============2429640907175120819==--