58757 2011-04-17 17:03:51 -0700 Make more strings in WebKit2 localizable 2011-04-17 17:10:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 387472 0 sam 2011-04-17 17:03:51 -0700 Make more strings in WebKit2 localizable 387474 1 89974 sam 2011-04-17 17:07:57 -0700 Created attachment 89974 Patch 387475 2 89974 ggaren 2011-04-17 17:09:33 -0700 Comment on attachment 89974 Patch r=me 387476 3 sam 2011-04-17 17:10:20 -0700 Committed r84118: <http://trac.webkit.org/changeset/84118> 89974 2011-04-17 17:07:57 -0700 2011-04-17 17:09:33 -0700 Patch bug-58757-20110417170756.patch text/plain 12657 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MTE3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDQtMTcgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNYWtlIG1vcmUgc3RyaW5ncyBpbiBXZWJLaXQyIGxvY2FsaXphYmxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODc1NworCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xsZXIubW06CisgICAgICAg ICgtW1dLUERGVmlldyBtZW51Rm9yRXZlbnQ6XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9t YWMvUGFnZUNsaWVudEltcGwubW06CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpz ZXRWaWV3cG9ydEFyZ3VtZW50cyk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpy ZWdpc3RlckVkaXRDb21tYW5kKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRWRpdENvbW1hbmRQ cm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkVkaXRDb21tYW5kUHJveHk6Om5hbWVGb3JF ZGl0QWN0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRWRpdENvbW1hbmRQcm94eS5oOgor ICAgICAgICBVc2UgV2ViQ29yZSdzIGxvY2FsaXphdGlvbiBtYWNybyB0byBtYWtlIG1vcmUgc3Ry aW5ncyBsb2NhbGl6YWJsZS4KKwogMjAxMS0wNC0xNyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkVkaXRDb21tYW5kUHJveHkuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJFZGl0Q29tbWFuZFByb3h5LmNwcAko cmV2aXNpb24gODQwOTApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRWRpdENvbW1h bmRQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDggQEAKICNpbmNsdWRlICJX ZWJQYWdlTWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKICNpbmNsdWRlICJX ZWJQcm9jZXNzUHJveHkuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL0xvY2FsaXplZFN0cmluZ3MuaD4K KyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNv cmU7CiAKQEAgLTY2LDQgKzY4LDg1IEBAIHZvaWQgV2ViRWRpdENvbW1hbmRQcm94eTo6cmVhcHBs eSgpCiAgICAgbV9wYWdlLT5yZWdpc3RlckVkaXRDb21tYW5kKHRoaXMsIFdlYlBhZ2VQcm94eTo6 VW5kbyk7CiB9CiAKK1N0cmluZyBXZWJFZGl0Q29tbWFuZFByb3h5OjpuYW1lRm9yRWRpdEFjdGlv bihFZGl0QWN0aW9uIGVkaXRBY3Rpb24pCit7CisgICAgc3dpdGNoIChlZGl0QWN0aW9uKSB7Cisg ICAgY2FzZSBFZGl0QWN0aW9uVW5zcGVjaWZpZWQ6CisgICAgICAgIHJldHVybiBTdHJpbmcoKTsK KyAgICBjYXNlIEVkaXRBY3Rpb25TZXRDb2xvcjoKKyAgICAgICAgcmV0dXJuIFdFQl9VSV9TVFJJ TkdfS0VZKCJTZXQgQ29sb3IiLCAiU2V0IENvbG9yIChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRv IGFjdGlvbiBuYW1lIik7CisgICAgY2FzZSBFZGl0QWN0aW9uU2V0QmFja2dyb3VuZENvbG9yOgor ICAgICAgICByZXR1cm4gV0VCX1VJX1NUUklOR19LRVkoIlNldCBCYWNrZ3JvdW5kIENvbG9yIiwg IlNldCBCYWNrZ3JvdW5kIENvbG9yIChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBu YW1lIik7CisgICAgY2FzZSBFZGl0QWN0aW9uVHVybk9mZktlcm5pbmc6CisgICAgICAgIHJldHVy biBXRUJfVUlfU1RSSU5HX0tFWSgiVHVybiBPZmYgS2VybmluZyIsICJUdXJuIE9mZiBLZXJuaW5n IChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBuYW1lIik7CisgICAgY2FzZSBFZGl0 QWN0aW9uVGlnaHRlbktlcm5pbmc6CisgICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgi VGlnaHRlbiBLZXJuaW5nIiwgIlRpZ2h0ZW4gS2VybmluZyAoVW5kbyBhY3Rpb24gbmFtZSkiLCAi VW5kbyBhY3Rpb24gbmFtZSIpOworICAgIGNhc2UgRWRpdEFjdGlvbkxvb3Nlbktlcm5pbmc6Cisg ICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgiTG9vc2VuIEtlcm5pbmciLCAiTG9vc2Vu IEtlcm5pbmcgKFVuZG8gYWN0aW9uIG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICBj YXNlIEVkaXRBY3Rpb25Vc2VTdGFuZGFyZEtlcm5pbmc6CisgICAgICAgIHJldHVybiBXRUJfVUlf U1RSSU5HX0tFWSgiVXNlIFN0YW5kYXJkIEtlcm5pbmciLCAiVXNlIFN0YW5kYXJkIEtlcm5pbmcg KFVuZG8gYWN0aW9uIG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICBjYXNlIEVkaXRB Y3Rpb25UdXJuT2ZmTGlnYXR1cmVzOgorICAgICAgICByZXR1cm4gV0VCX1VJX1NUUklOR19LRVko IlR1cm4gT2ZmIExpZ2F0dXJlcyIsICJUdXJuIE9mZiBMaWdhdHVyZXMgKFVuZG8gYWN0aW9uIG5h bWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICBjYXNlIEVkaXRBY3Rpb25Vc2VTdGFuZGFy ZExpZ2F0dXJlczoKKyAgICAgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZKCJVc2UgU3RhbmRh cmQgTGlnYXR1cmVzIiwgIlVzZSBTdGFuZGFyZCBMaWdhdHVyZXMgKFVuZG8gYWN0aW9uIG5hbWUp IiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICBjYXNlIEVkaXRBY3Rpb25Vc2VBbGxMaWdhdHVy ZXM6CisgICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgiVXNlIEFsbCBMaWdhdHVyZXMi LCAiVXNlIEFsbCBMaWdhdHVyZXMgKFVuZG8gYWN0aW9uIG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5h bWUiKTsKKyAgICBjYXNlIEVkaXRBY3Rpb25SYWlzZUJhc2VsaW5lOgorICAgICAgICByZXR1cm4g V0VCX1VJX1NUUklOR19LRVkoIlJhaXNlIEJhc2VsaW5lIiwgIlJhaXNlIEJhc2VsaW5lIChVbmRv IGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBuYW1lIik7CisgICAgY2FzZSBFZGl0QWN0aW9u TG93ZXJCYXNlbGluZToKKyAgICAgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZKCJMb3dlciBC YXNlbGluZSIsICJMb3dlciBCYXNlbGluZSAoVW5kbyBhY3Rpb24gbmFtZSkiLCAiVW5kbyBhY3Rp b24gbmFtZSIpOworICAgIGNhc2UgRWRpdEFjdGlvblNldFRyYWRpdGlvbmFsQ2hhcmFjdGVyU2hh cGU6CisgICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgiU2V0IFRyYWRpdGlvbmFsIENo YXJhY3RlciBTaGFwZSIsICJTZXQgVHJhZGl0aW9uYWwgQ2hhcmFjdGVyIFNoYXBlIChVbmRvIGFj dGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBuYW1lIik7CisgICAgY2FzZSBFZGl0QWN0aW9uU2V0 Rm9udDoKKyAgICAgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZKCJTZXQgRm9udCIsICJTZXQg Rm9udCAoVW5kbyBhY3Rpb24gbmFtZSkiLCAiVW5kbyBhY3Rpb24gbmFtZSIpOworICAgIGNhc2Ug RWRpdEFjdGlvbkNoYW5nZUF0dHJpYnV0ZXM6CisgICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5H X0tFWSgiQ2hhbmdlIEF0dHJpYnV0ZXMiLCAiQ2hhbmdlIEF0dHJpYnV0ZXMgKFVuZG8gYWN0aW9u IG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICBjYXNlIEVkaXRBY3Rpb25BbGlnbkxl ZnQ6CisgICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgiQWxpZ24gTGVmdCIsICJBbGln biBMZWZ0IChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBuYW1lIik7CisgICAgY2Fz ZSBFZGl0QWN0aW9uQWxpZ25SaWdodDoKKyAgICAgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZ KCJBbGlnbiBSaWdodCIsICJBbGlnbiBSaWdodCAoVW5kbyBhY3Rpb24gbmFtZSkiLCAiVW5kbyBh Y3Rpb24gbmFtZSIpOworICAgIGNhc2UgRWRpdEFjdGlvbkNlbnRlcjoKKyAgICAgICAgcmV0dXJu IFdFQl9VSV9TVFJJTkdfS0VZKCJDZW50ZXIiLCAiQ2VudGVyIChVbmRvIGFjdGlvbiBuYW1lKSIs ICJVbmRvIGFjdGlvbiBuYW1lIik7CisgICAgY2FzZSBFZGl0QWN0aW9uSnVzdGlmeToKKyAgICAg ICAgcmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZKCJKdXN0aWZ5IiwgIkp1c3RpZnkgKFVuZG8gYWN0 aW9uIG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICBjYXNlIEVkaXRBY3Rpb25TZXRX cml0aW5nRGlyZWN0aW9uOgorICAgICAgICByZXR1cm4gV0VCX1VJX1NUUklOR19LRVkoIlNldCBX cml0aW5nIERpcmVjdGlvbiIsICJTZXQgV3JpdGluZyBEaXJlY3Rpb24gKFVuZG8gYWN0aW9uIG5h bWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICBjYXNlIEVkaXRBY3Rpb25TdWJzY3JpcHQ6 CisgICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgiU3Vic2NyaXB0IiwgIlN1YnNjcmlw dCAoVW5kbyBhY3Rpb24gbmFtZSkiLCAiVW5kbyBhY3Rpb24gbmFtZSIpOworICAgIGNhc2UgRWRp dEFjdGlvblN1cGVyc2NyaXB0OgorICAgICAgICByZXR1cm4gV0VCX1VJX1NUUklOR19LRVkoIlN1 cGVyc2NyaXB0IiwgIlN1cGVyc2NyaXB0IChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlv biBuYW1lIik7CisgICAgY2FzZSBFZGl0QWN0aW9uVW5kZXJsaW5lOgorICAgICAgICByZXR1cm4g V0VCX1VJX1NUUklOR19LRVkoIlVuZGVybGluZSIsICJVbmRlcmxpbmUgKFVuZG8gYWN0aW9uIG5h bWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICBjYXNlIEVkaXRBY3Rpb25PdXRsaW5lOgor ICAgICAgICByZXR1cm4gV0VCX1VJX1NUUklOR19LRVkoIk91dGxpbmUiLCAiT3V0bGluZSAoVW5k byBhY3Rpb24gbmFtZSkiLCAiVW5kbyBhY3Rpb24gbmFtZSIpOworICAgIGNhc2UgRWRpdEFjdGlv blVuc2NyaXB0OgorICAgICAgICByZXR1cm4gV0VCX1VJX1NUUklOR19LRVkoIlVuc2NyaXB0Iiwg IlVuc2NyaXB0IChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBuYW1lIik7CisgICAg Y2FzZSBFZGl0QWN0aW9uRHJhZzoKKyAgICAgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZKCJE cmFnIiwgIkRyYWcgKFVuZG8gYWN0aW9uIG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAg ICBjYXNlIEVkaXRBY3Rpb25DdXQ6CisgICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgi Q3V0IiwgIkN1dCAoVW5kbyBhY3Rpb24gbmFtZSkiLCAiVW5kbyBhY3Rpb24gbmFtZSIpOworICAg IGNhc2UgRWRpdEFjdGlvblBhc3RlOgorICAgICAgICByZXR1cm4gV0VCX1VJX1NUUklOR19LRVko IlBhc3RlIiwgIlBhc3RlIChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBuYW1lIik7 CisgICAgY2FzZSBFZGl0QWN0aW9uUGFzdGVGb250OgorICAgICAgICByZXR1cm4gV0VCX1VJX1NU UklOR19LRVkoIlBhc3RlIEZvbnQiLCAiUGFzdGUgRm9udCAoVW5kbyBhY3Rpb24gbmFtZSkiLCAi VW5kbyBhY3Rpb24gbmFtZSIpOworICAgIGNhc2UgRWRpdEFjdGlvblBhc3RlUnVsZXI6CisgICAg ICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgiUGFzdGUgUnVsZXIiLCAiUGFzdGUgUnVsZXIg KFVuZG8gYWN0aW9uIG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICBjYXNlIEVkaXRB Y3Rpb25UeXBpbmc6CisgICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgiVHlwaW5nIiwg IlR5cGluZyAoVW5kbyBhY3Rpb24gbmFtZSkiLCAiVW5kbyBhY3Rpb24gbmFtZSIpOworICAgIGNh c2UgRWRpdEFjdGlvbkNyZWF0ZUxpbms6CisgICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tF WSgiQ3JlYXRlIExpbmsiLCAiQ3JlYXRlIExpbmsgKFVuZG8gYWN0aW9uIG5hbWUpIiwgIlVuZG8g YWN0aW9uIG5hbWUiKTsKKyAgICBjYXNlIEVkaXRBY3Rpb25Vbmxpbms6CisgICAgICAgIHJldHVy biBXRUJfVUlfU1RSSU5HX0tFWSgiVW5saW5rIiwgIlVubGluayAoVW5kbyBhY3Rpb24gbmFtZSki LCAiVW5kbyBhY3Rpb24gbmFtZSIpOworICAgIGNhc2UgRWRpdEFjdGlvbkluc2VydExpc3Q6Cisg ICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5HX0tFWSgiSW5zZXJ0IExpc3QiLCAiSW5zZXJ0IExp c3QgKFVuZG8gYWN0aW9uIG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICBjYXNlIEVk aXRBY3Rpb25Gb3JtYXRCbG9jazoKKyAgICAgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZKCJG b3JtYXR0aW5nIiwgIkZvcm1hdCBCbG9jayAoVW5kbyBhY3Rpb24gbmFtZSkiLCAiVW5kbyBhY3Rp b24gbmFtZSIpOworICAgIGNhc2UgRWRpdEFjdGlvbkluZGVudDoKKyAgICAgICAgcmV0dXJuIFdF Ql9VSV9TVFJJTkdfS0VZKCJJbmRlbnQiLCAiSW5kZW50IChVbmRvIGFjdGlvbiBuYW1lKSIsICJV bmRvIGFjdGlvbiBuYW1lIik7CisgICAgY2FzZSBFZGl0QWN0aW9uT3V0ZGVudDoKKyAgICAgICAg cmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZKCJPdXRkZW50IiwgIk91dGRlbnQgKFVuZG8gYWN0aW9u IG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKKyAgICB9CisgICAgcmV0dXJuIFN0cmluZygp OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJFZGl0Q29tbWFuZFByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYkVkaXRDb21tYW5kUHJveHkuaAkocmV2aXNpb24gODQwOTApCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRWRpdENvbW1hbmRQcm94eS5oCSh3b3JraW5nIGNvcHkp CkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJBUElPYmplY3QuaCIKICNpbmNsdWRlIDxX ZWJDb3JlL0VkaXRBY3Rpb24uaD4KKyNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUg PHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KIApAQCAtNTEs NiArNTIsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCB1bmFwcGx5KCk7CiAgICAgdm9pZCByZWFwcGx5 KCk7CiAKKyAgICBzdGF0aWMgU3RyaW5nIG5hbWVGb3JFZGl0QWN0aW9uKFdlYkNvcmU6OkVkaXRB Y3Rpb24pOworCiBwcml2YXRlOgogICAgIFdlYkVkaXRDb21tYW5kUHJveHkodWludDY0X3QgY29t bWFuZElELCBXZWJDb3JlOjpFZGl0QWN0aW9uLCBXZWJQYWdlUHJveHkqKTsKIApJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xsZXIubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xs ZXIubW0JKHJldmlzaW9uIDg0MDkwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvUERGVmlld0NvbnRyb2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAK ICNpbXBvcnQgIldlYlBhZ2VQcm94eS5oIgogI2ltcG9ydCAiV2ViUHJlZmVyZW5jZXMuaCIKICNp bXBvcnQgPFBERktpdC9QREZLaXQuaD4KKyNpbXBvcnQgPFdlYkNvcmUvTG9jYWxpemVkU3RyaW5n cy5oPgogI2ltcG9ydCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIC8vIFJlZGVjbGFyYXRpb25z IG9mIFBERktpdCBub3RpZmljYXRpb25zLiBXZSBjYW4ndCB1c2UgdGhlIEFQSSBzaW5jZSB3ZSB1 c2UgYSB3ZWFrIGxpbmsgdG8gdGhlIGZyYW1ld29yay4KQEAgLTMxMywxNSArMzE0LDEzIEBAIC0g KE5TTWVudSAqKW1lbnVGb3JFdmVudDooTlNFdmVudCAqKXRoZUUKICAgICAgICAgTlNJbWFnZSAq YXBwSWNvbiA9IG5pbDsKIAogICAgICAgICBfYXBwbGljYXRpb25JbmZvRm9yTUlNRVR5cGUoQCJh cHBsaWNhdGlvbi9wZGYiLCAmYXBwTmFtZSwgJmFwcEljb24pOwotICAgICAgICBpZiAoIWFwcE5h bWUpIHsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBMb2NhbGl6ZSB0aGlzLgotICAgICAgICAgICAg YXBwTmFtZSA9IEAiRmluZGVyIjsKLSAgICAgICAgfQorICAgICAgICBpZiAoIWFwcE5hbWUpCisg ICAgICAgICAgICBhcHBOYW1lID0gV0VCX1VJX1NUUklORygiRmluZGVyIiwgIkRlZmF1bHQgYXBw bGljYXRpb24gbmFtZSBmb3IgT3BlbiBXaXRoIGNvbnRleHQgbWVudSIpOwogCiAgICAgICAgIC8v IFRvIG1hdGNoIHRoZSBQREZLaXQgc3R5bGUsIHdlJ2xsIGFkZCBPcGVuIHdpdGggUHJldmlldyBl dmVuIHdoZW4gdGhlcmUncyBubyBkb2N1bWVudCB5ZXQgdG8gdmlldywgYW5kCiAgICAgICAgIC8v IGRpc2FibGUgaXQgdXNpbmcgdmFsaWRhdGVVc2VySW50ZXJmYWNlSXRlbS4KLSAgICAgICAgLy8g RklYTUU6IExvY2FsaXplIHRoaXMuCi0gICAgICAgIE5TU3RyaW5nICp0aXRsZSA9IFtOU1N0cmlu ZyBzdHJpbmdXaXRoRm9ybWF0OkAiT3BlbiB3aXRoICVAIiwgYXBwTmFtZV07CisgICAgICAgIE5T U3RyaW5nICp0aXRsZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OldFQl9VSV9TVFJJTkco Ik9wZW4gd2l0aCAlQCIsICJjb250ZXh0IG1lbnUgaXRlbSBmb3IgUERGIiksIGFwcE5hbWVdOwor CiAgICAgICAgIGl0ZW0gPSBbW05TTWVudUl0ZW0gYWxsb2NdIGluaXRXaXRoVGl0bGU6dGl0bGUg YWN0aW9uOkBzZWxlY3Rvcihfb3BlbldpdGhGaW5kZXI6KSBrZXlFcXVpdmFsZW50OkAiIl07CiAg ICAgICAgIGlmIChhcHBJY29uKQogICAgICAgICAgICAgW2l0ZW0gc2V0SW1hZ2U6YXBwSWNvbl07 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xp ZW50SW1wbC5tbQkocmV2aXNpb24gODQwOTApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQkod29ya2luZyBjb3B5KQpAQCAtMjA5LDU0ICsyMDks NiBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpzZXRDdXJzb3IoY29uc3QgV2ViCiAKIHZvaWQgUGFn ZUNsaWVudEltcGw6OnNldFZpZXdwb3J0QXJndW1lbnRzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0 QXJndW1lbnRzJikKIHsKLQotfQotCi1zdGF0aWMgTlNTdHJpbmcqIG5hbWVGb3JFZGl0QWN0aW9u KEVkaXRBY3Rpb24gZWRpdEFjdGlvbikKLXsKLSAgICAvLyBGSVhNRTogVXNlIGxvY2FsaXplZCBz dHJpbmdzLgotICAgIC8vIEZJWE1FOiBNb3ZlIHRoaXMgdG8gYSBwbGF0Zm9ybSBpbmRlcGVuZGVu dCBsb2NhdGlvbi4KLQotICAgIHN3aXRjaCAoZWRpdEFjdGlvbikgewotICAgIGNhc2UgRWRpdEFj dGlvblVuc3BlY2lmaWVkOiByZXR1cm4gbmlsOwotICAgIGNhc2UgRWRpdEFjdGlvblNldENvbG9y OiByZXR1cm4gQCJTZXQgQ29sb3IiOwotICAgIGNhc2UgRWRpdEFjdGlvblNldEJhY2tncm91bmRD b2xvcjogcmV0dXJuIEAiU2V0IEJhY2tncm91bmQgQ29sb3IiOwotICAgIGNhc2UgRWRpdEFjdGlv blR1cm5PZmZLZXJuaW5nOiByZXR1cm4gQCJUdXJuIE9mZiBLZXJuaW5nIjsKLSAgICBjYXNlIEVk aXRBY3Rpb25UaWdodGVuS2VybmluZzogcmV0dXJuIEAiVGlnaHRlbiBLZXJuaW5nIjsKLSAgICBj YXNlIEVkaXRBY3Rpb25Mb29zZW5LZXJuaW5nOiByZXR1cm4gQCJMb29zZW4gS2VybmluZyI7Ci0g ICAgY2FzZSBFZGl0QWN0aW9uVXNlU3RhbmRhcmRLZXJuaW5nOiByZXR1cm4gQCJVc2UgU3RhbmRh cmQgS2VybmluZyI7Ci0gICAgY2FzZSBFZGl0QWN0aW9uVHVybk9mZkxpZ2F0dXJlczogcmV0dXJu IEAiVHVybiBPZmYgTGlnYXR1cmVzIjsKLSAgICBjYXNlIEVkaXRBY3Rpb25Vc2VTdGFuZGFyZExp Z2F0dXJlczogcmV0dXJuIEAiVXNlIFN0YW5kYXJkIExpZ2F0dXJlcyI7Ci0gICAgY2FzZSBFZGl0 QWN0aW9uVXNlQWxsTGlnYXR1cmVzOiByZXR1cm4gQCJVc2UgQWxsIExpZ2F0dXJlcyI7Ci0gICAg Y2FzZSBFZGl0QWN0aW9uUmFpc2VCYXNlbGluZTogcmV0dXJuIEAiUmFpc2UgQmFzZWxpbmUiOwot ICAgIGNhc2UgRWRpdEFjdGlvbkxvd2VyQmFzZWxpbmU6IHJldHVybiBAIkxvd2VyIEJhc2VsaW5l IjsKLSAgICBjYXNlIEVkaXRBY3Rpb25TZXRUcmFkaXRpb25hbENoYXJhY3RlclNoYXBlOiByZXR1 cm4gQCJTZXQgVHJhZGl0aW9uYWwgQ2hhcmFjdGVyIFNoYXBlIjsKLSAgICBjYXNlIEVkaXRBY3Rp b25TZXRGb250OiByZXR1cm4gQCJTZXQgRm9udCI7Ci0gICAgY2FzZSBFZGl0QWN0aW9uQ2hhbmdl QXR0cmlidXRlczogcmV0dXJuIEAiQ2hhbmdlIEF0dHJpYnV0ZXMiOwotICAgIGNhc2UgRWRpdEFj dGlvbkFsaWduTGVmdDogcmV0dXJuIEAiQWxpZ24gTGVmdCI7Ci0gICAgY2FzZSBFZGl0QWN0aW9u QWxpZ25SaWdodDogcmV0dXJuIEAiQWxpZ24gUmlnaHQiOwotICAgIGNhc2UgRWRpdEFjdGlvbkNl bnRlcjogcmV0dXJuIEAiQ2VudGVyIjsKLSAgICBjYXNlIEVkaXRBY3Rpb25KdXN0aWZ5OiByZXR1 cm4gQCJKdXN0aWZ5IjsKLSAgICBjYXNlIEVkaXRBY3Rpb25TZXRXcml0aW5nRGlyZWN0aW9uOiBy ZXR1cm4gQCJTZXQgV3JpdGluZyBEaXJlY3Rpb24iOwotICAgIGNhc2UgRWRpdEFjdGlvblN1YnNj cmlwdDogcmV0dXJuIEAiU3Vic2NyaXB0IjsKLSAgICBjYXNlIEVkaXRBY3Rpb25TdXBlcnNjcmlw dDogcmV0dXJuIEAiU3VwZXJzY3JpcHQiOwotICAgIGNhc2UgRWRpdEFjdGlvblVuZGVybGluZTog cmV0dXJuIEAiVW5kZXJsaW5lIjsKLSAgICBjYXNlIEVkaXRBY3Rpb25PdXRsaW5lOiByZXR1cm4g QCJPdXRsaW5lIjsKLSAgICBjYXNlIEVkaXRBY3Rpb25VbnNjcmlwdDogcmV0dXJuIEAiVW5zY3Jp cHQiOwotICAgIGNhc2UgRWRpdEFjdGlvbkRyYWc6IHJldHVybiBAIkRyYWciOwotICAgIGNhc2Ug RWRpdEFjdGlvbkN1dDogcmV0dXJuIEAiQ3V0IjsKLSAgICBjYXNlIEVkaXRBY3Rpb25QYXN0ZTog cmV0dXJuIEAiUGFzdGUiOwotICAgIGNhc2UgRWRpdEFjdGlvblBhc3RlRm9udDogcmV0dXJuIEAi UGFzdGUgRm9udCI7Ci0gICAgY2FzZSBFZGl0QWN0aW9uUGFzdGVSdWxlcjogcmV0dXJuIEAiUGFz dGUgUnVsZXIiOwotICAgIGNhc2UgRWRpdEFjdGlvblR5cGluZzogcmV0dXJuIEAiVHlwaW5nIjsK LSAgICBjYXNlIEVkaXRBY3Rpb25DcmVhdGVMaW5rOiByZXR1cm4gQCJDcmVhdGUgTGluayI7Ci0g ICAgY2FzZSBFZGl0QWN0aW9uVW5saW5rOiByZXR1cm4gQCJVbmxpbmsiOwotICAgIGNhc2UgRWRp dEFjdGlvbkluc2VydExpc3Q6IHJldHVybiBAIkluc2VydCBMaXN0IjsKLSAgICBjYXNlIEVkaXRB Y3Rpb25Gb3JtYXRCbG9jazogcmV0dXJuIEAiRm9ybWF0dGluZyI7Ci0gICAgY2FzZSBFZGl0QWN0 aW9uSW5kZW50OiByZXR1cm4gQCJJbmRlbnQiOwotICAgIGNhc2UgRWRpdEFjdGlvbk91dGRlbnQ6 IHJldHVybiBAIk91dGRlbnQiOwotICAgIH0KLSAgICByZXR1cm4gbmlsOwogfQogCiB2b2lkIFBh Z2VDbGllbnRJbXBsOjpyZWdpc3RlckVkaXRDb21tYW5kKFBhc3NSZWZQdHI8V2ViRWRpdENvbW1h bmRQcm94eT4gcHJwQ29tbWFuZCwgV2ViUGFnZVByb3h5OjpVbmRvT3JSZWRvIHVuZG9PclJlZG8p CkBAIC0yNjQsMTIgKzIxNiwxMiBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpyZWdpc3RlckVkaXRD b21tYW5kCiAgICAgUmVmUHRyPFdlYkVkaXRDb21tYW5kUHJveHk+IGNvbW1hbmQgPSBwcnBDb21t YW5kOwogCiAgICAgUmV0YWluUHRyPFdLRWRpdENvbW1hbmRPYmpDPiBjb21tYW5kT2JqQyhBZG9w dE5TLCBbW1dLRWRpdENvbW1hbmRPYmpDIGFsbG9jXSBpbml0V2l0aFdlYkVkaXRDb21tYW5kUHJv eHk6Y29tbWFuZF0pOwotICAgIE5TU3RyaW5nICphY3Rpb25OYW1lID0gbmFtZUZvckVkaXRBY3Rp b24oY29tbWFuZC0+ZWRpdEFjdGlvbigpKTsKKyAgICBTdHJpbmcgYWN0aW9uTmFtZSA9IFdlYkVk aXRDb21tYW5kUHJveHk6Om5hbWVGb3JFZGl0QWN0aW9uKGNvbW1hbmQtPmVkaXRBY3Rpb24oKSk7 CiAKICAgICBOU1VuZG9NYW5hZ2VyICp1bmRvTWFuYWdlciA9IFttX3drVmlldyB1bmRvTWFuYWdl cl07CiAgICAgW3VuZG9NYW5hZ2VyIHJlZ2lzdGVyVW5kb1dpdGhUYXJnZXQ6bV91bmRvVGFyZ2V0 LmdldCgpIHNlbGVjdG9yOigodW5kb09yUmVkbyA9PSBXZWJQYWdlUHJveHk6OlVuZG8pID8gQHNl bGVjdG9yKHVuZG9FZGl0aW5nOikgOiBAc2VsZWN0b3IocmVkb0VkaXRpbmc6KSkgb2JqZWN0OmNv bW1hbmRPYmpDLmdldCgpXTsKLSAgICBpZiAoYWN0aW9uTmFtZSkKLSAgICAgICAgW3VuZG9NYW5h Z2VyIHNldEFjdGlvbk5hbWU6YWN0aW9uTmFtZV07CisgICAgaWYgKCFhY3Rpb25OYW1lLmlzRW1w dHkoKSkKKyAgICAgICAgW3VuZG9NYW5hZ2VyIHNldEFjdGlvbk5hbWU6KE5TU3RyaW5nICopYWN0 aW9uTmFtZV07CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OmNsZWFyQWxsRWRpdENvbW1hbmRz KCkK