diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-03 16:11:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-03 16:11:50 (GMT) |
| commit | b162ee295586d732292498945f335884bfa86b3e (patch) | |
| tree | f0acb6ddf0333ea092add2f3cc41625de75ef4db /tools/linguist | |
| parent | c5ac774717f1ec2c99407e3ee3c337127d94329e (diff) | |
| parent | d5f33087eca066d70240e272d4109c5cca8001cf (diff) | |
| download | Qt-b162ee295586d732292498945f335884bfa86b3e.zip Qt-b162ee295586d732292498945f335884bfa86b3e.tar.gz Qt-b162ee295586d732292498945f335884bfa86b3e.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tools/linguist')
| -rw-r--r-- | tools/linguist/shared/ts.dtd | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/tools/linguist/shared/ts.dtd b/tools/linguist/shared/ts.dtd index 4d2cdeb..12d3562 100644 --- a/tools/linguist/shared/ts.dtd +++ b/tools/linguist/shared/ts.dtd @@ -4,8 +4,6 @@ ! ! The location element is set as optional since it was introduced first in Qt 4.2. ! The userdata element is set as optional since it was introduced first in Qt 4.4. - ! The source and translation elements are optional starting with version 3.0 - ! (Qt 4.6) to support S60 blank messages. ! --> <!-- @@ -36,13 +34,10 @@ language CDATA #IMPLIED> <!-- The encoding to use in the QM file by default. Default is ISO-8859-1. --> <!ELEMENT defaultcodec (#PCDATA) > -<!ELEMENT context (name?, comment?, (context|message)+) > +<!ELEMENT context (name, comment?, (context|message)+) > <!ATTLIST context encoding CDATA #IMPLIED> <!ELEMENT name %evilstring; > -<!-- If "no", then the context nesting is for informational puposes only --> -<!ATTLIST name - nest (yes|no) "yes"> <!-- This is "disambiguation" in the (new) API, or "msgctxt" in gettext speak --> <!ELEMENT comment %evilstring; > <!-- Previous content of comment (result of merge) --> @@ -53,12 +48,13 @@ <!ELEMENT translatorcomment %evilstring; > <!ELEMENT message (location*, source?, oldsource?, comment?, oldcomment?, extracomment?, translatorcomment?, translation?, userdata?, extra-**) > <!-- - ! If utf8 is true, the defaultcodec is overridden and the message is encoded - ! in UTF-8 in the QM file. + ! If utf8 is "true", the defaultcodec is overridden and the message is encoded + ! in UTF-8 in the QM file. If it is "both", both source encodings are stored + ! in the QM file. --> <!ATTLIST message id CDATA #IMPLIED - utf8 (true|false) "false" + utf8 (true|false|both) "false" numerus (yes|no) "no"> <!ELEMENT location EMPTY> <!-- @@ -100,14 +96,5 @@ --> <!ELEMENT numerusform (#PCDATA|byte|lengthvariant)* > <!ATTLIST numerusform - plurality (nullar|singular|dual|trial|paucal|greaterpaucal|plural|greaterplural) #IMPLIED> variants (yes|no) "no"> <!ELEMENT lengthvariant %evilstring; > -<!-- - ! The translation variants have a priority between 1 ("highest") and 9 ("lowest") - ! Typically longer translations get a higher priority. - ! If omitted, the order of appearance of the variants in the TS files is used. - --> -<!ATTLIST lengthvariant - priority (1|2|3|4|5|6|7|8|9) #IMPLIED> - |