[Sugar-devel] sugar.po string change

[Simon Schampijer]

No, please no backporting. I did not see that string landing. We are in string freeze as well for 0.95 so the addition should be reverted in both the 0.94 and the 0.96 branch.

Regards,
   Simon

Am 24.04.2012 um 07:49 schrieb Chris Leonard <cjlhomeaddress at gmail.com>:

> Ok, that is a sensible explanation.
> 
> As 0.94 is the current stable (and the base for dx3) I'll make sure
> the new string is made available and try to back-port if from Glucose
> (0.95) sugar.po where it has been completed.
> 
> cjl
> 
> On Tue, Apr 24, 2012 at 1:38 AM, Anish Mangal <anish at activitycentral.com> wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>> 
>> On Tue 24 Apr 2012 11:03:37 AM IST, Chris Leonard wrote:
>>> Why did this change land in glucose 0.94 sugar.po instead of glucose
>>> 0.95 sugar.po ?
>>> 
>>> 
>>> ../src/jarabe/desktop/keydialog.py:94
>>> A wireless encryption key is required for\n
>>> the wireless network '%s'.
>>> 
>>> 
>>> 
>>>  ####### Checking POT for Sugar (0.94) ######
>>> 
>>> 
>>> 
>>> From git.sugarlabs.org:sugar/mainline
>>>   255ba0b..dde95e4  master     -> origin/master
>>>   93800b8..117b285  sucrose-0.94 -> origin/sucrose-0.94
>>> Updating 93800b8..117b285
>>> Fast-forward
>>>  extensions/deviceicon/network.py   |   19 ++++++++------
>>>  src/jarabe/desktop/keydialog.py    |    5 ++-
>>>  src/jarabe/desktop/meshbox.py      |    4 +-
>>>  src/jarabe/desktop/networkviews.py |   32 +++++++++++-----------
>>>  src/jarabe/model/adhoc.py          |    6 ++--
>>>  src/jarabe/model/network.py        |   49 +++++++++++++++++++++++++++++++++--
>>>  6 files changed, 81 insertions(+), 34 deletions(-)
>>> 
>>> 
>>>  ***** Updating POT for Sugar (0.94)*****
>>> 
>>> 
>>> cjl
>>> _______________________________________________
>>> Sugar-devel mailing list
>>> Sugar-devel at lists.sugarlabs.org
>>> http://lists.sugarlabs.org/listinfo/sugar-devel
>> 
>> Hi,
>> 
>> I'm guessing its related to the non-UTF8-ssid fix that was backported
>> to 0.94 recently. [1]
>> 
>> [1] https://patchwork.sugarlabs.org/patch/1348/
>> 
>> - --
>> Anish
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1.4.12 (GNU/Linux)
>> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>> 
>> iQEcBAEBAgAGBQJPljxBAAoJEBoxUdDHDZVp/l4H/2GCRWd8hVz/RF42Rxu7o58U
>> R7nj5A205au1FSYXyeAcf2Ki/P5LN04v6pwZ8uPhGEOyYZeY9E3/3GGUSHMBnaNq
>> rIdOIlUqU9lyzT7qPBGHMBmLA1zTcExlo55W2uqFDqaxyqscL0RGtz6VeuGgaLxd
>> ZNLK1NR9Z20UTwSR8WeOoRwq+3wuRXrdqq6snd4ZPkmOi1pjcEhuFebl9DuyoKa0
>> wlwCLBjfzykD6bjUbTdPG4hl3CRtKV4QRepMkb6drbHF7GZmw6Lbuk0V3rygxba0
>> BxxEotVwqtTOeLPnMZv+UlcpRb70ILRdolwPhL8Ul+HIb3D92IbLdwggaiZ2WBM=
>> =si4g
>> -----END PGP SIGNATURE-----
>> 
> _______________________________________________
> Sugar-devel mailing list
> Sugar-devel at lists.sugarlabs.org
> http://lists.sugarlabs.org/listinfo/sugar-devel