Re: Fix addressbook error messages
"Jennifer Newman" <[email protected]> Sat, 15 Nov 2008 12:36:46 -0500
| Newsgroups | gmane.comp.gnome.evolution.patches |
|---|---|
| Message-ID | <[email protected]> |
------=_Part_17059_1456898.1226770606232 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline (See bug #549964) Get rid of "we"s in error messages, combine duplicate error messages. Thanks! Jenn ------=_Part_17059_1456898.1226770606232 Content-Type: application/octet-stream; name=549964.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fnkjjadn1 Content-Disposition: attachment; filename=549964.patch SW5kZXg6IGFkZHJlc3Nib29rL2d1aS93aWRnZXRzL2VhYi1ndWktdXRpbC5jCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIGFkZHJlc3Nib29rL2d1aS93aWRnZXRzL2VhYi1ndWktdXRpbC5jCShyZXZpc2lvbiAzNjc4 NykKKysrIGFkZHJlc3Nib29rL2d1aS93aWRnZXRzL2VhYi1ndWktdXRpbC5jCSh3b3JraW5nIGNv cHkpCkBAIC0xMDcsNDYgKzEwNyw0NSBAQAogCiAJaWYgKHN0YXR1cyA9PSBFX0JPT0tfRVJST1Jf T0ZGTElORV9VTkFWQUlMQUJMRSkgewogCQljYW5fZGV0YWlsX2Vycm9yID0gRkFMU0U7Ci0JCWxh YmVsX3N0cmluZyA9IF8oIldlIHdlcmUgdW5hYmxlIHRvIG9wZW4gdGhpcyBhZGRyZXNzIGJvb2su IFRoaXMgZWl0aGVyIG1lYW5zICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0 aGlzIGJvb2sgaXMgbm90IG1hcmtlZCBmb3Igb2ZmbGluZSB1c2FnZSBvciBub3QgeWV0IGRvd25s b2FkZWQgIgorCQlsYWJlbF9zdHJpbmcgPSBfKCJUaGlzIGFkZHJlc3MgYm9vayBjYW5ub3QgYmUg b3BlbmVkLiBUaGlzIGVpdGhlciBtZWFucyB0aGlzICIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJib29rIGlzIG5vdCBtYXJrZWQgZm9yIG9mZmxpbmUgdXNhZ2Ugb3Igbm90IHll dCBkb3dubG9hZGVkICIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJmb3Igb2Zm bGluZSB1c2FnZS4gUGxlYXNlIGxvYWQgdGhlIGFkZHJlc3MgYm9vayBvbmNlIGluIG9ubGluZSBt b2RlICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0byBkb3dubG9hZCBpdHMg Y29udGVudHMiKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0byBkb3dubG9h ZCBpdHMgY29udGVudHMuIik7CiAJfQogCiAJZWxzZSBpZiAoIXN0cm5jbXAgKHVyaSwgImZpbGU6 IiwgNSkpIHsKIAkJY2hhciAqcGF0aCA9IGdfZmlsZW5hbWVfZnJvbV91cmkgKHVyaSwgTlVMTCwg TlVMTCk7CiAJCWxhYmVsID0gZ19zdHJkdXBfcHJpbnRmICgKLQkJCV8oIldlIHdlcmUgdW5hYmxl IHRvIG9wZW4gdGhpcyBhZGRyZXNzIGJvb2suICBQbGVhc2UgY2hlY2sgdGhhdCB0aGUgIgotCQkJ ICAicGF0aCAlcyBleGlzdHMgYW5kIHRoYXQgeW91IGhhdmUgcGVybWlzc2lvbiB0byBhY2Nlc3Mg aXQuIiksIHBhdGgpOworCQkJXygiVGhpcyBhZGRyZXNzIGJvb2sgY2Fubm90IGJlIG9wZW5lZC4g IFBsZWFzZSBjaGVjayB0aGF0IHRoZSAiCisJCQkgICJwYXRoICVzIGV4aXN0cyBhbmQgdGhhdCBw ZXJtaXNzaW9ucyBhcmUgc2V0IHRvIGFjY2VzcyBpdC4iKSwgcGF0aCk7CiAJCWdfZnJlZSAocGF0 aCk7CiAJCWxhYmVsX3N0cmluZyA9IGxhYmVsOwogCX0KKworI2lmbmRlZiBIQVZFX0xEQVAKIAll bHNlIGlmICghc3RybmNtcCAodXJpLCAibGRhcDoiLCA1KSkgewogCQkvKiBzcGVjaWFsIGNhc2Ug Zm9yIGxkYXA6IGNvbnRhY3QgZm9sZGVycyBzbyB3ZSBjYW4gdGVsbCB0aGUgdXNlciBhYm91dCBv cGVubGRhcCAqLwotI2lmZGVmIEhBVkVfTERBUAotCQlsYWJlbF9zdHJpbmcgPQotCQkJXygiV2Ug d2VyZSB1bmFibGUgdG8gb3BlbiB0aGlzIGFkZHJlc3MgYm9vay4gIFRoaXMgZWl0aGVyICIKLQkJ CSAgIm1lYW5zIHlvdSBoYXZlIGVudGVyZWQgYW4gaW5jb3JyZWN0IFVSSSwgb3IgdGhlIExEQVAg c2VydmVyICIKLQkJCSAgImlzIHVucmVhY2hhYmxlLiIpOwotI2Vsc2UKKwogCQljYW5fZGV0YWls X2Vycm9yID0gRkFMU0U7CiAJCWxhYmVsX3N0cmluZyA9CiAJCQlfKCJUaGlzIHZlcnNpb24gb2Yg RXZvbHV0aW9uIGRvZXMgbm90IGhhdmUgTERBUCBzdXBwb3J0ICIKLQkJCSAgImNvbXBpbGVkIGlu IHRvIGl0LiAgSWYgeW91IHdhbnQgdG8gdXNlIExEQVAgaW4gRXZvbHV0aW9uLCAiCi0JCQkgICJ5 b3UgbXVzdCBpbnN0YWxsIGFuIExEQVAtZW5hYmxlZCBFdm9sdXRpb24gcGFja2FnZS4iKTsKKwkJ CSAgImNvbXBpbGVkIGluIHRvIGl0LiAgVG8gdXNlIExEQVAgaW4gRXZvbHV0aW9uICIKKwkJCSAg ImFuIExEQVAtZW5hYmxlZCBFdm9sdXRpb24gcGFja2FnZSBtdXN0IGJlIGluc3RhbGxlZC4iKTsK KworCX0KICNlbmRpZgotCX0gZWxzZSB7Ci0JCS8qIG90aGVyIG5ldHdvcmsgZm9sZGVycyAqLwor CSBlbHNlIHsKKwkJLyogb3RoZXIgbmV0d29yayBmb2xkZXJzIChvciBpZiBsZGFwIGlzIGVuYWJs ZWQgYW5kIHNlcnZlciBpcyB1bnJlYWNoYWJsZSkgKi8KIAkJbGFiZWxfc3RyaW5nID0KLQkJCV8o IldlIHdlcmUgdW5hYmxlIHRvIG9wZW4gdGhpcyBhZGRyZXNzIGJvb2suICBUaGlzIGVpdGhlciAi Ci0JCQkgICJtZWFucyB5b3UgaGF2ZSBlbnRlcmVkIGFuIGluY29ycmVjdCBVUkksIG9yIHRoZSBz ZXJ2ZXIgIgorCQkJXygiVGhpcyBhZGRyZXNzIGJvb2sgY2Fubm90IGJlIG9wZW5lZC4gIFRoaXMg ZWl0aGVyICIKKwkJCSAgIm1lYW5zIHRoYXQgYW4gaW5jb3JyZWN0IFVSSSB3YXMgZW50ZXJlZCwg b3IgdGhlIHNlcnZlciAiCiAJCQkgICJpcyB1bnJlYWNoYWJsZS4iKTsKIAl9CiAKIAlpZiAoY2Fu X2RldGFpbF9lcnJvcikgewogCQkvKiBkbyBub3Qgc2hvdyByZXBvc2l0b3J5IG9mZmxpbmUgbWVz c2FnZSwgaXQncyBraW5kIG9mIGdlbmVyaWMgZXJyb3IgKi8KIAkJaWYgKHN0YXR1cyAhPSBFX0JP T0tfRVJST1JfUkVQT1NJVE9SWV9PRkZMSU5FICYmIHN0YXR1cyA+IDAgJiYgc3RhdHVzIDwgR19O X0VMRU1FTlRTIChzdGF0dXNfdG9fc3RyaW5nKSAmJiBzdGF0dXNfdG9fc3RyaW5nIFtzdGF0dXNd KSB7Ci0JCQlsYWJlbCA9IGdfc3RyY29uY2F0IChsYWJlbF9zdHJpbmcsICJcblxuIiwgXygiRGV0 YWlsZWQgZXJyb3I6IiksICIgIiwgXyhzdGF0dXNfdG9fc3RyaW5nIFtzdGF0dXNdKSwgTlVMTCk7 CisJCQlsYWJlbCA9IGdfc3RyY29uY2F0IChsYWJlbF9zdHJpbmcsICJcblxuIiwgXygiRGV0YWls ZWQgZXJyb3IgbWVzc2FnZToiKSwgIiAiLCBfKHN0YXR1c190b19zdHJpbmcgW3N0YXR1c10pLCBO VUxMKTsKIAkJCWxhYmVsX3N0cmluZyA9IGxhYmVsOwogCQl9CiAJfQpAQCAtMTc2LDcgKzE3NSw3 IEBACiAJCWJyZWFrOwogCWNhc2UgRV9CT09LX1ZJRVdfU1RBVFVTX1RJTUVfTElNSVRfRVhDRUVE RUQ6CiAJCXN0ciA9IF8oIlRoZSB0aW1lIHRvIGV4ZWN1dGUgdGhpcyBxdWVyeSBleGNlZWRlZCB0 aGUgc2VydmVyIGxpbWl0IG9yIHRoZSBsaW1pdFxuIgotCQkJInlvdSBoYXZlIGNvbmZpZ3VyZWQg Zm9yIHRoaXMgYWRkcmVzcyBib29rLiAgUGxlYXNlIG1ha2UgeW91ciBzZWFyY2hcbiIKKwkJCSJj b25maWd1cmVkIGZvciB0aGlzIGFkZHJlc3MgYm9vay4gIFBsZWFzZSBtYWtlIHlvdXIgc2VhcmNo XG4iCiAJCQkibW9yZSBzcGVjaWZpYyBvciByYWlzZSB0aGUgdGltZSBsaW1pdCBpbiB0aGUgZGly ZWN0b3J5IHNlcnZlclxuIgogCQkJInByZWZlcmVuY2VzIGZvciB0aGlzIGFkZHJlc3MgYm9vay4i KTsKIAkJYnJlYWs7CkluZGV4OiBwbHVnaW5zL21haWxpbmctbGlzdC1hY3Rpb25zL29yZy1nbm9t ZS1tYWlsaW5nLWxpc3QtYWN0aW9ucy5lcnJvci54bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGx1Z2lucy9t YWlsaW5nLWxpc3QtYWN0aW9ucy9vcmctZ25vbWUtbWFpbGluZy1saXN0LWFjdGlvbnMuZXJyb3Iu eG1sCShyZXZpc2lvbiAzNjc4NykKKysrIHBsdWdpbnMvbWFpbGluZy1saXN0LWFjdGlvbnMvb3Jn LWdub21lLW1haWxpbmctbGlzdC1hY3Rpb25zLmVycm9yLnhtbAkod29ya2luZyBjb3B5KQpAQCAt MzAsNyArMzAsNyBAQAogCiAgPGVycm9yIGlkPSJuby1hY3Rpb24iIHR5cGU9ImVycm9yIj4KICAg PF9wcmltYXJ5Pk5vIGUtbWFpbCBhY3Rpb248L19wcmltYXJ5PgotICA8X3NlY29uZGFyeSB4bWw6 c3BhY2U9InByZXNlcnZlIj5UaGUgYWN0aW9uIGNvdWxkIG5vdCBiZSBwZXJmb3JtZWQuIFRoaXMg bWVhbnMgdGhlIGhlYWRlciBmb3IgdGhpcyBhY3Rpb24gZGlkIG5vdCBjb250YWluIGFueSBhY3Rp b24gd2UgY291bGQgcHJvY2Vzcy4KKyAgPF9zZWNvbmRhcnkgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+ VGhlIGFjdGlvbiBjb3VsZCBub3QgYmUgcGVyZm9ybWVkLiBUaGUgaGVhZGVyIGZvciB0aGlzIGFj dGlvbiBkaWQgbm90IGNvbnRhaW4gYW55IGFjdGlvbiB0aGF0IGNvdWxkIGJlIHByb2Nlc3NlZC4K IAogSGVhZGVyOiB7MH08L19zZWNvbmRhcnk+CiAgPC9lcnJvcj4K ------=_Part_17059_1456898.1226770606232 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Evolution-patches mailing list [email protected] http://mail.gnome.org/mailman/listinfo/evolution-patches ------=_Part_17059_1456898.1226770606232--