From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: util-linux-owner@vger.kernel.org Received: from out1-smtp.messagingengine.com ([66.111.4.25]:45662 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751582Ab3JFKmd (ORCPT ); Sun, 6 Oct 2013 06:42:33 -0400 Message-Id: <1381056152.6496.30556453.76E742F1@webmail.messagingengine.com> From: Benno Schulenberg To: "Util-Linux" Cc: =?UTF-8?Q?Petr=20P=C3=ADsa=C5=99?= MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="_----------=_138105615264964"; charset="utf-8" Subject: [patches] pluralization, and some trifles along the way Date: Sun, 06 Oct 2013 12:42:32 +0200 Sender: util-linux-owner@vger.kernel.org List-ID: This is a multi-part message in MIME format. --_----------=_138105615264964 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Hi, Attached bunch of patches fix most of the issues reported by Petr P=C3=ADs= a=C5=99 two days ago. It also fixes some small things I noticed along the way. The patches are simple. The eighth and fifteenth patch are slightly specia= l, as they don't consume all the arguments to fdisk_info() in the singular cas= e; I haven't checked whether that actually works. The help text of partx had a blank line after the three command options. Later the --update option was added, but *after* the blank line. The twelf= th patch moves it to before the blank line, and even to before the --show opti= on to harmonize better with the rest of the text. The patch also corrects the argument of the --output option, from to . Oh, and it tries to describe better what the TYPE column shows -- I'm not entirely sure about this: I had to read the code to see what it was doing. The thirteenth patch gettextizes an overlooked message, pluralizes it, and rewords it to avoid ambiguity (past tense/present tense). Benno --=20 http://www.fastmail.fm - One of many happy users: http://www.fastmail.fm/help/overview_quotes.html --_----------=_138105615264964 Content-Disposition: attachment; filename="0001-textual-end-both-the-singular-and-the-plural-message.patch" Content-Id: <1381055983.5822.3d2365696f969bd5c3cc38d5c580deff20343ad3.180967E9@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-textual-end-both-the-singular-and-the-plural-message.patch" RnJvbSA3MDdjYTlmOTE0MDQ4Y2I4MWVhNDllZTRjOGExYmIxOTc3MmVkNjM4 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogRnJpLCA0IE9j dCAyMDEzIDIxOjUwOjA1ICswMjAwClN1YmplY3Q6IFtQQVRDSCAwMS8xNV0g dGV4dHVhbDogZW5kIGJvdGggdGhlIHNpbmd1bGFyIGFuZCB0aGUgcGx1cmFs IG1lc3NhZ2Ugd2l0aCBhIHBlcmlvZAoKU2lnbmVkLW9mZi1ieTogQmVubm8g U2NodWxlbmJlcmcgPGJlbnNiZXJnQGp1c3RlbWFpbC5uZXQ+Ci0tLQogbGli ZmRpc2svc3JjL2dwdC5jIHwgICAgMiArLQogMSBmaWxlcyBjaGFuZ2VkLCAx IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv bGliZmRpc2svc3JjL2dwdC5jIGIvbGliZmRpc2svc3JjL2dwdC5jCmluZGV4 IDk3MTVlMzguLjA1NGE3NzEgMTAwNjQ0Ci0tLSBhL2xpYmZkaXNrL3NyYy9n cHQuYworKysgYi9saWJmZGlzay9zcmMvZ3B0LmMKQEAgLTE1MzAsNyArMTUz MCw3IEBAIHN0YXRpYyBpbnQgZ3B0X3ZlcmlmeV9kaXNrbGFiZWwoc3RydWN0 IGZkaXNrX2NvbnRleHQgKmN4dCkKIAkJICAgICAgIGZyZWVfc2VjdG9ycywg bnNlZ21lbnRzLCBsYXJnZXN0X3NlZ21lbnQpOwogCX0gZWxzZQogCQlmZGlz a193YXJueChjeHQsCi0JCQlQXygiJWQgZXJyb3IgZGV0ZWN0ZWQuIiwgIiVz IGVycm9ycyBkZXRlY3RlZCIsIG5lcnJvciksCisJCQlQXygiJWQgZXJyb3Ig ZGV0ZWN0ZWQuIiwgIiVzIGVycm9ycyBkZXRlY3RlZC4iLCBuZXJyb3IpLAog CQkJbmVycm9yKTsKIAogCXJldHVybiAwOwotLSAKMS43LjAuNAoK --_----------=_138105615264964 Content-Disposition: attachment; filename="0002-hexsyntax-in-help-text-wrap-argument-of-option-e-in-.patch" Content-Id: <1381055995.5815.b8e43ee9c0ac2fa5ef42d929019bdc9f55d270a6.7373C2EB@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0002-hexsyntax-in-help-text-wrap-argument-of-option-e-in-.patch" RnJvbSBhNzMwMzU4NzUwZTBiNjBjN2JlM2ZlMDAzY2FmMmMyYmQ1MmRmMTEz IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogRnJpLCA0IE9j dCAyMDEzIDIxOjU5OjAyICswMjAwClN1YmplY3Q6IFtQQVRDSCAwMi8xNV0g aGV4c3ludGF4OiBpbiBoZWxwIHRleHQsIHdyYXAgYXJndW1lbnQgb2Ygb3B0 aW9uIC1lIGluIGFuZ3VsYXIgYnJhY2tldHMKTUlNRS1WZXJzaW9uOiAxLjAK Q29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04CkNvbnRl bnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKClJlcG9ydGVkLWJ5OiBQZXRy IFDDrXNhxZkgPHBldHIucGlzYXJAYXRsYXMuY3o+ClNpZ25lZC1vZmYtYnk6 IEJlbm5vIFNjaHVsZW5iZXJnIDxiZW5zYmVyZ0BqdXN0ZW1haWwubmV0Pgot LS0KIHRleHQtdXRpbHMvaGV4c3ludGF4LmMgfCAgICAyICstCiAxIGZpbGVz IGNoYW5nZWQsIDEgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS90ZXh0LXV0aWxzL2hleHN5bnRheC5jIGIvdGV4dC11dGls cy9oZXhzeW50YXguYwppbmRleCAyOTEwY2E1Li4xYjgwNDBjIDEwMDY0NAot LS0gYS90ZXh0LXV0aWxzL2hleHN5bnRheC5jCisrKyBiL3RleHQtdXRpbHMv aGV4c3ludGF4LmMKQEAgLTE0Nyw3ICsxNDcsNyBAQCB2b2lkIF9fYXR0cmli dXRlX18oKF9fbm9yZXR1cm5fXykpIHVzYWdlKEZJTEUgKm91dCkKIAlmcHV0 cyhfKCIgLWQsIC0tdHdvLWJ5dGVzLWRlY2ltYWwgICB0d28tYnl0ZSBkZWNp bWFsIGRpc3BsYXlcbiIpLCBvdXQpOwogCWZwdXRzKF8oIiAtbywgLS10d28t Ynl0ZXMtb2N0YWwgICAgIHR3by1ieXRlIG9jdGFsIGRpc3BsYXlcbiIpLCBv dXQpOwogCWZwdXRzKF8oIiAteCwgLS10d28tYnl0ZXMtaGV4ICAgICAgIHR3 by1ieXRlIGhleGFkZWNpbWFsIGRpc3BsYXlcbiIpLCBvdXQpOwotCWZwdXRz KF8oIiAtZSwgLS1mb3JtYXQgZm9ybWF0ICAgICAgIGZvcm1hdCBzdHJpbmcg dG8gYmUgdXNlZCBmb3IgZGlzcGxheWluZyBkYXRhXG4iKSwgb3V0KTsKKwlm cHV0cyhfKCIgLWUsIC0tZm9ybWF0IDxmb3JtYXQ+ICAgICBmb3JtYXQgc3Ry aW5nIHRvIGJlIHVzZWQgZm9yIGRpc3BsYXlpbmcgZGF0YVxuIiksIG91dCk7 CiAJZnB1dHMoXygiIC1mLCAtLWZvcm1hdC1maWxlIDxmaWxlPiAgZmlsZSB0 aGF0IGNvbnRhaW5zIGZvcm1hdCBzdHJpbmdzXG4iKSwgb3V0KTsKIAlmcHV0 cyhfKCIgLW4sIC0tbGVuZ3RoIDxsZW5ndGg+ICAgICBpbnRlcnByZXQgb25s eSBsZW5ndGggYnl0ZXMgb2YgaW5wdXRcbiIpLCBvdXQpOwogCWZwdXRzKF8o IiAtcywgLS1za2lwIDxvZmZzZXQ+ICAgICAgIHNraXAgb2Zmc2V0IGJ5dGVz IGZyb20gdGhlIGJlZ2lubmluZ1xuIiksIG91dCk7Ci0tIAoxLjcuMC40Cgo= --_----------=_138105615264964 Content-Disposition: attachment; filename="0003-textual-properly-use-uppercase-in-certain-abbreviati.patch" Content-Id: <1381056003.5861.fc6d7ee9f43eb5667bdb9cacd54db45db8a27828.128EC30C@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0003-textual-properly-use-uppercase-in-certain-abbreviati.patch" RnJvbSBkM2JiZmJiYWRmZDRlYjBmMmRkMGI1MDE5MDJjOGUxNzQ0YjQwOGU4 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogRnJpLCA0IE9j dCAyMDEzIDIyOjAzOjU4ICswMjAwClN1YmplY3Q6IFtQQVRDSCAwMy8xNV0g dGV4dHVhbDogcHJvcGVybHkgdXNlIHVwcGVyY2FzZSBpbiBjZXJ0YWluIGFi YnJldmlhdGlvbnMKTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0 ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5j b2Rpbmc6IDhiaXQKClJlcG9ydGVkLWJ5OiBQZXRyIFDDrXNhxZkgPHBldHIu cGlzYXJAYXRsYXMuY3o+ClNpZ25lZC1vZmYtYnk6IEJlbm5vIFNjaHVsZW5i ZXJnIDxiZW5zYmVyZ0BqdXN0ZW1haWwubmV0PgotLS0KIHN5cy11dGlscy9k bWVzZy5jIHwgICAgMiArLQogc3lzLXV0aWxzL2xzY3B1LmMgfCAgICA0ICsr LS0KIDIgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL3N5cy11dGlscy9kbWVzZy5jIGIvc3lz LXV0aWxzL2RtZXNnLmMKaW5kZXggYjU1ZWQ4ZS4uNTAzOWZlNyAxMDA2NDQK LS0tIGEvc3lzLXV0aWxzL2RtZXNnLmMKKysrIGIvc3lzLXV0aWxzL2RtZXNn LmMKQEAgLTExNSw3ICsxMTUsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRt ZXNnX25hbWUgZmFjaWxpdHlfbmFtZXNbXSA9CiAJW0ZBQ19CQVNFKExPR19V VUNQKV0gICAgID0geyAidXVjcCIsICAgICBOXygiVVVDUCBzdWJzeXN0ZW0i KSB9LAogCVtGQUNfQkFTRShMT0dfQ1JPTildICAgICA9IHsgImNyb24iLCAg ICAgTl8oImNsb2NrIGRhZW1vbiIpIH0sCiAJW0ZBQ19CQVNFKExPR19BVVRI UFJJVildID0geyAiYXV0aHByaXYiLCBOXygic2VjdXJpdHkvYXV0aG9yaXph dGlvbiBtZXNzYWdlcyAocHJpdmF0ZSkiKSB9LAotCVtGQUNfQkFTRShMT0df RlRQKV0gICAgICA9IHsgImZ0cCIsICAgICAgTl8oImZ0cCBkYWVtb24iKSB9 LAorCVtGQUNfQkFTRShMT0dfRlRQKV0gICAgICA9IHsgImZ0cCIsICAgICAg Tl8oIkZUUCBkYWVtb24iKSB9LAogfTsKIAogLyogc3VwcG9ydGVkIG1ldGhv ZHMgdG8gcmVhZCBtZXNzYWdlIGJ1ZmZlcgpkaWZmIC0tZ2l0IGEvc3lzLXV0 aWxzL2xzY3B1LmMgYi9zeXMtdXRpbHMvbHNjcHUuYwppbmRleCBkNDg0NmU3 Li45OTI3MjZjIDEwMDY0NAotLS0gYS9zeXMtdXRpbHMvbHNjcHUuYworKysg Yi9zeXMtdXRpbHMvbHNjcHUuYwpAQCAtMjU3LDggKzI1Nyw4IEBAIHN0YXRp YyBzdHJ1Y3QgbHNjcHVfY29sZGVzYyBjb2xkZXNjc1tdID0KIAlbQ09MX0FE RFJFU1NdICAgICAgPSB7ICJBRERSRVNTIiwgTl8oInBoeXNpY2FsIGFkZHJl c3Mgb2YgYSBDUFUiKSB9LAogCVtDT0xfQ09ORklHVVJFRF0gICA9IHsgIkNP TkZJR1VSRUQiLCBOXygic2hvd3MgaWYgdGhlIGh5cGVydmlzb3IgaGFzIGFs bG9jYXRlZCB0aGUgQ1BVIikgfSwKIAlbQ09MX09OTElORV0gICAgICAgPSB7 ICJPTkxJTkUiLCBOXygic2hvd3MgaWYgTGludXggY3VycmVudGx5IG1ha2Vz IHVzZSBvZiB0aGUgQ1BVIikgfSwKLQlbQ09MX01BWE1IWl0JICAgPSB7ICJN QVhNSFoiLCBOXygic2hvd3MgdGhlIG1heGltdW0gbWh6IG9mIHRoZSBDUFUi KSB9LAotCVtDT0xfTUlOTUhaXQkgICA9IHsgIk1JTk1IWiIsIE5fKCJzaG93 cyB0aGUgbWluaW11bSBtaHogb2YgdGhlIENQVSIpIH0KKwlbQ09MX01BWE1I Wl0JICAgPSB7ICJNQVhNSFoiLCBOXygic2hvd3MgdGhlIG1heGltdW0gTUh6 IG9mIHRoZSBDUFUiKSB9LAorCVtDT0xfTUlOTUhaXQkgICA9IHsgIk1JTk1I WiIsIE5fKCJzaG93cyB0aGUgbWluaW11bSBNSHogb2YgdGhlIENQVSIpIH0K IH07CiAKIHN0YXRpYyBpbnQKLS0gCjEuNy4wLjQKCg== --_----------=_138105615264964 Content-Disposition: attachment; filename="0004-mcookie-pluralize-two-messages.patch" Content-Id: <1381056017.5868.83dfff774a981073331e3668c160d2485660898e.693EEEB1@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0004-mcookie-pluralize-two-messages.patch" RnJvbSBhMDlkOWJhMTA3ZjViM2VkODIwY2Q3ZDJmMDExNGNhYjgwN2E0NTNj IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogRnJpLCA0IE9j dCAyMDEzIDIyOjE1OjE1ICswMjAwClN1YmplY3Q6IFtQQVRDSCAwNC8xNV0g bWNvb2tpZTogcGx1cmFsaXplIHR3byBtZXNzYWdlcwpNSU1FLVZlcnNpb246 IDEuMApDb250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgK Q29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJpdAoKUmVwb3J0ZWQtYnk6 IFBldHIgUMOtc2HFmSA8cGV0ci5waXNhckBhdGxhcy5jej4KU2lnbmVkLW9m Zi1ieTogQmVubm8gU2NodWxlbmJlcmcgPGJlbnNiZXJnQGp1c3RlbWFpbC5u ZXQ+Ci0tLQogbWlzYy11dGlscy9tY29va2llLmMgfCAgIDEwICsrKysrKy0t LS0KIDEgZmlsZXMgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCA0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL21pc2MtdXRpbHMvbWNvb2tpZS5jIGIv bWlzYy11dGlscy9tY29va2llLmMKaW5kZXggZGE2NDFhMS4uMzc2MWM0YiAx MDA2NDQKLS0tIGEvbWlzYy11dGlscy9tY29va2llLmMKKysrIGIvbWlzYy11 dGlscy9tY29va2llLmMKQEAgLTE0Nyw4ICsxNDcsOSBAQCBpbnQgbWFpbihp bnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJCQljb3VudCA9IGhhc2hfZmlsZSgm Y3R4LCBmZCk7CiAJCQlpZiAodmVyYm9zZSkKIAkJCQlmcHJpbnRmKHN0ZGVy ciwKLQkJCQkJXygiR290ICVkIGJ5dGVzIGZyb20gJXNcbiIpLCBjb3VudCwK LQkJCQkJZmlsZSk7CisJCQkJCVBfKCJHb3QgJWQgYnl0ZSBmcm9tICVzXG4i LAorCQkJCQkgICAiR290ICVkIGJ5dGVzIGZyb20gJXNcbiIsIGNvdW50KSwK KwkJCQkJY291bnQsIGZpbGUpOwogCiAJCQlpZiAoZmQgIT0gU1RESU5fRklM RU5PKQogCQkJCWlmIChjbG9zZShmZCkpCkBAIC0xNzEsOCArMTcyLDkgQEAg aW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCQkJY2xvc2UoZmQp OwogCQkJaWYgKHZlcmJvc2UpCiAJCQkJZnByaW50ZihzdGRlcnIsCi0JCQkJ CV8oIkdvdCAlZCBieXRlcyBmcm9tICVzXG4iKSwgciwKLQkJCQkJcm5nc1tp XS5wYXRoKTsKKwkJCQkJUF8oIkdvdCAlZCBieXRlIGZyb20gJXNcbiIsCisJ CQkJCSAgICJHb3QgJWQgYnl0ZXMgZnJvbSAlc1xuIiwgciksCisJCQkJCXIs IHJuZ3NbaV0ucGF0aCk7CiAJCQlpZiAocm5nc1tpXS5taW5sZW5ndGggJiYg ciA+PSBybmdzW2ldLm1pbmxlbmd0aCkKIAkJCQlicmVhazsKIAkJfSBlbHNl IGlmICh2ZXJib3NlKQotLSAKMS43LjAuNAoK --_----------=_138105615264964 Content-Disposition: attachment; filename="0005-su-common-pluralize-one-message.patch" Content-Id: <1381056027.5915.44a513b61fa661c886d5154657e37ee69d56797a.6C2F7F6D@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0005-su-common-pluralize-one-message.patch" RnJvbSBjZDU5ZDkxNWQ1YTAzNzdhYTFkZTYzZjM5MTUwODNlYTVmMzkzZTQz IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogRnJpLCA0IE9j dCAyMDEzIDIyOjI3OjUxICswMjAwClN1YmplY3Q6IFtQQVRDSCAwNS8xNV0g c3UtY29tbW9uOiBwbHVyYWxpemUgb25lIG1lc3NhZ2UKTUlNRS1WZXJzaW9u OiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04 CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKClJlcG9ydGVkLWJ5 OiBQZXRyIFDDrXNhxZkgPHBldHIucGlzYXJAYXRsYXMuY3o+ClNpZ25lZC1v ZmYtYnk6IEJlbm5vIFNjaHVsZW5iZXJnIDxiZW5zYmVyZ0BqdXN0ZW1haWwu bmV0PgotLS0KIGxvZ2luLXV0aWxzL3N1LWNvbW1vbi5jIHwgICAgNCArKyst CiAxIGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9sb2dpbi11dGlscy9zdS1jb21tb24uYyBi L2xvZ2luLXV0aWxzL3N1LWNvbW1vbi5jCmluZGV4IDdmMWI1MDUuLjdmZDI3 OTIgMTAwNjQ0Ci0tLSBhL2xvZ2luLXV0aWxzL3N1LWNvbW1vbi5jCisrKyBi L2xvZ2luLXV0aWxzL3N1LWNvbW1vbi5jCkBAIC04MDcsNyArODA3LDkgQEAg c3VfbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2LCBpbnQgbW9kZSkKIAkg IG51bV9zdXBwX2dyb3VwcysrOwogCSAgaWYgKG51bV9zdXBwX2dyb3VwcyA+ PSBOR1JPVVBTX01BWCkKIAkgICAgIGVycngoRVhJVF9GQUlMVVJFLAotCQkg IF8oImNhbid0IHNwZWNpZnkgbW9yZSB0aGFuICVkIHN1cHBsZW1lbnRhbCBn cm91cHMiKSwKKwkJICBQXygic3BlY2lmeWluZyBtb3JlIHRoYW4gJWQgc3Vw cGxlbWVudGFsIGdyb3VwIGlzIG5vdCBwb3NzaWJsZSIsCisJCSAgICAgInNw ZWNpZnlpbmcgbW9yZSB0aGFuICVkIHN1cHBsZW1lbnRhbCBncm91cHMgaXMg bm90IHBvc3NpYmxlIiwKKwkJICAgICBOR1JPVVBTX01BWCAtIDEpLAogCQkg IE5HUk9VUFNfTUFYIC0gMSk7CiAJICBnciA9IGdldGdybmFtKG9wdGFyZyk7 CiAJICBpZiAoIWdyKQotLSAKMS43LjAuNAoK --_----------=_138105615264964 Content-Disposition: attachment; filename="0006-wipefs-pluralize-one-message.patch" Content-Id: <1381056036.5873.ac6be222e3ff9c3cefc15c4815ed4b24200b1684.12B29A85@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0006-wipefs-pluralize-one-message.patch" RnJvbSBiNzFiOWJkYWRmYjllZmI3YTJiOTg1MWFhYmY0NmYwNzFjOGI4ZDYy IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogRnJpLCA0IE9j dCAyMDEzIDIyOjMyOjU2ICswMjAwClN1YmplY3Q6IFtQQVRDSCAwNi8xNV0g d2lwZWZzOiBwbHVyYWxpemUgb25lIG1lc3NhZ2UKTUlNRS1WZXJzaW9uOiAx LjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04CkNv bnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKClJlcG9ydGVkLWJ5OiBQ ZXRyIFDDrXNhxZkgPHBldHIucGlzYXJAYXRsYXMuY3o+ClNpZ25lZC1vZmYt Ynk6IEJlbm5vIFNjaHVsZW5iZXJnIDxiZW5zYmVyZ0BqdXN0ZW1haWwubmV0 PgotLS0KIG1pc2MtdXRpbHMvd2lwZWZzLmMgfCAgICA2ICsrKystLQogMSBm aWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvbWlzYy11dGlscy93aXBlZnMuYyBiL21pc2MtdXRp bHMvd2lwZWZzLmMKaW5kZXggZmYyZjYyZi4uOGFjNmMzMyAxMDA2NDQKLS0t IGEvbWlzYy11dGlscy93aXBlZnMuYworKysgYi9taXNjLXV0aWxzL3dpcGVm cy5jCkBAIC0zMDgsOCArMzA4LDEwIEBAIHN0YXRpYyB2b2lkIGRvX3dpcGVf cmVhbChibGtpZF9wcm9iZSBwciwgY29uc3QgY2hhciAqZGV2bmFtZSwKIAlp ZiAoZmxhZ3MgJiBXUF9GTF9RVUlFVCkKIAkJcmV0dXJuOwogCi0JcHJpbnRm KF8oIiVzOiAlemQgYnl0ZXMgd2VyZSBlcmFzZWQgYXQgb2Zmc2V0IDB4JTA4 anggKCVzKTogIiksCi0JCWRldm5hbWUsIHctPmxlbiwgdy0+b2Zmc2V0LCB3 LT50eXBlKTsKKwlwcmludGYoUF8oIiVzOiAlemQgYnl0ZSB3YXMgZXJhc2Vk IGF0IG9mZnNldCAweCUwOGp4ICglcyk6ICIsCisJCSAgIiVzOiAlemQgYnl0 ZXMgd2VyZSBlcmFzZWQgYXQgb2Zmc2V0IDB4JTA4anggKCVzKTogIiwKKwkJ ICB3LT5sZW4pLAorCSAgICAgICBkZXZuYW1lLCB3LT5sZW4sIHctPm9mZnNl dCwgdy0+dHlwZSk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgdy0+bGVuOyBpKysp IHsKIAkJcHJpbnRmKCIlMDJ4Iiwgdy0+bWFnaWNbaV0pOwotLSAKMS43LjAu NAoK --_----------=_138105615264964 Content-Disposition: attachment; filename="0007-mkfs.minix-properly-pluralize-four-messages.patch" Content-Id: <1381056043.5915.53e163385f8fcbab7c6b3855f45653842bc67dce.6AD47621@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0007-mkfs.minix-properly-pluralize-four-messages.patch" RnJvbSA3MmUyYTgwODRjYjMwNzUwYTNlYzgxYjhlNTQ0MTg2OTc0ODEwNTRi IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogRnJpLCA0IE9j dCAyMDEzIDIyOjQ0OjI4ICswMjAwClN1YmplY3Q6IFtQQVRDSCAwNy8xNV0g bWtmcy5taW5peDogcHJvcGVybHkgcGx1cmFsaXplIGZvdXIgbWVzc2FnZXMK TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBj aGFyc2V0PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQK ClJlcG9ydGVkLWJ5OiBQZXRyIFDDrXNhxZkgPHBldHIucGlzYXJAYXRsYXMu Y3o+ClNpZ25lZC1vZmYtYnk6IEJlbm5vIFNjaHVsZW5iZXJnIDxiZW5zYmVy Z0BqdXN0ZW1haWwubmV0PgotLS0KIGRpc2stdXRpbHMvbWtmcy5taW5peC5j IHwgICAxNiArKysrKystLS0tLS0tLS0tCiAxIGZpbGVzIGNoYW5nZWQsIDYg aW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZGlzay11dGlscy9ta2ZzLm1pbml4LmMgYi9kaXNrLXV0aWxzL21rZnMubWlu aXguYwppbmRleCA2MzlhY2U3Li5kZDJjZjQzIDEwMDY0NAotLS0gYS9kaXNr LXV0aWxzL21rZnMubWluaXguYworKysgYi9kaXNrLXV0aWxzL21rZnMubWlu aXguYwpAQCAtNTQxLDggKzU0MSw4IEBAIHN0YXRpYyB2b2lkIHNldHVwX3Rh Ymxlcyh2b2lkKSB7CiAJCWVycihNS0ZTX0VYX0VSUk9SLCBfKCIlczogdW5h YmxlIHRvIGFsbG9jYXRlIGJ1ZmZlciBmb3IgaW5vZGVzIiksCiAJCQkJZGV2 aWNlX25hbWUpOwogCW1lbXNldChpbm9kZV9idWZmZXIsMCwgZ2V0X2lub2Rl X2J1ZmZlcl9zaXplKCkpOwotCXByaW50ZihfKCIlbHUgaW5vZGVzXG4iKSwg aW5vZGVzKTsKLQlwcmludGYoXygiJWx1IGJsb2Nrc1xuIiksIHpvbmVzKTsK KwlwcmludGYoUF8oIiVsdSBpbm9kZVxuIiwgIiVsdSBpbm9kZXNcbiIsIGlu b2RlcyksIGlub2Rlcyk7CisJcHJpbnRmKFBfKCIlbHUgYmxvY2tcbiIsICIl bHUgYmxvY2tzXG4iLCB6b25lcyksIHpvbmVzKTsKIAlwcmludGYoXygiRmly c3RkYXRhem9uZT0lamQgKCVqZClcbiIpLCBnZXRfZmlyc3Rfem9uZSgpLCBm aXJzdF96b25lX2RhdGEoKSk7CiAJcHJpbnRmKF8oIlpvbmVzaXplPSV6dVxu IiksIChzaXplX3QpIE1JTklYX0JMT0NLX1NJWkUgPDwgZ2V0X3pvbmVfc2l6 ZSgpKTsKIAlwcmludGYoXygiTWF4c2l6ZT0lenVcblxuIiksZ2V0X21heF9z aXplKCkpOwpAQCAtNjE0LDEwICs2MTQsOCBAQCBzdGF0aWMgdm9pZCBjaGVj a19ibG9ja3Modm9pZCkgewogCQliYWRibG9ja3MrKzsKIAkJY3VycmVudGx5 X3Rlc3RpbmcrKzsKIAl9Ci0JaWYgKGJhZGJsb2NrcyA+IDEpCi0JCXByaW50 ZihfKCIlZCBiYWQgYmxvY2tzXG4iKSwgYmFkYmxvY2tzKTsKLQllbHNlIGlm IChiYWRibG9ja3MgPT0gMSkKLQkJcHJpbnRmKF8oIm9uZSBiYWQgYmxvY2tc biIpKTsKKwlpZiAoYmFkYmxvY2tzID4gMCkKKwkJcHJpbnRmKFBfKCIlZCBi YWQgYmxvY2tcbiIsICIlZCBiYWQgYmxvY2tzXG4iLCBiYWRibG9ja3MpLCBi YWRibG9ja3MpOwogfQogCiBzdGF0aWMgdm9pZCBnZXRfbGlzdF9ibG9ja3Mo Y2hhciAqZmlsZW5hbWUpIHsKQEAgLTY0MCwxMCArNjM4LDggQEAgc3RhdGlj IHZvaWQgZ2V0X2xpc3RfYmxvY2tzKGNoYXIgKmZpbGVuYW1lKSB7CiAJfQog CWZjbG9zZShsaXN0ZmlsZSk7CiAKLQlpZihiYWRibG9ja3MgPiAxKQotCQlw cmludGYoXygiJWQgYmFkIGJsb2Nrc1xuIiksIGJhZGJsb2Nrcyk7Ci0JZWxz ZSBpZiAoYmFkYmxvY2tzID09IDEpCi0JCXByaW50ZihfKCJvbmUgYmFkIGJs b2NrXG4iKSk7CisJaWYgKGJhZGJsb2NrcyA+IDApCisJCXByaW50ZihQXygi JWQgYmFkIGJsb2NrXG4iLCAiJWQgYmFkIGJsb2Nrc1xuIiwgYmFkYmxvY2tz KSwgYmFkYmxvY2tzKTsKIH0KIAogaW50IG1haW4oaW50IGFyZ2MsIGNoYXIg KiogYXJndikgewotLSAKMS43LjAuNAoK --_----------=_138105615264964 Content-Disposition: attachment; filename="0008-libfdisk-sgi-properly-pluralize-three-messages.patch" Content-Id: <1381056050.6311.ba1f8f9cfe500b76e6da24218062a352919cb5ce.395915F9@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0008-libfdisk-sgi-properly-pluralize-three-messages.patch" RnJvbSAyYjE5YWM1N2MxMmZlN2JiODBmY2NkYjdmY2VjZWFjNDQ1Y2VlZjYz IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogU2F0LCA1IE9j dCAyMDEzIDEwOjQzOjQwICswMjAwClN1YmplY3Q6IFtQQVRDSCAwOC8xNV0g bGliZmRpc2svc2dpOiBwcm9wZXJseSBwbHVyYWxpemUgdGhyZWUgbWVzc2Fn ZXMKTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWlu OyBjaGFyc2V0PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhi aXQKClJlcG9ydGVkLWJ5OiBQZXRyIFDDrXNhxZkgPHBldHIucGlzYXJAYXRs YXMuY3o+ClNpZ25lZC1vZmYtYnk6IEJlbm5vIFNjaHVsZW5iZXJnIDxiZW5z YmVyZ0BqdXN0ZW1haWwubmV0PgotLS0KIGxpYmZkaXNrL3NyYy9zZ2kuYyB8 ICAgMzIgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmls ZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvbGliZmRpc2svc3JjL3NnaS5jIGIvbGliZmRpc2sv c3JjL3NnaS5jCmluZGV4IGQyZTg3NzguLmYzN2I4ZmYgMTAwNjQ0Ci0tLSBh L2xpYmZkaXNrL3NyYy9zZ2kuYworKysgYi9saWJmZGlzay9zcmMvc2dpLmMK QEAgLTQxNyw4ICs0MTcsMTAgQEAgc3RhdGljIGludCBzZ2lfY2hlY2tfYm9v dGZpbGUoc3RydWN0IGZkaXNrX2NvbnRleHQgKmN4dCwgY29uc3QgY2hhciAq bmFtZSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKIAl9IGVsc2UgaWYgKHN6ID4g c2l6ZW9mKHNnaWxhYmVsLT5ib290X2ZpbGUpKSB7Ci0JCWZkaXNrX3dhcm54 KGN4dCwgXygiTmFtZSBvZiBCb290ZmlsZSB0b28gbG9uZzogJXp1IGJ5dGVz IG1heGltdW0uIiksCi0JCQkJc2l6ZW9mKHNnaWxhYmVsLT5ib290X2ZpbGUp KTsKKwkJZmRpc2tfd2FybngoY3h0LCBQXygiTmFtZSBvZiBib290ZmlsZSBp cyB0b28gbG9uZzogJXp1IGJ5dGUgbWF4aW11bS4iLAorCQkJCSAgICAiTmFt ZSBvZiBib290ZmlsZSBpcyB0b28gbG9uZzogJXp1IGJ5dGVzIG1heGltdW0u IiwKKwkJCQkgICAgc2l6ZW9mKHNnaWxhYmVsLT5ib290X2ZpbGUpKSwKKwkJ CSAgICBzaXplb2Yoc2dpbGFiZWwtPmJvb3RfZmlsZSkpOwogCQlyZXR1cm4g LUVJTlZBTDsKIAogCX0gZWxzZSBpZiAoKm5hbWUgIT0gJy8nKSB7CkBAIC02 NTYsMTkgKzY1OCwyMyBAQCBzdGF0aWMgaW50IHZlcmlmeV9kaXNrbGFiZWwo c3RydWN0IGZkaXNrX2NvbnRleHQgKmN4dCwgaW50IHZlcmJvc2UpCiAJCQlj b250aW51ZTsKIAkJaWYgKHN0YXJ0ID4gc2dpX2dldF9zdGFydF9zZWN0b3Io Y3h0LCBJbmRleFtpXSkpIHsKIAkJCWlmICh2ZXJib3NlKQotCQkJCWZkaXNr X2luZm8oY3h0LCBfKCJUaGUgUGFydGl0aW9uICVkIGFuZCAlZCBvdmVybGFw ICIKLQkJCQkJICAiYnkgJWQgc2VjdG9ycy4iKSwKLQkJCQkgICAgICAgSW5k ZXhbaS0xXSsxLCBJbmRleFtpXSsxLAotCQkJCSAgICAgICBzdGFydCAtIHNn aV9nZXRfc3RhcnRfc2VjdG9yKGN4dCwgSW5kZXhbaV0pKTsKKwkJCQlmZGlz a19pbmZvKGN4dCwKKwkJCQkJICAgUF8oIlBhcnRpdGlvbnMgJWQgYW5kICVk IG92ZXJsYXAgYnkgJWQgc2VjdG9yLiIsCisJCQkJCSAgICAgICJQYXJ0aXRp b25zICVkIGFuZCAlZCBvdmVybGFwIGJ5ICVkIHNlY3RvcnMuIiwKKwkJCQkJ ICAgICAgc3RhcnQgLSBzZ2lfZ2V0X3N0YXJ0X3NlY3RvcihjeHQsIEluZGV4 W2ldKSksCisJCQkJCSAgIEluZGV4W2ktMV0rMSwgSW5kZXhbaV0rMSwKKwkJ CQkJICAgc3RhcnQgLSBzZ2lfZ2V0X3N0YXJ0X3NlY3RvcihjeHQsIEluZGV4 W2ldKSk7CiAJCQlpZiAoZ2FwID4gIDApIGdhcCA9IC1nYXA7CiAJCQlpZiAo Z2FwID09IDApIGdhcCA9IC0xOwogCQl9CiAJCWlmIChzdGFydCA8IHNnaV9n ZXRfc3RhcnRfc2VjdG9yKGN4dCwgSW5kZXhbaV0pKSB7CiAJCQlpZiAodmVy Ym9zZSkKLQkJCQlmZGlza19pbmZvKGN4dCwgXygiVW51c2VkIGdhcCBvZiAl OHUgc2VjdG9ycyAiCi0JCQkJCSAgICAiLSBzZWN0b3JzICU4dS0ldSIpLAot CQkJCSAgICAgICBzZ2lfZ2V0X3N0YXJ0X3NlY3RvcihjeHQsIEluZGV4W2ld KSAtIHN0YXJ0LAotCQkJCSAgICAgICBzdGFydCwgc2dpX2dldF9zdGFydF9z ZWN0b3IoY3h0LCBJbmRleFtpXSktMSk7CisJCQkJZmRpc2tfaW5mbyhjeHQs CisJCQkJCSAgIFBfKCJVbnVzZWQgZ2FwIG9mICU4dSBzZWN0b3I6IHNlY3Rv ciAlOHUiLAorCQkJCQkgICAgICAiVW51c2VkIGdhcCBvZiAlOHUgc2VjdG9y czogc2VjdG9ycyAlOHUtJXUiLAorCQkJCQkgICAgICBzZ2lfZ2V0X3N0YXJ0 X3NlY3RvcihjeHQsIEluZGV4W2ldKSAtIHN0YXJ0KSwKKwkJCQkJICAgc2dp X2dldF9zdGFydF9zZWN0b3IoY3h0LCBJbmRleFtpXSkgLSBzdGFydCwKKwkJ CQkJICAgc3RhcnQsIHNnaV9nZXRfc3RhcnRfc2VjdG9yKGN4dCwgSW5kZXhb aV0pLTEpOwogCQkJZ2FwICs9IHNnaV9nZXRfc3RhcnRfc2VjdG9yKGN4dCwg SW5kZXhbaV0pIC0gc3RhcnQ7CiAJCQlhZGRfdG9fZnJlZWxpc3QoY3h0LCBz dGFydCwKIAkJCQkJc2dpX2dldF9zdGFydF9zZWN0b3IoY3h0LCBJbmRleFtp XSkpOwpAQCAtNjg2LDggKzY5MiwxMCBAQCBzdGF0aWMgaW50IHZlcmlmeV9k aXNrbGFiZWwoc3RydWN0IGZkaXNrX2NvbnRleHQgKmN4dCwgaW50IHZlcmJv c2UpCiAJfQogCWlmIChzdGFydCA8IGxhc3RibG9jaykgewogCQlpZiAodmVy Ym9zZSkKLQkJCWZkaXNrX2luZm8oY3h0LCBfKCJVbnVzZWQgZ2FwIG9mICU4 dSBzZWN0b3JzIC0gc2VjdG9ycyAlOHUtJXUiKSwKLQkJCQlsYXN0YmxvY2sg LSBzdGFydCwgc3RhcnQsIGxhc3RibG9jay0xKTsKKwkJCWZkaXNrX2luZm8o Y3h0LCBQXygiVW51c2VkIGdhcCBvZiAlOHUgc2VjdG9yOiBzZWN0b3IgJTh1 IiwKKwkJCQkJICAgIlVudXNlZCBnYXAgb2YgJTh1IHNlY3RvcnM6IHNlY3Rv cnMgJTh1LSV1IiwKKwkJCQkJICAgbGFzdGJsb2NrIC0gc3RhcnQpLAorCQkJ CSAgIGxhc3RibG9jayAtIHN0YXJ0LCBzdGFydCwgbGFzdGJsb2NrLTEpOwog CQlnYXAgKz0gbGFzdGJsb2NrIC0gc3RhcnQ7CiAJCWFkZF90b19mcmVlbGlz dChjeHQsIHN0YXJ0LCBsYXN0YmxvY2spOwogCX0KLS0gCjEuNy4wLjQKCg== --_----------=_138105615264964 Content-Disposition: attachment; filename="0009-libfdisk-sgi-tweak-and-harmonize-some-comments.patch" Content-Id: <1381056058.5872.dd8973905ab37f7ef029286dbf2e105247accad9.480705BC@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0009-libfdisk-sgi-tweak-and-harmonize-some-comments.patch" RnJvbSBkZjI3ODQzYTJlZmI1YTUzNjY0ODk2Nzc4ZDQwNzc4YzJmOWQzMzc2 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogU2F0LCA1IE9j dCAyMDEzIDExOjAxOjI4ICswMjAwClN1YmplY3Q6IFtQQVRDSCAwOS8xNV0g bGliZmRpc2svc2dpOiB0d2VhayBhbmQgaGFybW9uaXplIHNvbWUgY29tbWVu dHMKClNpZ25lZC1vZmYtYnk6IEJlbm5vIFNjaHVsZW5iZXJnIDxiZW5zYmVy Z0BqdXN0ZW1haWwubmV0PgotLS0KIGxpYmZkaXNrL3NyYy9zZ2kuYyB8ICAg NDAgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog MSBmaWxlcyBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9saWJmZGlzay9zcmMvc2dpLmMgYi9saWJm ZGlzay9zcmMvc2dpLmMKaW5kZXggZjM3YjhmZi4uNTBiOTVjZCAxMDA2NDQK LS0tIGEvbGliZmRpc2svc3JjL3NnaS5jCisrKyBiL2xpYmZkaXNrL3NyYy9z Z2kuYwpAQCAtMywxMiArMywxMiBAQAogICogQ29weXJpZ2h0IChDKSAyMDEy IERhdmlkbG9ociBCdWVzbyA8ZGF2ZUBnbnUub3JnPgogICogICAgICAgICAg ICAgICAyMDEzIEthcmVsIFphayA8a3pha0ByZWRoYXQuY29tPgogICoKLSAq IFRoaXMgaXMgcmUtd3JpdHRlbiB2ZXJzaW9uIGZvciBsaWJmZGlzaywgdGhl IG9yaWdpbmFsIHdhcyBmZGlza3NnaWxhYmVsLmMKKyAqIFRoaXMgaXMgYSBy ZS13cml0dGVuIHZlcnNpb24gZm9yIGxpYmZkaXNrLCB0aGUgb3JpZ2luYWwg d2FzIGZkaXNrc2dpbGFiZWwuYwogICogZnJvbSB1dGlsLWxpbnV4IGZkaXNr LCBieToKICAqCi0gKiAgICAgICAgICAgICAgIEFuZHJlYXMgTmV1cGVyLCBT ZXAgMTk5OC4KLSAqICAgICAgICAgICAgICAgQXJuYWxkbyBDYXJ2YWxobyBk ZSBNZWxvIDxhY21lQGNvbmVjdGl2YS5jb20uYnI+LCBNYXIgMTk5OQotICog ICAgICAgICAgICAgICBQaGlsbGlwIEtlc2xpbmcgPHBrZXNsaW5nQHNnaS5j b20+LCBNYXIgMjAwMworICogICAgICAgICAgICAgICBBbmRyZWFzIE5ldXBl ciwgU2VwIDE5OTgsCisgKiAgICAgICAgICAgICAgIEFybmFsZG8gQ2FydmFs aG8gZGUgTWVsbyA8YWNtZUBjb25lY3RpdmEuY29tLmJyPiwgTWFyIDE5OTks CisgKiAgICAgICAgICAgICAgIFBoaWxsaXAgS2VzbGluZyA8cGtlc2xpbmdA c2dpLmNvbT4sIE1hciAyMDAzLgogICovCiAjaW5jbHVkZSAiYy5oIgogI2lu Y2x1ZGUgIm5scy5oIgpAQCAtNjIsNyArNjIsNyBAQCBzdGF0aWMgdW5zaWdu ZWQgaW50IHNnaV9nZXRfbnVtX3NlY3RvcnMoc3RydWN0IGZkaXNrX2NvbnRl eHQgKmN4dCwgaW50IGkgKTsKIHN0YXRpYyBpbnQgc2dpX2dldF9ib290cGFy dGl0aW9uKHN0cnVjdCBmZGlza19jb250ZXh0ICpjeHQpOwogc3RhdGljIGlu dCBzZ2lfZ2V0X3N3YXBwYXJ0aXRpb24oc3RydWN0IGZkaXNrX2NvbnRleHQg KmN4dCk7CiAKLS8qIHJldHVybiBwb2l0ZXIgYnVmZmVyIHdpdGggb24tZGlz ayBkYXRhICovCisvKiBSZXR1cm5zIGEgcG9pbnRlciBidWZmZXIgd2l0aCBv bi1kaXNrIGRhdGEuICovCiBzdGF0aWMgaW5saW5lIHN0cnVjdCBzZ2lfZGlz a2xhYmVsICpzZWxmX2Rpc2tsYWJlbChzdHJ1Y3QgZmRpc2tfY29udGV4dCAq Y3h0KQogewogCWFzc2VydChjeHQpOwpAQCAtNzIsNyArNzIsNyBAQCBzdGF0 aWMgaW5saW5lIHN0cnVjdCBzZ2lfZGlza2xhYmVsICpzZWxmX2Rpc2tsYWJl bChzdHJ1Y3QgZmRpc2tfY29udGV4dCAqY3h0KQogCXJldHVybiAoKHN0cnVj dCBmZGlza19zZ2lfbGFiZWwgKikgY3h0LT5sYWJlbCktPmhlYWRlcjsKIH0K IAotLyogcmV0dXJuIGluLW1lbW9yeSBmZGlzayBkYXRhICovCisvKiBSZXR1 cm5zIGluLW1lbW9yeSBmZGlzayBkYXRhLiAqLwogc3RhdGljIGlubGluZSBz dHJ1Y3QgZmRpc2tfc2dpX2xhYmVsICpzZWxmX2xhYmVsKHN0cnVjdCBmZGlz a19jb250ZXh0ICpjeHQpCiB7CiAJYXNzZXJ0KGN4dCk7CkBAIC00MzMsOCAr NDMzLDcgQEAgc3RhdGljIGludCBzZ2lfY2hlY2tfYm9vdGZpbGUoc3RydWN0 IGZkaXNrX2NvbnRleHQgKmN4dCwgY29uc3QgY2hhciAqbmFtZSkKIAkJZmRp c2tfd2FybngoY3h0LCBfKCJCZSBhd2FyZSwgdGhhdCB0aGUgYm9vdGZpbGUg aXMgbm90IGNoZWNrZWQgIgogCQkJImZvciBleGlzdGVuY2UuIFNHSSdzIGRl ZmF1bHQgaXMgXCIvdW5peFwiIGFuZCBmb3IgIgogCQkJImJhY2t1cCBcIi91 bml4LnNhdmVcIi4iKSk7Ci0JCS8qIGZpbGVuYW1lIGlzIGNvcnJlY3QgYW5k IGRpZCBjaGFuZ2UgKi8KLQkJcmV0dXJuIDA7CisJCXJldHVybiAwOwkvKiBm aWxlbmFtZSBpcyBjb3JyZWN0IGFuZCBkaWQgY2hhbmdlICovCiAJfQogCiAJ cmV0dXJuIDE7CS8qIGZpbGVuYW1lIGRpZCBub3QgY2hhbmdlICovCkBAIC00 OTMsOCArNDkyLDggQEAgc3RhdGljIGludCBzZ2lfd3JpdGVfZGlza2xhYmVs KHN0cnVjdCBmZGlza19jb250ZXh0ICpjeHQpCiAJCWdvdG8gZXJyOwogCWlm ICghc3RybmNtcCgoY2hhciAqKSBzZ2lsYWJlbC0+dm9sdW1lWzBdLm5hbWUs ICJzZ2lsYWJlbCIsIDgpKSB7CiAJCS8qCi0JCSAqIGtlZXAgdGhpcyBoYWJp dCBvZiBmaXJzdCB3cml0aW5nIHRoZSAic2dpbGFiZWwiLgotCQkgKiBJIG5l dmVyIHRlc3RlZCB3aGV0aGVyIGl0IHdvcmtzIHdpdGhvdXQgKEFOIDk4MTAw MikuCisJCSAqIEtlZXAgdGhpcyBoYWJpdCBvZiBmaXJzdCB3cml0aW5nIHRo ZSAic2dpbGFiZWwiLgorCQkgKiBJIG5ldmVyIHRlc3RlZCB3aGV0aGVyIGl0 IHdvcmtzIHdpdGhvdXQuIChBTiAxOTk4LTEwLTAyKQogCQkgKi8KIAkJaW50 IGluZm9zdGFydGJsb2NrCiAJCQk9IGJlMzJfdG9fY3B1KHNnaWxhYmVsLT52 b2x1bWVbMF0uYmxvY2tfbnVtKTsKQEAgLTUyMCw4ICs1MTksOCBAQCBzdGF0 aWMgaW50IGNvbXBhcmVfc3RhcnQoc3RydWN0IGZkaXNrX2NvbnRleHQgKmN4 dCwKIAkJCSBjb25zdCB2b2lkICp4LCBjb25zdCB2b2lkICp5KQogewogCS8q Ci0JICogc29ydCBhY2NvcmRpbmcgdG8gc3RhcnQgc2VjdG9ycyBhbmQgcHJl ZmVycyBsYXJnZXN0IHBhcnRpdGlvbjogZW50cnkKLQkgKiB6ZXJvIGlzIGVu dGlyZSBkaXNrIGVudHJ5CisJICogU29ydCBhY2NvcmRpbmcgdG8gc3RhcnQg c2VjdG9ycyBhbmQgcHJlZmVyIHRoZSBsYXJnZXN0IHBhcnRpdGlvbjoKKwkg KiBlbnRyeSB6ZXJvIGlzIHRoZSBlbnRpcmUtZGlzayBlbnRyeS4KIAkgKi8K IAl1bnNpZ25lZCBpbnQgaSA9ICooaW50ICopIHg7CiAJdW5zaWduZWQgaW50 IGogPSAqKGludCAqKSB5OwpAQCAtNjU2LDYgKzY1NSw3IEBAIHN0YXRpYyBp bnQgdmVyaWZ5X2Rpc2tsYWJlbChzdHJ1Y3QgZmRpc2tfY29udGV4dCAqY3h0 LCBpbnQgdmVyYm9zZSkKIAkJLyogV2UgY2Fubm90IGhhbmRsZSBzZXZlcmFs ICJlbnRpcmUgZGlzayIgZW50cmllcy4gKi8KIAkJaWYgKHNnaV9nZXRfc3lz aWQoY3h0LCBJbmRleFtpXSkgPT0gU0dJX1RZUEVfRU5USVJFX0RJU0spCiAJ CQljb250aW51ZTsKKwogCQlpZiAoc3RhcnQgPiBzZ2lfZ2V0X3N0YXJ0X3Nl Y3RvcihjeHQsIEluZGV4W2ldKSkgewogCQkJaWYgKHZlcmJvc2UpCiAJCQkJ ZmRpc2tfaW5mbyhjeHQsCkBAIC02ODEsNyArNjgxLDcgQEAgc3RhdGljIGlu dCB2ZXJpZnlfZGlza2xhYmVsKHN0cnVjdCBmZGlza19jb250ZXh0ICpjeHQs IGludCB2ZXJib3NlKQogCQl9CiAJCXN0YXJ0ID0gc2dpX2dldF9zdGFydF9z ZWN0b3IoY3h0LCBJbmRleFtpXSkKIAkJCSsgc2dpX2dldF9udW1fc2VjdG9y cyhjeHQsIEluZGV4W2ldKTsKLQkJLyogQWxpZ24gZnJlZSBzcGFjZSBvbiBj eWxpbmRlciBib3VuZGFyeSAqLworCQkvKiBBbGlnbiBmcmVlIHNwYWNlIG9u IGN5bGluZGVyIGJvdW5kYXJ5LiAqLwogCQlpZiAoY3lsc2l6ZSAmJiBzdGFy dCAlIGN5bHNpemUpCiAJCQlzdGFydCArPSBjeWxzaXplIC0gKHN0YXJ0ICUg Y3lsc2l6ZSk7CiAKQEAgLTcwMCw3ICs3MDAsNyBAQCBzdGF0aWMgaW50IHZl cmlmeV9kaXNrbGFiZWwoc3RydWN0IGZkaXNrX2NvbnRleHQgKmN4dCwgaW50 IHZlcmJvc2UpCiAJCWFkZF90b19mcmVlbGlzdChjeHQsIHN0YXJ0LCBsYXN0 YmxvY2spOwogCX0KIAkvKgotCSAqIERvbmUgd2l0aCBhcml0aG1ldGljcy4g R28gZm9yIGRldGFpbHMgbm93CisJICogRG9uZSB3aXRoIGFyaXRobWV0aWNz LiBHbyBmb3IgZGV0YWlscyBub3cuCiAJICovCiAJaWYgKHZlcmJvc2UpIHsK IAkJaWYgKHNnaV9nZXRfYm9vdHBhcnRpdGlvbihjeHQpIDwgMApAQCAtNzM5 LDcgKzczOSw3IEBAIHN0YXRpYyBpbnQgc2dpX2dhcHMoc3RydWN0IGZkaXNr X2NvbnRleHQgKmN4dCkKIAlyZXR1cm4gdmVyaWZ5X2Rpc2tsYWJlbChjeHQs IDApOwogfQogCi0vKiByZXR1cm5zIHBhcnRpdGlvbiBpbmRleCBvZiBmaXJz dCBlbnRyeSBtYXJrZWQgYXMgZW50aXJlIGRpc2sgKi8KKy8qIFJldHVybnMg cGFydGl0aW9uIGluZGV4IG9mIGZpcnN0IGVudHJ5IG1hcmtlZCBhcyBlbnRp cmUgZGlzay4gKi8KIHN0YXRpYyBpbnQgc2dpX2VudGlyZShzdHJ1Y3QgZmRp c2tfY29udGV4dCAqY3h0KQogewogCXNpemVfdCBpOwpAQCAtNzk0LDEwICs3 OTQsNyBAQCBzdGF0aWMgdm9pZCBzZ2lfc2V0X3ZvbGhkcihzdHJ1Y3QgZmRp c2tfY29udGV4dCAqY3h0KQogCiAJZm9yIChuID0gODsgbiA8IGN4dC0+bGFi ZWwtPm5wYXJ0c19tYXg7IG4rKykgewogCQlpZiAoIXNnaV9nZXRfbnVtX3Nl Y3RvcnMoY3h0LCBuKSkgewotCQkJLyoKLQkJCSAqIENob29zZSBzYW1lIGRl ZmF1bHQgdm9sdW1lIGhlYWRlciBzaXplCi0JCQkgKiBhcyBJUklYIGZ4IHVz ZXMuCi0JCQkgKi8KKwkJCS8qIENob29zZSBzYW1lIGRlZmF1bHQgdm9sdW1l IGhlYWRlciBzaXplIGFzIElSSVggZnggdXNlcy4gKi8KIAkJCWlmICg0MDk2 IDwgc2dpX2dldF9sYXN0YmxvY2soY3h0KSkKIAkJCQlzZ2lfc2V0X3BhcnRp dGlvbihjeHQsIG4sIDAsIDQwOTYsIFNHSV9UWVBFX1ZPTEhEUik7CiAJCQli cmVhazsKQEAgLTExMDMsNyArMTEwMCw2IEBAIHN0YXRpYyBpbnQgc2dpX2dl dF9wYXJ0aXRpb25fc3RhdHVzKAogCQlzaXplX3QgaSwKIAkJaW50ICpzdGF0 dXMpCiB7Ci0KIAlhc3NlcnQoY3h0KTsKIAlhc3NlcnQoZmRpc2tfaXNfZGlz a2xhYmVsKGN4dCwgU0dJKSk7CiAKQEAgLTExNjYsOSArMTE2Miw3IEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZmRpc2tfbGFiZWxfb3BlcmF0aW9ucyBzZ2lf b3BlcmF0aW9ucyA9CiAJLnBhcnRfdG9nZ2xlX2ZsYWcgPSBzZ2lfdG9nZ2xl X3BhcnRpdGlvbl9mbGFnCiB9OwogCi0vKgotICogYWxsb2NhdGVzIFNHSSBs YWJlbCBkcml2ZXIKLSAqLworLyogQWxsb2NhdGVzIGFuIFNHSSBsYWJlbCBk cml2ZXIuICovCiBzdHJ1Y3QgZmRpc2tfbGFiZWwgKmZkaXNrX25ld19zZ2lf bGFiZWwoc3RydWN0IGZkaXNrX2NvbnRleHQgKmN4dCkKIHsKIAlzdHJ1Y3Qg ZmRpc2tfbGFiZWwgKmxiOwotLSAKMS43LjAuNAoK --_----------=_138105615264964 Content-Disposition: attachment; filename="0010-libfdisk-sgi-tweak-and-harmonize-some-message-string.patch" Content-Id: <1381056068.6358.b71864ef092e12b0284316297e7565edc2aae36c.64585D61@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0010-libfdisk-sgi-tweak-and-harmonize-some-message-string.patch" RnJvbSAzZmRhN2Q4NmQ0ZTRjMjY4OWRhMTRlZDY0NTI4Y2Q4YTFhYzE3N2Qz IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogU2F0LCA1IE9j dCAyMDEzIDExOjIyOjUzICswMjAwClN1YmplY3Q6IFtQQVRDSCAxMC8xNV0g bGliZmRpc2svc2dpOiB0d2VhayBhbmQgaGFybW9uaXplIHNvbWUgbWVzc2Fn ZSBzdHJpbmdzCgpVc2luZyBjb25zaXN0ZW50IGNhcGl0YWxzIGFuZCBsb3dl cmNhc2UsIGFkZGluZyBtaXNzaW5nIHBlcmlvZHMgYW5kCmEgbWlzc2luZyBz cGFjZSwgcmVwb3NpdGlvbmluZyBjb21tYXMgZm9yIGNsYXJpdHksIGltcHJv dmluZyBncmFtbWFyLAphbmQgYWxpZ25pbmcgc3Vic3RyaW5ncyBmb3IgZXN0 aGV0aWNzLgoKU2lnbmVkLW9mZi1ieTogQmVubm8gU2NodWxlbmJlcmcgPGJl bnNiZXJnQGp1c3RlbWFpbC5uZXQ+Ci0tLQogbGliZmRpc2svc3JjL3NnaS5j IHwgICA1MSArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgMjUgaW5zZXJ0aW9u cygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliZmRpc2sv c3JjL3NnaS5jIGIvbGliZmRpc2svc3JjL3NnaS5jCmluZGV4IDUwYjk1Y2Qu LjhjZmYzOTQgMTAwNjQ0Ci0tLSBhL2xpYmZkaXNrL3NyYy9zZ2kuYworKysg Yi9saWJmZGlzay9zcmMvc2dpLmMKQEAgLTIzOCw3ICsyMzgsNyBAQCBzdGF0 aWMgaW50IHNnaV9wcm9iZV9sYWJlbChzdHJ1Y3QgZmRpc2tfY29udGV4dCAq Y3h0KQogCSAqIHRlc3QgZm9yIGNvcnJlY3QgY2hlY2tzdW0KIAkgKi8KIAlp ZiAoc2dpX3B0X2NoZWNrc3VtKHNnaWxhYmVsKSAhPSAwKQotCQlmZGlza193 YXJueChjeHQsIF8oIkRldGVjdGVkIHNnaSBkaXNrbGFiZWwgd2l0aCB3cm9u ZyBjaGVja3N1bS4iKSk7CisJCWZkaXNrX3dhcm54KGN4dCwgXygiRGV0ZWN0 ZWQgYW4gU0dJIGRpc2tsYWJlbCB3aXRoIHdyb25nIGNoZWNrc3VtLiIpKTsK IAogCWNsZWFyX2ZyZWVsaXN0KGN4dCk7CiAJY3h0LT5sYWJlbC0+bnBhcnRz X21heCA9IFNHSV9NQVhQQVJUSVRJT05TOwpAQCAtNDExLDkgKzQxMSw5IEBA IHN0YXRpYyBpbnQgc2dpX2NoZWNrX2Jvb3RmaWxlKHN0cnVjdCBmZGlza19j b250ZXh0ICpjeHQsIGNvbnN0IGNoYXIgKm5hbWUpCiAKIAlpZiAoc3ogPCAz KSB7CiAJCS8qICIvYVxuIiBpcyBtaW5pbXVtICovCi0JCWZkaXNrX3dhcm54 KGN4dCwgXygiSW52YWxpZCBCb290ZmlsZSEgIgotCQkJICJUaGUgYm9vdGZp bGUgbXVzdCBiZSBhbiBhYnNvbHV0ZSBub24temVybyBwYXRobmFtZSwiCi0J CQkgImUuZy4gXCIvdW5peFwiIG9yIFwiL3VuaXguc2F2ZVwiLiIpKTsKKwkJ ZmRpc2tfd2FybngoY3h0LCBfKCJJbnZhbGlkIGJvb3RmaWxlISAgVGhlIGJv b3RmaWxlIG11c3QgIgorCQkJCSAgICJiZSBhbiBhYnNvbHV0ZSBub24temVy byBwYXRobmFtZSwgIgorCQkJCSAgICJlLmcuIFwiL3VuaXhcIiBvciBcIi91 bml4LnNhdmVcIi4iKSk7CiAJCXJldHVybiAtRUlOVkFMOwogCiAJfSBlbHNl IGlmIChzeiA+IHNpemVvZihzZ2lsYWJlbC0+Ym9vdF9maWxlKSkgewpAQCAt NDMwLDkgKzQzMCw5IEBAIHN0YXRpYyBpbnQgc2dpX2NoZWNrX2Jvb3RmaWxl KHN0cnVjdCBmZGlza19jb250ZXh0ICpjeHQsIGNvbnN0IGNoYXIgKm5hbWUp CiAKIAlpZiAoc3RybmNtcChuYW1lLCAoY2hhciAqKSBzZ2lsYWJlbC0+Ym9v dF9maWxlLAogCQkJCXNpemVvZihzZ2lsYWJlbC0+Ym9vdF9maWxlKSkpIHsK LQkJZmRpc2tfd2FybngoY3h0LCBfKCJCZSBhd2FyZSwgdGhhdCB0aGUgYm9v dGZpbGUgaXMgbm90IGNoZWNrZWQgIgotCQkJImZvciBleGlzdGVuY2UuIFNH SSdzIGRlZmF1bHQgaXMgXCIvdW5peFwiIGFuZCBmb3IgIgotCQkJImJhY2t1 cCBcIi91bml4LnNhdmVcIi4iKSk7CisJCWZkaXNrX3dhcm54KGN4dCwgXygi QmUgYXdhcmUgdGhhdCB0aGUgYm9vdGZpbGUgaXMgbm90IGNoZWNrZWQgIgor CQkJCSAgICJmb3IgZXhpc3RlbmNlLiAgU0dJJ3MgZGVmYXVsdCBpcyBcIi91 bml4XCIsICIKKwkJCQkgICAiYW5kIGZvciBiYWNrdXAgXCIvdW5peC5zYXZl XCIuIikpOwogCQlyZXR1cm4gMDsJLyogZmlsZW5hbWUgaXMgY29ycmVjdCBh bmQgZGlkIGNoYW5nZSAqLwogCX0KIApAQCAtNDUzLDcgKzQ1Myw3IEBAIGlu dCBmZGlza19zZ2lfc2V0X2Jvb3RmaWxlKHN0cnVjdCBmZGlza19jb250ZXh0 ICpjeHQpCiAJCXJjID0gc2dpX2NoZWNrX2Jvb3RmaWxlKGN4dCwgbmFtZSk7 CiAJaWYgKHJjKSB7CiAJCWlmIChyYyA9PSAxKQotCQkJZmRpc2tfaW5mbyhj eHQsIF8oIkJvb3QgZmlsZSB1bmNoYW5nZWQiKSk7CisJCQlmZGlza19pbmZv KGN4dCwgXygiQm9vdCBmaWxlIGlzIHVuY2hhbmdlZC4iKSk7CiAJCWdvdG8g ZG9uZTsKIAl9CiAKQEAgLTQ2NSw3ICs0NjUsNyBAQCBpbnQgZmRpc2tfc2dp X3NldF9ib290ZmlsZShzdHJ1Y3QgZmRpc2tfY29udGV4dCAqY3h0KQogCW1l bWNweShzZ2lsYWJlbC0+Ym9vdF9maWxlLCBuYW1lLCBzeik7CiAKIAlmZGlz a19zaW5mbyhjeHQsIEZESVNLX0lORk9fU1VDQ0VTUywKLQkJCV8oIkJvb3Rm aWxlIGlzIGNoYW5nZWQgdG8gXCIlc1wiLiIpLCBuYW1lKTsKKwkJCV8oIkJv b3RmaWxlIGhhcyBiZWVuIGNoYW5nZWQgdG8gXCIlc1wiLiIpLCBuYW1lKTsK IGRvbmU6CiAJZnJlZShuYW1lKTsKIAlyZXR1cm4gcmM7CkBAIC02MTIsNyAr NjEyLDcgQEAgc3RhdGljIGludCB2ZXJpZnlfZGlza2xhYmVsKHN0cnVjdCBm ZGlza19jb250ZXh0ICpjeHQsIGludCB2ZXJib3NlKQogCX0KIAlpZiAoc29y dGNvdW50ID09IDApIHsKIAkJaWYgKHZlcmJvc2UpCi0JCQlmZGlza19pbmZv KGN4dCwgXygiTm8gcGFydGl0aW9ucyBkZWZpbmVkIikpOworCQkJZmRpc2tf aW5mbyhjeHQsIF8oIk5vIHBhcnRpdGlvbnMgZGVmaW5lZC4iKSk7CiAJCXJl dHVybiAobGFzdGJsb2NrID4gMCkgPyAxIDogKGxhc3RibG9jayA9PSAwKSA/ IDAgOiAtMTsKIAl9CiAKQEAgLTYyMCwxMyArNjIwLDEzIEBAIHN0YXRpYyBp bnQgdmVyaWZ5X2Rpc2tsYWJlbChzdHJ1Y3QgZmRpc2tfY29udGV4dCAqY3h0 LCBpbnQgdmVyYm9zZSkKIAogCWlmIChzZ2lfZ2V0X3N5c2lkKGN4dCwgSW5k ZXhbMF0pID09IFNHSV9UWVBFX0VOVElSRV9ESVNLKSB7CiAJCWlmICh2ZXJi b3NlICYmIEluZGV4WzBdICE9IDEwKQotCQkJZmRpc2tfaW5mbyhjeHQsIF8o IklSSVggbGlrZXMgd2hlbiBQYXJ0aXRpb24gMTEgIgorCQkJZmRpc2tfaW5m byhjeHQsIF8oIklSSVggbGlrZXMgaXQgd2hlbiBwYXJ0aXRpb24gMTEgIgog CQkJCQkgICJjb3ZlcnMgdGhlIGVudGlyZSBkaXNrLiIpKTsKIAogCQlpZiAo dmVyYm9zZSAmJiBzZ2lfZ2V0X3N0YXJ0X3NlY3RvcihjeHQsIEluZGV4WzBd KSAhPSAwKQogCQkJZmRpc2tfaW5mbyhjeHQsIF8oIlRoZSBlbnRpcmUgZGlz ayBwYXJ0aXRpb24gc2hvdWxkICIKLQkJCQkic3RhcnQgYXQgYmxvY2sgMCwg bm90IGF0IGRpc2tibG9jayAlZC4iKSwKLQkJCSAgICAgICBzZ2lfZ2V0X3N0 YXJ0X3NlY3RvcihjeHQsIEluZGV4WzBdKSk7CisJCQkJCSAgInN0YXJ0IGF0 IGJsb2NrIDAsIG5vdCBhdCBibG9jayAlZC4iKSwKKwkJCQkgICBzZ2lfZ2V0 X3N0YXJ0X3NlY3RvcihjeHQsIEluZGV4WzBdKSk7CiAKIAkJaWYgKHZlcmJv c2UgJiYgc2dpX2dldF9udW1fc2VjdG9ycyhjeHQsIEluZGV4WzBdKSAhPSBs YXN0YmxvY2spCiAJCQlEQkcoTEFCRUwsIGRiZ3ByaW50KApAQCAtNzE2LDgg KzcxNiw3IEBAIHN0YXRpYyBpbnQgdmVyaWZ5X2Rpc2tsYWJlbChzdHJ1Y3Qg ZmRpc2tfY29udGV4dCAqY3h0LCBpbnQgdmVyYm9zZSkKIAkJCWZkaXNrX2lu Zm8oY3h0LCBfKCJUaGUgc3dhcCBwYXJ0aXRpb24gaGFzIG5vIHN3YXAgdHlw ZS4iKSk7CiAKIAkJaWYgKHNnaV9jaGVja19ib290ZmlsZShjeHQsICIvdW5p eCIpKQotCQkJZmRpc2tfaW5mbyhjeHQsIF8oIllvdSBoYXZlIGNob3NlbiBh biB1bnVzdWFsIGJvb3QgIgotCQkJCQkgICJmaWxlIG5hbWUuIikpOworCQkJ ZmRpc2tfaW5mbyhjeHQsIF8oIllvdSBoYXZlIGNob3NlbiBhbiB1bnVzdWFs IGJvb3RmaWxlIG5hbWUuIikpOwogCX0KIAogCXJldHVybiAoZ2FwID4gMCkg PyAxIDogKGdhcCA9PSAwKSA/IDAgOiAtMTsKQEAgLTg0Miw4ICs4NDEsOCBA QCBzdGF0aWMgaW50IHNnaV9hZGRfcGFydGl0aW9uKHN0cnVjdCBmZGlza19j b250ZXh0ICpjeHQsCiAJc2dpID0gc2VsZl9sYWJlbChjeHQpOwogCiAJaWYg KHNnaV9nZXRfbnVtX3NlY3RvcnMoY3h0LCBuKSkgewotCQlmZGlza193YXJu eChjeHQsIF8oIlBhcnRpdGlvbiAlemQgaXMgYWxyZWFkeSBkZWZpbmVkLiAg RGVsZXRlICIKLQkJCSAiaXQgYmVmb3JlIHJlLWFkZGluZyBpdC4iKSwgbiAr IDEpOworCQlmZGlza193YXJueChjeHQsIF8oIlBhcnRpdGlvbiAlemQgaXMg YWxyZWFkeSBkZWZpbmVkLiAgIgorCQkJCSAgICJEZWxldGUgaXQgYmVmb3Jl IHJlLWFkZGluZyBpdC4iKSwgbiArIDEpOwogCQlyZXR1cm4gLUVJTlZBTDsK IAl9CiAJaWYgKHNnaV9lbnRpcmUoY3h0KSA9PSAtMSAmJiAgc3lzICE9IFNH SV9UWVBFX0VOVElSRV9ESVNLKSB7CkBAIC04OTAsOSArODg5LDkgQEAgc3Rh dGljIGludCBzZ2lfYWRkX3BhcnRpdGlvbihzdHJ1Y3QgZmRpc2tfY29udGV4 dCAqY3h0LAogCQkJcmV0dXJuIHJjOwogCiAJCWlmIChmaXJzdCAmJiBzeXMg PT0gU0dJX1RZUEVfRU5USVJFX0RJU0spCi0JCQlmZGlza19pbmZvKGN4dCwg XygiSXQgaXMgaGlnaGx5IHJlY29tbWVuZGVkIHRoYXQgIgotCQkJCQkiZWxl dmVudGggcGFydGl0aW9uIGNvdmVycyB0aGUgZW50aXJlICIKLQkJCQkJImRp c2sgYW5kIGlzIG9mIHR5cGUgYFNHSSB2b2x1bWUnIikpOworCQkJZmRpc2tf aW5mbyhjeHQsIF8oIkl0IGlzIGhpZ2hseSByZWNvbW1lbmRlZCB0aGF0IHRo ZSAiCisJCQkJCSAgImVsZXZlbnRoIHBhcnRpdGlvbiBjb3ZlcnMgdGhlIGVu dGlyZSAiCisJCQkJCSAgImRpc2sgYW5kIGlzIG9mIHR5cGUgJ1NHSSB2b2x1 bWUnLiIpKTsKIAogCQlpZiAoZmRpc2tfY29udGV4dF91c2VfY3lsaW5kZXJz KGN4dCkpCiAJCQlmaXJzdCAqPSBmZGlza19jb250ZXh0X2dldF91bml0c19w ZXJfc2VjdG9yKGN4dCk7CkBAIC05MDIsNyArOTAxLDcgQEAgc3RhdGljIGlu dCBzZ2lfYWRkX3BhcnRpdGlvbihzdHJ1Y3QgZmRpc2tfY29udGV4dCAqY3h0 LAogCQkJbGFzdCA9IGlzX2luX2ZyZWVsaXN0KGN4dCwgZmlyc3QpOwogCQlp ZiAobGFzdCA9PSAwKQogCQkJZmRpc2tfd2FybngoY3h0LCBfKCJZb3Ugd2ls bCBnZXQgYSBwYXJ0aXRpb24gb3ZlcmxhcCAiCi0JCQkJIm9uIHRoZSBkaXNr LiBGaXggaXQgZmlyc3QhIikpOworCQkJCQkgICAib24gdGhlIGRpc2suIEZp eCBpdCBmaXJzdCEiKSk7CiAJCWVsc2UKIAkJCWJyZWFrOwogCX0KQEAgLTk0 Myw5ICs5NDIsOSBAQCBzdGF0aWMgaW50IHNnaV9hZGRfcGFydGl0aW9uKHN0 cnVjdCBmZGlza19jb250ZXh0ICpjeHQsCiAKIAlpZiAoc3lzID09IFNHSV9U WVBFX0VOVElSRV9ESVNLCiAJICAgICYmIChmaXJzdCAhPSAwIHx8IGxhc3Qg IT0gc2dpX2dldF9sYXN0YmxvY2soY3h0KSkpCi0JCWZkaXNrX2luZm8oY3h0 LCBfKCJJdCBpcyBoaWdobHkgcmVjb21tZW5kZWQgdGhhdCBlbGV2ZW50aCAi Ci0JCQkicGFydGl0aW9uIGNvdmVycyB0aGUgZW50aXJlIGRpc2sgYW5kIGlz IG9mIHR5cGUgIgotCQkJImBTR0kgdm9sdW1lJyIpKTsKKwkJZmRpc2tfaW5m byhjeHQsIF8oIkl0IGlzIGhpZ2hseSByZWNvbW1lbmRlZCB0aGF0IHRoZSAi CisJCQkJICAiZWxldmVudGggcGFydGl0aW9uIGNvdmVycyB0aGUgZW50aXJl ICIKKwkJCQkgICJkaXNrIGFuZCBpcyBvZiB0eXBlICdTR0kgdm9sdW1lJy4i KSk7CiAKIAlzZ2lfc2V0X3BhcnRpdGlvbihjeHQsIG4sIGZpcnN0LCBsYXN0 IC0gZmlyc3QsIHN5cyk7CiAJY3h0LT5sYWJlbC0+bnBhcnRzX2N1ciA9IGNv dW50X3VzZWRfcGFydGl0aW9ucyhjeHQpOwpAQCAtMTA3Myw4ICsxMDcyLDgg QEAgc3RhdGljIGludCBzZ2lfc2V0X3BhcnR0eXBlKHN0cnVjdCBmZGlza19j b250ZXh0ICpjeHQsCiAJaWYgKChpID09IDEwICYmIHQtPnR5cGUgIT0gU0dJ X1RZUEVfRU5USVJFX0RJU0spCiAJICAgIHx8IChpID09IDggJiYgdC0+dHlw ZSAhPSAwKSkKIAkJZmRpc2tfaW5mbyhjeHQsIF8oIkNvbnNpZGVyIGxlYXZp bmcgcGFydGl0aW9uIDkgYXMgdm9sdW1lIGhlYWRlciAoMCksICIKLQkJCSAi YW5kIHBhcnRpdGlvbiAxMSBhcyBlbnRpcmUgdm9sdW1lICg2KSwgYXMgSVJJ WCAiCi0JCQkgImV4cGVjdHMgaXQuIikpOworCQkJCSAgImFuZCBwYXJ0aXRp b24gMTEgYXMgZW50aXJlIHZvbHVtZSAoNiksICIKKwkJCQkgICJhcyBJUklY IGV4cGVjdHMgaXQuIikpOwogCiAJaWYgKCgodC0+dHlwZSAhPSBTR0lfVFlQ RV9FTlRJUkVfRElTSykgJiYgKHQtPnR5cGUgIT0gU0dJX1RZUEVfVk9MSERS KSkKIAkgICAgJiYgKHNnaV9nZXRfc3RhcnRfc2VjdG9yKGN4dCwgaSkgPCAx KSkgewotLSAKMS43LjAuNAoK --_----------=_138105615264964 Content-Disposition: attachment; filename="0011-partx-pluralize-one-message.patch" Content-Id: <1381056073.6369.e3b9f67f7fc0b685b3b7e4dae1f837a8001ee012.2FD6D612@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0011-partx-pluralize-one-message.patch" RnJvbSBkOWE0YzIzNDhhYjllZmJiNTEzY2Y2ZTY3NzFlNDE0MDYxYmVkZDQx IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogU2F0LCA1IE9j dCAyMDEzIDExOjM3OjQ4ICswMjAwClN1YmplY3Q6IFtQQVRDSCAxMS8xNV0g cGFydHg6IHBsdXJhbGl6ZSBvbmUgbWVzc2FnZQpNSU1FLVZlcnNpb246IDEu MApDb250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29u dGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJpdAoKUmVwb3J0ZWQtYnk6IFBl dHIgUMOtc2HFmSA8cGV0ci5waXNhckBhdGxhcy5jej4KU2lnbmVkLW9mZi1i eTogQmVubm8gU2NodWxlbmJlcmcgPGJlbnNiZXJnQGp1c3RlbWFpbC5uZXQ+ Ci0tLQogZGlzay11dGlscy9wYXJ0eC5jIHwgICAgNCArKystCiAxIGZpbGVz IGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kaXNrLXV0aWxzL3BhcnR4LmMgYi9kaXNrLXV0aWxzL3Bh cnR4LmMKaW5kZXggYzRiMWQ3My4uYjY5YTMyOSAxMDA2NDQKLS0tIGEvZGlz ay11dGlscy9wYXJ0eC5jCisrKyBiL2Rpc2stdXRpbHMvcGFydHguYwpAQCAt NTIzLDcgKzUyMyw5IEBAIHN0YXRpYyBpbnQgbGlzdF9wYXJ0cyhibGtpZF9w YXJ0bGlzdCBscywgaW50IGxvd2VyLCBpbnQgdXBwZXIpCiAJCXN0YXJ0ID0g YmxraWRfcGFydGl0aW9uX2dldF9zdGFydChwYXIpOwogCQlzaXplID0gIGJs a2lkX3BhcnRpdGlvbl9nZXRfc2l6ZShwYXIpOwogCi0JCXByaW50ZihfKCIj JTJkOiAlOWp1LSU5anUgKCU5anUgc2VjdG9ycywgJTZqdSBNQilcbiIpLAor CQlwcmludGYoUF8oIiMlMmQ6ICU5anUtJTlqdSAoJTlqdSBzZWN0b3IsICU2 anUgTUIpXG4iLAorCQkJICAiIyUyZDogJTlqdS0lOWp1ICglOWp1IHNlY3Rv cnMsICU2anUgTUIpXG4iLAorCQkJICBzaXplKSwKIAkJICAgICAgIG4sIHN0 YXJ0LCBzdGFydCArIHNpemUgLTEsCiAJCSAgICAgICBzaXplLCAoc2l6ZSA8 PCA5KSAvIDEwMDAwMDApOwogCX0KLS0gCjEuNy4wLjQKCg== --_----------=_138105615264964 Content-Disposition: attachment; filename="0012-partx-correct-three-messages.patch" Content-Id: <1381056083.6358.6f8f73dd176054e37535435a86c3ec28207a36c6.35623C52@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0012-partx-correct-three-messages.patch" RnJvbSAzYzY5OGQxODIzOTA4OGIwZmM1NjVmNDMzMDk0YWQyOTNmZDgyZTk4 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogU2F0LCA1IE9j dCAyMDEzIDEyOjAxOjMyICswMjAwClN1YmplY3Q6IFtQQVRDSCAxMi8xNV0g cGFydHg6IGNvcnJlY3QgdGhyZWUgbWVzc2FnZXMKClByb3Blcmx5IGRlc2Ny aWJpbmcgdGhlIHBhcnRpdGlvbiB0eXBlLCB1c2luZyBhIHZlcmIgaW5zdGVh ZCBvZiBhIG5vdW4sCnB1dHRpbmcgdGhlIGJsYW5rIGxpbmUgYWZ0ZXIgdGhl IGNvbW1hbmQgb3B0aW9ucywgYW5kIHVzaW5nIHRoZSBjb3JyZWN0CmFyZ3Vt ZW50IGZvciAtLW91dHB1dC4KClNpZ25lZC1vZmYtYnk6IEJlbm5vIFNjaHVs ZW5iZXJnIDxiZW5zYmVyZ0BqdXN0ZW1haWwubmV0PgotLS0KIGRpc2stdXRp bHMvcGFydHguYyB8ICAgIDggKysrKy0tLS0KIDEgZmlsZXMgY2hhbmdlZCwg NCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2Rpc2stdXRpbHMvcGFydHguYyBiL2Rpc2stdXRpbHMvcGFydHguYwppbmRl eCBiNjlhMzI5Li44ODBkNzc5IDEwMDY0NAotLS0gYS9kaXNrLXV0aWxzL3Bh cnR4LmMKKysrIGIvZGlzay11dGlscy9wYXJ0eC5jCkBAIC04Niw3ICs4Niw3 IEBAIHN0cnVjdCBjb2xpbmZvIGluZm9zW10gPSB7CiAJW0NPTF9VVUlEXSAg ICAgPSB7ICJVVUlEIiwgICAgMzYsIDAsIE5fKCJwYXJ0aXRpb24gVVVJRCIp fSwKIAlbQ09MX1NDSEVNRV0gICA9IHsgIlNDSEVNRSIsICAwLjEsIFRUX0ZM X1RSVU5DLCBOXygicGFydGl0aW9uIHRhYmxlIHR5cGUgKGRvcywgZ3B0LCAu Li4pIil9LAogCVtDT0xfRkxBR1NdICAgID0geyAiRkxBR1MiLCAgIDAuMSwg VFRfRkxfVFJVTkMsIE5fKCJwYXJ0aXRpb24gZmxhZ3MiKX0sCi0JW0NPTF9U WVBFXSAgICAgPSB7ICJUWVBFIiwgICAgMSwgVFRfRkxfUklHSFQsIE5fKCJw YXJ0aXRpb24gdHlwZSBoZXggb3IgdXVpZCIpfSwKKwlbQ09MX1RZUEVdICAg ICA9IHsgIlRZUEUiLCAgICAxLCBUVF9GTF9SSUdIVCwgTl8oInBhcnRpdGlv biB0eXBlIChhIHN0cmluZywgYSBVVUlELCBvciBoZXgpIil9LAogfTsKIAog I2RlZmluZSBOQ09MUyBBUlJBWV9TSVpFKGluZm9zKQpAQCAtMTIxLDcgKzEy MSw3IEBAIHN0YXRpYyB2b2lkIGFzc29jX2xvb3BkZXYoY29uc3QgY2hhciAq Zm5hbWUpCiAJcmMgPSBsb29wY3h0X3NldHVwX2RldmljZSgmbGMpOwogCiAJ aWYgKHJjID09IC1FQlVTWSkKLQkJZXJyKEVYSVRfRkFJTFVSRSwgXygiJXM6 IGZhaWxlZCB0byBzZXR1cCBsb29wIGRldmljZSIpLCBmbmFtZSk7CisJCWVy cihFWElUX0ZBSUxVUkUsIF8oIiVzOiBmYWlsZWQgdG8gc2V0IHVwIGxvb3Ag ZGV2aWNlIiksIGZuYW1lKTsKIAogCWxvb3BkZXYgPSAxOwogfQpAQCAtNzAw LDEyICs3MDAsMTIgQEAgc3RhdGljIHZvaWQgX19hdHRyaWJ1dGVfXygoX19u b3JldHVybl9fKSkgdXNhZ2UoRklMRSAqb3V0KQogCWZwdXRzKFVTQUdFX09Q VElPTlMsIG91dCk7CiAJZnB1dHMoXygiIC1hLCAtLWFkZCAgICAgICAgICAg IGFkZCBzcGVjaWZpZWQgcGFydGl0aW9ucyBvciBhbGwgb2YgdGhlbVxuIiks IG91dCk7CiAJZnB1dHMoXygiIC1kLCAtLWRlbGV0ZSAgICAgICAgIGRlbGV0 ZSBzcGVjaWZpZWQgcGFydGl0aW9ucyBvciBhbGwgb2YgdGhlbVxuIiksIG91 dCk7Ci0JZnB1dHMoXygiIC1zLCAtLXNob3cgICAgICAgICAgIGxpc3QgcGFy dGl0aW9uc1xuXG4iKSwgb3V0KTsKIAlmcHV0cyhfKCIgLXUsIC0tdXBkYXRl ICAgICAgICAgdXBkYXRlIHNwZWNpZmllZCBwYXJ0aXRpb25zIG9yIGFsbCBv ZiB0aGVtXG4iKSwgb3V0KTsKKwlmcHV0cyhfKCIgLXMsIC0tc2hvdyAgICAg ICAgICAgbGlzdCBwYXJ0aXRpb25zXG5cbiIpLCBvdXQpOwogCWZwdXRzKF8o IiAtYiwgLS1ieXRlcyAgICAgICAgICBwcmludCBTSVpFIGluIGJ5dGVzIHJh dGhlciB0aGFuIGluIGh1bWFuIHJlYWRhYmxlIGZvcm1hdFxuIiksIG91dCk7 CiAJZnB1dHMoXygiIC1nLCAtLW5vaGVhZGluZ3MgICAgIGRvbid0IHByaW50 IGhlYWRpbmdzIGZvciAtLXNob3dcbiIpLCBvdXQpOwogCWZwdXRzKF8oIiAt biwgLS1uciA8bjptPiAgICAgICBzcGVjaWZ5IHRoZSByYW5nZSBvZiBwYXJ0 aXRpb25zIChlLmcuIC0tbnIgMjo0KVxuIiksIG91dCk7Ci0JZnB1dHMoXygi IC1vLCAtLW91dHB1dCA8dHlwZT4gIGRlZmluZSB3aGljaCBvdXRwdXQgY29s dW1ucyB0byB1c2VcbiIpLCBvdXQpOworCWZwdXRzKF8oIiAtbywgLS1vdXRw dXQgPGxpc3Q+ICBkZWZpbmUgd2hpY2ggb3V0cHV0IGNvbHVtbnMgdG8gdXNl XG4iKSwgb3V0KTsKIAlmcHV0cyhfKCIgLVAsIC0tcGFpcnMgICAgICAgICAg dXNlIGtleT1cInZhbHVlXCIgb3V0cHV0IGZvcm1hdFxuIiksIG91dCk7CiAJ ZnB1dHMoXygiIC1yLCAtLXJhdyAgICAgICAgICAgIHVzZSByYXcgb3V0cHV0 IGZvcm1hdFxuIiksIG91dCk7CiAJZnB1dHMoXygiIC10LCAtLXR5cGUgPHR5 cGU+ICAgIHNwZWNpZnkgdGhlIHBhcnRpdGlvbiB0eXBlIChkb3MsIGJzZCwg c29sYXJpcywgZXRjLilcbiIpLCBvdXQpOwotLSAKMS43LjAuNAoK --_----------=_138105615264964 Content-Disposition: attachment; filename="0013-wdctl-gettextize-and-pluralize-one-forgotten-message.patch" Content-Id: <1381056089.6369.c4b73c72801debf47977c073a1822e989f1fd5dc.04CE76D3@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0013-wdctl-gettextize-and-pluralize-one-forgotten-message.patch" RnJvbSA4N2ZmMWNhNDgyNjAyZjhkNGE2ZGM4MzdmNjUyN2Q1M2VkNjk4OWUy IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogU2F0LCA1IE9j dCAyMDEzIDIzOjEyOjIzICswMjAwClN1YmplY3Q6IFtQQVRDSCAxMy8xNV0g d2RjdGw6IGdldHRleHRpemUgYW5kIHBsdXJhbGl6ZSBvbmUgZm9yZ290dGVu IG1lc3NhZ2UKClNpZ25lZC1vZmYtYnk6IEJlbm5vIFNjaHVsZW5iZXJnIDxi ZW5zYmVyZ0BqdXN0ZW1haWwubmV0PgotLS0KIHN5cy11dGlscy93ZGN0bC5j IHwgICAgMyArKy0KIDEgZmlsZXMgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCsp LCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3N5cy11dGlscy93ZGN0 bC5jIGIvc3lzLXV0aWxzL3dkY3RsLmMKaW5kZXggMjY5ODg1My4uNzEzMDkx OCAxMDA2NDQKLS0tIGEvc3lzLXV0aWxzL3dkY3RsLmMKKysrIGIvc3lzLXV0 aWxzL3dkY3RsLmMKQEAgLTMzNCw3ICszMzQsOCBAQCBzdGF0aWMgaW50IHNl dF93YXRjaGRvZyhzdHJ1Y3Qgd2RpbmZvICp3ZCwgaW50IHRpbWVvdXQpCiAJ aWYgKGNsb3NlX2ZkKGZkKSkKIAkJd2FybihfKCJ3cml0ZSBmYWlsZWQiKSk7 CiAJc2lncHJvY21hc2soU0lHX1NFVE1BU0ssICZvbGRzaWdzLCBOVUxMKTsK LQlwcmludGYoIlNldCB0aW1lb3V0IHRvICVkIHNlY29uZHNcbiIsIHRpbWVv dXQpOworCXByaW50ZihQXygiVGltZW91dCBoYXMgYmVlbiBzZXQgdG8gJWQg c2Vjb25kLlxuIiwKKwkJICAiVGltZW91dCBoYXMgYmVlbiBzZXQgdG8gJWQg c2Vjb25kcy5cbiIsIHRpbWVvdXQpLCB0aW1lb3V0KTsKIAogCXJldHVybiBy YzsKIH0KLS0gCjEuNy4wLjQKCg== --_----------=_138105615264964 Content-Disposition: attachment; filename="0014-wdctl-pluralize-one-thrice-repeated-message.patch" Content-Id: <1381056096.6425.44da01940ed1ae4aeca71a85401f6a0fa4f61b6d.118B004A@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0014-wdctl-pluralize-one-thrice-repeated-message.patch" RnJvbSAzNzZjYTU0ZmEzZTY1OGQyNGI5NDU2ODdlZGFkMDhhMDBmZWNmNzlk IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogU2F0LCA1IE9j dCAyMDEzIDIzOjE5OjU1ICswMjAwClN1YmplY3Q6IFtQQVRDSCAxNC8xNV0g d2RjdGw6IHBsdXJhbGl6ZSBvbmUgdGhyaWNlLXJlcGVhdGVkIG1lc3NhZ2UK CkFsc28gcHV0IGluIG9uZSBoYXJkIHNwYWNlLCB0byBrZWVwIHRleHQgYW5k IG51bWJlciBzZXBhcmF0ZWQgd2hlbgp0aGUgdHJhbnNsYXRlZCBzdHJpbmcg c2hvdWxkIGJlIHRvbyBsb25nLgoKU2lnbmVkLW9mZi1ieTogQmVubm8gU2No dWxlbmJlcmcgPGJlbnNiZXJnQGp1c3RlbWFpbC5uZXQ+Ci0tLQogc3lzLXV0 aWxzL3dkY3RsLmMgfCAgICA5ICsrKysrKy0tLQogMSBmaWxlcyBjaGFuZ2Vk LCA2IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvc3lzLXV0aWxzL3dkY3RsLmMgYi9zeXMtdXRpbHMvd2RjdGwuYwppbmRl eCA3MTMwOTE4Li5jMDk1M2M5IDEwMDY0NAotLS0gYS9zeXMtdXRpbHMvd2Rj dGwuYworKysgYi9zeXMtdXRpbHMvd2RjdGwuYwpAQCAtNDUwLDExICs0NTAs MTQgQEAgc3RhdGljIHZvaWQgcHJpbnRfb25lbGluZShzdHJ1Y3Qgd2RpbmZv ICp3ZCwgdWludDMyX3Qgd2FudGVkLAogc3RhdGljIHZvaWQgc2hvd190aW1l b3V0cyhzdHJ1Y3Qgd2RpbmZvICp3ZCkKIHsKIAlpZiAod2QtPmhhc190aW1l b3V0KQotCQlwcmludGYoXygiJS0xNXMlMmkgc2Vjb25kc1xuIiksIF8oIlRp bWVvdXQ6IiksIHdkLT50aW1lb3V0KTsKKwkJcHJpbnRmKFBfKCIlLTE0cyAl Mmkgc2Vjb25kXG4iLCAiJS0xNHMgJTJpIHNlY29uZHNcbiIsIHdkLT50aW1l b3V0KSwKKwkJCSAgXygiVGltZW91dDoiKSwgd2QtPnRpbWVvdXQpOwogCWlm ICh3ZC0+aGFzX3ByZXRpbWVvdXQpCi0JCXByaW50ZihfKCIlLTE1cyUyaSBz ZWNvbmRzXG4iKSwgXygiUHJlLXRpbWVvdXQ6IiksIHdkLT5wcmV0aW1lb3V0 KTsKKwkJcHJpbnRmKFBfKCIlLTE0cyAlMmkgc2Vjb25kXG4iLCAiJS0xNHMg JTJpIHNlY29uZHNcbiIsIHdkLT5wcmV0aW1lb3V0KSwKKwkJCSAgXygiUHJl LXRpbWVvdXQ6IiksIHdkLT5wcmV0aW1lb3V0KTsKIAlpZiAod2QtPmhhc190 aW1lbGVmdCkKLQkJcHJpbnRmKF8oIiUtMTVzJTJpIHNlY29uZHNcbiIpLCBf KCJUaW1lbGVmdDoiKSwgd2QtPnRpbWVsZWZ0KTsKKwkJcHJpbnRmKFBfKCIl LTE0cyAlMmkgc2Vjb25kXG4iLCAiJS0xNHMgJTJpIHNlY29uZHNcbiIsIHdk LT50aW1lbGVmdCksCisJCQkgIF8oIlRpbWVsZWZ0OiIpLCB3ZC0+dGltZWxl ZnQpOwogfQogCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQot LSAKMS43LjAuNAoK --_----------=_138105615264964 Content-Disposition: attachment; filename="0015-libfdisk-gpt-partly-pluralize-one-message.patch" Content-Id: <1381056103.6461.51a1b69702dab00a24ed426c594ef210c7bf9f58.13AE1F2E@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0015-libfdisk-gpt-partly-pluralize-one-message.patch" RnJvbSA2NTY5NzUyMTA0MTIyODMyODI2MGRhZmVhOGUwMDM3YzE3YzQ1NDg1 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogU3VuLCA2IE9j dCAyMDEzIDExOjQ5OjU0ICswMjAwClN1YmplY3Q6IFtQQVRDSCAxNS8xNV0g bGliZmRpc2svZ3B0OiBwYXJ0bHkgcGx1cmFsaXplIG9uZSBtZXNzYWdlCgpB bmQgZG9uJ3QgbWVudGlvbiB0aGUgbGFyZ2VzdCB3aGVuIHRoZXJlIGlzIG9u bHkgb25lIHNlZ21lbnQuCgpTaWduZWQtb2ZmLWJ5OiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KLS0tCiBsaWJmZGlzay9z cmMvZ3B0LmMgfCAgICA4ICsrKysrLS0tCiAxIGZpbGVzIGNoYW5nZWQsIDUg aW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9s aWJmZGlzay9zcmMvZ3B0LmMgYi9saWJmZGlzay9zcmMvZ3B0LmMKaW5kZXgg MDU0YTc3MS4uNmJkMmZiNyAxMDA2NDQKLS0tIGEvbGliZmRpc2svc3JjL2dw dC5jCisrKyBiL2xpYmZkaXNrL3NyYy9ncHQuYwpAQCAtMTUyNSw5ICsxNTI1 LDExIEBAIHN0YXRpYyBpbnQgZ3B0X3ZlcmlmeV9kaXNrbGFiZWwoc3RydWN0 IGZkaXNrX2NvbnRleHQgKmN4dCkKIAogCQlmcmVlX3NlY3RvcnMgPSBnZXRf ZnJlZV9zZWN0b3JzKGN4dCwgZ3B0LT5waGVhZGVyLCBncHQtPmVudHMsCiAJ CQkJCQkmbnNlZ21lbnRzLCAmbGFyZ2VzdF9zZWdtZW50KTsKLQkJZmRpc2tf aW5mbyhjeHQsIF8oIkEgdG90YWwgb2YgJWxkIGZyZWUgc2VjdG9ycyBhdmFp bGFibGUgaW4gJWQgc2VnbWVudChzKSAiCi0JCQkgIihsYXJnZXN0ICVsZCku IiksCi0JCSAgICAgICBmcmVlX3NlY3RvcnMsIG5zZWdtZW50cywgbGFyZ2Vz dF9zZWdtZW50KTsKKwkJZmRpc2tfaW5mbyhjeHQsCisJCQkgICBQXygiQSB0 b3RhbCBvZiAlbGQgZnJlZSBzZWN0b3JzIGlzIGF2YWlsYWJsZSBpbiAlZCBz ZWdtZW50LiIsCisJCQkgICAgICAiQSB0b3RhbCBvZiAlbGQgZnJlZSBzZWN0 b3JzIGlzIGF2YWlsYWJsZSBpbiAlZCBzZWdtZW50cyAiCisJCQkgICAgICAi KHRoZSBsYXJnZXN0IGlzICVsZCkuIiwgbnNlZ21lbnRzKSwKKwkJCSAgIGZy ZWVfc2VjdG9ycywgbnNlZ21lbnRzLCBsYXJnZXN0X3NlZ21lbnQpOwogCX0g ZWxzZQogCQlmZGlza193YXJueChjeHQsCiAJCQlQXygiJWQgZXJyb3IgZGV0 ZWN0ZWQuIiwgIiVzIGVycm9ycyBkZXRlY3RlZC4iLCBuZXJyb3IpLAotLSAK MS43LjAuNAoK --_----------=_138105615264964--