summaryrefslogtreecommitdiff
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorElliott Sales de Andrade <qulogic@pidgin.im>2010-08-23 01:41:31 +0000
committerElliott Sales de Andrade <qulogic@pidgin.im>2010-08-23 01:41:31 +0000
commit1f268303c55ce3acaae9c86cd15fea0ba42e0140 (patch)
tree7878944c355ef6dc512fc0c0effa14b516476747 /po/en_GB.po
parentba4820921f3e2b2cd7c183af120806d50b7f2652 (diff)
downloadpidgin-1f268303c55ce3acaae9c86cd15fea0ba42e0140.tar.gz
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.
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po2
1 files changed, 1 insertions, 1 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 78398ab360..61e8fa2139 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -793,7 +793,7 @@ msgstr "Stop"
msgid "Waiting for transfer to begin"
msgstr "Waiting for transfer to begin"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Cancelled"
msgid "Failed"