svnno****@sourc*****
svnno****@sourc*****
2009年 7月 26日 (日) 10:28:40 JST
ForkRevision: 2474
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2474
Author: nogu
Date: 2009-07-26 10:28:40 +0900 (Sun, 26 Jul 2009)
Log Message:
-----------
- use i18nc() instead of i18n()
- don't use args() with i18n()
Modified Paths:
--------------
kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp
kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp 2009-07-26 00:30:53 UTC (rev 2473)
+++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp 2009-07-26 01:28:40 UTC (rev 2474)
@@ -35,7 +35,7 @@
FavoriteListView* favoriteList = new FavoriteListView(this);
favoriteList->setObjectName("favoriteTab");
ViewMediator::getInstance()->setFavoriteListView(favoriteList);
- addTab(favoriteList, i18n("Favorite"));
+ addTab(favoriteList, i18nc("Favorite boards", "Favorite"));
setupActions();
}
@@ -124,7 +124,8 @@
connect(find_action, SIGNAL(triggered()), this, SLOT(slotFocusSearchCombo()));
KAction* reload_action = actionCollection()->addAction("subjectview_reload");
- reload_action->setText(i18n("Reload"));
+ reload_action->setText(i18nc("@action:button Reload the subject view",
+ "Reload"));
reload_action->setShortcut(KStandardShortcut::reload());
connect(reload_action, SIGNAL(triggered()), this, SLOT(slotReloadButton()));
Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-07-26 00:30:53 UTC (rev 2473)
+++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-07-26 01:28:40 UTC (rev 2474)
@@ -710,7 +710,8 @@
KAction* backLink = new KAction(str, this);
backSubMenu->addAction(backLink);
}
- backSubMenu->setTitle(i18n("Back"));
+ backSubMenu->setTitle(
+ i18nc("@title:menu Go back to the responses", "Back"));
popupMenu.addMenu(backSubMenu);
popupMenu.addSeparator();
}
@@ -732,14 +733,15 @@
}
// home
- homeLinkAct = new KAction(i18n("Start"), this);
+ homeLinkAct = new KAction(
+ i18nc("@action:inmenu Go to the original post", "Start"), this);
popupMenu.addAction(homeLinkAct);
// template
if (m_mode == HTMLPART_MODE_MAINPART) {
int kokoyon = DatManager::getViewPos(m_datURL);
if (kokoyon) {
- str = i18n("Kokomade Yonda (%1)").arg(kokoyon);
+ str = i18n("Kokomade Yonda (%1)", kokoyon);
kokoLinkAct = new KAction(str, this);
popupMenu.addAction(kokoLinkAct);
}
@@ -766,7 +768,8 @@
selectedStr.append("...");
}
- aboneWordAct = new KAction(i18n("Add '%1' to abone list").arg(selectedStr), this);
+ aboneWordAct
+ = new KAction(i18n("Add '%1' to abone list", selectedStr), this);
popupMenu.addAction(aboneWordAct);
}
@@ -813,8 +816,8 @@
clipboard->setText(selectedText(), QClipboard::Clipboard);
} else if (action == aboneWordAct) {
if (KMessageBox::warningYesNo(view(),
- i18n("Do you want to add '%1' to abone list ?")
- .arg(selectedText())) == KMessageBox::Yes) {
+ i18n("Do you want to add '%1' to abone list ?",
+ selectedText())) == KMessageBox::Yes) {
AboneConfig::aboneWordList().append(selectedText());
redrawHTMLPart(m_datURL, false);
}
@@ -1157,7 +1160,7 @@
KRun::runUrl(str, "text/html", view());
} else if (action == aboneNameAct) {
if (KMessageBox::warningYesNo(view(),
- i18n("Do you want to add '%1' to abone list ?").arg(namestr),
+ i18n("Do you want to add '%1' to abone list ?", namestr),
"Kita") == KMessageBox::Yes) {
AboneConfig::aboneNameList().append(namestr);
redrawHTMLPart(m_datURL, false);
@@ -1201,7 +1204,7 @@
if (action == aboneAct) {
// add ID to abone list
if (KMessageBox::warningYesNo(view(),
- i18n("Do you want to add '%1' to abone list ?").arg(strid),
+ i18n("Do you want to add '%1' to abone list ?", strid),
"Kita") == KMessageBox::Yes) {
AboneConfig::aboneIDList().append(strid);
redrawHTMLPart(m_datURL, false);
@@ -1457,7 +1460,9 @@
if (num >= 2) {
tmpstr = QString("<DIV>ID:%1:[%2]</DIV>").arg(url.mid(6)).arg(num);
} else {
- tmpstr = "<DIV>" + i18n("None") + "</DIV>";
+ tmpstr = "<DIV>"
+ + i18nc("@label:textbox This is the first reply", "None")
+ + "</DIV>";
}
showPopup(m_datURL, tmpstr);
return ;
@@ -1475,7 +1480,8 @@
if (num) {
tmpstr = QString("<DIV>No.%1 : [%2]</DIV>").arg(no).arg(num);
} else {
- tmpstr = "<DIV>" + i18n("None") + "</DIV>";
+ tmpstr = "<DIV>"
+ + i18nc("@label:textbox There is no reply", "None") + "</DIV>";
}
showPopup(m_datURL, tmpstr);
return ;