85785 2004-07-23 15:07:30 +0000 Some strings cannot be translated 2004-08-19 08:59:41 +0000 1 1 2 Applications kolourpaint general unspecified Compiled Sources Linux RESOLVED FIXED NOR normal --- 1 cedric.pasteur dang 0 oldest_to_newest 251862 0 cedric.pasteur 2004-07-23 15:07:30 +0000 Version: (using KDE KDE 3.2.91) Installed from: Compiled From Sources KolourPaint use sometimes (in particular in tools) strange way to create to create strings, which make those strings very hard to translate, or maybe impossible in some languages. For example, in kptoolskew.cpp, there is " Skewing the %1" where %1 is "image", "selection" or "text box". This works good in English, but not with other languages. So I think this should be avoided, and there should be one string for each type. There will be more strings to translate, but the translater work will be really easier. 252095 1 dang 2004-07-24 06:52:36 +0000 On Fri, 23 Jul 2004 11:07 pm, Cédric Pasteur wrote: > KolourPaint use sometimes (in particular in tools) strange way to create to > create strings, which make those strings very hard to translate, or maybe > impossible in some languages. If you tell me specifically which ones, I can provides patches very quickly. > For example, in kptoolskew.cpp, there is " > Skewing the %1" where %1 is "image", "selection" or "text box". This works > good in English, but not with other languages. Ok, how's the attached patch (also removes strings for unreachable code paths)? Thanks, Clarence Created an attachment (id=6814) kolourpaint-rotate_skew-strings.diff 252567 2 dang 2004-07-25 14:38:04 +0000 Related to this bug report, attached patch fixes completely incorrect string. Created an attachment (id=6834) kolourpaint-crop-wrongstring.diff 253026 3 cedric.pasteur 2004-07-26 13:49:55 +0000 The patch fix the problem in those two files, but there are also other files which have the same problem: * kppixmapfx.cpp: 305 : "The %1 may have .." --> what is %1? Maybe you could also change this (and the related strings in the same file, eg "The %1 contains ..") * All strings related to key press (there are many in a lot of files) , eg : "%1 another line or %2 to finish." (in tools/kptoolpolygon.cpp:747) --> imho it would be better to have also the full sentence here. * in kptoolpreviewdialog.cpp: captionFromActionName () should be dropped, and all the strings should be complete; also with "After %1:" in the same file. * in tools/kptoolresizescale.cpp:129 "Text: %1 Box" * tools/kptoolrotate.cpp has the same problems as kptoolresizescale.cpp I also think that the messages about memory usage could all be merged in one more general such as : "This operation may take a substantial amount of memory. This can reduce system responsiveness and cause other application resource problems. Are you sure want to continue?" This could also be a solution for other strings. 254429 4 dang 2004-07-30 14:40:47 +0000 ------- Additional Comments From cedric.pasteur free fr 2004-07-26 13:49 > kppixmapfx.cpp: 305 : "The %1 may have .." --> what is %1? Maybe you > could also change this (and the related strings in the same file, > eg "The %1 contains ..") kolourpaint-i18n-pixmapfx-warn-about-loss-info.diff > All strings related to key press (there are many in a lot of files) , > eg : "%1 another line or %2 to finish." (in tools/kptoolpolygon.cpp:747) > --> imho it would be better to have also the full sentence here. kolourpaint-i18n-tools.diff > in kptoolpreviewdialog.cpp: captionFromActionName () should be dropped, > and all the strings should be complete; also with "After %1:" in the same > file. kolourpaint-i18n-preview-dialog.diff > in tools/kptoolresizescale.cpp:129 "Text: %1 Box" kolourpaint-i18n-resize-scale-dialog.diff > tools/kptoolrotate.cpp has the same problems as kptoolresizescale.cpp Do you mean 'i18n ("Selection: %1").arg (opName)' in kpToolRotateCommand::name()? Else I can't see where I've made a mistake. > I also think that the messages about memory usage could all be merged in > one more general such as : "This operation may take a substantial amount > of memory. This can reduce system responsiveness and cause other > application resource problems. Are you sure want to continue?" > This could also be a solution for other strings. Well, that's already been fixed in CVS with a lot of strings :) In general, I like the messages to be as precise as possible. Created an attachment (id=6921) kolourpaint-i18n-pixmapfx-warn-about-loss-info.diff Created an attachment (id=6922) kolourpaint-i18n-preview-dialog.diff Created an attachment (id=6923) kolourpaint-i18n-resize-scale-dialog.diff Created an attachment (id=6924) kolourpaint-i18n-tools.diff 254433 5 cedric.pasteur 2004-07-30 14:51:42 +0000 > Do you mean 'i18n ("Selection: %1").arg (opName)' in > kpToolRotateCommand::name()? > Else I can't see where I've made a mistake. It seems you already have fixed this file. Sorry. Thanks for fixing all these problems. Will you commit those patches before kde3.3 ? 254443 6 dang 2004-07-30 15:18:39 +0000 kde-i18n-doc people, Is it ok to commit? On Fri, 30 Jul 2004 10:51 pm, Cédric Pasteur wrote: > Thanks for fixing all these problems. > Will you commit those patches before kde3.3 ? 254814 7 cedric.pasteur 2004-07-31 20:06:05 +0000 All these patch are good. But I'm afraid it might be too late for kde 3.3.0, as total freeze is on August 4th. I think you'd better commit them in KDE3_3_BRANCH after kde3.3.0 is out, because else translaters wouldn't have enough time to translate modified strings. Finally, I hope you'll avoid in he future those type of strings impossible to translate, without the need of a bug report to fix them. And thanks for fixing everything quickly. 254882 8 dang 2004-08-01 03:34:51 +0000 On Sun, 1 Aug 2004 04:06 am, Cédric Pasteur wrote: > Finally, I hope you'll avoid in he future those type of strings impossible > to translate, without the need of a bug report to fix them. Sorry about that :) Ok, I'll commit after 3.3. 259994 9 dang 2004-08-19 08:50:23 +0000 CVS commit by dang: Update and apply patches to fix untranslatable strings. CCMAIL: 85785-done@bugs.kde.org, kde-i18n-doc@kde.org M +3 -0 NEWS 1.1.2.2 M +0 -2 TODO 1.66.2.2 M +24 -3 kpdocument.cpp 1.48.2.2 M +21 -3 kpmainwindow_edit.cpp 1.32.2.1 M +2 -1 pixmapfx/kpeffectsdialog.cpp 1.9.2.1 M +9 -35 pixmapfx/kppixmapfx.cpp 1.27.2.1 M +59 -26 pixmapfx/kppixmapfx.h 1.17.2.1 M +7 -63 tools/kptool.cpp 1.41.2.1 M +4 -6 tools/kptool.h 1.21.2.1 M +3 -6 tools/kptoolairspray.cpp 1.15.2.1 M +2 -3 tools/kptoolcolorpicker.cpp 1.14.2.1 M +3 -5 tools/kptoolfloodfill.cpp 1.13.2.1 M +1 -3 tools/kptoolpen.cpp 1.25.2.1 M +25 -43 tools/kptoolpolygon.cpp 1.19.2.1 M +5 -17 tools/kptoolpreviewdialog.cpp 1.14.2.1 M +5 -3 tools/kptoolpreviewdialog.h 1.7.2.1 M +3 -6 tools/kptoolrectangle.cpp 1.17.2.1 M +23 -18 tools/kptoolresizescale.cpp 1.30.2.1 M +3 -1 tools/kptoolrotate.cpp 1.19.2.1 M +1 -3 tools/kptoolselection.cpp 1.34.2.1 M +3 -1 tools/kptoolskew.cpp 1.18.2.1 259996 10 dang 2004-08-19 08:54:29 +0000 CVS commit by dang: Update and apply patches to fix untranslatable strings. CCMAIL: 85785@bugs.kde.org M +3 -0 NEWS 1.1.2.1.2.3 M +0 -2 TODO 1.66.2.1.2.1 M +24 -3 kpdocument.cpp 1.48.2.1.2.2 M +21 -3 kpmainwindow_edit.cpp 1.32.4.2 M +2 -1 pixmapfx/kpeffectsdialog.cpp 1.9.4.2 M +9 -35 pixmapfx/kppixmapfx.cpp 1.27.4.2 M +59 -26 pixmapfx/kppixmapfx.h 1.17.4.1 M +7 -63 tools/kptool.cpp 1.41.4.2 M +4 -6 tools/kptool.h 1.21.4.2 M +3 -6 tools/kptoolairspray.cpp 1.15.4.2 M +2 -3 tools/kptoolcolorpicker.cpp 1.14.4.1 M +3 -5 tools/kptoolfloodfill.cpp 1.13.4.1 M +1 -3 tools/kptoolpen.cpp 1.25.4.1 M +25 -43 tools/kptoolpolygon.cpp 1.19.4.2 M +5 -17 tools/kptoolpreviewdialog.cpp 1.14.4.1 M +5 -3 tools/kptoolpreviewdialog.h 1.7.4.1 M +3 -6 tools/kptoolrectangle.cpp 1.17.4.1 M +23 -18 tools/kptoolresizescale.cpp 1.30.4.2 M +3 -1 tools/kptoolrotate.cpp 1.19.4.2 M +1 -3 tools/kptoolselection.cpp 1.34.4.2 M +3 -1 tools/kptoolskew.cpp 1.18.4.1 259998 11 dang 2004-08-19 08:59:41 +0000 CVS commit by dang: Update and apply patches to fix untranslatable strings. CCMAIL: 85785@bugs.kde.org M +6 -0 NEWS 1.4 M +6 -2 TODO 1.70 M +24 -3 kpdocument.cpp 1.50 M +21 -3 kpmainwindow_edit.cpp 1.33 M +2 -1 pixmapfx/kpeffectsdialog.cpp 1.10 M +9 -35 pixmapfx/kppixmapfx.cpp 1.28 M +59 -26 pixmapfx/kppixmapfx.h 1.18 M +7 -63 tools/kptool.cpp 1.42 M +4 -6 tools/kptool.h 1.22 M +3 -6 tools/kptoolairspray.cpp 1.16 M +2 -3 tools/kptoolcolorpicker.cpp 1.15 M +3 -5 tools/kptoolfloodfill.cpp 1.14 M +1 -3 tools/kptoolpen.cpp 1.26 M +25 -43 tools/kptoolpolygon.cpp 1.20 M +5 -17 tools/kptoolpreviewdialog.cpp 1.15 M +5 -3 tools/kptoolpreviewdialog.h 1.8 M +3 -6 tools/kptoolrectangle.cpp 1.18 M +23 -18 tools/kptoolresizescale.cpp 1.31 M +3 -1 tools/kptoolrotate.cpp 1.20 M +1 -3 tools/kptoolselection.cpp 1.35 M +3 -1 tools/kptoolskew.cpp 1.19 6814 2004-07-24 06:52:36 +0000 2004-07-24 06:52:36 +0000 kolourpaint-rotate_skew-strings.diff kolourpaint-rotate_skew-strings.diff text/x-diff 6243 dang SW5kZXg6IHRvb2xzL2twdG9vbHJvdGF0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUv a2RlL2tkZWdyYXBoaWNzL2tvbG91cnBhaW50L3Rvb2xzL2twdG9vbHJvdGF0ZS5jcHAsdgpyZXRy aWV2aW5nIHJldmlzaW9uIDEuMTcKZGlmZiAtdSAtcCAtcjEuMTcga3B0b29scm90YXRlLmNwcAot LS0gdG9vbHMva3B0b29scm90YXRlLmNwcAkxNCBKdWwgMjAwNCAxMzoyOTowMCAtMDAwMAkxLjE3 CisrKyB0b29scy9rcHRvb2xyb3RhdGUuY3BwCTI0IEp1bCAyMDA0IDA0OjM5OjA3IC0wMDAwCkBA IC00MzUsMjUgKzQ0NSwzOCBAQCB2b2lkIGtwVG9vbFJvdGF0ZURpYWxvZzo6c2xvdFVwZGF0ZSAo KQogLy8gcHJpdmF0ZSBzbG90IHZpcnR1YWwgW2Jhc2UgS0RpYWxvZ0Jhc2VdCiB2b2lkIGtwVG9v bFJvdGF0ZURpYWxvZzo6c2xvdE9rICgpCiB7Ci0gICAgUVN0cmluZyBzZWxPckltYWdlTG93ZXJD YXNlLCBzZWxPckltYWdlVGl0bGVDYXNlOworICAgIFFTdHJpbmcgbWVzc2FnZSwgY2FwdGlvbiwg Y29udGludWVCdXR0b25UZXh0OwogCiAgICAgaWYgKGRvY3VtZW50ICgpLT5zZWxlY3Rpb24gKCkp CiAgICAgewotICAgICAgICBpZiAoZG9jdW1lbnQgKCktPnNlbGVjdGlvbiAoKS0+aXNUZXh0ICgp KQotICAgICAgICB7Ci0gICAgICAgICAgICBzZWxPckltYWdlTG93ZXJDYXNlID0gaTE4biAoInRl eHQgYm94Iik7Ci0gICAgICAgICAgICBzZWxPckltYWdlVGl0bGVDYXNlID0gaTE4biAoIlRleHQg Qm94Iik7Ci0gICAgICAgIH0KLSAgICAgICAgZWxzZQorICAgICAgICBpZiAoIWRvY3VtZW50ICgp LT5zZWxlY3Rpb24gKCktPmlzVGV4dCAoKSkKICAgICAgICAgewotICAgICAgICAgICAgc2VsT3JJ bWFnZUxvd2VyQ2FzZSA9IGkxOG4gKCJzZWxlY3Rpb24iKTsKLSAgICAgICAgICAgIHNlbE9ySW1h Z2VUaXRsZUNhc2UgPSBpMThuICgiU2VsZWN0aW9uIik7CisgICAgICAgICAgICBtZXNzYWdlID0K KyAgICAgICAgICAgICAgICBpMThuICgiPHF0PjxwPlJvdGF0aW5nIHRoZSBzZWxlY3Rpb24gdG8g JTF4JTIiCisgICAgICAgICAgICAgICAgICAgICAgIiBtYXkgdGFrZSBhIHN1YnN0YW50aWFsIGFt b3VudCBvZiBtZW1vcnkuIgorICAgICAgICAgICAgICAgICAgICAgICIgVGhpcyBjYW4gcmVkdWNl IHN5c3RlbSIKKyAgICAgICAgICAgICAgICAgICAgICAiIHJlc3BvbnNpdmVuZXNzIGFuZCBjYXVz ZSBvdGhlciBhcHBsaWNhdGlvbiByZXNvdXJjZSIKKyAgICAgICAgICAgICAgICAgICAgICAiIHBy b2JsZW1zLjwvcD4iCisKKyAgICAgICAgICAgICAgICAgICAgICAiPHA+QXJlIHlvdSBzdXJlIHdh bnQgdG8gcm90YXRlIHRoZSBzZWxlY3Rpb24/PC9wPjwvcXQ+Iik7CisKKyAgICAgICAgICAgIGNh cHRpb24gPSBpMThuICgiUm90YXRlIFNlbGVjdGlvbj8iKTsKKyAgICAgICAgICAgIGNvbnRpbnVl QnV0dG9uVGV4dCA9IGkxOG4gKCJSb3RhdCZlIFNlbGVjdGlvbiIpOwogICAgICAgICB9CiAgICAg fQogICAgIGVsc2UKICAgICB7Ci0gICAgICAgIHNlbE9ySW1hZ2VMb3dlckNhc2UgPSBpMThuICgi aW1hZ2UiKTsKLSAgICAgICAgc2VsT3JJbWFnZVRpdGxlQ2FzZSA9IGkxOG4gKCJJbWFnZSIpOwor ICAgICAgICBtZXNzYWdlID0KKyAgICAgICAgICAgIGkxOG4gKCI8cXQ+PHA+Um90YXRpbmcgdGhl IGltYWdlIHRvICUxeCUyIgorICAgICAgICAgICAgICAgICAgIiBtYXkgdGFrZSBhIHN1YnN0YW50 aWFsIGFtb3VudCBvZiBtZW1vcnkuIgorICAgICAgICAgICAgICAgICAgIiBUaGlzIGNhbiByZWR1 Y2Ugc3lzdGVtIgorICAgICAgICAgICAgICAgICAgIiByZXNwb25zaXZlbmVzcyBhbmQgY2F1c2Ug b3RoZXIgYXBwbGljYXRpb24gcmVzb3VyY2UiCisgICAgICAgICAgICAgICAgICAiIHByb2JsZW1z LjwvcD4iCisKKyAgICAgICAgICAgICAgICAgICI8cD5BcmUgeW91IHN1cmUgd2FudCB0byByb3Rh dGUgdGhlIGltYWdlPzwvcD48L3F0PiIpOworCisgICAgICAgIGNhcHRpb24gPSBpMThuICgiUm90 YXRlIEltYWdlPyIpOworICAgICAgICBjb250aW51ZUJ1dHRvblRleHQgPSBpMThuICgiUm90YXQm ZSBJbWFnZSIpOwogICAgIH0KIAogCkBAIC00NjMsMjUgKzQ4NiwxMyBAQCB2b2lkIGtwVG9vbFJv dGF0ZURpYWxvZzo6c2xvdE9rICgpCiAgICAgaWYgKGtwVG9vbDo6d2FybklmQmlnSW1hZ2VTaXpl IChtX29sZFdpZHRoLAogICAgICAgICAgICAgbV9vbGRIZWlnaHQsCiAgICAgICAgICAgICBuZXdX aWR0aCwgbmV3SGVpZ2h0LAotICAgICAgICAgICAgaTE4biAoIjxxdD48cD5Sb3RhdGluZyB0aGUg JTEgdG8iCi0gICAgICAgICAgICAgICAgICAgICIgJTJ4JTMgbWF5IHRha2UgYSBzdWJzdGFudGlh bCBhbW91bnQgb2YgbWVtb3J5LiIKLSAgICAgICAgICAgICAgICAgICAgIiBUaGlzIGNhbiByZWR1 Y2Ugc3lzdGVtIgotICAgICAgICAgICAgICAgICAgICAiIHJlc3BvbnNpdmVuZXNzIGFuZCBjYXVz ZSBvdGhlciBhcHBsaWNhdGlvbiByZXNvdXJjZSIKLSAgICAgICAgICAgICAgICAgICAgIiBwcm9i bGVtcy48L3A+IgotCi0gICAgICAgICAgICAgICAgICAgICI8cD5BcmUgeW91IHN1cmUgd2FudCB0 byByb3RhdGUgdGhlIgotICAgICAgICAgICAgICAgICAgICAiICU0PzwvcD48L3F0PiIpCi0gICAg ICAgICAgICAgICAgLmFyZyAoc2VsT3JJbWFnZUxvd2VyQ2FzZSkKLSAgICAgICAgICAgICAgICAu YXJnIChuZXdXaWR0aCkKLSAgICAgICAgICAgICAgICAuYXJnIChuZXdIZWlnaHQpCi0gICAgICAg ICAgICAgICAgLmFyZyAoc2VsT3JJbWFnZUxvd2VyQ2FzZSksCi0gICAgICAgICAgICBpMThuICgi Um90YXRlICUxPyIpLmFyZyAoc2VsT3JJbWFnZVRpdGxlQ2FzZSksCi0gICAgICAgICAgICBpMThu ICgiUm90YXQmZSAlMSIpLmFyZyAoc2VsT3JJbWFnZVRpdGxlQ2FzZSksCisgICAgICAgICAgICBt ZXNzYWdlLmFyZyAobmV3V2lkdGgpLmFyZyAobmV3SGVpZ2h0KSwKKyAgICAgICAgICAgIGNhcHRp b24sCisgICAgICAgICAgICBjb250aW51ZUJ1dHRvblRleHQsCiAgICAgICAgICAgICB0aGlzKSkK ICAgICB7CiAgICAgICAgIEtEaWFsb2dCYXNlOjpzbG90T2sgKCk7CiAgICAgfQogfQogCi0KICNp bmNsdWRlIDxrcHRvb2xyb3RhdGUubW9jPgpJbmRleDogdG9vbHMva3B0b29sc2tldy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZWdyYXBoaWNzL2tvbG91cnBhaW50L3Rvb2xz L2twdG9vbHNrZXcuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE2CmRpZmYgLXUgLXAgLXIx LjE2IGtwdG9vbHNrZXcuY3BwCi0tLSB0b29scy9rcHRvb2xza2V3LmNwcAkxNCBKdWwgMjAwNCAx MzoyOTowMCAtMDAwMAkxLjE2CisrKyB0b29scy9rcHRvb2xza2V3LmNwcAkyNCBKdWwgMjAwNCAw NDozOTowOCAtMDAwMApAQCAtMzc5LDI1ICszOTAsMzggQEAgYm9vbCBrcFRvb2xTa2V3RGlhbG9n Ojppc05vT3AgKCkgY29uc3QKIC8vIHByaXZhdGUgc2xvdCB2aXJ0dWFsIFtiYXNlIEtEaWFsb2dC YXNlXQogdm9pZCBrcFRvb2xTa2V3RGlhbG9nOjpzbG90T2sgKCkKIHsKLSAgICBRU3RyaW5nIHNl bE9ySW1hZ2VMb3dlckNhc2UsIHNlbE9ySW1hZ2VUaXRsZUNhc2U7CisgICAgUVN0cmluZyBtZXNz YWdlLCBjYXB0aW9uLCBjb250aW51ZUJ1dHRvblRleHQ7CiAKICAgICBpZiAoZG9jdW1lbnQgKCkt PnNlbGVjdGlvbiAoKSkKICAgICB7Ci0gICAgICAgIGlmIChkb2N1bWVudCAoKS0+c2VsZWN0aW9u ICgpLT5pc1RleHQgKCkpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHNlbE9ySW1hZ2VMb3dlckNh c2UgPSBpMThuICgidGV4dCBib3giKTsKLSAgICAgICAgICAgIHNlbE9ySW1hZ2VUaXRsZUNhc2Ug PSBpMThuICgiVGV4dCBCb3giKTsKLSAgICAgICAgfQotICAgICAgICBlbHNlCisgICAgICAgIGlm ICghZG9jdW1lbnQgKCktPnNlbGVjdGlvbiAoKS0+aXNUZXh0ICgpKQogICAgICAgICB7Ci0gICAg ICAgICAgICBzZWxPckltYWdlTG93ZXJDYXNlID0gaTE4biAoInNlbGVjdGlvbiIpOwotICAgICAg ICAgICAgc2VsT3JJbWFnZVRpdGxlQ2FzZSA9IGkxOG4gKCJTZWxlY3Rpb24iKTsKKyAgICAgICAg ICAgIG1lc3NhZ2UgPQorICAgICAgICAgICAgICAgIGkxOG4gKCI8cXQ+PHA+U2tld2luZyB0aGUg c2VsZWN0aW9uIHRvICUxeCUyIgorICAgICAgICAgICAgICAgICAgICAgICIgbWF5IHRha2UgYSBz dWJzdGFudGlhbCBhbW91bnQgb2YgbWVtb3J5LiIKKyAgICAgICAgICAgICAgICAgICAgICAiIFRo aXMgY2FuIHJlZHVjZSBzeXN0ZW0iCisgICAgICAgICAgICAgICAgICAgICAgIiByZXNwb25zaXZl bmVzcyBhbmQgY2F1c2Ugb3RoZXIgYXBwbGljYXRpb24gcmVzb3VyY2UiCisgICAgICAgICAgICAg ICAgICAgICAgIiBwcm9ibGVtcy48L3A+IgorCisgICAgICAgICAgICAgICAgICAgICAgIjxwPkFy ZSB5b3Ugc3VyZSB3YW50IHRvIHNrZXcgdGhlIHNlbGVjdGlvbj88L3A+PC9xdD4iKTsKKworICAg ICAgICAgICAgY2FwdGlvbiA9IGkxOG4gKCJTa2V3IFNlbGVjdGlvbj8iKTsKKyAgICAgICAgICAg IGNvbnRpbnVlQnV0dG9uVGV4dCA9IGkxOG4gKCJTayZldyBTZWxlY3Rpb24iKTsKICAgICAgICAg fQogICAgIH0KICAgICBlbHNlCiAgICAgewotICAgICAgICBzZWxPckltYWdlTG93ZXJDYXNlID0g aTE4biAoImltYWdlIik7Ci0gICAgICAgIHNlbE9ySW1hZ2VUaXRsZUNhc2UgPSBpMThuICgiSW1h Z2UiKTsKKyAgICAgICAgbWVzc2FnZSA9CisgICAgICAgICAgICBpMThuICgiPHF0PjxwPlNrZXdp bmcgdGhlIGltYWdlIHRvICUxeCUyIgorICAgICAgICAgICAgICAgICAgIiBtYXkgdGFrZSBhIHN1 YnN0YW50aWFsIGFtb3VudCBvZiBtZW1vcnkuIgorICAgICAgICAgICAgICAgICAgIiBUaGlzIGNh biByZWR1Y2Ugc3lzdGVtIgorICAgICAgICAgICAgICAgICAgIiByZXNwb25zaXZlbmVzcyBhbmQg Y2F1c2Ugb3RoZXIgYXBwbGljYXRpb24gcmVzb3VyY2UiCisgICAgICAgICAgICAgICAgICAiIHBy b2JsZW1zLjwvcD4iCisKKyAgICAgICAgICAgICAgICAgICI8cD5BcmUgeW91IHN1cmUgd2FudCB0 byBza2V3IHRoZSBpbWFnZT88L3A+PC9xdD4iKTsKKworICAgICAgICBjYXB0aW9uID0gaTE4biAo IlNrZXcgSW1hZ2U/Iik7CisgICAgICAgIGNvbnRpbnVlQnV0dG9uVGV4dCA9IGkxOG4gKCJTayZl dyBJbWFnZSIpOwogICAgIH0KIAogCkBAIC00MDcsMjAgKzQzMSw5IEBAIHZvaWQga3BUb29sU2tl d0RpYWxvZzo6c2xvdE9rICgpCiAgICAgaWYgKGtwVG9vbDo6d2FybklmQmlnSW1hZ2VTaXplICht X29sZFdpZHRoLAogICAgICAgICAgICAgbV9vbGRIZWlnaHQsCiAgICAgICAgICAgICBuZXdXaWR0 aCwgbmV3SGVpZ2h0LAotICAgICAgICAgICAgaTE4biAoIjxxdD48cD5Ta2V3aW5nIHRoZSAlMSB0 byIKLSAgICAgICAgICAgICAgICAgICAgIiAlMnglMyBtYXkgdGFrZSBhIHN1YnN0YW50aWFsIGFt b3VudCBvZiBtZW1vcnkuIgotICAgICAgICAgICAgICAgICAgICAiIFRoaXMgY2FuIHJlZHVjZSBz eXN0ZW0iCi0gICAgICAgICAgICAgICAgICAgICIgcmVzcG9uc2l2ZW5lc3MgYW5kIGNhdXNlIG90 aGVyIGFwcGxpY2F0aW9uIHJlc291cmNlIgotICAgICAgICAgICAgICAgICAgICAiIHByb2JsZW1z LjwvcD4iCi0KLSAgICAgICAgICAgICAgICAgICAgIjxwPkFyZSB5b3Ugc3VyZSB3YW50IHRvIHNr ZXcgdGhlIgotICAgICAgICAgICAgICAgICAgICAiICU0PzwvcD48L3F0PiIpCi0gICAgICAgICAg ICAgICAgLmFyZyAoc2VsT3JJbWFnZUxvd2VyQ2FzZSkKLSAgICAgICAgICAgICAgICAuYXJnIChu ZXdXaWR0aCkKLSAgICAgICAgICAgICAgICAuYXJnIChuZXdIZWlnaHQpCi0gICAgICAgICAgICAg ICAgLmFyZyAoc2VsT3JJbWFnZUxvd2VyQ2FzZSksCi0gICAgICAgICAgICBpMThuICgiU2tldyAl MT8iKS5hcmcgKHNlbE9ySW1hZ2VUaXRsZUNhc2UpLAotICAgICAgICAgICAgaTE4biAoIlNrJmV3 ICUxIikuYXJnIChzZWxPckltYWdlVGl0bGVDYXNlKSwKKyAgICAgICAgICAgIG1lc3NhZ2UuYXJn IChuZXdXaWR0aCkuYXJnIChuZXdIZWlnaHQpLAorICAgICAgICAgICAgY2FwdGlvbiwKKyAgICAg ICAgICAgIGNvbnRpbnVlQnV0dG9uVGV4dCwKICAgICAgICAgICAgIHRoaXMpKQogICAgIHsKICAg ICAgICAgS0RpYWxvZ0Jhc2U6OnNsb3RPayAoKTsK 6834 2004-07-25 14:38:04 +0000 2004-07-25 14:38:04 +0000 kolourpaint-crop-wrongstring.diff kolourpaint-crop-wrongstring.diff text/x-diff 635 dang SW5kZXg6IGtwdG9vbGNyb3AuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVn cmFwaGljcy9rb2xvdXJwYWludC90b29scy9rcHRvb2xjcm9wLmNwcCx2CnJldHJpZXZpbmcgcmV2 aXNpb24gMS4zCmRpZmYgLXUgLXAgLWIgLXIxLjMga3B0b29sY3JvcC5jcHAKLS0tIGtwdG9vbGNy b3AuY3BwCTExIEp1bCAyMDA0IDA3OjA3OjEwIC0wMDAwCTEuMworKysga3B0b29sY3JvcC5jcHAJ MjUgSnVsIDIwMDQgMTI6MzQ6MDUgLTAwMDAKQEAgLTE0Niw3ICsxNDYsNyBAQCB2b2lkIGtwVG9v bENyb3BTZXRJbWFnZUNvbW1hbmQ6OnVuZXhlY3V0CiAgKi8KIAoga3BUb29sQ3JvcENvbW1hbmQ6 OmtwVG9vbENyb3BDb21tYW5kIChrcE1haW5XaW5kb3cgKm1haW5XaW5kb3cpCi0gICAgOiBrcE1h Y3JvQ29tbWFuZCAoaTE4biAoIkNyb3AgT3V0c2lkZSBTZWxlY3Rpb24iKSwgbWFpbldpbmRvdykK KyAgICA6IGtwTWFjcm9Db21tYW5kIChpMThuICgiU2V0IGFzIEltYWdlIiksIG1haW5XaW5kb3cp CiB7CiAgICAgaWYgKCFtYWluV2luZG93IHx8CiAgICAgICAgICFtYWluV2luZG93LT5kb2N1bWVu dCAoKSB8fAo= 6921 2004-07-30 14:40:47 +0000 2004-07-30 14:40:47 +0000 kolourpaint-i18n-pixmapfx-warn-about-loss-info.diff kolourpaint-i18n-pixmapfx-warn-about-loss-info.diff text/x-diff 11600 dang SW5kZXg6IGtwZG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVn cmFwaGljcy9rb2xvdXJwYWludC9rcGRvY3VtZW50LmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24g MS40NApkaWZmIC11IC1wIC1yMS40NCBrcGRvY3VtZW50LmNwcAotLS0ga3Bkb2N1bWVudC5jcHAJ MjkgSnVsIDIwMDQgMTM6NTk6MDEgLTAwMDAJMS40NAorKysga3Bkb2N1bWVudC5jcHAJMzAgSnVs IDIwMDQgMTI6MTY6MzggLTAwMDAKQEAgLTI0MCw5ICsyNDAsMzAgQEAgUVBpeG1hcCBrcERvY3Vt ZW50OjpnZXRQaXhtYXBGcm9tRmlsZSAoYwogICAgIFFQaXhtYXAgbmV3UGl4bWFwOwogICAgIG5l d1BpeG1hcCA9IGtwUGl4bWFwRlg6OmNvbnZlcnRUb1BpeG1hcCAoaW1hZ2UsCiAgICAgICAgIGZh bHNlLypubyBkaXRoZXIqLywKLSAgICAgICAga3BQaXhtYXBGWDo6V2FybkFib3V0TG9zc0luZm8g KHBhcmVudCwKLSAgICAgICAgICAgIGkxOG4gKCJpbWFnZSBcIiUxXCIiKS5hcmcgKHByZXR0eUZp bGVuYW1lRm9yVVJMICh1cmwpKSwKLSAgICAgICAgICAgICJkb2NPcGVuIikpOworICAgICAgICBr cFBpeG1hcEZYOjpXYXJuQWJvdXRMb3NzSW5mbyAoCisgICAgICAgICAgICAgaTE4biAoIlRoZSBp bWFnZSBcIiUxXCIiCisgICAgICAgICAgICAgICAgICAgIiBtYXkgaGF2ZSBtb3JlIGNvbG9ycyB0 aGFuIHRoZSBjdXJyZW50IHNjcmVlbiBtb2RlLiIKKyAgICAgICAgICAgICAgICAgICAiIEluIG9y ZGVyIHRvIGRpc3BsYXkgaXQsIHNvbWUgY29sb3JzIG1heSBiZSBjaGFuZ2VkLiIKKyAgICAgICAg ICAgICAgICAgICAiIFRyeSBpbmNyZWFzaW5nIHlvdXIgc2NyZWVuIGRlcHRoIHRvIGF0IGxlYXN0 ICUyYnBwLiIKKworICAgICAgICAgICAgICAgICAgICJcbkl0IGFsc28iCisKKyAgICAgICAgICAg ICAgICAgICAiIGNvbnRhaW5zIHRyYW5zbHVjZW5jeSB3aGljaCBpcyBub3QgZnVsbHkiCisgICAg ICAgICAgICAgICAgICAgIiBzdXBwb3J0ZWQuIFRoZSB0cmFuc2x1Y2VuY3kgZGF0YSB3aWxsIGJl IgorICAgICAgICAgICAgICAgICAgICIgYXBwcm94aW1hdGVkIHdpdGggYSAxLWJpdCB0cmFuc3Bh cmVuY3kgbWFzay4iKQorICAgICAgICAgICAgICAgICAuYXJnIChwcmV0dHlGaWxlbmFtZUZvclVS TCAodXJsKSksCisgICAgICAgICAgICAgaTE4biAoIlRoZSBpbWFnZSBcIiUxXCIiCisgICAgICAg ICAgICAgICAgICAgIiBtYXkgaGF2ZSBtb3JlIGNvbG9ycyB0aGFuIHRoZSBjdXJyZW50IHNjcmVl biBtb2RlLiIKKyAgICAgICAgICAgICAgICAgICAiIEluIG9yZGVyIHRvIGRpc3BsYXkgaXQsIHNv bWUgY29sb3JzIG1heSBiZSBjaGFuZ2VkLiIKKyAgICAgICAgICAgICAgICAgICAiIFRyeSBpbmNy ZWFzaW5nIHlvdXIgc2NyZWVuIGRlcHRoIHRvIGF0IGxlYXN0ICUyYnBwLiIpCisgICAgICAgICAg ICAgICAgIC5hcmcgKHByZXR0eUZpbGVuYW1lRm9yVVJMICh1cmwpKSwKKyAgICAgICAgICAgICBp MThuICgiVGhlIGltYWdlIFwiJTFcIiIKKyAgICAgICAgICAgICAgICAgICAiIGNvbnRhaW5zIHRy YW5zbHVjZW5jeSB3aGljaCBpcyBub3QgZnVsbHkiCisgICAgICAgICAgICAgICAgICAgIiBzdXBw b3J0ZWQuIFRoZSB0cmFuc2x1Y2VuY3kgZGF0YSB3aWxsIGJlIgorICAgICAgICAgICAgICAgICAg ICIgYXBwcm94aW1hdGVkIHdpdGggYSAxLWJpdCB0cmFuc3BhcmVuY3kgbWFzay4iKQorICAgICAg ICAgICAgICAgIC5hcmcgKHByZXR0eUZpbGVuYW1lRm9yVVJMICh1cmwpKSwKKyAgICAgICAgICAg ICJkb2NPcGVuIiwKKyAgICAgICAgICAgIHBhcmVudCkpOwogCiAgICAgaWYgKG5ld1BpeG1hcC5p c051bGwgKCkpCiAgICAgewpJbmRleDoga3BtYWlud2luZG93X2VkaXQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K UkNTIGZpbGU6IC9ob21lL2tkZS9rZGVncmFwaGljcy9rb2xvdXJwYWludC9rcG1haW53aW5kb3df ZWRpdC5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjgKZGlmZiAtdSAtcCAtcjEuMjgga3Bt YWlud2luZG93X2VkaXQuY3BwCi0tLSBrcG1haW53aW5kb3dfZWRpdC5jcHAJMjkgSnVsIDIwMDQg MTM6NTk6MDEgLTAwMDAJMS4yOAorKysga3BtYWlud2luZG93X2VkaXQuY3BwCTMwIEp1bCAyMDA0 IDEyOjE2OjQwIC0wMDAwCkBAIC02MCw5ICs2MCwyNyBAQAogLy8gcHJpdmF0ZQoga3BQaXhtYXBG WDo6V2FybkFib3V0TG9zc0luZm8ga3BNYWluV2luZG93OjpwYXN0ZVdhcm5BYm91dExvc3NJbmZv ICgpCiB7Ci0gICAgcmV0dXJuIGtwUGl4bWFwRlg6Oldhcm5BYm91dExvc3NJbmZvICh0aGlzLAot ICAgICAgICBpMThuICgiaW1hZ2UgdG8gYmUgcGFzdGVkIiksCi0gICAgICAgICJwYXN0ZSIpOwor ICAgIHJldHVybiBrcFBpeG1hcEZYOjpXYXJuQWJvdXRMb3NzSW5mbyAoCisgICAgICAgICAgICAg ICBpMThuICgiVGhlIGltYWdlIHRvIGJlIHBhc3RlZCIKKyAgICAgICAgICAgICAgICAgICAgICIg bWF5IGhhdmUgbW9yZSBjb2xvcnMgdGhhbiB0aGUgY3VycmVudCBzY3JlZW4gbW9kZS4iCisgICAg ICAgICAgICAgICAgICAgICAiIEluIG9yZGVyIHRvIGRpc3BsYXkgaXQsIHNvbWUgY29sb3JzIG1h eSBiZSBjaGFuZ2VkLiIKKyAgICAgICAgICAgICAgICAgICAgICIgVHJ5IGluY3JlYXNpbmcgeW91 ciBzY3JlZW4gZGVwdGggdG8gYXQgbGVhc3QgJTFicHAuIgorCisgICAgICAgICAgICAgICAgICAg ICAiXG5JdCBhbHNvIgorCisgICAgICAgICAgICAgICAgICAgICAiIGNvbnRhaW5zIHRyYW5zbHVj ZW5jeSB3aGljaCBpcyBub3QgZnVsbHkiCisgICAgICAgICAgICAgICAgICAgICAiIHN1cHBvcnRl ZC4gVGhlIHRyYW5zbHVjZW5jeSBkYXRhIHdpbGwgYmUiCisgICAgICAgICAgICAgICAgICAgICAi IGFwcHJveGltYXRlZCB3aXRoIGEgMS1iaXQgdHJhbnNwYXJlbmN5IG1hc2suIiksCisgICAgICAg ICAgICAgICBpMThuICgiVGhlIGltYWdlIHRvIGJlIHBhc3RlZCIKKyAgICAgICAgICAgICAgICAg ICAgICIgbWF5IGhhdmUgbW9yZSBjb2xvcnMgdGhhbiB0aGUgY3VycmVudCBzY3JlZW4gbW9kZS4i CisgICAgICAgICAgICAgICAgICAgICAiIEluIG9yZGVyIHRvIGRpc3BsYXkgaXQsIHNvbWUgY29s b3JzIG1heSBiZSBjaGFuZ2VkLiIKKyAgICAgICAgICAgICAgICAgICAgICIgVHJ5IGluY3JlYXNp bmcgeW91ciBzY3JlZW4gZGVwdGggdG8gYXQgbGVhc3QgJTFicHAuIiksCisgICAgICAgICAgICAg ICBpMThuICgiVGhlIGltYWdlIHRvIGJlIHBhc3RlZCIKKyAgICAgICAgICAgICAgICAgICAgICIg Y29udGFpbnMgdHJhbnNsdWNlbmN5IHdoaWNoIGlzIG5vdCBmdWxseSIKKyAgICAgICAgICAgICAg ICAgICAgICIgc3VwcG9ydGVkLiBUaGUgdHJhbnNsdWNlbmN5IGRhdGEgd2lsbCBiZSIKKyAgICAg ICAgICAgICAgICAgICAgICIgYXBwcm94aW1hdGVkIHdpdGggYSAxLWJpdCB0cmFuc3BhcmVuY3kg bWFzay4iKSwKKyAgICAgICAgICAgICAgICJwYXN0ZSIsCisgICAgICAgICAgICAgICB0aGlzKTsK IH0KIAogCkluZGV4OiBwaXhtYXBmeC9rcHBpeG1hcGZ4LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxl OiAvaG9tZS9rZGUva2RlZ3JhcGhpY3Mva29sb3VycGFpbnQvcGl4bWFwZngva3BwaXhtYXBmeC5j cHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjQKZGlmZiAtdSAtcCAtcjEuMjQga3BwaXhtYXBm eC5jcHAKLS0tIHBpeG1hcGZ4L2twcGl4bWFwZnguY3BwCTMwIEp1bCAyMDA0IDExOjI0OjM0IC0w MDAwCTEuMjQKKysrIHBpeG1hcGZ4L2twcGl4bWFwZnguY3BwCTMwIEp1bCAyMDA0IDEyOjE2OjQz IC0wMDAwCkBAIC0yNiw3ICsyNiw3IEBACiAqLwogCiAKLSNkZWZpbmUgREVCVUdfS1BfUElYTUFQ X0ZYIDAKKyNkZWZpbmUgREVCVUdfS1BfUElYTUFQX0ZYIDEKIAogCiAjaW5jbHVkZSA8a3BwaXht YXBmeC5oPgpAQCAtMjc4LDExICsyNzgsMTEgQEAgc3RhdGljIHZvaWQgY29udmVydFRvUGl4bWFw V2FybkFib3V0TG9zcwogCiAKICAgICBjb25zdCBRU3RyaW5nIGNvbG9yRGVwdGhUcmFuc2x1Y2Vu Y3lEb250QXNrQWdhaW4gPQotICAgICAgICB3YWxpLmRvbnRBc2tBZ2FpblByZWZpeCAoKSArICJf Q29sb3JEZXB0aFRyYW5zbHVjZW5jeSI7CisgICAgICAgIHdhbGkubV9kb250QXNrQWdhaW5QcmVm aXggKyAiX0NvbG9yRGVwdGhUcmFuc2x1Y2VuY3kiOwogICAgIGNvbnN0IFFTdHJpbmcgY29sb3JE ZXB0aERvbnRBc2tBZ2FpbiA9Ci0gICAgICAgIHdhbGkuZG9udEFza0FnYWluUHJlZml4ICgpICsg Il9Db2xvckRlcHRoIjsKKyAgICAgICAgd2FsaS5tX2RvbnRBc2tBZ2FpblByZWZpeCArICJfQ29s b3JEZXB0aCI7CiAgICAgY29uc3QgUVN0cmluZyB0cmFuc2x1Y2VuY3lEb250QXNrQWdhaW4gPQot ICAgICAgICB3YWxpLmRvbnRBc2tBZ2FpblByZWZpeCAoKSArICJfVHJhbnNsdWNlbmN5IjsKKyAg ICAgICAgd2FsaS5tX2RvbnRBc2tBZ2FpblByZWZpeCArICJfVHJhbnNsdWNlbmN5IjsKIAogI2lm IERFQlVHX0tQX1BJWE1BUF9GWCAmJiAxCiAgICAgUVRpbWUgdGltZXI7CkBAIC0zMzIsMjIgKzMz Miw4IEBAIHN0YXRpYyB2b2lkIGNvbnZlcnRUb1BpeG1hcFdhcm5BYm91dExvc3MKIAogICAgIGlm IChtb3JlQ29sb3JzVGhhbkRpc3BsYXkgJiYgaGFzQWxwaGFDaGFubmVsKQogICAgIHsKLSAgICAg ICAgS01lc3NhZ2VCb3g6OmluZm9ybWF0aW9uICh3YWxpLnBhcmVudCAoKSwKLSAgICAgICAgICAg IGkxOG4gKCJUaGUgJTEgIgotICAgICAgICAgICAgICAgICAgLy8gc3luYzogbW9yZUNvbG9yc1Ro YW5EaXNwbGF5TWVzc2FnZQotICAgICAgICAgICAgICAgICAgIm1heSBoYXZlIG1vcmUgY29sb3Jz IHRoYW4gdGhlIGN1cnJlbnQgc2NyZWVuIG1vZGUuICIKLSAgICAgICAgICAgICAgICAgICJJbiBv cmRlciB0byBkaXNwbGF5IGl0LCBzb21lIGNvbG9ycyBtYXkgYmUgY2hhbmdlZC4gIgotICAgICAg ICAgICAgICAgICAgIlRyeSBpbmNyZWFzaW5nIHlvdXIgc2NyZWVuICIKLSAgICAgICAgICAgICAg ICAgICJkZXB0aCB0byBhdCBsZWFzdCAlMmJwcC4iCi0KLSAgICAgICAgICAgICAgICAgICJcbkl0 IGFsc28gIgotCi0gICAgICAgICAgICAgICAgICAvLyBzeW5jOiBoYXNBbHBoYUNoYW5uZWxNZXNz YWdlCi0gICAgICAgICAgICAgICAgICAiY29udGFpbnMgdHJhbnNsdWNlbmN5IHdoaWNoIGlzIG5v dCAiCi0gICAgICAgICAgICAgICAgICAiZnVsbHkgc3VwcG9ydGVkLiAiCi0gICAgICAgICAgICAg ICAgICAiVGhlIHRyYW5zbHVjZW5jeSBkYXRhIHdpbGwgYmUgIgotICAgICAgICAgICAgICAgICAg ImFwcHJveGltYXRlZCB3aXRoIGEgMS1iaXQgdHJhbnNwYXJlbmN5IG1hc2suIikKLSAgICAgICAg ICAgICAgICAuYXJnICh3YWxpLml0ZW1OYW1lICgpKQorICAgICAgICBLTWVzc2FnZUJveDo6aW5m b3JtYXRpb24gKHdhbGkubV9wYXJlbnQsCisgICAgICAgICAgICB3YWxpLm1fbW9yZUNvbG9yc1Ro YW5EaXNwbGF5QW5kSGFzQWxwaGFDaGFubmVsTWVzc2FnZQogICAgICAgICAgICAgICAgIC5hcmcg KHNjcmVlbkRlcHRoTmVlZGVkKSwKICAgICAgICAgICAgIFFTdHJpbmc6Om51bGwsICAvLyBvciB3 b3VsZCB5b3UgcHJlZmVyICJMb3cgU2NyZWVuIERlcHRoIGFuZCBJbWFnZSBDb250YWlucyBUcmFu c3BhcmVuY3kiPyA6KQogICAgICAgICAgICAgY29sb3JEZXB0aFRyYW5zbHVjZW5jeURvbnRBc2tB Z2Fpbik7CkBAIC0zNjAsMjggKzM0NiwxNiBAQCBzdGF0aWMgdm9pZCBjb252ZXJ0VG9QaXhtYXBX YXJuQWJvdXRMb3NzCiAgICAgfQogICAgIGVsc2UgaWYgKG1vcmVDb2xvcnNUaGFuRGlzcGxheSkK ICAgICB7Ci0gICAgICAgIEtNZXNzYWdlQm94OjppbmZvcm1hdGlvbiAod2FsaS5wYXJlbnQgKCks Ci0gICAgICAgICAgICBpMThuICgiVGhlICUxICIKLSAgICAgICAgICAgICAgICAgIC8vIHN5bmM6 IG1vcmVDb2xvcnNUaGFuRGlzcGxheU1lc3NhZ2UKLSAgICAgICAgICAgICAgICAgICJtYXkgaGF2 ZSBtb3JlIGNvbG9ycyB0aGFuIHRoZSBjdXJyZW50IHNjcmVlbiBtb2RlLiAiCi0gICAgICAgICAg ICAgICAgICAiSW4gb3JkZXIgdG8gZGlzcGxheSBpdCwgc29tZSBjb2xvcnMgbWF5IGJlIGNoYW5n ZWQuICIKLSAgICAgICAgICAgICAgICAgICJUcnkgaW5jcmVhc2luZyB5b3VyIHNjcmVlbiAiCi0g ICAgICAgICAgICAgICAgICAiZGVwdGggdG8gYXQgbGVhc3QgJTJicHAuIikKLSAgICAgICAgICAg ICAgICAuYXJnICh3YWxpLml0ZW1OYW1lICgpKQorICAgICAgICBLTWVzc2FnZUJveDo6aW5mb3Jt YXRpb24gKHdhbGkubV9wYXJlbnQsCisgICAgICAgICAgICB3YWxpLm1fbW9yZUNvbG9yc1RoYW5E aXNwbGF5TWVzc2FnZQogICAgICAgICAgICAgICAgIC5hcmcgKHNjcmVlbkRlcHRoTmVlZGVkKSwK ICAgICAgICAgICAgIGkxOG4gKCJMb3cgU2NyZWVuIERlcHRoIiksCiAgICAgICAgICAgICBjb2xv ckRlcHRoRG9udEFza0FnYWluKTsKICAgICB9CiAgICAgZWxzZSBpZiAoaGFzQWxwaGFDaGFubmVs KQogICAgIHsKLSAgICAgICAgS01lc3NhZ2VCb3g6OmluZm9ybWF0aW9uICh3YWxpLnBhcmVudCAo KSwKLSAgICAgICAgICAgIGkxOG4gKCJUaGUgJTEgIgotICAgICAgICAgICAgICAgICAgLy8gc3lu YzogaGFzQWxwaGFDaGFubmVsTWVzc2FnZQotICAgICAgICAgICAgICAgICAgImNvbnRhaW5zIHRy YW5zbHVjZW5jeSB3aGljaCBpcyBub3QgIgotICAgICAgICAgICAgICAgICAgImZ1bGx5IHN1cHBv cnRlZC4gIgotICAgICAgICAgICAgICAgICAgIlRoZSB0cmFuc2x1Y2VuY3kgZGF0YSB3aWxsIGJl ICIKLSAgICAgICAgICAgICAgICAgICJhcHByb3hpbWF0ZWQgd2l0aCBhIDEtYml0IHRyYW5zcGFy ZW5jeSBtYXNrLiIpCi0gICAgICAgICAgICAgICAgLmFyZyAod2FsaS5pdGVtTmFtZSAoKSksCisg ICAgICAgIEtNZXNzYWdlQm94OjppbmZvcm1hdGlvbiAod2FsaS5tX3BhcmVudCwKKyAgICAgICAg ICAgIHdhbGkubV9oYXNBbHBoYUNoYW5uZWxNZXNzYWdlLAogICAgICAgICAgICAgaTE4biAoIklt YWdlIENvbnRhaW5zIFRyYW5zbHVjZW5jeSIpLAogICAgICAgICAgICAgdHJhbnNsdWNlbmN5RG9u dEFza0FnYWluKTsKICAgICB9CkluZGV4OiBwaXhtYXBmeC9rcHBpeG1hcGZ4LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZWdyYXBoaWNzL2tvbG91cnBhaW50L3BpeG1hcGZ4L2tw cGl4bWFwZnguaCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNgpkaWZmIC11IC1wIC1yMS4xNiBr cHBpeG1hcGZ4LmgKLS0tIHBpeG1hcGZ4L2twcGl4bWFwZnguaAkzMCBKdWwgMjAwNCAxMToxODoy NyAtMDAwMAkxLjE2CisrKyBwaXhtYXBmeC9rcHBpeG1hcGZ4LmgJMzAgSnVsIDIwMDQgMTI6MTY6 NDUgLTAwMDAKQEAgLTk4LDMwICs5OCw2MyBAQCBwdWJsaWM6CiAgICAgLy8KICAgICAvLyBEaWFs b2cgaW5mbyBmb3Igd2FybmluZyBhYm91dCBkYXRhIGxvc3Mgd2l0aCBjb252ZXJ0VG9QaXhtYXAo KS4KICAgICAvLwotICAgIGNsYXNzIFdhcm5BYm91dExvc3NJbmZvCisgICAgc3RydWN0IFdhcm5B Ym91dExvc3NJbmZvCiAgICAgewotICAgIHB1YmxpYzoKLSAgICAgICAgV2FybkFib3V0TG9zc0lu Zm8gKCkKLSAgICAgICAgICAgIDogbV9pc1ZhbGlkIChmYWxzZSksCi0gICAgICAgICAgICAgIG1f cGFyZW50ICgwKQorICAgICAgICAvLyA8bW9yZUNvbG9yc1RoYW5EaXNwbGF5QW5kSGFzQWxwaGFD aGFubmVsTWVzc2FnZT46CisgICAgICAgIC8vCisgICAgICAgIC8vICAgICBpMThuICgiVGhlIChp bWFnZSBcImV4YW1wbGUuanBnXCJ8aW1hZ2UgZnJvbSB0aGUgY2xpcGJvYXJkKSIKKyAgICAgICAg Ly8gICAgICAgICAgICIgbWF5IGhhdmUgbW9yZSBjb2xvcnMgdGhhbiB0aGUgY3VycmVudCBzY3Jl ZW4gbW9kZS4iCisgICAgICAgIC8vICAgICAgICAgICAiIEluIG9yZGVyIHRvIGRpc3BsYXkgaXQs IHNvbWUgY29sb3JzIG1heSBiZSBjaGFuZ2VkLiIKKyAgICAgICAgLy8gICAgICAgICAgICIgVHJ5 IGluY3JlYXNpbmcgeW91ciBzY3JlZW4gZGVwdGggdG8gYXQgbGVhc3QgJTFicHAuIgorICAgICAg ICAvLworICAgICAgICAvLyAgICAgICAgICAgIlxuSXQgYWxzbyIKKyAgICAgICAgLy8KKyAgICAg ICAgLy8gICAgICAgICAgICIgY29udGFpbnMgdHJhbnNsdWNlbmN5IHdoaWNoIGlzIG5vdCBmdWxs eSIKKyAgICAgICAgLy8gICAgICAgICAgICIgc3VwcG9ydGVkLiBUaGUgdHJhbnNsdWNlbmN5IGRh dGEgd2lsbCBiZSIKKyAgICAgICAgLy8gICAgICAgICAgICIgYXBwcm94aW1hdGVkIHdpdGggYSAx LWJpdCB0cmFuc3BhcmVuY3kgbWFzay4iKQorICAgICAgICAvLworICAgICAgICAvLyA8bW9yZUNv bG9yc1RoYW5EaXNwbGF5TWVzc2FnZT46CisgICAgICAgIC8vICAgICBpMThuICgiVGhlIChpbWFn ZSBcImV4YW1wbGUuanBnXCJ8aW1hZ2UgZnJvbSB0aGUgY2xpcGJvYXJkKSIKKyAgICAgICAgLy8g ICAgICAgICAgICIgbWF5IGhhdmUgbW9yZSBjb2xvcnMgdGhhbiB0aGUgY3VycmVudCBzY3JlZW4g bW9kZS4iCisgICAgICAgIC8vICAgICAgICAgICAiIEluIG9yZGVyIHRvIGRpc3BsYXkgaXQsIHNv bWUgY29sb3JzIG1heSBiZSBjaGFuZ2VkLiIKKyAgICAgICAgLy8gICAgICAgICAgICIgVHJ5IGlu Y3JlYXNpbmcgeW91ciBzY3JlZW4gZGVwdGggdG8gYXQgbGVhc3QgJTFicHAuIikKKyAgICAgICAg Ly8KKyAgICAgICAgLy8gPGhhc0FscGhhQ2hhbm5lbE1lc3NhZ2U+OgorICAgICAgICAvLyAgICAg aTE4biAoIlRoZSAoaW1hZ2UgXCJleGFtcGxlLmpwZ1wifGltYWdlIGZyb20gdGhlIGNsaXBib2Fy ZCkiCisgICAgICAgIC8vICAgICAgICAgICAiIGNvbnRhaW5zIHRyYW5zbHVjZW5jeSB3aGljaCBp cyBub3QgZnVsbHkiCisgICAgICAgIC8vICAgICAgICAgICAiIHN1cHBvcnRlZC4gVGhlIHRyYW5z bHVjZW5jeSBkYXRhIHdpbGwgYmUiCisgICAgICAgIC8vICAgICAgICAgICAiIGFwcHJveGltYXRl ZCB3aXRoIGEgMS1iaXQgdHJhbnNwYXJlbmN5IG1hc2suIikKKyAgICAgICAgLy8KKyAgICAgICAg Ly8gPGRvbnRBc2tBZ2FpblByZWZpeD46CisgICAgICAgIC8vCisgICAgICAgIC8vICAgICBEb24n dEFza0FnYWluIElEIGZvciBkaWFsb2cuCisgICAgICAgIC8vCisgICAgICAgIC8vIDxwYXJlbnQ+ OgorICAgICAgICAvLworICAgICAgICAvLyAgICAgRGlhbG9nIHBhcmVudAorICAgICAgICAvLwor ICAgICAgICBXYXJuQWJvdXRMb3NzSW5mbyAoY29uc3QgUVN0cmluZyAmbW9yZUNvbG9yc1RoYW5E aXNwbGF5QW5kSGFzQWxwaGFDaGFubmVsTWVzc2FnZSwKKyAgICAgICAgICAgICAgICBjb25zdCBR U3RyaW5nICZtb3JlQ29sb3JzVGhhbkRpc3BsYXlNZXNzYWdlLAorICAgICAgICAgICAgICAgIGNv bnN0IFFTdHJpbmcgJmhhc0FscGhhQ2hhbm5lbE1lc3NhZ2UsCisgICAgICAgICAgICAgICAgY29u c3QgUVN0cmluZyAmZG9udEFza0FnYWluUHJlZml4LAorICAgICAgICAgICAgICAgIFFXaWRnZXQg KnBhcmVudCkKKyAgICAgICAgICAgIDoKKyAgICAgICAgICAgICAgICBtX21vcmVDb2xvcnNUaGFu RGlzcGxheUFuZEhhc0FscGhhQ2hhbm5lbE1lc3NhZ2UgKAorICAgICAgICAgICAgICAgICAgICBt b3JlQ29sb3JzVGhhbkRpc3BsYXlBbmRIYXNBbHBoYUNoYW5uZWxNZXNzYWdlKSwKKyAgICAgICAg ICAgICAgICBtX21vcmVDb2xvcnNUaGFuRGlzcGxheU1lc3NhZ2UgKAorICAgICAgICAgICAgICAg ICAgICBtb3JlQ29sb3JzVGhhbkRpc3BsYXlNZXNzYWdlKSwKKyAgICAgICAgICAgICAgICBtX2hh c0FscGhhQ2hhbm5lbE1lc3NhZ2UgKAorICAgICAgICAgICAgICAgICAgICBoYXNBbHBoYUNoYW5u ZWxNZXNzYWdlKSwKKyAgICAgICAgICAgICAgICBtX2RvbnRBc2tBZ2FpblByZWZpeCAoCisgICAg ICAgICAgICAgICAgICAgIGRvbnRBc2tBZ2FpblByZWZpeCksCisgICAgICAgICAgICAgICAgbV9w YXJlbnQgKHBhcmVudCksCisgICAgICAgICAgICAgICAgbV9pc1ZhbGlkICh0cnVlKQogICAgICAg ICB7CiAgICAgICAgIH0KIAotCi0gICAgICAgLyoKLSAgICAgICAgKiA8cGFyZW50PiAgICAgICAg ICAgICAgICAgZGlhbG9nIHBhcmVudAotICAgICAgICAqIDxpdGVtTmFtZT4gICAgICAgICAgICAg ICBzb3VyY2Ugb2YgdGhlIG9yaWdpbmFsIGltYWdlIGUuZy4KLSAgICAgICAgKiAgICAgICAgICAg ICAgICAgICAgICAgICAgaTE4biAoImltYWdlIFwiZXhhbXBsZS5qcGdcIiIpIG9yCi0gICAgICAg ICogICAgICAgICAgICAgICAgICAgICAgICAgIGkxOG4gKCJpbWFnZSBmcm9tIHRoZSBjbGlwYm9h cmQiKQotICAgICAgICAqIDxkb250QXNrQWdhaW5QcmVmaXg+ICAgICBlLmcuICJkb2NPcGVuIiBv ciAiY2xpcGJvYXJkUGFzdGUiCi0gICAgICAgICovCi0gICAgICAgIFdhcm5BYm91dExvc3NJbmZv IChRV2lkZ2V0ICpwYXJlbnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3Ry aW5nICZpdGVtTmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFFTdHJpbmcg JmRvbnRBc2tBZ2FpblByZWZpeCkKLSAgICAgICAgICAgIDogbV9pc1ZhbGlkICh0cnVlKSwKLSAg ICAgICAgICAgICAgbV9wYXJlbnQgKHBhcmVudCksCi0gICAgICAgICAgICAgIG1faXRlbU5hbWUg KGl0ZW1OYW1lKSwKLSAgICAgICAgICAgICAgbV9kb250QXNrQWdhaW5QcmVmaXggKGRvbnRBc2tB Z2FpblByZWZpeCkKKyAgICAgICAgV2FybkFib3V0TG9zc0luZm8gKCkKKyAgICAgICAgICAgIDog bV9wYXJlbnQgKDApLAorICAgICAgICAgICAgICBtX2lzVmFsaWQgKGZhbHNlKQogICAgICAgICB7 CiAgICAgICAgIH0KIApAQCAtMTMxLDE0ICsxNjQsMTQgQEAgcHVibGljOgogCiAKICAgICAgICAg Ym9vbCBpc1ZhbGlkICgpIGNvbnN0IHsgcmV0dXJuIG1faXNWYWxpZDsgfQotICAgICAgICBRV2lk Z2V0ICpwYXJlbnQgKCkgY29uc3QgeyByZXR1cm4gbV9wYXJlbnQ7IH0KLSAgICAgICAgUVN0cmlu ZyBpdGVtTmFtZSAoKSBjb25zdCB7IHJldHVybiBtX2l0ZW1OYW1lOyB9Ci0gICAgICAgIFFTdHJp bmcgZG9udEFza0FnYWluUHJlZml4ICgpIGNvbnN0IHsgcmV0dXJuIG1fZG9udEFza0FnYWluUHJl Zml4OyB9CiAKLSAgICBwcml2YXRlOgotICAgICAgICBib29sIG1faXNWYWxpZDsKKworICAgICAg ICBRU3RyaW5nIG1fbW9yZUNvbG9yc1RoYW5EaXNwbGF5QW5kSGFzQWxwaGFDaGFubmVsTWVzc2Fn ZSwKKyAgICAgICAgICAgICAgICBtX21vcmVDb2xvcnNUaGFuRGlzcGxheU1lc3NhZ2UsCisgICAg ICAgICAgICAgICAgbV9oYXNBbHBoYUNoYW5uZWxNZXNzYWdlOworICAgICAgICBRU3RyaW5nIG1f ZG9udEFza0FnYWluUHJlZml4OwogICAgICAgICBRV2lkZ2V0ICptX3BhcmVudDsKLSAgICAgICAg UVN0cmluZyBtX2l0ZW1OYW1lLCBtX2RvbnRBc2tBZ2FpblByZWZpeDsKKyAgICAgICAgYm9vbCBt X2lzVmFsaWQ7CiAgICAgfTsKIAogICAgIC8vCgo= 6922 2004-07-30 14:40:47 +0000 2004-07-30 14:40:47 +0000 kolourpaint-i18n-preview-dialog.diff kolourpaint-i18n-preview-dialog.diff text/x-diff 6635 dang SW5kZXg6IHBpeG1hcGZ4L2twZWZmZWN0c2RpYWxvZy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTog L2hvbWUva2RlL2tkZWdyYXBoaWNzL2tvbG91cnBhaW50L3BpeG1hcGZ4L2twZWZmZWN0c2RpYWxv Zy5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuOApkaWZmIC11IC1wIC1yMS44IGtwZWZmZWN0 c2RpYWxvZy5jcHAKLS0tIHBpeG1hcGZ4L2twZWZmZWN0c2RpYWxvZy5jcHAJMjkgSnVsIDIwMDQg MTM6MzE6NTQgLTAwMDAJMS44CisrKyBwaXhtYXBmeC9rcGVmZmVjdHNkaWFsb2cuY3BwCTMwIEp1 bCAyMDA0IDEyOjE2OjQxIC0wMDAwCkBAIC02MSw3ICs2MSw4IEBAIGtwRWZmZWN0c0RpYWxvZzo6 a3BFZmZlY3RzRGlhbG9nIChib29sIGEKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBjaGFyICpuYW1lKQogICAgIDoga3BUb29sUHJldmlld0RpYWxvZyAoa3BUb29sUHJl dmlld0RpYWxvZzo6UHJldmlldywKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRydWUvKnJl c2VydmUgdG9wIHJvdyovLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgUVN0cmluZzo6bnVs bC8qYWN0aW9uTmFtZSovLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgUVN0cmluZzo6bnVs bC8qY2FwdGlvbiovLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgUVN0cmluZzo6bnVsbC8q YWZ0ZXJBY3Rpb25UZXh0IChubyBEaW1lbnNpb25zIEdyb3VwIEJveCkqLywKICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFjdE9uU2VsZWN0aW9uLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgcGFyZW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgbmFtZSksCkluZGV4OiB0b29s cy9rcHRvb2xwcmV2aWV3ZGlhbG9nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUv a2RlZ3JhcGhpY3Mva29sb3VycGFpbnQvdG9vbHMva3B0b29scHJldmlld2RpYWxvZy5jcHAsdgpy ZXRyaWV2aW5nIHJldmlzaW9uIDEuMTMKZGlmZiAtdSAtcCAtcjEuMTMga3B0b29scHJldmlld2Rp YWxvZy5jcHAKLS0tIHRvb2xzL2twdG9vbHByZXZpZXdkaWFsb2cuY3BwCTMwIEp1bCAyMDA0IDEx OjA2OjM3IC0wMDAwCTEuMTMKKysrIHRvb2xzL2twdG9vbHByZXZpZXdkaWFsb2cuY3BwCTMwIEp1 bCAyMDA0IDEyOjE2OjU0IC0wMDAwCkBAIC00OCwxNCArNDgsMTUgQEAKIAoga3BUb29sUHJldmll d0RpYWxvZzo6a3BUb29sUHJldmlld0RpYWxvZyAoRmVhdHVyZXMgZmVhdHVyZXMsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHJlc2VydmVUb3BSb3csCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZh Y3Rpb25OYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgUVN0cmluZyAmY2FwdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IFFTdHJpbmcgJmFmdGVyQWN0aW9uVGV4dCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgYWN0T25TZWxlY3Rpb24sCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBrcE1haW5XaW5kb3cgKnBhcmVudCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKm5hbWUp CiAgICAgOiBLRGlhbG9nQmFzZSAocGFyZW50LCBuYW1lLCB0cnVlLyptb2RhbCovLAotICAgICAg ICAgICAgICAgICAgIFFTdHJpbmc6Om51bGwsCisgICAgICAgICAgICAgICAgICAgY2FwdGlvbiwK ICAgICAgICAgICAgICAgICAgICBLRGlhbG9nQmFzZTo6T2sgfCBLRGlhbG9nQmFzZTo6Q2FuY2Vs KSwKLSAgICAgIG1fYWN0aW9uTmFtZSAoYWN0aW9uTmFtZSksCisgICAgICBtX2FmdGVyQWN0aW9u VGV4dCAoYWZ0ZXJBY3Rpb25UZXh0KSwKICAgICAgIG1fYWN0T25TZWxlY3Rpb24gKGFjdE9uU2Vs ZWN0aW9uKSwKICAgICAgIG1fbWFpbldpbmRvdyAocGFyZW50KSwKICAgICAgIG1fZGltZW5zaW9u c0dyb3VwQm94ICgwKSwKQEAgLTY0LDkgKzY1LDYgQEAga3BUb29sUHJldmlld0RpYWxvZzo6a3BU b29sUHJldmlld0RpYWxvZwogICAgICAgbV9wcmV2aWV3UGl4bWFwTGFiZWwgKDApLAogICAgICAg bV9ncmlkTGF5b3V0ICgwKQogewotICAgIHNldENhcHRpb24gKGNhcHRpb25Gcm9tQWN0aW9uTmFt ZSAoKSk7Ci0KLQogICAgIFFXaWRnZXQgKmJhc2VXaWRnZXQgPSBuZXcgUVdpZGdldCAodGhpcyk7 CiAgICAgc2V0TWFpbldpZGdldCAoYmFzZVdpZGdldCk7CiAKQEAgLTEyMywxNSArMTIxLDYgQEAg a3BUb29sUHJldmlld0RpYWxvZzo6fmtwVG9vbFByZXZpZXdEaWFsbwogCiAKIC8vIHByaXZhdGUK LVFTdHJpbmcga3BUb29sUHJldmlld0RpYWxvZzo6Y2FwdGlvbkZyb21BY3Rpb25OYW1lICgpIGNv bnN0Ci17Ci0gICAgaWYgKG1fYWN0T25TZWxlY3Rpb24pCi0gICAgICAgIHJldHVybiBpMThuICgi JTEgU2VsZWN0aW9uIikuYXJnIChtX2FjdGlvbk5hbWUpOwotICAgIGVsc2UKLSAgICAgICAgcmV0 dXJuIGkxOG4gKCIlMSBJbWFnZSIpLmFyZyAobV9hY3Rpb25OYW1lKTsKLX0KLQotLy8gcHJpdmF0 ZQogdm9pZCBrcFRvb2xQcmV2aWV3RGlhbG9nOjpjcmVhdGVEaW1lbnNpb25zR3JvdXBCb3ggKCkK IHsKICAgICBtX2RpbWVuc2lvbnNHcm91cEJveCA9IG5ldyBRR3JvdXBCb3ggKGkxOG4gKCJEaW1l bnNpb25zIiksIG1haW5XaWRnZXQgKCkpOwpAQCAtMTUyLDggKzE0MSw3IEBAIHZvaWQga3BUb29s UHJldmlld0RpYWxvZzo6Y3JlYXRlRGltZW5zaW8KICAgICB9CiAgICAgUUxhYmVsICpvcmlnaW5h bERpbWVuc2lvbnNMYWJlbCA9IG5ldyBRTGFiZWwgKG9yaWdpbmFsRGltZW5zaW9ucywgbV9kaW1l bnNpb25zR3JvdXBCb3gpOwogCi0gICAgUUxhYmVsICphZnRlclRyYW5zZm9ybUxhYmVsID0gbmV3 IFFMYWJlbCAoaTE4biAoIkFmdGVyICUxOiIpLmFyZyAobV9hY3Rpb25OYW1lKSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2RpbWVuc2lvbnNHcm91cEJv eCk7CisgICAgUUxhYmVsICphZnRlclRyYW5zZm9ybUxhYmVsID0gbmV3IFFMYWJlbCAobV9hZnRl ckFjdGlvblRleHQsIG1fZGltZW5zaW9uc0dyb3VwQm94KTsKICAgICBtX2FmdGVyVHJhbnNmb3Jt RGltZW5zaW9uc0xhYmVsID0gbmV3IFFMYWJlbCAobV9kaW1lbnNpb25zR3JvdXBCb3gpOwogCiAK SW5kZXg6IHRvb2xzL2twdG9vbHByZXZpZXdkaWFsb2cuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAv aG9tZS9rZGUva2RlZ3JhcGhpY3Mva29sb3VycGFpbnQvdG9vbHMva3B0b29scHJldmlld2RpYWxv Zy5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjYKZGlmZiAtdSAtcCAtcjEuNiBrcHRvb2xwcmV2 aWV3ZGlhbG9nLmgKLS0tIHRvb2xzL2twdG9vbHByZXZpZXdkaWFsb2cuaAkyOSBKdWwgMjAwNCAx MzozMTo1NCAtMDAwMAkxLjYKKysrIHRvb2xzL2twdG9vbHByZXZpZXdkaWFsb2cuaAkzMCBKdWwg MjAwNCAxMjoxNjo1NCAtMDAwMApAQCAtNTcsMTQgKzU3LDE2IEBAIHB1YmxpYzoKICAgICAvLyBZ b3UgbXVzdCBjYWxsIHNsb3RVcGRhdGUoKSBpbiB5b3VyIGNvbnN0cnVjdG9yCiAgICAga3BUb29s UHJldmlld0RpYWxvZyAoRmVhdHVyZXMgZmVhdHVyZXMsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgYm9vbCByZXNlcnZlVG9wUm93LAotICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFFT dHJpbmcgJmFjdGlvbk5hbWUsICAvLyBlLmcuICJTa2V3IgorICAgICAgICAgICAgICAgICAgICAg ICAgLy8gZS5nLiAiU2tldyAoSW1hZ2V8U2VsZWN0aW9uKSIKKyAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBRU3RyaW5nICZjYXB0aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgIC8v IChpbiB0aGUgRGltZW5zaW9ucyBHcm91cCBCb3gpIGUuZy4gIkFmdGVyIFNrZXc6IgorICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IFFTdHJpbmcgJmFmdGVyQWN0aW9uVGV4dCwKICAgICAg ICAgICAgICAgICAgICAgICAgICBib29sIGFjdE9uU2VsZWN0aW9uLAogICAgICAgICAgICAgICAg ICAgICAgICAgIGtwTWFpbldpbmRvdyAqcGFyZW50LAogICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGNoYXIgKm5hbWUgPSAwKTsKICAgICB2aXJ0dWFsIH5rcFRvb2xQcmV2aWV3RGlhbG9n ICgpOwogCiBwcml2YXRlOgotICAgIFFTdHJpbmcgY2FwdGlvbkZyb21BY3Rpb25OYW1lICgpIGNv bnN0OwogICAgIHZvaWQgY3JlYXRlRGltZW5zaW9uc0dyb3VwQm94ICgpOwogICAgIHZvaWQgY3Jl YXRlUHJldmlld0dyb3VwQm94ICgpOwogCkBAIC0xMDQsNyArMTA2LDcgQEAgcHJvdGVjdGVkIHNs b3RzOgogICAgIHZpcnR1YWwgdm9pZCBzbG90VXBkYXRlV2l0aFdhaXRDdXJzb3IgKCk7CiAKIHBy b3RlY3RlZDoKLSAgICBRU3RyaW5nIG1fYWN0aW9uTmFtZTsKKyAgICBRU3RyaW5nIG1fYWZ0ZXJB Y3Rpb25UZXh0OwogICAgIGJvb2wgbV9hY3RPblNlbGVjdGlvbjsKICAgICBrcE1haW5XaW5kb3cg Km1fbWFpbldpbmRvdzsKIApJbmRleDogdG9vbHMva3B0b29scm90YXRlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlZ3JhcGhpY3Mva29sb3VycGFpbnQvdG9vbHMva3B0b29s cm90YXRlLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xOQpkaWZmIC11IC1wIC1yMS4xOSBr cHRvb2xyb3RhdGUuY3BwCi0tLSB0b29scy9rcHRvb2xyb3RhdGUuY3BwCTI5IEp1bCAyMDA0IDEz OjEwOjMxIC0wMDAwCTEuMTkKKysrIHRvb2xzL2twdG9vbHJvdGF0ZS5jcHAJMzAgSnVsIDIwMDQg MTI6MTY6NTcgLTAwMDAKQEAgLTIzNiw3ICsyMzYsOSBAQCBrcFRvb2xSb3RhdGVEaWFsb2c6Omtw VG9vbFJvdGF0ZURpYWxvZyAoCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgY2hhciAqbmFtZSkKICAgICA6IGtwVG9vbFByZXZpZXdEaWFsb2cgKGtwVG9vbFBy ZXZpZXdEaWFsb2c6OkFsbEZlYXR1cmVzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgZmFs c2UvKmRvbid0IHJlc2VydmUgdG9wIHJvdyovLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg aTE4biAoIlJvdGF0ZSIpLCBhY3RPblNlbGVjdGlvbiwgbWFpbldpbmRvdywgbmFtZSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgIGFjdE9uU2VsZWN0aW9uID8gaTE4biAoIlJvdGF0ZSBTZWxl Y3Rpb24iKSA6IGkxOG4gKCJSb3RhdGUgSW1hZ2UiKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgIGkxOG4gKCJBZnRlciBSb3RhdGU6IiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICBh Y3RPblNlbGVjdGlvbiwgbWFpbldpbmRvdywgbmFtZSkKIHsKICAgICAvLyBUb28gY29uZnVzaW5n IC0gZGlzYWJsZSBmb3Igbm93CiAgICAgc19sYXN0QW5nbGVSYWRpb0J1dHRvbklEID0gMzsKSW5k ZXg6IHRvb2xzL2twdG9vbHNrZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9r ZGVncmFwaGljcy9rb2xvdXJwYWludC90b29scy9rcHRvb2xza2V3LmNwcCx2CnJldHJpZXZpbmcg cmV2aXNpb24gMS4xOApkaWZmIC11IC1wIC1yMS4xOCBrcHRvb2xza2V3LmNwcAotLS0gdG9vbHMv a3B0b29sc2tldy5jcHAJMjkgSnVsIDIwMDQgMTM6MTE6MjEgLTAwMDAJMS4xOAorKysgdG9vbHMv a3B0b29sc2tldy5jcHAJMzAgSnVsIDIwMDQgMTI6MTY6NTcgLTAwMDAKQEAgLTIyMiw3ICsyMjIs OSBAQCBrcFRvb2xTa2V3RGlhbG9nOjprcFRvb2xTa2V3RGlhbG9nIChib29sCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpuYW1lKQogICAgIDoga3BUb29s UHJldmlld0RpYWxvZyAoa3BUb29sUHJldmlld0RpYWxvZzo6QWxsRmVhdHVyZXMsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICBmYWxzZS8qZG9uJ3QgcmVzZXJ2ZSB0b3Agcm93Ki8sCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICBpMThuICgiU2tldyIpLCBhY3RPblNlbGVjdGlvbiwgcGFy ZW50LCBuYW1lKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0T25TZWxlY3Rpb24gPyBp MThuICgiU2tldyBTZWxlY3Rpb24iKSA6IGkxOG4gKCJTa2V3IEltYWdlIiksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICBpMThuICgiQWZ0ZXIgU2tldzoiKSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIGFjdE9uU2VsZWN0aW9uLCBwYXJlbnQsIG5hbWUpCiB7CiAgICAgLy8gVG9vIGNv bmZ1c2luZyAtIGRpc2FibGUgZm9yIG5vdwogICAgIHNfbGFzdEhvcml6b250YWxBbmdsZSA9IHNf bGFzdFZlcnRpY2FsQW5nbGUgPSAwOwo= 6923 2004-07-30 14:40:47 +0000 2004-07-30 14:40:47 +0000 kolourpaint-i18n-resize-scale-dialog.diff kolourpaint-i18n-resize-scale-dialog.diff text/x-diff 1665 dang SW5kZXg6IHRvb2xzL2twdG9vbHJlc2l6ZXNjYWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAv aG9tZS9rZGUva2RlZ3JhcGhpY3Mva29sb3VycGFpbnQvdG9vbHMva3B0b29scmVzaXplc2NhbGUu Y3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjI5CmRpZmYgLXUgLXAgLXIxLjI5IGtwdG9vbHJl c2l6ZXNjYWxlLmNwcAotLS0gdG9vbHMva3B0b29scmVzaXplc2NhbGUuY3BwCTMwIEp1bCAyMDA0 IDExOjA2OjM3IC0wMDAwCTEuMjkKKysrIHRvb2xzL2twdG9vbHJlc2l6ZXNjYWxlLmNwcAkzMCBK dWwgMjAwNCAxMjoxNjo1NiAtMDAwMApAQCAtMTA4LDMwICsxMDgsMzUgQEAga3BUb29sUmVzaXpl U2NhbGVDb21tYW5kOjp+a3BUb29sUmVzaXplUwogLy8gcHVibGljIHZpcnR1YWwgW2Jhc2Uga3BD b21tYW5kXQogUVN0cmluZyBrcFRvb2xSZXNpemVTY2FsZUNvbW1hbmQ6Om5hbWUgKCkgY29uc3QK IHsKLSAgICBRU3RyaW5nIG9wTmFtZTsKLQotICAgIHN3aXRjaCAobV90eXBlKQotICAgIHsKLSAg ICBjYXNlIFJlc2l6ZToKLSAgICAgICAgb3BOYW1lID0gaTE4biAoIlJlc2l6ZSIpOwotICAgICAg ICBicmVhazsKLSAgICBjYXNlIFNjYWxlOgotICAgICAgICBvcE5hbWUgPSBpMThuICgiU2NhbGUi KTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBTbW9vdGhTY2FsZToKLSAgICAgICAgb3BOYW1l ID0gaTE4biAoIlNtb290aCBTY2FsZSIpOwotICAgICAgICBicmVhazsKLSAgICB9Ci0KICAgICBp ZiAobV9hY3RPblNlbGVjdGlvbikKICAgICB7CiAgICAgICAgIGlmIChtX2FjdE9uVGV4dFNlbGVj dGlvbikKLSAgICAgICAgICAgIHJldHVybiBpMThuICgiVGV4dDogJTEgQm94IikuYXJnIChvcE5h bWUpOworICAgICAgICB7CisgICAgICAgICAgICBpZiAobV90eXBlID09IFJlc2l6ZSkKKyAgICAg ICAgICAgICAgICByZXR1cm4gaTE4biAoIlRleHQ6IFJlc2l6ZSBCb3giKTsKKyAgICAgICAgfQog ICAgICAgICBlbHNlCi0gICAgICAgICAgICByZXR1cm4gaTE4biAoIlNlbGVjdGlvbjogJTEiKS5h cmcgKG9wTmFtZSk7CisgICAgICAgIHsKKyAgICAgICAgICAgIGlmIChtX3R5cGUgPT0gU2NhbGUp CisgICAgICAgICAgICAgICAgcmV0dXJuIGkxOG4gKCJTZWxlY3Rpb246IFNjYWxlIik7CisgICAg ICAgICAgICBlbHNlIGlmIChtX3R5cGUgPT0gU21vb3RoU2NhbGUpCisgICAgICAgICAgICAgICAg cmV0dXJuIGkxOG4gKCJTZWxlY3Rpb246IFNtb290aCBTY2FsZSIpOworICAgICAgICB9CiAgICAg fQogICAgIGVsc2UKLSAgICAgICAgcmV0dXJuIG9wTmFtZTsKKyAgICB7CisgICAgICAgIHN3aXRj aCAobV90eXBlKQorICAgICAgICB7CisgICAgICAgIGNhc2UgUmVzaXplOgorICAgICAgICAgICAg cmV0dXJuIGkxOG4gKCJSZXNpemUiKTsKKyAgICAgICAgY2FzZSBTY2FsZToKKyAgICAgICAgICAg IHJldHVybiBpMThuICgiU2NhbGUiKTsKKyAgICAgICAgY2FzZSBTbW9vdGhTY2FsZToKKyAgICAg ICAgICAgIHJldHVybiBpMThuICgiU21vb3RoIFNjYWxlIik7CisgICAgICAgIH0KKyAgICB9CisK KyAgICByZXR1cm4gUVN0cmluZzo6bnVsbDsKIH0KIAogLy8gcHVibGljIHZpcnR1YWwgW2Jhc2Ug a3BDb21tYW5kXQoK 6924 2004-07-30 14:40:47 +0000 2004-07-30 14:40:47 +0000 kolourpaint-i18n-tools.diff kolourpaint-i18n-tools.diff text/x-diff 13133 dang SW5kZXg6IHRvb2xzL2twdG9vbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tk ZWdyYXBoaWNzL2tvbG91cnBhaW50L3Rvb2xzL2twdG9vbC5jcHAsdgpyZXRyaWV2aW5nIHJldmlz aW9uIDEuMzkKZGlmZiAtdSAtcCAtcjEuMzkga3B0b29sLmNwcAotLS0gdG9vbHMva3B0b29sLmNw cAkzMCBKdWwgMjAwNCAxMToxODoyNyAtMDAwMAkxLjM5CisrKyB0b29scy9rcHRvb2wuY3BwCTMw IEp1bCAyMDA0IDEyOjE2OjQ3IC0wMDAwCkBAIC0xMzYyLDc2ICsxMzYyLDIwIEBAIGludCBrcFRv b2w6Om1vdXNlQnV0dG9uIChjb25zdCBRdDo6QnV0dG8KICAqIFVzZXIgTm90aWZpY2F0aW9ucwog ICovCiAKLS8vIHByaXZhdGUKLWludCBrcFRvb2w6OmNhbGNNb3VzZUJ1dHRvbiAoYm9vbCBvdGhl ck1vdXNlQnV0dG9uKSBjb25zdAotewotICAgIGlmICghb3RoZXJNb3VzZUJ1dHRvbikKLSAgICAg ICAgcmV0dXJuIG1fbW91c2VCdXR0b247Ci0gICAgZWxzZQotICAgICAgICByZXR1cm4gMSAtIG1f bW91c2VCdXR0b247Ci19Ci0KLS8vIHB1YmxpYwotUVN0cmluZyBrcFRvb2w6Om1vdXNlQnV0dG9u VGV4dCAoYm9vbCBvdGhlck1vdXNlQnV0dG9uLCBib29sIHNlbnRlbmNlU3RhcnQpIGNvbnN0Ci17 Ci0gICAgaW50IG1iID0gY2FsY01vdXNlQnV0dG9uIChvdGhlck1vdXNlQnV0dG9uKTsKLQotICAg IGlmIChtYiA9PSAwKQotICAgIHsKLSAgICAgICAgaWYgKHNlbnRlbmNlU3RhcnQpCi0gICAgICAg ICAgICByZXR1cm4gaTE4biAoIkxlZnQiKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmV0 dXJuIGkxOG4gKCJsZWZ0Iik7Ci0gICAgfQotICAgIGVsc2UKLSAgICB7Ci0gICAgICAgIGlmIChz ZW50ZW5jZVN0YXJ0KQotICAgICAgICAgICAgcmV0dXJuIGkxOG4gKCJSaWdodCIpOwotICAgICAg ICBlbHNlCi0gICAgICAgICAgICByZXR1cm4gaTE4biAoInJpZ2h0Iik7Ci0gICAgfQotfQogCi0v LyBwdWJsaWMKLVFTdHJpbmcga3BUb29sOjptb3VzZUNsaWNrVGV4dCAoYm9vbCBvdGhlck1vdXNl QnV0dG9uLCBib29sIHNlbnRlbmNlU3RhcnQpIGNvbnN0CisvLyBwdWJsaWMgc3RhdGljCitRU3Ry aW5nIGtwVG9vbDo6Y2FuY2VsVXNlck1lc3NhZ2UgKGludCBtb3VzZUJ1dHRvbikKIHsKLSAgICBp bnQgbWIgPSBjYWxjTW91c2VCdXR0b24gKG90aGVyTW91c2VCdXR0b24pOwotCi0gICAgaWYgKG1i ID09IDApCi0gICAgewotICAgICAgICBpZiAoc2VudGVuY2VTdGFydCkKLSAgICAgICAgICAgIHJl dHVybiBpMThuICgiTGVmdCBjbGljayIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICByZXR1 cm4gaTE4biAoImxlZnQgY2xpY2siKTsKLSAgICB9CisgICAgaWYgKG1vdXNlQnV0dG9uID09IDAp CisgICAgICAgIHJldHVybiBpMThuICgiUmlnaHQgY2xpY2sgdG8gY2FuY2VsLiIpOwogICAgIGVs c2UKLSAgICB7Ci0gICAgICAgIGlmIChzZW50ZW5jZVN0YXJ0KQotICAgICAgICAgICAgcmV0dXJu IGkxOG4gKCJSaWdodCBjbGljayIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICByZXR1cm4g aTE4biAoInJpZ2h0IGNsaWNrIik7Ci0gICAgfQorICAgICAgICByZXR1cm4gaTE4biAoIkxlZnQg Y2xpY2sgdG8gY2FuY2VsLiIpOwogfQogCiAvLyBwdWJsaWMKLVFTdHJpbmcga3BUb29sOjptb3Vz ZURyYWdUZXh0IChib29sIG90aGVyTW91c2VCdXR0b24sIGJvb2wgc2VudGVuY2VTdGFydCkgY29u c3QKK1FTdHJpbmcga3BUb29sOjpjYW5jZWxVc2VyTWVzc2FnZSAoKSBjb25zdAogewotICAgIGlu dCBtYiA9IGNhbGNNb3VzZUJ1dHRvbiAob3RoZXJNb3VzZUJ1dHRvbik7Ci0KLSAgICBpZiAobWIg PT0gMCkKLSAgICB7Ci0gICAgICAgIGlmIChzZW50ZW5jZVN0YXJ0KQotICAgICAgICAgICAgcmV0 dXJuIGkxOG4gKCJMZWZ0IGRyYWciKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmV0dXJu IGkxOG4gKCJsZWZ0IGRyYWciKTsKLSAgICB9Ci0gICAgZWxzZQotICAgIHsKLSAgICAgICAgaWYg KHNlbnRlbmNlU3RhcnQpCi0gICAgICAgICAgICByZXR1cm4gaTE4biAoIlJpZ2h0IGRyYWciKTsK LSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmV0dXJuIGkxOG4gKCJyaWdodCBkcmFnIik7Ci0g ICAgfQorICAgIHJldHVybiBjYW5jZWxVc2VyTWVzc2FnZSAobV9tb3VzZUJ1dHRvbik7CiB9CiAK IApJbmRleDogdG9vbHMva3B0b29sLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tk ZWdyYXBoaWNzL2tvbG91cnBhaW50L3Rvb2xzL2twdG9vbC5oLHYKcmV0cmlldmluZyByZXZpc2lv biAxLjIwCmRpZmYgLXUgLXAgLXIxLjIwIGtwdG9vbC5oCi0tLSB0b29scy9rcHRvb2wuaAkzMCBK dWwgMjAwNCAxMDoyOToxOSAtMDAwMAkxLjIwCisrKyB0b29scy9rcHRvb2wuaAkzMCBKdWwgMjAw NCAxMjoxNjo0OCAtMDAwMApAQCAtMzMwLDEzICszMzAsMTEgQEAgcHJvdGVjdGVkOgogICAgICAq IFVzZXIgTm90aWZpY2F0aW9ucyAoU3RhdHVzIEJhcikKICAgICAgKi8KIAotcHJpdmF0ZToKLSAg ICBpbnQgY2FsY01vdXNlQnV0dG9uIChib29sIG90aGVyTW91c2VCdXR0b24gPSBmYWxzZSkgY29u c3Q7Ci0KIHB1YmxpYzoKLSAgICBRU3RyaW5nIG1vdXNlQnV0dG9uVGV4dCAoYm9vbCBvdGhlck1v dXNlQnV0dG9uID0gZmFsc2UsIGJvb2wgc2VudGVuY2VTdGFydCA9IGZhbHNlKSBjb25zdDsKLSAg ICBRU3RyaW5nIG1vdXNlQ2xpY2tUZXh0IChib29sIG90aGVyTW91c2VCdXR0b24gPSBmYWxzZSwg Ym9vbCBzZW50ZW5jZVN0YXJ0ID0gZmFsc2UpIGNvbnN0OwotICAgIFFTdHJpbmcgbW91c2VEcmFn VGV4dCAoYm9vbCBvdGhlck1vdXNlQnV0dG9uID0gZmFsc2UsIGJvb2wgc2VudGVuY2VTdGFydCA9 IGZhbHNlKSBjb25zdDsKKyAgICAvLyBSZXR1cm5zICIoTGVmdHxSaWdodCkgY2xpY2sgdG8gY2Fu Y2VsLiIgd2hlcmUgTGVmdCBvciBSaWdodCBpcyBjaG9zZW4KKyAgICAvLyBkZXBlbmRpbmcgb24g d2hpY2ggb25lIGlzIHRoZSBfb3Bwb3NpdGVfIG9mIDxtb3VzZUJ1dHRvbj4KKyAgICBzdGF0aWMg UVN0cmluZyBjYW5jZWxVc2VyTWVzc2FnZSAoaW50IG1vdXNlQnV0dG9uKTsKKyAgICBRU3RyaW5n IGNhbmNlbFVzZXJNZXNzYWdlICgpIGNvbnN0OwogCiAgICAgUVN0cmluZyB1c2VyTWVzc2FnZSAo KSBjb25zdDsKICAgICB2b2lkIHNldFVzZXJNZXNzYWdlIChjb25zdCBRU3RyaW5nICZ1c2VyTWVz c2FnZSA9IFFTdHJpbmc6Om51bGwpOwpJbmRleDogdG9vbHMva3B0b29sYWlyc3ByYXkuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVncmFwaGljcy9rb2xvdXJwYWludC90b29s cy9rcHRvb2xhaXJzcHJheS5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTUKZGlmZiAtdSAt cCAtcjEuMTUga3B0b29sYWlyc3ByYXkuY3BwCi0tLSB0b29scy9rcHRvb2xhaXJzcHJheS5jcHAJ MTEgSnVsIDIwMDQgMDc6MDc6MTAgLTAwMDAJMS4xNQorKysgdG9vbHMva3B0b29sYWlyc3ByYXku Y3BwCTMwIEp1bCAyMDA0IDEyOjE2OjQ5IC0wMDAwCkBAIC0xMzcsMTEgKzEzNyw4IEBAIHZvaWQg a3BUb29sQWlyU3ByYXk6OmJlZ2luRHJhdyAoKQogCiAgICAgLy8gdXNlIGEgdGltZXIgaW5zdGVh ZCBvZiByZWltcGxlbWVudGluZyBkcmF3KCkgKHdlIGRvbid0IGRyYXcgYWxsIHRoZSB0aW1lKQog ICAgIG1fdGltZXItPnN0YXJ0ICgyNSk7Ci0gICAgCi0gICAgc2V0VXNlck1lc3NhZ2UgKGkxOG4g KCIlMSB0byBjYW5jZWwuIikKLSAgICAgICAgICAgICAgICAgICAgICAgIC5hcmcgKG1vdXNlQ2xp Y2tUZXh0ICh0cnVlLypvdGhlciBtb3VzZSBidXR0b24qLywKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVlLypzdGFydCBvZiBzZW50ZW5jZSovKSkpOwot ICAgIAorCisgICAgc2V0VXNlck1lc3NhZ2UgKGNhbmNlbFVzZXJNZXNzYWdlICgpKTsKIH0KIAog dm9pZCBrcFRvb2xBaXJTcHJheTo6ZHJhdyAoY29uc3QgUVBvaW50ICZ0aGlzUG9pbnQsIGNvbnN0 IFFQb2ludCAmLCBjb25zdCBRUmVjdCAmKQpAQCAtMjI3LDcgKzIyNCw3IEBAIHZvaWQga3BUb29s QWlyU3ByYXk6OmVuZERyYXcgKGNvbnN0IFFQb2kKIAogICAgIC8vIGRvbid0IGRlbGV0ZSAtIGl0 J3MgdXAgdG8gdGhlIGNvbW1hbmRIaXN0b3J5CiAgICAgbV9jdXJyZW50Q29tbWFuZCA9IDA7Ci0g ICAgCisKICAgICBzZXRVc2VyTWVzc2FnZSAoaGF2ZW50QmVndW5EcmF3VXNlck1lc3NhZ2UgKCkp OwogfQogCkluZGV4OiB0b29scy9rcHRvb2xjb2xvcnBpY2tlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1Mg ZmlsZTogL2hvbWUva2RlL2tkZWdyYXBoaWNzL2tvbG91cnBhaW50L3Rvb2xzL2twdG9vbGNvbG9y cGlja2VyLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNApkaWZmIC11IC1wIC1yMS4xNCBr cHRvb2xjb2xvcnBpY2tlci5jcHAKLS0tIHRvb2xzL2twdG9vbGNvbG9ycGlja2VyLmNwcAkzMCBK dWwgMjAwNCAxMToyNDozNSAtMDAwMAkxLjE0CisrKyB0b29scy9rcHRvb2xjb2xvcnBpY2tlci5j cHAJMzAgSnVsIDIwMDQgMTI6MTY6NDkgLTAwMDAKQEAgLTg1LDkgKzg1LDggQEAgdm9pZCBrcFRv b2xDb2xvclBpY2tlcjo6YmVnaW4gKCkKIHZvaWQga3BUb29sQ29sb3JQaWNrZXI6OmJlZ2luRHJh dyAoKQogewogICAgIG1fb2xkQ29sb3IgPSBjb2xvciAobV9tb3VzZUJ1dHRvbik7Ci0gICAgc2V0 VXNlck1lc3NhZ2UgKGkxOG4gKCIlMSB0byBjYW5jZWwuIikKLSAgICAgICAgICAgICAgICAgICAg ICAgIC5hcmcgKG1vdXNlQ2xpY2tUZXh0ICh0cnVlLypvdGhlciBtb3VzZSBidXR0b24qLywKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVlLypzdGFydCBv ZiBzZW50ZW5jZSovKSkpOworCisgICAgc2V0VXNlck1lc3NhZ2UgKGNhbmNlbFVzZXJNZXNzYWdl ICgpKTsKIH0KIAogLy8gdmlydHVhbApJbmRleDogdG9vbHMva3B0b29sZmxvb2RmaWxsLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlZ3JhcGhpY3Mva29sb3VycGFpbnQvdG9v bHMva3B0b29sZmxvb2RmaWxsLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMwpkaWZmIC11 IC1wIC1yMS4xMyBrcHRvb2xmbG9vZGZpbGwuY3BwCi0tLSB0b29scy9rcHRvb2xmbG9vZGZpbGwu Y3BwCTExIEp1bCAyMDA0IDA3OjA3OjEwIC0wMDAwCTEuMTMKKysrIHRvb2xzL2twdG9vbGZsb29k ZmlsbC5jcHAJMzAgSnVsIDIwMDQgMTI6MTY6NTAgLTAwMDAKQEAgLTExNCw5ICsxMTQsNyBAQCB2 b2lkIGtwVG9vbEZsb29kRmlsbDo6YmVnaW5EcmF3ICgpCiAKICAgICBRQXBwbGljYXRpb246OnJl c3RvcmVPdmVycmlkZUN1cnNvciAoKTsKIAotICAgIHNldFVzZXJNZXNzYWdlIChpMThuICgiJTEg dG8gY2FuY2VsLiIpCi0gICAgICAgICAgICAgICAgICAgICAgICAuYXJnIChtb3VzZUNsaWNrVGV4 dCAodHJ1ZS8qb3RoZXIgbW91c2UgYnV0dG9uKi8sCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdHJ1ZS8qc3RhcnQgb2Ygc2VudGVuY2UqLykpKTsKKyAgICBz ZXRVc2VyTWVzc2FnZSAoY2FuY2VsVXNlck1lc3NhZ2UgKCkpOwogfQogCiAvLyB2aXJ0dWFsCkBA IC0yMDYsNyArMjA0LDcgQEAgdm9pZCBrcFRvb2xGbG9vZEZpbGxDb21tYW5kOjpleGVjdXRlICgp CiAgICAgaWYgKCFkb2MpCiAgICAgICAgIHJldHVybjsKIAotICAgIAorCiAgICAgaWYgKG1fZmls bEVudGlyZVBpeG1hcCkKICAgICB7CiAgICAgICAgIGRvYy0+ZmlsbCAoa3BGbG9vZEZpbGw6OmNv bG9yICgpKTsKQEAgLTI0MSw3ICsyMzksNyBAQCB2b2lkIGtwVG9vbEZsb29kRmlsbENvbW1hbmQ6 OnVuZXhlY3V0ZSAoCiAgICAgaWYgKCFkb2MpCiAgICAgICAgIHJldHVybjsKIAotICAgIAorCiAg ICAgaWYgKG1fZmlsbEVudGlyZVBpeG1hcCkKICAgICB7CiAgICAgICAgIGRvYy0+ZmlsbCAoa3BG bG9vZEZpbGw6OmNvbG9yVG9DaGFuZ2UgKCkpOwpJbmRleDogdG9vbHMva3B0b29scGVuLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlZ3JhcGhpY3Mva29sb3VycGFpbnQvdG9v bHMva3B0b29scGVuLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yNQpkaWZmIC11IC1wIC1y MS4yNSBrcHRvb2xwZW4uY3BwCi0tLSB0b29scy9rcHRvb2xwZW4uY3BwCTI0IEp1bCAyMDA0IDA2 OjE0OjMzIC0wMDAwCTEuMjUKKysrIHRvb2xzL2twdG9vbHBlbi5jcHAJMzAgSnVsIDIwMDQgMTI6 MTY6NTEgLTAwMDAKQEAgLTIyMCw5ICsyMjAsNyBAQCB2b2lkIGtwVG9vbFBlbjo6YmVnaW5EcmF3 ICgpCiAgICAgLy8gdG8gYXZvaWQgY29uZnVzaW9uCiAgICAgdmlld01hbmFnZXIgKCktPmludmFs aWRhdGVUZW1wUGl4bWFwICgpOwogCi0gICAgc2V0VXNlck1lc3NhZ2UgKGkxOG4gKCIlMSB0byBj YW5jZWwuIikKLSAgICAgICAgICAgICAgICAgICAgICAgIC5hcmcgKG1vdXNlQ2xpY2tUZXh0ICh0 cnVlLypvdGhlciBtb3VzZSBidXR0b24qLywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0cnVlLypzdGFydCBvZiBzZW50ZW5jZSovKSkpOworICAgIHNldFVz ZXJNZXNzYWdlIChjYW5jZWxVc2VyTWVzc2FnZSAoKSk7CiB9CiAKIC8vIHZpcnR1YWwKSW5kZXg6 IHRvb2xzL2twdG9vbHBvbHlnb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9r ZGVncmFwaGljcy9rb2xvdXJwYWludC90b29scy9rcHRvb2xwb2x5Z29uLmNwcCx2CnJldHJpZXZp bmcgcmV2aXNpb24gMS4xOQpkaWZmIC11IC1wIC1yMS4xOSBrcHRvb2xwb2x5Z29uLmNwcAotLS0g dG9vbHMva3B0b29scG9seWdvbi5jcHAJMTEgSnVsIDIwMDQgMDc6MDc6MTAgLTAwMDAJMS4xOQor KysgdG9vbHMva3B0b29scG9seWdvbi5jcHAJMzAgSnVsIDIwMDQgMTI6MTY6NTMgLTAwMDAKQEAg LTQ2OSw0MyArNDY5LDEzIEBAIHZvaWQga3BUb29sUG9seWdvbjo6YmVnaW5EcmF3ICgpCiAKICAg ICBpZiAoIWVuZGVkU2hhcGUpCiAgICAgewotICAgICAgICBjb25zdCBRU3RyaW5nIG1jdCA9IG1v dXNlQ2xpY2tUZXh0ICh0cnVlLypvdGhlciBtb3VzZSBidXR0b24qLywKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHJ1ZS8qc3RhcnQgc2VudGVuY2UqLyk7CiAg ICAgICAgIHN3aXRjaCAobV9tb2RlKQogICAgICAgICB7CiAgICAgICAgIGNhc2UgTGluZToKLSAg ICAgICAgICAgIHNldFVzZXJNZXNzYWdlIChpMThuICgiJTEgdG8gY2FuY2VsLiIpLmFyZyAobWN0 KSk7Ci0gICAgICAgICAgICBicmVhazsKLQogICAgICAgICBjYXNlIEN1cnZlOgotICAgICAgICAg ICAgLyppZiAobV9wb2ludHMuc2l6ZSAoKSA9PSAyKQotICAgICAgICAgICAgeyovCi0gICAgICAg ICAgICAgICAgc2V0VXNlck1lc3NhZ2UgKGkxOG4gKCIlMSB0byBjYW5jZWwuIikuYXJnIChtY3Qp KTsKLSAgICAgICAgICAgIC8qfQotICAgICAgICAgICAgZWxzZSBpZiAobV9wb2ludHMuc2l6ZSAo KSA9PSAzKQotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHNldFVzZXJNZXNzYWdlIChp MThuICgiRHJhZ2dpbmcgZmlyc3QgY29udHJvbCBwb2ludC4gJTEgdG8gY2FuY2VsLiIpCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuYXJnIChtY3QpKTsKLSAgICAgICAgICAg IH0KLSAgICAgICAgICAgIGVsc2UgaWYgKG1fcG9pbnRzLnNpemUgKCkgPT0gNCkKLSAgICAgICAg ICAgIHsKLSAgICAgICAgICAgICAgICBzZXRVc2VyTWVzc2FnZSAoaTE4biAoIkRyYWdnaW5nIGxh c3QgY29udHJvbCBwb2ludC4gJTEgdG8gY2FuY2VsLiIpCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAuYXJnIChtY3QpKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGVs c2UKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBrZEVycm9yICgpIDw8ICJrcFRvb2xQ b2x5Z29uOjpiZWdpbkRyYXcoKSAjcG9pbnRzIiA8PCBlbmRsOwotICAgICAgICAgICAgICAgIHNl dFVzZXJNZXNzYWdlICgpOwotICAgICAgICAgICAgfSovCi0KLSAgICAgICAgICAgIGJyZWFrOwot CiAgICAgICAgIGNhc2UgUG9seWdvbjoKLSAgICAgICAgICAgIHNldFVzZXJNZXNzYWdlIChpMThu ICgiJTEgdG8gY2FuY2VsLiIpLmFyZyAobWN0KSk7Ci0gICAgICAgICAgICBicmVhazsKLQogICAg ICAgICBjYXNlIFBvbHlsaW5lOgotICAgICAgICAgICAgc2V0VXNlck1lc3NhZ2UgKGkxOG4gKCIl MSB0byBjYW5jZWwuIikuYXJnIChtY3QpKTsKKyAgICAgICAgICAgIHNldFVzZXJNZXNzYWdlIChj YW5jZWxVc2VyTWVzc2FnZSAoKSk7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBkZWZh dWx0OgpAQCAtNzQ0LDEwICs3MTQsMTQgQEAgdm9pZCBrcFRvb2xQb2x5Z29uOjplbmREcmF3IChj b25zdCBRUG9pbgogICAgICAgICAgICAgfQogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAg ewotICAgICAgICAgICAgICAgIHNldFVzZXJNZXNzYWdlIChpMThuICgiJTEgYW5vdGhlciBsaW5l IG9yICUyIHRvIGZpbmlzaC4iKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg LmFyZyAobW91c2VEcmFnVGV4dCAoZmFsc2UvKnRoaXMgbW91c2UgYnV0dG9uKi8sCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVlLypz dGFydCBzZW50ZW5jZSovKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1vdXNlQ2xpY2tUZXh0ICh0cnVlLypvdGhlciBtb3VzZSBidXR0b24qLykpKTsKKyAgICAg ICAgICAgICAgICBpZiAobV9tb3VzZUJ1dHRvbiA9PSAwKQorICAgICAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICAgICAgc2V0VXNlck1lc3NhZ2UgKGkxOG4gKCJMZWZ0IGRyYWcgYW5vdGhl ciBsaW5lIG9yIHJpZ2h0IGNsaWNrIHRvIGZpbmlzaC4iKSk7CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg ICAgIHNldFVzZXJNZXNzYWdlIChpMThuICgiUmlnaHQgZHJhZyBhbm90aGVyIGxpbmUgb3IgbGVm dCBjbGljayB0byBmaW5pc2guIikpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0K IAogICAgICAgICAgICAgYnJlYWs7CkBAIC03NTUsMTcgKzcyOSwyNSBAQCB2b2lkIGtwVG9vbFBv bHlnb246OmVuZERyYXcgKGNvbnN0IFFQb2luCiAgICAgICAgIGNhc2UgQ3VydmU6CiAgICAgICAg ICAgICBpZiAobV9wb2ludHMuc2l6ZSAoKSA9PSAyKQogICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgIHNldFVzZXJNZXNzYWdlIChpMThuICgiJTEgdG8gc2V0IHRoZSBmaXJzdCBjb250cm9s IHBvaW50IG9yICUyIHRvIGZpbmlzaC4iKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgLmFyZyAobW91c2VEcmFnVGV4dCAoZmFsc2UvKnRoaXMgbW91c2UgYnV0dG9uKi8sCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 cnVlLypzdGFydCBzZW50ZW5jZSovKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG1vdXNlQ2xpY2tUZXh0ICh0cnVlLypvdGhlciBtb3VzZSBidXR0b24qLykpKTsK KyAgICAgICAgICAgICAgICBpZiAobV9tb3VzZUJ1dHRvbiA9PSAwKQorICAgICAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAgICAgc2V0VXNlck1lc3NhZ2UgKGkxOG4gKCJMZWZ0IGRyYWcg dG8gc2V0IHRoZSBmaXJzdCBjb250cm9sIHBvaW50IG9yIHJpZ2h0IGNsaWNrIHRvIGZpbmlzaC4i KSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgICAgIHNldFVzZXJNZXNzYWdlIChpMThuICgiUmlnaHQg ZHJhZyB0byBzZXQgdGhlIGZpcnN0IGNvbnRyb2wgcG9pbnQgb3IgbGVmdCBjbGljayB0byBmaW5p c2guIikpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGVs c2UgaWYgKG1fcG9pbnRzLnNpemUgKCkgPT0gMykKICAgICAgICAgICAgIHsKLSAgICAgICAgICAg ICAgICBzZXRVc2VyTWVzc2FnZSAoaTE4biAoIiUxIHRvIHNldCB0aGUgbGFzdCBjb250cm9sIHBv aW50IG9yICUyIHRvIGZpbmlzaC4iKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgLmFyZyAobW91c2VEcmFnVGV4dCAoZmFsc2UvKnRoaXMgbW91c2UgYnV0dG9uKi8sCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVl LypzdGFydCBzZW50ZW5jZSovKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1vdXNlQ2xpY2tUZXh0ICh0cnVlLypvdGhlciBtb3VzZSBidXR0b24qLykpKTsKKyAg ICAgICAgICAgICAgICBpZiAobV9tb3VzZUJ1dHRvbiA9PSAwKQorICAgICAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICAgICAgc2V0VXNlck1lc3NhZ2UgKGkxOG4gKCJMZWZ0IGRyYWcgdG8g c2V0IHRoZSBsYXN0IGNvbnRyb2wgcG9pbnQgb3IgcmlnaHQgY2xpY2sgdG8gZmluaXNoLiIpKTsK KyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAgICAgc2V0VXNlck1lc3NhZ2UgKGkxOG4gKCJSaWdodCBkcmFn IHRvIHNldCB0aGUgbGFzdCBjb250cm9sIHBvaW50IG9yIGxlZnQgY2xpY2sgdG8gZmluaXNoLiIp KTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBlbHNlCiAg ICAgICAgICAgICB7CkluZGV4OiB0b29scy9rcHRvb2xyZWN0YW5nbGUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K UkNTIGZpbGU6IC9ob21lL2tkZS9rZGVncmFwaGljcy9rb2xvdXJwYWludC90b29scy9rcHRvb2xy ZWN0YW5nbGUuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE3CmRpZmYgLXUgLXAgLXIxLjE3 IGtwdG9vbHJlY3RhbmdsZS5jcHAKLS0tIHRvb2xzL2twdG9vbHJlY3RhbmdsZS5jcHAJMTEgSnVs IDIwMDQgMDc6MDc6MTAgLTAwMDAJMS4xNworKysgdG9vbHMva3B0b29scmVjdGFuZ2xlLmNwcAkz MCBKdWwgMjAwNCAxMjoxNjo1NCAtMDAwMApAQCAtNDQwLDEwICs0NDAsNyBAQCB2b2lkIGtwVG9v bFJlY3RhbmdsZTo6YXBwbHlNb2RpZmllcnMgKCkKIAogdm9pZCBrcFRvb2xSZWN0YW5nbGU6OmJl Z2luRHJhdyAoKQogewotICAgIHNldFVzZXJNZXNzYWdlIChpMThuICgiJTEgdG8gY2FuY2VsLiIp Ci0gICAgICAgICAgICAgICAgICAgICAgICAuYXJnIChtb3VzZUNsaWNrVGV4dCAodHJ1ZS8qb3Ro ZXIgbW91c2UgYnV0dG9uKi8sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdHJ1ZS8qc3RhcnQgb2Ygc2VudGVuY2UqLykpKTsKLQorICAgIHNldFVzZXJNZXNz YWdlIChjYW5jZWxVc2VyTWVzc2FnZSAoKSk7CiB9CiAKIHZvaWQga3BUb29sUmVjdGFuZ2xlOjp1 cGRhdGVTaGFwZSAoKQpAQCAtNjAwLDcgKzU5Nyw3IEBAIHZvaWQga3BUb29sUmVjdGFuZ2xlQ29t bWFuZDo6ZXhlY3V0ZSAoKQogICAgIGtwRG9jdW1lbnQgKmRvYyA9IGRvY3VtZW50ICgpOwogICAg IGlmICghZG9jKQogICAgICAgICByZXR1cm47Ci0gICAgCisKICAgICAvLyBzdG9yZSBVbmRvIGlu Zm8KICAgICBpZiAoIW1fb2xkUGl4bWFwUHRyKQogICAgIHsKQEAgLTYyNCw3ICs2MjEsNyBAQCB2 b2lkIGtwVG9vbFJlY3RhbmdsZUNvbW1hbmQ6OnVuZXhlY3V0ZSAoCiAgICAga3BEb2N1bWVudCAq ZG9jID0gZG9jdW1lbnQgKCk7CiAgICAgaWYgKCFkb2MpCiAgICAgICAgIHJldHVybjsKLSAgICAK KwogICAgIGlmIChtX29sZFBpeG1hcFB0cikKICAgICB7CiAgICAgICAgIGRvYy0+c2V0UGl4bWFw QXQgKCptX29sZFBpeG1hcFB0ciwgbV9yZWN0LnRvcExlZnQgKCkpOwoKSW5kZXg6IHRvb2xzL2tw dG9vbHNlbGVjdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZWdyYXBo aWNzL2tvbG91cnBhaW50L3Rvb2xzL2twdG9vbHNlbGVjdGlvbi5jcHAsdgpyZXRyaWV2aW5nIHJl dmlzaW9uIDEuMzEKZGlmZiAtdSAtcCAtcjEuMzEga3B0b29sc2VsZWN0aW9uLmNwcAotLS0gdG9v bHMva3B0b29sc2VsZWN0aW9uLmNwcAkzMCBKdWwgMjAwNCAxMDo0Njo0NyAtMDAwMAkxLjMxCisr KyB0b29scy9rcHRvb2xzZWxlY3Rpb24uY3BwCTMwIEp1bCAyMDA0IDEyOjIzOjMyIC0wMDAwCkBA IC0zMzUsOSArMzM1LDcgQEAgdm9pZCBrcFRvb2xTZWxlY3Rpb246OmJlZ2luRHJhdyAoKQogCiAg ICAgaWYgKG1fZHJhZ1R5cGUgIT0gU2VsZWN0VGV4dCkKICAgICB7Ci0gICAgICAgIHNldFVzZXJN ZXNzYWdlIChpMThuICgiJTEgdG8gY2FuY2VsLiIpCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgLmFyZyAobW91c2VDbGlja1RleHQgKHRydWUvKm90aGVyIG1vdXNlIGJ1dHRvbiovLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVlLypzdGFy dCBvZiBzZW50ZW5jZSovKSkpOworICAgICAgICBzZXRVc2VyTWVzc2FnZSAoY2FuY2VsVXNlck1l c3NhZ2UgKCkpOwogICAgIH0KIH0KIAo=