484021 - [cy] Update 3.0.x localization for consistency with 3.1/3.5

Status: RESOLVED WONTFIX

(Mozilla Localizations :: cy / Welsh, defect)

Description

[Staś Małolepszy :stas]

Attachment: 3.0.x updates

Before we can de-beta Welsh, there are a couple of updates that we need to land. Attached is the patch by Dewi and David with the updates.

Comment 1

[Staś Małolepszy :stas]

Comment on attachment 368048 [details] [diff] [review]
3.0.x updates

I'm r-'ing the patch as it breaks the Windows installer.

The log from tinderbox build <http://tinderbox.mozilla.org/showlog.cgi?log=Mozilla-l10n-cy/1237364489.1237364620.24561.gz> suggest that the problem concerns the encoding of the browser/installer/mui.properties file.

> iconv: l10ngen/mui.properties:34:45: cannot convert
> Error converting codepage to CP1252 for l10ngen/mui.properties at /e/builds/buildbot/fx-win32-1.9-slave04/win32_l10n_nightly/mozilla/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl line 183.

I think this might be related to the "ŵ" circumflex used in "siŵr" in a couple of strings (MUI_TEXT_ABORTWARNING, MUI_UNTEXT_WELCOME_INFO_TEXT, MUI_UNTEXT_ABORTWARNING).

In http://mxr.mozilla.org/l10n/source/cy/toolkit/installer/windows/charset.mk#1 I see:
> WIN_INSTALLER_CHARSET = CP1252

Does this charset support the "ŵ" circumflex?

Comment 2

[David Chan]

Hi, No "ŵ" is not in CP1252 -- but IIRC we use this character set to be compatible with Windows 2000.  I believe we've run into this issue before, and decided to remove the accent (siŵr -> siwr).  We seem to have missed it this time -- sorry :-/

I think there may also be an issue with the "…" character in installer.it (please see following attachment for the proposed fix).

Comment 3

[David Chan]

Attachment: Patch on top of the previous patch, to fix install.it to match the required install charset

Comment 4

[Staś Małolepszy :stas]

Thanks David, this explains a lot. Would you mind attaching the whole update again, similar to attachment 368048 [details] [diff] [review], but this time without "ŵ" and "…" in the installer files? I'll review it asap.

Thanks!

Comment 5

[David Chan]

Attachment: Updated strings (corrected for windows installer charset limitations)

Comment 6

[Staś Małolepszy :stas]

Comment on attachment 368048 [details] [diff] [review]
3.0.x updates

