Mercurial > pidgin
comparison po/nb.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 |
|---|---|
| 801 msgstr "Stopp" | 801 msgstr "Stopp" |
| 802 | 802 |
| 803 msgid "Waiting for transfer to begin" | 803 msgid "Waiting for transfer to begin" |
| 804 msgstr "Venter på at overføringen skal starte" | 804 msgstr "Venter på at overføringen skal starte" |
| 805 | 805 |
| 806 msgid "Canceled" | 806 msgid "Cancelled" |
| 807 msgstr "Avbrutt" | 807 msgstr "Avbrutt" |
| 808 | 808 |
| 809 msgid "Failed" | 809 msgid "Failed" |
| 810 msgstr "Feilet" | 810 msgstr "Feilet" |
| 811 | 811 |
| 16206 #~ msgstr "Lagre kataloginfo" | 16206 #~ msgstr "Lagre kataloginfo" |
| 16207 | 16207 |
| 16208 #~ msgid "Could not open %s for writing!" | 16208 #~ msgid "Could not open %s for writing!" |
| 16209 #~ msgstr "Klarte ikke åpne %s for skriving!" | 16209 #~ msgstr "Klarte ikke åpne %s for skriving!" |
| 16210 | 16210 |
| 16211 #~ msgid "File transfer failed; other side probably canceled." | 16211 #~ msgid "File transfer failed; other side probably cancelled." |
| 16212 #~ msgstr "" | 16212 #~ msgstr "" |
| 16213 #~ "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden." | 16213 #~ "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden." |
| 16214 | 16214 |
| 16215 #~ msgid "Could not connect for transfer." | 16215 #~ msgid "Could not connect for transfer." |
| 16216 #~ msgstr "Klarte ikke koble til for dataoverføring." | 16216 #~ msgstr "Klarte ikke koble til for dataoverføring." |