143661 2015-04-12 23:12:30 -0700 [Cocoa] Localizable strings are inconsistent and need to be regenerated 2019-01-15 17:10:52 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 darin darin bdakin enrica jeffm mitz oldest_to_newest 1084735 0 darin 2015-04-12 23:12:30 -0700 [Cocoa] Localizable strings are inconsistent and need to be regenerated 1084736 1 250625 darin 2015-04-12 23:17:31 -0700 Created attachment 250625 Patch 1084737 2 darin 2015-04-12 23:18:41 -0700 <rdar://problem/19634388> 1084809 3 darin 2015-04-13 08:42:39 -0700 Committed r182735: <http://trac.webkit.org/changeset/182735> 250625 2015-04-12 23:17:31 -0700 2019-01-15 17:10:52 -0800 Patch bug-143661-20150412231636.patch text/plain 11763 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNjc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzE0N2VkOTM2NmU0NGQy NWVlM2NlNTBjMDI3NjYyMTA4NjEzZmIxZi4uNzljY2EzZTFmMGVmZTZhMjMxMGMzNjI2NzE2OTU0 OWRlYzZlZGRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA0LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIExvY2FsaXphYmxl IHN0cmluZ3MgYXJlIGluY29uc2lzdGVudCBhbmQgbmVlZCB0byBiZSByZWdlbmVyYXRlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNjYxCisgICAg ICAgIHJkYXI6Ly9wcm9ibGVtLzE5NjM0Mzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3M6 IFVwZGF0ZWQgYnkgcnVubmluZyB0aGUKKyAgICAgICAgdXBkYXRlLXdlYmtpdC1sb2NhbGl6YWJs ZS1zdHJpbmdzIHNjcmlwdC4KKwogMjAxNS0wNC0xMiAgQmVuamFtaW4gUG91bGFpbiAgPGJlbmph bWluQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTGVnYWN5IHNjcm9sbCBiZWhhdmlvciBvbiBIVE1M Qm9keUVsZW1lbnQgc2hvdWxkIG9ubHkgYXBwbHkgdG8gdGhlIGZpcnN0IGJvZHkgZWxlbWVudCBv ZiBhIGRvY3VtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggYmE0ZTA1NzllOWRlOThiOTFiYTY4ZjU3 ZGM4M2VlOWQyZDkxOGUzNy4uMGM0MjBjYTk4NjU0ZGFiMzhiYjUxNjRmNDA0YWFjNjZhMTY2MTQx MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA0LTEyICBEYXJpbiBB ZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIExvY2FsaXphYmxlIHN0 cmluZ3MgYXJlIGluY29uc2lzdGVudCBhbmQgbmVlZCB0byBiZSByZWdlbmVyYXRlZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNjYxCisgICAgICAg IHJkYXI6Ly9wcm9ibGVtLzE5NjM0Mzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBNaXNjL1dlYkxvY2FsaXphYmxlU3RyaW5ncy5tbToKKyAgICAg ICAgKExvYWRXZWJMb2NhbGl6ZWRTdHJpbmdzVGltZXJDYWxsYmFjayk6IE1vdmVkIHRoZSBjb21t ZW50LCB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGJ1dAorICAgICAgICBub3QgZm9yIGxvY2FsaXph dGlvbiwgaW50byBhIEMrKyBzb3VyY2UgY29kZSBjb21tZW50LCBhbmQgbWFkZSB0aGUgbG9jYWxp emVyIGNvbW1lbnQKKyAgICAgICAgY29uc2lzdGVudCB3aXRoIHRoZSBwbGFjZSB0aGlzIGxvY2Fs aXphYmxlIHN0cmluZyBpcyB1c2VkIGZvciBhY3R1YWwgbG9jYWxpemF0aW9uLgorICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5tbToKKyAgICAgICAgKHVuZG9OYW1lRm9y RWRpdEFjdGlvbik6IENoYW5nZWQgdGhlIGxvY2FsaXplciBjb21tZW50cyBmb3IgRGVsZXRlIGFu ZCBEaWN0YXRpb24KKyAgICAgICAgdG8gbWF0Y2ggdGhlIG9uZXMgaW4gV2ViS2l0Mjsgbm8gbmVl ZCB0byBzcGVjaWZ5IHRoYXQgdGhlc2UgYXJlIGlPUyBvbmx5LCBhbmQgaWYgd2UgZG8KKyAgICAg ICAgd2FudCB0byBzcGVjaWZ5IHRoYXQsIHdlIHNob3VsZCBub3QgYmUgdXNpbmcgdGhlIHRlcm0g UExBVEZPUk0oSU9TKSBzaW5jZSB0aGVyZSBpcyBubworICAgICAgICByZWFzb24gZm9yIHVzIHRv IGV4cGVjdCBsb2NhbGl6ZXJzIHRvIHVuZGVyc3RhbmQgdGhhdCB0ZXJtaW5vbG9neS4gQWxzbyBh ZGRlZCBhIGNvbW1lbnQKKyAgICAgICAgYWJvdXQgdGhlIGZhY3QgdGhhdCB3ZSBoYXZlIHR3byBj b3BpZXMgb2YgYWxsIHRoZSBsb2NhbGl6YWJsZSBzdHJpbmdzLgorCiAyMDE1LTA0LTExICBZdXN1 a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIFtFUzZdIEVuYWJs ZSBTeW1ib2wgaW4gd2ViIHBhZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTFiMzExNzk2MWU5OTY1N2Y4Njgw YmIzMjcwOTBhZTRjNTBhMjY1Ni4uZDJiNjIzMDA1YzAyN2YwYzFlNDYxMTY2ODgzNzc1YjUxYzRi NWQ0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA0LTEyICBEYXJpbiBBZGxl ciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIExvY2FsaXphYmxlIHN0cmlu Z3MgYXJlIGluY29uc2lzdGVudCBhbmQgbmVlZCB0byBiZSByZWdlbmVyYXRlZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNjYxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRWRp dENvbW1hbmRQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkVkaXRDb21tYW5kUHJveHk6 Om5hbWVGb3JFZGl0QWN0aW9uKTogQWxzbyBhZGRlZCBhIGNvbW1lbnQKKyAgICAgICAgYWJvdXQg dGhlIGZhY3QgdGhhdCB3ZSBoYXZlIHR3byBjb3BpZXMgb2YgYWxsIHRoZSBsb2NhbGl6YWJsZSBz dHJpbmdzLgorCiAyMDE1LTA0LTEyICBTdW5nbWFubiBDaG8gIDxzdW5nbWFubi5jaG9AbmF2ZXJj b3JwLmNvbT4KIAogICAgICAgICBGaXggdHJpdmFsIHR5cG9zIHJlbGF0ZWQgdG8gdGhlIHdvcmQg ImNvb3JkaW5hdGUiLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9M b2NhbGl6YWJsZS5zdHJpbmdzIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9Mb2NhbGl6 YWJsZS5zdHJpbmdzCmluZGV4IDc0NzRkYzMyOWQ3NjM1MmE2MjExZjQ5ODA1NTFjN2JmZTZiYWQy ODYuLmNmZWMzMDA2MzcyODIyOGNhYjBmODUyYzU4NTBjM2Y3ZjQ1NDg2MWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncworKysgYi9T b3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MKQEAgLTkxLDkg KzkxLDE1IEBACiAvKiBXS0Vycm9ySmF2YVNjcmlwdEV4Y2VwdGlvbk9jY3VycmVkIGRlc2NyaXB0 aW9uICovCiAiQSBKYXZhU2NyaXB0IGV4Y2VwdGlvbiBvY2N1cnJlZCIgPSAiQSBKYXZhU2NyaXB0 IGV4Y2VwdGlvbiBvY2N1cnJlZCI7CiAKKy8qIGFjdGlvbiBtZW51IGl0ZW0gKi8KKyJBZGQgdG8g UGhvdG9zIChhY3Rpb24gbWVudSBpdGVtKSIgPSAiQWRkIHRvIFBob3RvcyI7CisKIC8qIFRpdGxl IGZvciBBZGQgdG8gUmVhZGluZyBMaXN0IGFjdGlvbiBidXR0b24gKi8KICJBZGQgdG8gUmVhZGlu ZyBMaXN0IiA9ICJBZGQgdG8gUmVhZGluZyBMaXN0IjsKIAorLyogYWN0aW9uIG1lbnUgaXRlbSAq LworIkFkZCB0byBSZWFkaW5nIExpc3QgKGFjdGlvbiBtZW51IGl0ZW0pIiA9ICJBZGQgdG8gUmVh ZGluZyBMaXN0IjsKKwogLyogVW5kbyBhY3Rpb24gbmFtZSAqLwogIkFsaWduIExlZnQgKFVuZG8g YWN0aW9uIG5hbWUpIiA9ICJBbGlnbiBMZWZ0IjsKIApAQCAtMTgxLDYgKzE4NywxNSBAQAogLyog Q29weSBjb250ZXh0IG1lbnUgaXRlbSAqLwogIkNvcHkiID0gIkNvcHkiOwogCisvKiBpbWFnZSBh Y3Rpb24gbWVudSBpdGVtICovCisiQ29weSAoaW1hZ2UgYWN0aW9uIG1lbnUgaXRlbSkiID0gIkNv cHkiOworCisvKiB0ZXh0IGFjdGlvbiBtZW51IGl0ZW0gKi8KKyJDb3B5ICh0ZXh0IGFjdGlvbiBt ZW51IGl0ZW0pIiA9ICJDb3B5IjsKKworLyogdmlkZW8gYWN0aW9uIG1lbnUgaXRlbSAqLworIkNv cHkgKHZpZGVvIGFjdGlvbiBtZW51IGl0ZW0pIiA9ICJDb3B5IjsKKwogLyogVGl0bGUgZm9yIENv cHkgTGluayBvciBJbWFnZSBhY3Rpb24gYnV0dG9uICovCiAiQ29weSBBY3Rpb25TaGVldCBMaW5r IiA9ICJDb3B5IjsKIApAQCAtMjExLDEzICsyMjYsMTMgQEAKIC8qIERlZmF1bHQgd3JpdGluZyBk aXJlY3Rpb24gY29udGV4dCBtZW51IGl0ZW0gKi8KICJEZWZhdWx0IiA9ICJEZWZhdWx0IjsKIAot LyogVW5kbyBhY3Rpb24gbmFtZSAoVXNlZCBvbmx5IGJ5IFBMQVRGT1JNKElPUykgY29kZSkgKi8K Ky8qIFVuZG8gYWN0aW9uIG5hbWUgKi8KICJEZWxldGUgKFVuZG8gYWN0aW9uIG5hbWUpIiA9ICJE ZWxldGUiOwogCiAvKiB0ZXh0IHRvIGRpc3BsYXkgaW4gPGRldGFpbHM+IHRhZyB3aGVuIGl0IGhh cyBubyA8c3VtbWFyeT4gY2hpbGQgKi8KICJEZXRhaWxzIiA9ICJEZXRhaWxzIjsKIAotLyogVW5k byBhY3Rpb24gbmFtZSAoVXNlZCBvbmx5IGJ5IFBMQVRGT1JNKElPUykgY29kZSkgKi8KKy8qIFVu ZG8gYWN0aW9uIG5hbWUgKi8KICJEaWN0YXRpb24gKFVuZG8gYWN0aW9uIG5hbWUpIiA9ICJEaWN0 YXRpb24iOwogCiAvKiBEb3dubG9hZCBBdWRpbyBUbyBEaXNrIGNvbnRleHQgbWVudSBpdGVtICov CkBAIC0zNjQsNiArMzc5LDkgQEAKIC8qIE1lbnUgaXRlbSBsYWJlbCBmb3IgdGhlIHRyYWNrIHRo YXQgcmVwcmVzZW50cyBkaXNhYmxpbmcgY2xvc2VkIGNhcHRpb25zICovCiAiT2ZmIiA9ICJPZmYi OwogCisvKiBhY3Rpb24gbWVudSBpdGVtICovCisiT3BlbiAoYWN0aW9uIG1lbnUgaXRlbSkiID0g Ik9wZW4iOworCiAvKiBUaXRsZSBmb3IgT3BlbiBMaW5rIGFjdGlvbiBidXR0b24gKi8KICJPcGVu IEFjdGlvblNoZWV0IExpbmsiID0gIk9wZW4iOwogCkBAIC00MDYsNiArNDI0LDkgQEAKIC8qIFVu ZG8gYWN0aW9uIG5hbWUgKi8KICJQYXN0ZSAoVW5kbyBhY3Rpb24gbmFtZSkiID0gIlBhc3RlIjsK IAorLyogYWN0aW9uIG1lbnUgaXRlbSAqLworIlBhc3RlIChhY3Rpb24gbWVudSBpdGVtKSIgPSAi UGFzdGUiOworCiAvKiBVbmRvIGFjdGlvbiBuYW1lICovCiAiUGFzdGUgRm9udCAoVW5kbyBhY3Rp b24gbmFtZSkiID0gIlBhc3RlIEZvbnQiOwogCkBAIC00NTcsNiArNDc4LDEyIEBACiAvKiBUaXRs ZSBmb3IgU2F2ZSBJbWFnZSBhY3Rpb24gYnV0dG9uICovCiAiU2F2ZSBJbWFnZSIgPSAiU2F2ZSBJ bWFnZSI7CiAKKy8qIGltYWdlIGFjdGlvbiBtZW51IGl0ZW0gKi8KKyJTYXZlIHRvIERvd25sb2Fk cyAoaW1hZ2UgYWN0aW9uIG1lbnUgaXRlbSkiID0gIlNhdmUgdG8gRG93bmxvYWRzIjsKKworLyog dmlkZW8gYWN0aW9uIG1lbnUgaXRlbSAqLworIlNhdmUgdG8gRG93bmxvYWRzICh2aWRlbyBhY3Rp b24gbWVudSBpdGVtKSIgPSAiU2F2ZSB0byBEb3dubG9hZHMiOworCiAvKiBTZWFyY2ggaW4gU3Bv dGxpZ2h0IGNvbnRleHQgbWVudSBpdGVtICovCiAiU2VhcmNoIGluIFNwb3RsaWdodCIgPSAiU2Vh cmNoIGluIFNwb3RsaWdodCI7CiAKQEAgLTU2Miw2ICs1ODksOSBAQAogLyogTWVudSBzZWN0aW9u IGhlYWRpbmcgZm9yIHN1YnRpdGxlcyAqLwogIlN1YnRpdGxlcyIgPSAiU3VidGl0bGVzIjsKIAor LyogYWN0aW9uIG1lbnUgaXRlbSAqLworIlN1Z2dlc3Rpb25zIChhY3Rpb24gbWVudSBpdGVtKSIg PSAiU3VnZ2VzdGlvbnMiOworCiAvKiBVbmRvIGFjdGlvbiBuYW1lICovCiAiU3VwZXJzY3JpcHQg KFVuZG8gYWN0aW9uIG5hbWUpIiA9ICJTdXBlcnNjcmlwdCI7CiAKQEAgLTYyOCw3ICs2NTgsNyBA QAogLyogVW5kbyBhY3Rpb24gbmFtZSAqLwogIlR1cm4gT2ZmIExpZ2F0dXJlcyAoVW5kbyBhY3Rp b24gbmFtZSkiID0gIlR1cm4gT2ZmIExpZ2F0dXJlcyI7CiAKLS8qIFdlIGRvbid0IGNhcmUgaWYg d2UgZmluZCB0aGlzIHN0cmluZywgYnV0IHNlYXJjaGluZyBmb3IgaXQgd2lsbCBsb2FkIHRoZSBw bGlzdCBhbmQgc2F2ZSB0aGUgcmVzdWx0cy4gKi8KKy8qIFVuZG8gYWN0aW9uIG5hbWUgKi8KICJU eXBpbmcgKFVuZG8gYWN0aW9uIG5hbWUpIiA9ICJUeXBpbmciOwogCiAvKiBVbmRlcmxpbmUgY29u dGV4dCBtZW51IGl0ZW0gKi8KQEAgLTYzNyw2ICs2NjcsOSBAQAogLyogVW5kbyBhY3Rpb24gbmFt ZSAqLwogIlVuZGVybGluZSAoVW5kbyBhY3Rpb24gbmFtZSkiID0gIlVuZGVybGluZSI7CiAKKy8q IE1lbnUgaXRlbSBsYWJlbCBmb3IgYW4gYXVkaW8gdHJhY2sgdGhhdCBoYXMgbm8gb3RoZXIgbmFt ZSAqLworIlVua25vd24gKGF1ZGlvIHRyYWNrKSIgPSAiVW5rbm93biI7CisKIC8qIFVua25vd24g ZmlsZXNpemUgRlRQIGRpcmVjdG9yeSBsaXN0aW5nIGl0ZW0gKi8KICJVbmtub3duIChmaWxlc2l6 ZSkiID0gIlVua25vd24iOwogCkBAIC0xMDc1LDM4ICsxMTA4LDMgQEAKIC8qIGFjY2Vzc2liaWxp dHkgbGFiZWwgZm9yIHZpZGVvIGVsZW1lbnQgY29udHJvbGxlciAqLwogInZpZGVvIHBsYXliYWNr IiA9ICJ2aWRlbyBwbGF5YmFjayI7CiAKLS8qICJPcGVuIExpbmsgaW4gRGVmYXVsdCBCcm93c2Vy IiBhY3Rpb24gbWVudSBpdGVtICovCi0iT3BlbiAoYWN0aW9uIG1lbnUgaXRlbSkiID0gIk9wZW4i OwotCi0vKiAiUHJldmlldyBMaW5rIiBhY3Rpb24gbWVudSBpdGVtICovCi0iUHJldmlldyAoYWN0 aW9uIG1lbnUgaXRlbSkiID0gIlByZXZpZXciOwotCi0vKiAiQWRkIHRvIFJlYWRpbmcgTGlzdCIg YWN0aW9uIG1lbnUgaXRlbSAqLwotIkFkZCB0byBSZWFkaW5nIExpc3QgKGFjdGlvbiBtZW51IGl0 ZW0pIiA9ICJBZGQgdG8gUmVhZGluZyBMaXN0IjsKLQotLyogIkNvcHkiIGFjdGlvbiBtZW51IGl0 ZW0gaW4gaW1hZ2UgbWVudSAqLwotIkNvcHkgKGltYWdlIGFjdGlvbiBtZW51IGl0ZW0pIiA9ICJD b3B5IjsKLQotLyogIkFkZCB0byBQaG90b3MiIGFjdGlvbiBtZW51IGl0ZW0gKi8KLSJBZGQgdG8g UGhvdG9zIChhY3Rpb24gbWVudSBpdGVtKSIgPSAiQWRkIHRvIFBob3RvcyI7Ci0KLS8qICJTYXZl IHRvIERvd25sb2FkcyIgYWN0aW9uIG1lbnUgaXRlbSBpbiBpbWFnZSBtZW51ICovCi0iU2F2ZSB0 byBEb3dubG9hZHMgKGltYWdlIGFjdGlvbiBtZW51IGl0ZW0pIiA9ICJTYXZlIHRvIERvd25sb2Fk cyI7Ci0KLS8qICJDb3B5IiBhY3Rpb24gbWVudSBpdGVtIGluIHRleHQgbWVudSAqLwotIkNvcHkg KHRleHQgYWN0aW9uIG1lbnUgaXRlbSkiID0gIkNvcHkiOwotCi0vKiAiTG9vayBVcCIgYWN0aW9u IG1lbnUgaXRlbSAqLwotIkxvb2sgVXAgKGFjdGlvbiBtZW51IGl0ZW0pIiA9ICJMb29rIFVwIjsK LQotLyogIlBhc3RlIiBhY3Rpb24gbWVudSBpdGVtICovCi0iUGFzdGUgKGFjdGlvbiBtZW51IGl0 ZW0pIiA9ICJQYXN0ZSI7Ci0KLS8qICJTdWdnZXN0aW9ucyIgYWN0aW9uIG1lbnUgaXRlbSAqLwot IlN1Z2dlc3Rpb25zIChhY3Rpb24gbWVudSBpdGVtKSIgPSAiU3VnZ2VzdGlvbnMiOwotCi0vKiAi Q29weSIgYWN0aW9uIG1lbnUgaXRlbSBpbiB2aWRlbyBtZW51ICovCi0iQ29weSAodmlkZW8gYWN0 aW9uIG1lbnUgaXRlbSkiID0gIkNvcHkiOwotCi0vKiAiU2F2ZSB0byBEb3dubG9hZHMiIGFjdGlv biBtZW51IGl0ZW0gaW4gdmlkZW8gbWVudSAqLwotIlNhdmUgdG8gRG93bmxvYWRzICh2aWRlbyBh Y3Rpb24gbWVudSBpdGVtKSIgPSAiU2F2ZSB0byBEb3dubG9hZHMiOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJMb2NhbGl6YWJsZVN0cmluZ3MubW0gYi9Tb3VyY2UvV2Vi S2l0L21hYy9NaXNjL1dlYkxvY2FsaXphYmxlU3RyaW5ncy5tbQppbmRleCBlNDc5OTZkZjcyOWU2 ODQwZTBhODhkMzlkNmY2MGUwYWJmYmU2NGJhLi5mNzQ5MDgzYjA1NzlkMTA3N2QwZWMxZTkxODJk YTk2MTE1YTYxYTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYkxvY2Fs aXphYmxlU3RyaW5ncy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYkxvY2FsaXph YmxlU3RyaW5ncy5tbQpAQCAtNzQsMTEgKzc0LDE0IEBAIE5TU3RyaW5nICpXZWJMb2NhbGl6ZWRT dHJpbmcoV2ViTG9jYWxpemFibGVTdHJpbmdzQnVuZGxlICpzdHJpbmdzQnVuZGxlLCBjb25zdCBj CiB9CiAKICNpZiBQTEFURk9STShJT1MpCisKIC8vIFNlZSA8cmRhcjovL3Byb2JsZW0vNzkwMjQ3 Mz4gT3B0aW1pemUgV2ViTG9jYWxpemVkU3RyaW5nIGZvciB3aHkgd2UgZG8gdGhpcyBvbiBhIGJh Y2tncm91bmQgdGhyZWFkIG9uIGEgdGltZXIgY2FsbGJhY2sKIHN0YXRpYyB2b2lkIExvYWRXZWJM b2NhbGl6ZWRTdHJpbmdzVGltZXJDYWxsYmFjayhDRlJ1bkxvb3BUaW1lclJlZiB0aW1lciwgdm9p ZCAqaW5mbykKIHsKLSAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfZ2xvYmFsX3F1ZXVl KERJU1BBVENIX1FVRVVFX1BSSU9SSVRZX0xPVywgMCksIF57IAotICAgICAgICBVSV9TVFJJTkdf S0VZX0lOVEVSTkFMKCJUeXBpbmciLCAiVHlwaW5nIChVbmRvIGFjdGlvbiBuYW1lKSIsICJXZSBk b24ndCBjYXJlIGlmIHdlIGZpbmQgdGhpcyBzdHJpbmcsIGJ1dCBzZWFyY2hpbmcgZm9yIGl0IHdp bGwgbG9hZCB0aGUgcGxpc3QgYW5kIHNhdmUgdGhlIHJlc3VsdHMuIik7CisgICAgZGlzcGF0Y2hf YXN5bmMoZGlzcGF0Y2hfZ2V0X2dsb2JhbF9xdWV1ZShESVNQQVRDSF9RVUVVRV9QUklPUklUWV9M T1csIDApLCBeeworICAgICAgICAvLyBXZSBkb24ndCBjYXJlIGlmIHdlIGZpbmQgdGhpcyBzdHJp bmcsIGJ1dCBzZWFyY2hpbmcgZm9yIGl0IHdpbGwgbG9hZCB0aGUgcGxpc3QgYW5kIHNhdmUgdGhl IHJlc3VsdHMuCisgICAgICAgIC8vIEZJWE1FOiBJdCB3b3VsZCBiZSBuaWNlciB0byBkbyB0aGlz IGluIGEgbW9yZSBkaXJlY3Qgd2F5LgorICAgICAgICBVSV9TVFJJTkdfS0VZX0lOVEVSTkFMKCJU eXBpbmciLCAiVHlwaW5nIChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBuYW1lIik7 CiAgICAgfSk7CiB9CiAKQEAgLTg4LDQgKzkxLDUgQEAgdm9pZCBMb2FkV2ViTG9jYWxpemVkU3Ry aW5ncyh2b2lkKQogICAgIENGUnVuTG9vcEFkZFRpbWVyKENGUnVuTG9vcEdldEN1cnJlbnQoKSwg dGltZXIsIGtDRlJ1bkxvb3BDb21tb25Nb2Rlcyk7CiAgICAgQ0ZSZWxlYXNlKHRpbWVyKTsKIH0K KwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJFZGl0b3JDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJF ZGl0b3JDbGllbnQubW0KaW5kZXggYjhhODhlMTljNWQyOWU0YTUzYjhjYWNjMjg2ZDUyZGFiNTA3 ZjczYS4uZDIxY2RmMGJjZjFlY2JhNWUzNTNjZWM0NDI3MTdiYTIxOGUwMTAwNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5tbQpA QCAtNTQzLDYgKzU0Myw3IEBAIGJvb2wgV2ViRWRpdG9yQ2xpZW50OjpzaG91bGRJbnNlcnROb2Rl KE5vZGUgKm5vZGUsIFJhbmdlKiByZXBsYWNpbmdSYW5nZSwgRWRpdG9yCiAKIHN0YXRpYyBOU1N0 cmluZyogdW5kb05hbWVGb3JFZGl0QWN0aW9uKEVkaXRBY3Rpb24gZWRpdEFjdGlvbikKIHsKKyAg ICAvLyBGSVhNRTogVGhpcyBpcyBpZGVudGljYWwgdG8gY29kZSBpbiBXZWJLaXQyJ3MgV2ViRWRp dENvbW1hbmRQcm94eSBjbGFzczsgd291bGQgYmUgbmljZSB0byBzaGFyZSB0aGUgc3RyaW5ncyBp bnN0ZWFkIG9mIGhhdmluZyB0d28gY29waWVzLgogICAgIHN3aXRjaCAoZWRpdEFjdGlvbikgewog ICAgICAgICBjYXNlIEVkaXRBY3Rpb25VbnNwZWNpZmllZDogcmV0dXJuIG5pbDsKICAgICAgICAg Y2FzZSBFZGl0QWN0aW9uU2V0Q29sb3I6IHJldHVybiBVSV9TVFJJTkdfS0VZX0lOVEVSTkFMKCJT ZXQgQ29sb3IiLCAiU2V0IENvbG9yIChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBu YW1lIik7CkBAIC01ODMsOCArNTg0LDggQEAgc3RhdGljIE5TU3RyaW5nKiB1bmRvTmFtZUZvckVk aXRBY3Rpb24oRWRpdEFjdGlvbiBlZGl0QWN0aW9uKQogICAgICAgICBjYXNlIEVkaXRBY3Rpb25P dXRkZW50OiByZXR1cm4gVUlfU1RSSU5HX0tFWV9JTlRFUk5BTCgiT3V0ZGVudCIsICJPdXRkZW50 IChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBuYW1lIik7CiAgICAgICAgIGNhc2Ug RWRpdEFjdGlvbkJvbGQ6IHJldHVybiBVSV9TVFJJTkdfS0VZX0lOVEVSTkFMKCJCb2xkIiwgIkJv bGQgKFVuZG8gYWN0aW9uIG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUiKTsKICAgICAgICAgY2Fz ZSBFZGl0QWN0aW9uSXRhbGljczogcmV0dXJuIFVJX1NUUklOR19LRVlfSU5URVJOQUwoIkl0YWxp Y3MiLCAiSXRhbGljcyAoVW5kbyBhY3Rpb24gbmFtZSkiLCAiVW5kbyBhY3Rpb24gbmFtZSIpOwot ICAgICAgICBjYXNlIEVkaXRBY3Rpb25EZWxldGU6IHJldHVybiBVSV9TVFJJTkdfS0VZX0lOVEVS TkFMKCJEZWxldGUiLCAiRGVsZXRlIChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBu YW1lIChVc2VkIG9ubHkgYnkgUExBVEZPUk0oSU9TKSBjb2RlKSIpOwotICAgICAgICBjYXNlIEVk aXRBY3Rpb25EaWN0YXRpb246IHJldHVybiBVSV9TVFJJTkdfS0VZX0lOVEVSTkFMKCJEaWN0YXRp b24iLCAiRGljdGF0aW9uIChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBuYW1lIChV c2VkIG9ubHkgYnkgUExBVEZPUk0oSU9TKSBjb2RlKSIpOworICAgICAgICBjYXNlIEVkaXRBY3Rp b25EZWxldGU6IHJldHVybiBVSV9TVFJJTkdfS0VZX0lOVEVSTkFMKCJEZWxldGUiLCAiRGVsZXRl IChVbmRvIGFjdGlvbiBuYW1lKSIsICJVbmRvIGFjdGlvbiBuYW1lIik7CisgICAgICAgIGNhc2Ug RWRpdEFjdGlvbkRpY3RhdGlvbjogcmV0dXJuIFVJX1NUUklOR19LRVlfSU5URVJOQUwoIkRpY3Rh dGlvbiIsICJEaWN0YXRpb24gKFVuZG8gYWN0aW9uIG5hbWUpIiwgIlVuZG8gYWN0aW9uIG5hbWUi KTsKICAgICB9CiAgICAgcmV0dXJuIG5pbDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJFZGl0Q29tbWFuZFByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJFZGl0Q29tbWFuZFByb3h5LmNwcAppbmRleCAzMzc5N2IwMzQ4NGNmMDE0MDQyNmU0 ZDc2ZGE5ODFjZWU3YmZmZDVmLi41NGNlMDNjNjI0MjkwNjA3OTU2MDVlOTE4OTE0NjMxZDY5NzU2 MTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRWRpdENvbW1hbmRQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkVkaXRDb21tYW5kUHJv eHkuY3BwCkBAIC03MCw2ICs3MCw3IEBAIHZvaWQgV2ViRWRpdENvbW1hbmRQcm94eTo6cmVhcHBs eSgpCiAKIFN0cmluZyBXZWJFZGl0Q29tbWFuZFByb3h5OjpuYW1lRm9yRWRpdEFjdGlvbihFZGl0 QWN0aW9uIGVkaXRBY3Rpb24pCiB7CisgICAgLy8gRklYTUU6IFRoaXMgaXMgaWRlbnRpY2FsIHRv IGNvZGUgaW4gV2ViS2l0J3MgV2ViRWRpdG9yQ2xpZW50IGNsYXNzOyB3b3VsZCBiZSBuaWNlIHRv IHNoYXJlIHRoZSBzdHJpbmdzIGluc3RlYWQgb2YgaGF2aW5nIHR3byBjb3BpZXMuCiAgICAgc3dp dGNoIChlZGl0QWN0aW9uKSB7CiAgICAgY2FzZSBFZGl0QWN0aW9uVW5zcGVjaWZpZWQ6CiAgICAg ICAgIHJldHVybiBTdHJpbmcoKTsK