First round of comments, about the previous (r-'ed) patch:

>Index: browser/chrome/browser/aboutDialog.dtd
>===================================================================
>-<!ENTITY copyrightInfo "&#169;1998-2008 Cyfranwyr. Cedwir Pob Hawl. Mae Firefox a logos 
>-Firefox yn nodau masnach y Mozilla Foundation.  Cedwir pob hawl.">
>+<!ENTITY copyrightInfo "&#169;1998-2009 Cyfranwyr. Cedwir Pob Hawl. Mae Firefox a logos
>+Firefox yn nodau masnach y Mozilla Foundation.  Cedwir pob hawl.
>+">

This could be in one line.



>Index: browser/chrome/browser/aboutRights.dtd
>===================================================================
This file is still in English?



>Index: browser/chrome/browser/pageInfo.dtd
>===================================================================
>-<!ENTITY pageInfoWindow.width "600">
>-<!ENTITY pageInfoWindow.height "500">
>+<!ENTITY pageInfoWindow.width "_: Do not translate this.  Only change the numeric values if you need this dialogue box to appear bigger. 600">
>+<!ENTITY pageInfoWindow.height "_: Do not translate this.  Only change the numeric values if you need this dialogue box to appear bigger. 500">

This is some kind of a comment, I presume?



>Index: browser/chrome/browser/sanitize.dtd
>===================================================================

>-<!ENTITY window.width "30em">
>+<!ENTITY window.width "_: Do not translate this.  Only change the numeric values if you need this dialogue box to appear bigger. 30em">

Same here. 


>Index: browser/chrome/browser/tabbrowser.dtd
>===================================================================
>-<!ENTITY closeTab.label "Cau Tab">
>+<!ENTITY closeTab.label "Cau'r Tab">
> <!ENTITY closeTab.accesskey "c">
> <!ENTITY closeOtherTabs.accesskey "e">
> <!ENTITY closeOtherTabs.label "Cau Tabiau Eraill">

I'm no expert on Welsh grammar, but I simply noticed that you had changed "Cau" to "Cau'r" in other places. Should this say "Cau" here then?



>===================================================================
>--- browser/chrome/overrides/netError.dtd	10 Sep 2008 21:37:18 -0000	1.1
>+++ browser/chrome/overrides/netError.dtd	18 Mar 2009 04:44:45 -0000	1.2
> <li>Gwiriwch y cyfeiriad am wallau teipio megis 
> <strong>ww</strong>.esiampl.com yn lle 
>-<strong>www</strong>.esiampl.com</li> 
>+<strong>www</strong>.esiampl.com</li>

I think example.com would work better here, as it's a real domain name.



>Index: browser/installer/custom.properties
>===================================================================
>-WARN_UNSUPPORTED_MSG=Ymddiheuriadau, does dim modd gosod, $BrandShortName. Mae angen ${MinUnsupportedVer} neu'r diweddaraf ar $BrandShortName.
>+WARN_UNSUPPORTED_MSG=Ymddiheuriadau, does dim modd gosod, $BrandShortName . Mae angen ${MinUnsupportedVer} neu'r diweddaraf ar $BrandShortName

There's an extra space after $BrandShortName.



>Index: dom/chrome/layout/printing.properties
>===================================================================
> # File confirm
>-fileConfirm.exists=Mae %S yn bod yn barod. Hoffech chi amnewid y ffeil?
>+fileConfirm.exists=Mae %S yn bod yn barod.\nHoffech chi amnewid y ffeil?

Are you sure this \n will look OK here? (same for NS_ERROR_GFX_* strings in this file).



>Index: toolkit/chrome/global/intl.properties
>===================================================================
>-intl.charsetmenu.browser.unicode=UTF-8, UTF-16, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE
>+intl.charsetmenu.browser.unicode=UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE

Why remove UTF-16 from the list?



>Index: toolkit/chrome/global/mozilla.dtd
>===================================================================
>RCS file: /l10n/l10n/cy/toolkit/chrome/global/mozilla.dtd,v
>retrieving revision 1.1
>retrieving revision 1.2
>diff -u -8 -r1.1 -r1.2
>--- toolkit/chrome/global/mozilla.dtd	10 Sep 2008 21:37:23 -0000	1.1
>+++ toolkit/chrome/global/mozilla.dtd	18 Mar 2009 04:44:48 -0000	1.2
>@@ -1,9 +1,4 @@
>-<!ENTITY mozilla.quote 'Mammon slept. And the <em>beast reborn</em> spread over the earth and its numbers 
>-grew legion. And they proclaimed the times and <em>sacrificed</em> crops unto the 
>-fire, with the <em>cunning of foxes</em>. And they built a new world in their own 
>-image as promised by the <em><a href="http://www.mozilla.org/about/mozilla-manifesto.html"> 
>-sacred words</a></em>, and <em><a href="http://wiki.mozilla.org/About:mozilla">spoke 
>-</a></em> of the beast with their children. Mammon awoke, and lo! it was 
>-<em>naught</em> but a follower.'>
>+<!ENTITY mozilla.quote "<span style='font-size: 2em'>Llym ei ruthr <em>llammwr eithin</em>,<br/>
>+Llewpart â <em>dart</em> yn ei <em>dîn</em></span>">
> 
>-<!ENTITY mozilla.from "from <strong>The Book of Mozilla,</strong> 11:9<br/><small>(10th Edition)</small>">
>+<!ENTITY mozilla.from "Cywydd i'r Llwynog<br/>(Dafydd ap Gwilym, 14eg ganrif)">

Incomplete translation?



Hope this helps. Looking forward to reviewing a new patch :)

PS Thanks, Gandalf, for the help with the review.

Comment 7

[Staś Małolepszy :stas]

Comment on attachment 368153 [details] [diff] [review]
Updated strings (corrected for windows installer charset limitations)

Thanks David. This patch still has the comment thing in browser/chrome/browser/pageInfo.dtd. Would you mind fixing the issues I mentioned in comment 6 and attaching a new patch, please?

Comment 8

[David Chan]

> This could be in one line.
> This file is still in English?
> This is some kind of a comment, I presume?
> Same here.
[...]
> I think example.com would work better here, as it's a real domain
> name.
> There's an extra space after $BrandShortName.

Thanks, I've corrected all these [patch to follow immediately]

