Mercurial > pidgin
comparison po/af.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 | cbe5e9202925 |
comparison
equal
deleted
inserted
replaced
30431:c9a57878ed17 | 30432:1cdae196aac8 |
---|---|
800 msgstr "Stop" | 800 msgstr "Stop" |
801 | 801 |
802 msgid "Waiting for transfer to begin" | 802 msgid "Waiting for transfer to begin" |
803 msgstr "Wag vir oordrag om te begin" | 803 msgstr "Wag vir oordrag om te begin" |
804 | 804 |
805 msgid "Canceled" | 805 msgid "Cancelled" |
806 msgstr "Gekanselleer" | 806 msgstr "Gekanselleer" |
807 | 807 |
808 msgid "Failed" | 808 msgid "Failed" |
809 msgstr "Misluk" | 809 msgstr "Misluk" |
810 | 810 |
15696 #~ msgstr "" | 15696 #~ msgstr "" |
15697 #~ "Die sertifikaat wat deur \"%s\" voorgelê is, beweer om van \"%s\" " | 15697 #~ "Die sertifikaat wat deur \"%s\" voorgelê is, beweer om van \"%s\" " |
15698 #~ "afkomstig te wees. Dit kan beteken dat u nie tans aan die diens gekoppel " | 15698 #~ "afkomstig te wees. Dit kan beteken dat u nie tans aan die diens gekoppel " |
15699 #~ "is wat u dink nie." | 15699 #~ "is wat u dink nie." |
15700 | 15700 |
15701 #~ msgid "You canceled the transfer of %s" | 15701 #~ msgid "You cancelled the transfer of %s" |
15702 #~ msgstr "U het die oordrag van %s gekanselleer" | 15702 #~ msgstr "U het die oordrag van %s gekanselleer" |
15703 | 15703 |
15704 #~ msgid "%s canceled the transfer of %s" | 15704 #~ msgid "%s cancelled the transfer of %s" |
15705 #~ msgstr "%s het die oordrag van %s gekanselleer" | 15705 #~ msgstr "%s het die oordrag van %s gekanselleer" |
15706 | 15706 |
15707 #~ msgid "%s canceled the file transfer" | 15707 #~ msgid "%s cancelled the file transfer" |
15708 #~ msgstr "%s het die lêeroordrag gekanselleer" | 15708 #~ msgstr "%s het die lêeroordrag gekanselleer" |
15709 | 15709 |
15710 #~ msgid "Join/Part Hiding Configuration" | 15710 #~ msgid "Join/Part Hiding Configuration" |
15711 #~ msgstr "Opstelling vir in- en uitgaanversteking" | 15711 #~ msgstr "Opstelling vir in- en uitgaanversteking" |
15712 | 15712 |
16290 #~ msgstr "Stel gidsinligting" | 16290 #~ msgstr "Stel gidsinligting" |
16291 | 16291 |
16292 #~ msgid "Could not open %s for writing!" | 16292 #~ msgid "Could not open %s for writing!" |
16293 #~ msgstr "Kon nie %s vir skryf open nie!" | 16293 #~ msgstr "Kon nie %s vir skryf open nie!" |
16294 | 16294 |
16295 #~ msgid "File transfer failed; other side probably canceled." | 16295 #~ msgid "File transfer failed; other side probably cancelled." |
16296 #~ msgstr "Lêeroordrag het misluk; ander kant het waarskynlik gekanselleer." | 16296 #~ msgstr "Lêeroordrag het misluk; ander kant het waarskynlik gekanselleer." |
16297 | 16297 |
16298 #~ msgid "Could not connect for transfer." | 16298 #~ msgid "Could not connect for transfer." |
16299 #~ msgstr "Kon nie vir oordrag koppel nie." | 16299 #~ msgstr "Kon nie vir oordrag koppel nie." |
16300 | 16300 |