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

List:       kde-commits
Subject:    [kdepim] /: Improve UI messages for archiving a bit
From:       Lasse Liehu <lasse.liehu () gmail ! com>
Date:       2013-11-24 17:56:34
Message-ID: E1Vkdv8-0004pI-72 () scm ! kde ! org
[Download RAW message or body]

Git commit 44c492319692f3e50d28300d648005ca04e1725d by Lasse Liehu.
Committed on 24/11/2013 at 17:55.
Pushed by lliehu into branch 'master'.

Improve UI messages for archiving a bit

REVIEW: 113906

M  +1    -1    agents/folderarchiveagent/folderarchiveagentjob.cpp
M  +10   -5    agents/folderarchiveagent/folderarchivesettingpage.cpp
M  +2    -2    kmail/dialog/archivefolderdialog.cpp
M  +1    -1    kmail/kmmainwidget.cpp
M  +1    -1    kmail/messageactions.cpp

http://commits.kde.org/kdepim/44c492319692f3e50d28300d648005ca04e1725d

diff --git a/agents/folderarchiveagent/folderarchiveagentjob.cpp \
b/agents/folderarchiveagent/folderarchiveagentjob.cpp index 3292f4c..b7d6fdb 100644
--- a/agents/folderarchiveagent/folderarchiveagentjob.cpp
+++ b/agents/folderarchiveagent/folderarchiveagentjob.cpp
@@ -46,7 +46,7 @@ void FolderArchiveAgentJob::start()
         return;
     }
     if (mLstItem.isEmpty()) {
-        sendError(i18n("Any message selected."));
+        sendError(i18n("No messages selected."));
         return;
     }
 
diff --git a/agents/folderarchiveagent/folderarchivesettingpage.cpp \
b/agents/folderarchiveagent/folderarchivesettingpage.cpp index 11be63f..df271f9 \
                100644
--- a/agents/folderarchiveagent/folderarchivesettingpage.cpp
+++ b/agents/folderarchiveagent/folderarchivesettingpage.cpp
@@ -42,9 +42,12 @@ FolderArchiveComboBox::~FolderArchiveComboBox()
 
 void FolderArchiveComboBox::initialize()
 {
-    addItem(i18n("Unique folder"), FolderArchiveAccountInfo::UniqueFolder);
-    addItem(i18n("Folder by months"), FolderArchiveAccountInfo::FolderByMonths);
-    addItem(i18n("Folder by years"), FolderArchiveAccountInfo::FolderByYears);
+    addItem(i18nc("@item:inlistbox for option \"Archive folder name\"", "Unique"),
+            FolderArchiveAccountInfo::UniqueFolder);
+    addItem(i18nc("@item:inlistbox for option \"Archive folder name\"", "Month and \
year"), +            FolderArchiveAccountInfo::FolderByMonths);
+    addItem(i18nc("@item:inlistbox for option \"Archive folder name\"", "Year"),
+            FolderArchiveAccountInfo::FolderByYears);
 }
 
 void FolderArchiveComboBox::setType(FolderArchiveAccountInfo::FolderArchiveType \
type) @@ -73,14 +76,16 @@ FolderArchiveSettingPage::FolderArchiveSettingPage(const \
QString &instanceName,  lay->addWidget(mEnabled);
 
     QHBoxLayout *hbox = new QHBoxLayout;
-    QLabel *lab = new QLabel(i18n("Archive folder:"));
+    QLabel *lab = new QLabel(i18nc(
+        "@label:chooser for the folder that messages will be archived under",
+        "Archive into:"));
     hbox->addWidget(lab);
     mArchiveFolder = new MailCommon::FolderRequester;
     hbox->addWidget(mArchiveFolder);
     lay->addLayout(hbox);
 
     hbox = new QHBoxLayout;
-    lab = new QLabel(i18n("Archive folder named:"));
+    lab = new QLabel(i18nc("@label:listbox", "Archive folder name:"));
     hbox->addWidget(lab);
     mArchiveNamed = new FolderArchiveComboBox;
     hbox->addWidget(mArchiveNamed);
diff --git a/kmail/dialog/archivefolderdialog.cpp \
b/kmail/dialog/archivefolderdialog.cpp index 287d6f8..4cc1374 100644
--- a/kmail/dialog/archivefolderdialog.cpp
+++ b/kmail/dialog/archivefolderdialog.cpp
@@ -54,10 +54,10 @@ ArchiveFolderDialog::ArchiveFolderDialog( QWidget *parent )
     : KDialog( parent ), mParentWidget( parent )
 {
     setObjectName( QLatin1String("archive_folder_dialog") );
-    setCaption( i18n( "Archive Folder" ) );
+    setCaption( i18nc( "@title:window for archiving a folder", "Archive Folder" ) );
     setButtons( Ok|Cancel );
     setDefaultButton( Ok );
-    setButtonText(KDialog::Ok,i18n("Archive"));
+    setButtonText( KDialog::Ok, i18nc( "@action", "Archive" ) );
     setModal( true );
     QWidget *mainWidget = new QWidget( this );
     QGridLayout *mainLayout = new QGridLayout( mainWidget );
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 58aaf41..ce531dd 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -3705,7 +3705,7 @@ void KMMainWidget::setupActions()
              SLOT(slotMoveSelectedMessageToFolder()) );
   }
 
-  mArchiveAction = new KAction( i18n("Archive"), this);
+  mArchiveAction = new KAction( i18nc("@action", "Archive"), this);
   actionCollection()->addAction( QLatin1String("archive_mails"), mArchiveAction );
   connect( mArchiveAction, SIGNAL(triggered(bool)),
            SLOT(slotArchiveMails()) );
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index 9b5d061..b9f272c 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -130,7 +130,7 @@ MessageActions::MessageActions( KActionCollection *ac, QWidget \
*parent )  mKorganizerIsOnSystem = \
!KStandardDirs::findExe(QLatin1String("korganizer")).isEmpty();  \
mCreateTodoAction->setEnabled( mKorganizerIsOnSystem );  
-  mArchiveMailAction = new KAction(i18n("Archive"), this);
+  mArchiveMailAction = new KAction(i18nc("@action", "Archive"), this);
   ac->addAction(QLatin1String("archive_mail"), mArchiveMailAction );
   connect(mArchiveMailAction, SIGNAL(triggered(bool)), SLOT(slotArchiveMail()));
 


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