> I'm no expert on Welsh grammar, but I simply noticed that you
> had changed "Cau" to "Cau'r" in other places. Should this say
> "Cau" here then?

I think it's ok as it stands -- the apostrophe-r is the definite
article, and it's useful sometimes to disambiguate the syntax
(Sentence as opposed to Noun Phrase). Other times it is not needed
because the lexicon makes it clear enough.

> Are you sure this \n will look OK here? (same for NS_ERROR_GFX_*
> strings in this file).

The Welsh copies the en-US file here (keeping \n in four entities),
But we could remove them if that would be better.

> Why remove UTF-16 from the list?

Again, the Welsh copies en-US, but we can change it if preferable.

> Incomplete translation?

I've used a famous 14th Century Welsh couplet here by Dafydd Ap Gwilym
(in praise of a fox and its tail), as a free translation of the
cultural register of the English passage.  But if this is not OK, we
can provide a literal translation!

Will attach a new patch now.

Comment 9

[David Chan]

Attachment: Updated strings (corrected issues raised)

Comment 10

[David Chan]

Hello, do we need to do something extra to get the updated patch approved?
Thanks

Comment 11

[Mike Beltzner [:beltzner, not reading bugmail]]

(In reply to comment #8)
> > Incomplete translation?
> 
> I've used a famous 14th Century Welsh couplet here by Dafydd Ap Gwilym
> (in praise of a fox and its tail), as a free translation of the
> cultural register of the English passage.  But if this is not OK, we
> can provide a literal translation!

I don't know if we need a literal translation for about:mozilla, but I'd rather we not use a direct quotation. I think it would be fine for you to retain the meaning of the english about:mozilla but cast it in the style of Welsh poetry (retaining the links in relevant places) but it would need to be something you made up yourself, just like how the English version is in the style of old english religious storytelling.

Comment 12

[Staś Małolepszy :stas]

Comment on attachment 368164 [details] [diff] [review]
Updated strings (corrected issues raised)

Thanks Mike for sharing your opinion. I'm r-'ing the patch based on comment 11. Other comments inline:

(In reply to comment #8)

> > I'm no expert on Welsh grammar, but I simply noticed that you
> > had changed "Cau" to "Cau'r" in other places. Should this say
> > "Cau" here then?
> 
> I think it's ok as it stands -- the apostrophe-r is the definite
> article, and it's useful sometimes to disambiguate the syntax
> (Sentence as opposed to Noun Phrase). Other times it is not needed
> because the lexicon makes it clear enough.

Cool, thanks for clarification.
 
> > Are you sure this \n will look OK here? (same for NS_ERROR_GFX_*
> > strings in this file).
> 
> The Welsh copies the en-US file here (keeping \n in four entities),
> But we could remove them if that would be better.

Ah, right. Keeping "\n" will be fine.

> > Why remove UTF-16 from the list?
> 
> Again, the Welsh copies en-US, but we can change it if preferable.

Sorry, my bad. Please leave it as it is now, i.e.: "UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE". Thanks.

> > Incomplete translation?
> 
> I've used a famous 14th Century Welsh couplet here by Dafydd Ap Gwilym
> (in praise of a fox and its tail), as a free translation of the
> cultural register of the English passage.  But if this is not OK, we
> can provide a literal translation!

See Mike's comment 11 here. 

David, could you attach a new patch with the about:mozilla text changed? Thanks.

Comment 13

[Staś Małolepszy :stas]

David, any updates?

Comment 14

[David Chan]

Hi, I have uploaded a translation approximating the English meaning, as per #11.
Thanks

Comment 15

[Staś Małolepszy :stas]

(In reply to comment #14)
> Hi, I have uploaded a translation approximating the English meaning, as per
> #11.
Hi David,

I don't see any new check-ins to the CVS (3.0.x tree) here: http://bonsai-l10n.mozilla.org/cvsquery.cgi?treeid=default&module=Firefox3-cy&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=all&mindate=&maxdate=&cvsroot=%2Fl10n

Can you attach a new patch for review, please? We'll need a review and an approval before anything lands. Thanks.

Comment 16

[Staś Małolepszy :stas]

Hi David,

The 3.0.12 code freeze is in a week (June 16). It would be great to move forward and close this bug. Just let me know if I can provide any kind of help :)

Thanks!

Comment 17

[Staś Małolepszy :stas]

Ping?

Comment 18

[Axel Hecht [:Pike]]

Should we still invest in this?