Mercurial > pidgin
comparison po/sr.po @ 30432:1cdae196aac8
Standardize on "cancelled".
QuLogic: so, canceled or cancelled? that patch on #12130 is pretty thorough...
wabz: cancelled :D
wabz: that cancelled thing actually bothered me in the past
wabz: never quite enough to do such a patch :p
elb: that's an en_US vs en_GB thing
elb: both are correct, but canceled is more common in en_{US,CA} and cancelled in en_{GB,AU,NZ,etc.}
elb: personally, I use cancelled
QuLogic: yea, that's what I went for before, but I think I couldn't change any strings because we were frozen
QuLogic: you all had to pick the spelling that was opposite from the guy's patch, didn't you...
rekkanoryo: well, considering we're generally en_US in our strings, it should be canceled in our source
elb: considering they're both correct, and while I'm anal retentive, I'm not anal retentive about that, I have no preference ;-)
rekkanoryo: I don't really care either way, I just think that we should be consistently en_US or en_GB throughout
elb: right
elb: my point is, they're both correct for en_US
elb: one 'l' is simply more common
rekkanoryo: ah
rekkanoryo: if they're both technically correct for en_US, then "cancelled" is my vote
rekkanoryo: one 'l' always looks wrong to me
elb: the dictionary claims they are
Sorry, dwc.
Closes #12130.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 23 Aug 2010 01:41:31 +0000 |
| parents | babae1f32dc0 |
| children | 52d9f591585e |
comparison
equal
deleted
inserted
replaced
| 30431:c9a57878ed17 | 30432:1cdae196aac8 |
|---|---|
| 789 msgstr "Заустави" | 789 msgstr "Заустави" |
| 790 | 790 |
| 791 msgid "Waiting for transfer to begin" | 791 msgid "Waiting for transfer to begin" |
| 792 msgstr "Чекам да пренос почне" | 792 msgstr "Чекам да пренос почне" |
| 793 | 793 |
| 794 msgid "Canceled" | 794 msgid "Cancelled" |
| 795 msgstr "Откажи" | 795 msgstr "Откажи" |
| 796 | 796 |
| 797 msgid "Failed" | 797 msgid "Failed" |
| 798 msgstr "Неуспех" | 798 msgstr "Неуспех" |
| 799 | 799 |
| 16451 #~ msgstr "Постави податке у именик" | 16451 #~ msgstr "Постави податке у именик" |
| 16452 | 16452 |
| 16453 #~ msgid "Could not open %s for writing!" | 16453 #~ msgid "Could not open %s for writing!" |
| 16454 #~ msgstr "Не могу да отворим %s за упис!" | 16454 #~ msgstr "Не могу да отворим %s за упис!" |
| 16455 | 16455 |
| 16456 #~ msgid "File transfer failed; other side probably canceled." | 16456 #~ msgid "File transfer failed; other side probably cancelled." |
| 16457 #~ msgstr "Неуспешан пренос датотеке; друга страна је вероватно отказала." | 16457 #~ msgstr "Неуспешан пренос датотеке; друга страна је вероватно отказала." |
| 16458 | 16458 |
| 16459 #~ msgid "Could not connect for transfer." | 16459 #~ msgid "Could not connect for transfer." |
| 16460 #~ msgstr "Не могу да успоставим везу за пренос." | 16460 #~ msgstr "Не могу да успоставим везу за пренос." |
| 16461 | 16461 |