[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: Adding context in 4.4 branch
From: Torgny Nyblom <kde () nyblom ! org>
Date: 2010-01-12 20:37:04
Message-ID: 201001122137.04952.kde () nyblom ! org
[Download RAW message or body]
Hi,
for fixing bug# 222434 (No explanation with translatable strings in kmail
(htmlstatusbar.cpp)) we need to add some context to 3 strings (only adding
context no change in the strings). Is it ok to fix this in the 4.4 branch or
should the fix only go to trunk?
Change:
svn diff
Index: kmail/htmlstatusbar.cpp
===================================================================
--- kmail/htmlstatusbar.cpp (revision 1073708)
+++ kmail/htmlstatusbar.cpp (working copy)
@@ -106,14 +106,14 @@
switch ( mode() ) {
case Html: // bold: "HTML Message"
case MultipartHtml:
- return i18n( "<qt><b><br />H<br />T<br />M<br />L<br /> "
+ return i18nc("'HTML Message' with html linebreaks between each letter.",
"<qt><b><br />H<br />T<br />M<br />L<br /> "
"<br />M<br />e<br />s<br />s<br />a<br />g<br />e</b></qt>"
);
case Normal: // normal: "No HTML Message"
- return i18n( "<qt><br />N<br />o<br /> "
+ return i18nc("'No HTML Message' with html linebreaks between each
letter.", "<qt><br />N<br />o<br /> "
"<br />H<br />T<br />M<br />L<br /> "
"<br />M<br />e<br />s<br />s<br />a<br />g<br />e</qt>" );
case MultipartPlain: // normal: "Plain Message"
- return i18n( "<qt><br />P<br />l<br />a<br />i<br />n<br /> "
+ return i18n("'Plain Message' with html linebreaks between each letter.",
"<qt><br />P<br />l<br />a<br />i<br />n<br /> "
"<br />M<br />e<br />s<br />s<br />a<br />g<br />e<br
/></qt>" );
default:
return QString();
/Regards
Torgny
[Attachment #3 (text/html)]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" \
content="1" /><style type="text/css"> p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; \
font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;">Hi,</p> <p style="-qt-paragraph-type:empty; margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"></p> <p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;">for fixing bug# 222434 (<a \
name="summary_alias_container"></a>No explanation with translatable strings in kmail \
(htmlstatusbar.cpp)) we need to add some context to 3 strings (only adding context no \
change in the strings). Is it ok to fix this in the 4.4 branch or should the fix only \
go to trunk?</p> <p style="-qt-paragraph-type:empty; margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"></p> <p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;">Change:</p> <p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><a name="comment_text_1"></a><span style=" \
font-family:'Courier New,courier';">s</span><span style=" font-family:'Courier \
New,courier';">vn diff</span></p> <pre style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;"><span style=" font-family:'Courier New,courier';">Index: \
kmail/htmlstatusbar.cpp</span></pre> <pre style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';">===================================================================</span></pre>
<pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" \
font-family:'Courier New,courier';">--- kmail/htmlstatusbar.cpp (revision \
1073708)</span></pre> <pre style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;"><span style=" font-family:'Courier New,courier';">+++ \
kmail/htmlstatusbar.cpp (working copy)</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';">@@ -106,14 +106,14 @@</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';"> switch ( mode() ) {</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';"> case Html: // bold: "HTML Message"</span></pre> <pre \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" \
font-family:'Courier New,courier';"> case MultipartHtml:</span></pre> <pre style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" \
font-family:'Courier New,courier';">- return i18n( "<qt><b><br \
/>H<br />T<br />M<br />L<br /> "</span></pre> <pre \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" \
font-family:'Courier New,courier';">+ return i18nc("'HTML Message' with html \
linebreaks between each letter.",</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';">"<qt><b><br />H<br />T<br />M<br \
/>L<br /> "</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';"> "<br />M<br />e<br />s<br \
/>s<br />a<br />g<br />e</b></qt>"</span></pre> \
<pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" \
font-family:'Courier New,courier';">);</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';"> case Normal: // normal: "No HTML Message"</span></pre> \
<pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" \
font-family:'Courier New,courier';">- return i18n( "<qt><br \
/>N<br />o<br /> "</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';">+ return i18nc("'No HTML Message' with html linebreaks between \
each</span></pre> <pre style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span \
style=" font-family:'Courier New,courier';">letter.", "<qt><br \
/>N<br />o<br /> "</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';"> "<br />H<br />T<br />M<br \
/>L<br /> "</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';"> "<br />M<br />e<br />s<br \
/>s<br />a<br />g<br />e</qt>" );</span></pre> <pre \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" \
font-family:'Courier New,courier';"> case MultipartPlain: // normal: "Plain \
Message"</span></pre> <pre style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;"><span style=" font-family:'Courier New,courier';">- return \
i18n( "<qt><br />P<br />l<br />a<br />i<br \
/>n<br /> "</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';">+ return i18n("'Plain Message' with html linebreaks between \
each letter.",</span></pre> <pre style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';">"<qt><br />P<br />l<br />a<br \
/>i<br />n<br /> "</span></pre> <pre style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;"><span style=" font-family:'Courier \
New,courier';"> "<br />M<br />e<br />s<br \
/>s<br />a<br />g<br />e<br</span></pre> <pre style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" \
font-family:'Courier New,courier';">/></qt>" );</span></pre> <pre \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" \
font-family:'Courier New,courier';"> default:</span></pre> <pre style=" \
margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><span style=" \
font-family:'Courier New,courier';"> return QString();</span></pre> <p \
style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"></p> <p \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;">/Regards</p> <p style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Torgny</p> <p \
style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"></p> <p \
style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;"></p></body></html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic