Mercurial > pidgin
comparison po/ja.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 |
---|---|
806 msgstr "停止する" | 806 msgstr "停止する" |
807 | 807 |
808 msgid "Waiting for transfer to begin" | 808 msgid "Waiting for transfer to begin" |
809 msgstr "転送開始を待っています" | 809 msgstr "転送開始を待っています" |
810 | 810 |
811 msgid "Canceled" | 811 msgid "Cancelled" |
812 msgstr "キャンセルしました" | 812 msgstr "キャンセルしました" |
813 | 813 |
814 msgid "Failed" | 814 msgid "Failed" |
815 msgstr "失敗しました" | 815 msgstr "失敗しました" |
816 | 816 |
16757 #~ msgstr "フォルダ情報の設定" | 16757 #~ msgstr "フォルダ情報の設定" |
16758 | 16758 |
16759 #~ msgid "Could not open %s for writing!" | 16759 #~ msgid "Could not open %s for writing!" |
16760 #~ msgstr "書き込みモードで %s を開けません!" | 16760 #~ msgstr "書き込みモードで %s を開けません!" |
16761 | 16761 |
16762 #~ msgid "File transfer failed; other side probably canceled." | 16762 #~ msgid "File transfer failed; other side probably cancelled." |
16763 #~ msgstr "" | 16763 #~ msgstr "" |
16764 #~ "ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。" | 16764 #~ "ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。" |
16765 | 16765 |
16766 #~ msgid "Could not connect for transfer." | 16766 #~ msgid "Could not connect for transfer." |
16767 #~ msgstr "転送できませんでした!" | 16767 #~ msgstr "転送できませんでした!" |