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

List:       kde-i18n-doc
Subject:    =?utf-8?q?=5Bkdelibs=5D_kdeui/widgets=3A_kdeui=3A_i18n_fixes?=
From:       John Layt <jlayt () kde ! org>
Date:       2011-06-20 23:07:54
Message-ID: 20110620230754.E50B4A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit dd6215c127b4885010e1f00b493cf023fee82ce9 by John Layt.
Committed on 21/06/2011 at 00:27.
Pushed by jlayt into branch 'master'.

kdeui: i18n fixes

Fix inconsistant capitalisation, add contexts.

CCMAIL: kde-i18n-doc@kde.org

M  +3    -3    kdeui/widgets/kdatecombobox.cpp     
M  +4    -4    kdeui/widgets/kdatetimeedit.cpp     
M  +1    -1    kdeui/widgets/ktimecombobox.cpp     

http://commits.kde.org/kdelibs/dd6215c127b4885010e1f00b493cf023fee82ce9

diff --git a/kdeui/widgets/kdatecombobox.cpp b/kdeui/widgets/kdatecombobox.cpp
index 64308e8..b49085b 100644
--- a/kdeui/widgets/kdatecombobox.cpp
+++ b/kdeui/widgets/kdatecombobox.cpp
@@ -142,11 +142,11 @@ void KDateComboBoxPrivate::initDateWidget()
             if (m_dateMap.isEmpty()) {
                 addMenuAction(i18nc("@option next year",  "Next Year" ), \
                m_date.addYears(1).date());
                 addMenuAction(i18nc("@option next month", "Next Month"), \
                m_date.addMonths(1).date());
-                addMenuAction(i18nc("@option next week",  "Next week" ), \
m_date.addDays(m_date.daysInWeek()).date()); +                \
addMenuAction(i18nc("@option next week",  "Next Week" ), \
                m_date.addDays(m_date.daysInWeek()).date());
                 addMenuAction(i18nc("@option tomorrow",   "Tomorrow"  ), \
                m_date.addDays(1).date());
                 addMenuAction(i18nc("@option today",      "Today"     ), \
                m_date.date());
                 addMenuAction(i18nc("@option yesterday",  "Yesterday" ), \
                m_date.addDays(-1).date());
-                addMenuAction(i18nc("@option last week",  "Last week" ), \
m_date.addDays(-m_date.daysInWeek()).date()); +                \
addMenuAction(i18nc("@option last week",  "Last Week" ), \
                m_date.addDays(-m_date.daysInWeek()).date());
                 addMenuAction(i18nc("@option last month", "Last Month"), \
                m_date.addMonths(-1).date());
                 addMenuAction(i18nc("@option last year",  "Last Year" ), \
m_date.addYears(-1).date());  m_dateMenu->addSeparator();
@@ -227,7 +227,7 @@ void KDateComboBoxPrivate::warnDate()
         (m_options &KDateComboBox::WarnOnInvalid) == KDateComboBox::WarnOnInvalid) {
         QString warnMsg;
         if (!m_date.date().isValid()) {
-            warnMsg = i18n("The date you entered is invalid");
+            warnMsg = i18nc("@info", "The date you entered is invalid");
         } else if (m_date.date() < m_minDate) {
             if (m_minWarnMsg.isEmpty()) {
                 warnMsg = i18nc("@info", "Date cannot be earlier than %1", \
                formatDate(m_minDate));
diff --git a/kdeui/widgets/kdatetimeedit.cpp b/kdeui/widgets/kdatetimeedit.cpp
index a1d3cec..f86d37f 100644
--- a/kdeui/widgets/kdatetimeedit.cpp
+++ b/kdeui/widgets/kdatetimeedit.cpp
@@ -192,8 +192,8 @@ void KDateTimeEditPrivate::initTimeSpecWidget()
 {
     ui.m_timeSpecCombo->blockSignals(true);
     ui.m_timeSpecCombo->clear();
-    ui.m_timeSpecCombo->addItem(i18n("UTC"), "UTC");
-    ui.m_timeSpecCombo->addItem(i18n("Floating"), "Floating");
+    ui.m_timeSpecCombo->addItem(i18nc("UTC time zone", "UTC"), "UTC");
+    ui.m_timeSpecCombo->addItem(i18nc("No specific time zone", "Floating"), \
"Floating");  QStringList keys = m_zones.keys();
     QMap<QString, QString> names;
     foreach (const QString &key, keys) {
@@ -240,7 +240,7 @@ void KDateTimeEditPrivate::warnDateTime()
             if (m_minWarnMsg.isEmpty()) {
                 //TODO Add datetime to string
                 //warnMsg = i18nc("@info", "Date and time cannot be earlier than \
                %1", formatDate(m_minDate));
-                warnMsg = i18n("The entered date and time is before the minimum \
allowed date and time."); +                warnMsg = i18nc("@info", "The entered date \
and time is before the minimum allowed date and time.");  } else {
                 warnMsg = m_minWarnMsg;
                 //TODO localize properly
@@ -250,7 +250,7 @@ void KDateTimeEditPrivate::warnDateTime()
             if (m_maxWarnMsg.isEmpty()) {
                 //TODO Add datetime to string
                 //warnMsg = i18nc("@info", "Date cannot be later than %1", \
                formatDate(m_maxDate));
-                warnMsg = i18n("The entered date and time is after the maximum \
allowed date and time."); +                warnMsg = i18nc("@info", "The entered date \
and time is after the maximum allowed date and time.");  } else {
                 warnMsg = m_maxWarnMsg;
                 warnMsg.replace("%1", \
                KGlobal::locale()->formatDateTime(m_maxDateTime));
diff --git a/kdeui/widgets/ktimecombobox.cpp b/kdeui/widgets/ktimecombobox.cpp
index 2da5ab1..779c9ff 100644
--- a/kdeui/widgets/ktimecombobox.cpp
+++ b/kdeui/widgets/ktimecombobox.cpp
@@ -256,7 +256,7 @@ void KTimeComboBoxPrivate::warnTime()
         (m_options &KTimeComboBox::WarnOnInvalid) == KTimeComboBox::WarnOnInvalid) {
         QString warnMsg;
         if (!m_time.isValid()) {
-            warnMsg = i18n("The time you entered is invalid");
+            warnMsg = i18nc("@info", "The time you entered is invalid");
         } else if (m_time < m_minTime) {
             if (m_minWarnMsg.isEmpty()) {
                 warnMsg = i18nc("@info", "Time cannot be earlier than %1", \
formatTime(m_minTime));


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