Mercurial > pidgin
comparison po/xh.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 |
|---|---|
| 841 msgstr "I-Hiptop" | 841 msgstr "I-Hiptop" |
| 842 | 842 |
| 843 msgid "Waiting for transfer to begin" | 843 msgid "Waiting for transfer to begin" |
| 844 msgstr "Ulindele ukuba ukudlulisa kuqalise" | 844 msgstr "Ulindele ukuba ukudlulisa kuqalise" |
| 845 | 845 |
| 846 msgid "Canceled" | 846 msgid "Cancelled" |
| 847 msgstr "IRhoxisiwe" | 847 msgstr "IRhoxisiwe" |
| 848 | 848 |
| 849 msgid "Failed" | 849 msgid "Failed" |
| 850 msgstr "Akuphumelelanga" | 850 msgstr "Akuphumelelanga" |
| 851 | 851 |
| 17190 #~ msgstr "Misela uLwazi Ngqo" | 17190 #~ msgstr "Misela uLwazi Ngqo" |
| 17191 | 17191 |
| 17192 #~ msgid "Could not open %s for writing!" | 17192 #~ msgid "Could not open %s for writing!" |
| 17193 #~ msgstr "Akukwazekanga ukuvula i-%s malunga nokubhala!" | 17193 #~ msgstr "Akukwazekanga ukuvula i-%s malunga nokubhala!" |
| 17194 | 17194 |
| 17195 #~ msgid "File transfer failed; other side probably canceled." | 17195 #~ msgid "File transfer failed; other side probably cancelled." |
| 17196 #~ msgstr "" | 17196 #~ msgstr "" |
| 17197 #~ "Ukudluliswa kwefayili akuphumelelanga; mhlawumbi elinye icala licinyiwe." | 17197 #~ "Ukudluliswa kwefayili akuphumelelanga; mhlawumbi elinye icala licinyiwe." |
| 17198 | 17198 |
| 17199 #~ msgid "Could not connect for transfer." | 17199 #~ msgid "Could not connect for transfer." |
| 17200 #~ msgstr "Akukwazekanga ukunxibelelana ukuze kudluliswe." | 17200 #~ msgstr "Akukwazekanga ukunxibelelana ukuze kudluliswe." |