Mercurial > pidgin
comparison po/ca.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 | 4a88d29b8bae |
children | 52d9f591585e |
comparison
equal
deleted
inserted
replaced
30431:c9a57878ed17 | 30432:1cdae196aac8 |
---|---|
832 msgstr "Atura" | 832 msgstr "Atura" |
833 | 833 |
834 msgid "Waiting for transfer to begin" | 834 msgid "Waiting for transfer to begin" |
835 msgstr "S'està esperant a iniciar la transferència" | 835 msgstr "S'està esperant a iniciar la transferència" |
836 | 836 |
837 msgid "Canceled" | 837 msgid "Cancelled" |
838 msgstr "S'ha cancel·lat" | 838 msgstr "S'ha cancel·lat" |
839 | 839 |
840 msgid "Failed" | 840 msgid "Failed" |
841 msgstr "Ha fallat" | 841 msgstr "Ha fallat" |
842 | 842 |
16324 #~ msgstr "Estableix informació del directori" | 16324 #~ msgstr "Estableix informació del directori" |
16325 | 16325 |
16326 #~ msgid "Could not open %s for writing!" | 16326 #~ msgid "Could not open %s for writing!" |
16327 #~ msgstr "No s'ha pogut obrir %s per a escriure-hi." | 16327 #~ msgstr "No s'ha pogut obrir %s per a escriure-hi." |
16328 | 16328 |
16329 #~ msgid "File transfer failed; other side probably canceled." | 16329 #~ msgid "File transfer failed; other side probably cancelled." |
16330 #~ msgstr "" | 16330 #~ msgstr "" |
16331 #~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a " | 16331 #~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a " |
16332 #~ "l'altra banda." | 16332 #~ "l'altra banda." |
16333 | 16333 |
16334 #~ msgid "Could not connect for transfer." | 16334 #~ msgid "Could not connect for transfer." |