[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [rekonq] src: Fix strings as suggested in i18n-doc ml
From:       Andrea Diamantini <adjam7 () gmail ! com>
Date:       2011-10-16 21:10:05
Message-ID: 20111016211005.CEFD0A60B9 () git ! kde ! org
[Download RAW message or body]

Git commit afc4eeceb6f716043543621c7bcd2f1cc4685583 by Andrea Diamantini.
Committed on 16/10/2011 at 10:59.
Pushed by adjam into branch 'master'.

Fix strings as suggested in i18n-doc ml

CCMAIL: aspotashev@gmail.com

M  +1    -1    src/application.cpp
M  +1    -5    src/sslinfo.ui
M  +7    -7    src/urlbar/sslwidget.cpp

http://commits.kde.org/rekonq/afc4eeceb6f716043543621c7bcd2f1cc4685583

diff --git a/src/application.cpp b/src/application.cpp
index e180209..d770b3d 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -732,7 +732,7 @@ void Application::queryQuit()
     {
         int answer = KMessageBox::questionYesNoCancel(
                          mainWindow(),
-                         i18n("Wanna close the window or the whole app?"),
+                         i18n("Do you want to close the window or the whole \
application?"),  i18n("Application/Window closing..."),
                          KGuiItem(i18n("C&lose Current Window"),
                                   KIcon("window-close")),
diff --git a/src/sslinfo.ui b/src/sslinfo.ui
index 41393bb..3ed117a 100644
--- a/src/sslinfo.ui
+++ b/src/sslinfo.ui
@@ -298,11 +298,7 @@
       <item>
        <widget class="QLabel" name="label_23">
         <property name="text">
-         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; \
                &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; \
                /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; \
                font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; \
font-size:medium; font-weight:600;&quot;&gt;Digests:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 +         <string>&lt;h4&gt;Digests:&lt;/h4&gt;</string>
         </property>
        </widget>
       </item>
diff --git a/src/urlbar/sslwidget.cpp b/src/urlbar/sslwidget.cpp
index 525df7a..708c125 100644
--- a/src/urlbar/sslwidget.cpp
+++ b/src/urlbar/sslwidget.cpp
@@ -81,7 +81,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, \
QWidget *parent)  label->setWordWrap(true);
     if (cert.isNull())
     {
-        label->setText(i18n("Warning: this site is NOT carrying a certificate!"));
+        label->setText(i18n("Warning: this site is NOT carrying a certificate."));
         imageLabel->setPixmap(KIcon("security-low").pixmap(32));
         layout->addWidget(label, rows++, 1);
     }
@@ -103,7 +103,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, \
QWidget *parent)  }
             c += QL1S("</ul>");
 
-            label->setText(i18n("The certificate for this site is NOT valid, for the \
following reasons:\n%1", c)); +            label->setText(i18n("The certificate for \
this site is NOT valid, for the following reasons:\n%1.", c));  \
label->setTextFormat(Qt::RichText);  \
imageLabel->setPixmap(KIcon("security-low").pixmap(32));  }
@@ -112,7 +112,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, \
QWidget *parent)  
         label = new QLabel(this);
         label->setWordWrap(true);
-        label->setText("<a href=\"moresslinfos\">Certificate Information</a>");
+        label->setText(QL1S("\"<a href=\"moresslinfos\">") + i18n("Certificate \
                Information") + QL1S("</a>"));
         connect(label, SIGNAL(linkActivated(const QString &)), this, \
SLOT(showMoreSslInfos(const QString &)));  layout->addWidget(label, rows++, 1);
     }
@@ -134,7 +134,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, \
QWidget *parent)  {
         label = new QLabel(this);
         label->setWordWrap(true);
-        label->setText(i18n("Your connection to %1 is NOT encrypted!!\n", \
m_url.host())); +        label->setText(i18n("Your connection to %1 is NOT \
encrypted.\n", m_url.host()));  layout->addWidget(label, rows++ , 1);
 
         imageLabel->setPixmap(KIcon("security-low").pixmap(32));
@@ -143,7 +143,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, \
QWidget *parent)  {
         label = new QLabel(this);
         label->setWordWrap(true);
-        label->setText(i18n("Your connection to \"%1\" is encrypted!\n", \
m_url.host())); +        label->setText(i18n("Your connection to \"%1\" is \
encrypted.\n", m_url.host()));  layout->addWidget(label, rows++, 1);
 
         QString vers = m_info.protocol();
@@ -211,12 +211,12 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, \
QWidget *parent)  
     if (firstVisit.visitCount == 1)
     {
-        label->setText(i18n("It is your first time visiting this site!"));
+        label->setText(i18n("It is your first time visiting this site."));
         imageLabel->setPixmap(KIcon("security-medium").pixmap(32));
     }
     else
     {
-        label->setText(i18n("You just visited this site!\nYour first visit was on \
%1.\n", firstVisit.firstDateTimeVisit.toString())); +        label->setText(i18n("You \
just visited this site.\nYour first visit was on %1.\n", \
firstVisit.firstDateTimeVisit.toString()));  \
imageLabel->setPixmap(KIcon("security-high").pixmap(32));  }
     layout->addWidget(label, rows++, 1);


[prev in list] [next in list] [prev in thread] [next in thread]