[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/kdepim/enterprise4/kdepimlibs
From: Thomas McGuire <mcguire () kde ! org>
Date: 2009-05-13 14:06:05
Message-ID: 1242223565.943558.8138.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 967520 by tmcguire:
Merged revisions 967206 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.2/kdepimlibs
........
r967206 | smartins | 2009-05-12 23:07:45 +0200 (Tue, 12 May 2009) | 9 lines
Backport r967201 by smartins from trunk to the 4.2 branch:
Fix kcal's html export. Replace i18nc("@info", with i18nc("@info/plain" so the \
resulting html file doesn't get full of <html> tags.
Shouldn't give too much work to translators as the actual strings remain untouched.
CCBUG: 192316
........
_M . (directory)
M +8 -8 kcal/htmlexport.cpp
** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
- /branches/KDE/4.2/kdepimlibs:0-906699,908595,908778,909375,909480-909481,913686,9 \
14463,916781,917250,917474,917890,918215,920496,921344,921567,921657,925739,926581,926 \
658,926671,928173,929204,929982,930782-930954,931305,932900,932969,932982,933037,93303 \
9,933042,933082,933951,935076,939240,939625-939627,939629-939630,940569,941695,944611, \
944613-944614,944619,944621,944882,953497,954584,957769,960523,960542,960992,963977,965556,966698 \
/branches/KDE/4.1/kdepimlibs:1-834831,835273,835640-835906,835908-836398,836400-837899 \
,838884,839404,839801,841029,841539,841636,842671,843335,844834,844837,845949,846411,8 \
47482,848343-848345,850102,851238-851239,851691,853473,854917,856768,859481,859713,859 \
717,863249,865199,865203,868165,873590,875281,879229,879951,880893,880897,880908,88602 \
0,886341,887083,890863,892407,892930,893121,893737,893938,893947,893950,893953,893956, \
894620,894622,894875,894879-894881,894903,894905,894985,895056,895515,895906,895909-895910,895918,895924,896487,896770
,898353,899979,899982,904282,905120,905542,905607
+ /branches/KDE/4.2/kdepimlibs:0-906699,908595,908778,909375,909480-909481,913686,9 \
14463,916781,917250,917474,917890,918215,920496,921344,921567,921657,925739,926581,926 \
658,926671,928173,929204,929982,930782-930954,931305,932900,932969,932982,933037,93303 \
9,933042,933082,933951,935076,939240,939625-939627,939629-939630,940569,941695,944611, \
944613-944614,944619,944621,944882,953497,954584,957769,960523,960542,960992,963977,965556,966698,967206 \
/branches/KDE/4.1/kdepimlibs:1-834831,835273,835640-835906,835908-836398,836400-837899 \
,838884,839404,839801,841029,841539,841636,842671,843335,844834,844837,845949,846411,8 \
47482,848343-848345,850102,851238-851239,851691,853473,854917,856768,859481,859713,859 \
717,863249,865199,865203,868165,873590,875281,879229,879951,880893,880897,880908,88602 \
0,886341,887083,890863,892407,892930,893121,893737,893938,893947,893950,893953,893956, \
894620,894622,894875,894879-894881,894903,894905,894985,895056,895515,895906,895909-895910,895918,895924,896487
,896770,898353,899979,899982,904282,905120,905542,905607
--- branches/kdepim/enterprise4/kdepimlibs/kcal/htmlexport.cpp #967519:967520
@@ -501,7 +501,7 @@
*ts << " class=\"done\"";
}
*ts << ">\n";
- *ts << " " << i18nc( "@info to-do percent complete",
+ *ts << " " << i18nc( "@info/plain to-do percent complete",
"%1 %", todo->percentComplete() ) << "\n";
*ts << " </td>\n";
@@ -664,7 +664,7 @@
void HtmlExport::createFooter( QTextStream *ts )
{
// FIXME: Implement this in a translatable way!
- QString trailer = i18nc( "@info", "This page was created " );
+ QString trailer = i18nc( "@info/plain", "This page was created " );
/* bool hasPerson = false;
bool hasCredit = false;
@@ -672,27 +672,27 @@
QString mail, name, credit, creditURL;*/
if ( !d->mSettings->eMail().isEmpty() ) {
if ( !d->mSettings->name().isEmpty() ) {
- trailer += i18nc( "@info page creator email link with name",
+ trailer += i18nc( "@info/plain page creator email link with name",
"by <link url='mailto:%1'>%2</link>",
d->mSettings->eMail(), d->mSettings->name() );
} else {
- trailer += i18nc( "@info page creator email link",
+ trailer += i18nc( "@info/plain page creator email link",
"by <link url='mailto:%1'>%2</link>",
d->mSettings->eMail(), d->mSettings->eMail() );
}
} else {
if ( !d->mSettings->name().isEmpty() ) {
- trailer += i18nc( "@info page creator name only",
+ trailer += i18nc( "@info/plain page creator name only",
"by %1 ", d->mSettings->name() );
}
}
if ( !d->mSettings->creditName().isEmpty() ) {
if ( !d->mSettings->creditURL().isEmpty() ) {
- trailer += i18nc( "@info page credit with name and link",
+ trailer += i18nc( "@info/plain page credit with name and link",
"with <link url='%1'>%2</link>",
d->mSettings->creditURL(), d->mSettings->creditName() );
} else {
- trailer += i18nc( "@info page credit name only",
+ trailer += i18nc( "@info/plain page credit name only",
"with %1", d->mSettings->creditName() );
}
}
@@ -759,7 +759,7 @@
if ( d->mHolidayMap[date].isEmpty() ) {
d->mHolidayMap[date] = name;
} else {
- d->mHolidayMap[date] = i18nc( "@info holiday by date and name",
+ d->mHolidayMap[date] = i18nc( "@info/plain holiday by date and name",
"%1, %2", d->mHolidayMap[date], name );
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic