SVN_MERGE

Merged revisions 1033276,1033284,1033290-1033297,1033299,1033326,1033332,1033340,1033376,1033438,1033489,1033595,1033690,1033723,1033732,1033736,1033749,1033794,1033828,1033871,1033880,1033892,1033905,1033915-1033916,1033926,1033930,1033937,1033942,1033945,1034062,1034070,1034077,1034083,1034085,1034087,1034090,1034092-1034093,1034095,1034097,1034104-1034108,1034110-1034111,1034268,1034274-1034275,1034285,1034311,1034323,1034325,1034336-1034337 via svnmerge from https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim ................ r1033276 | tmcguire | 2009-10-09 22:40:00 +0200 (Fri, 09 Oct 2009) | 20 lines No such foldertree here. SYN_SILENT SVN_MERGE Blocked revisions 1032375 via svnmerge ................ r1032375 | winterz | 2009-10-07 18:53:43 +0200 (Wed, 07 Oct 2009) | 11 lines Merged revisions 1032272 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1032272 | tmcguire | 2009-10-07 09:03:53 -0400 (Wed, 07 Oct 2009) | 4 lines warnings-- I'll also use -Wno-deprecated and Wno-ignored-qualifiers to get rid of the other warnings from kdelibs. ........ ................ ................ r1033284 | mlaurent | 2009-10-09 22:57:59 +0200 (Fri, 09 Oct 2009) | 2 lines Fix typo ................ r1033290 | tmcguire | 2009-10-09 23:06:32 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1031559 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r1031559 | mutz | 2009-10-05 14:53:51 +0200 (Mon, 05 Oct 2009) | 1 line AdvancedSettingsDialog: Mr. ElGamal is now written Elgamal ........ SVN_MERGE ................ r1033291 | tmcguire | 2009-10-09 23:07:03 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1031803 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r1031803 | mutz | 2009-10-06 09:04:59 +0200 (Tue, 06 Oct 2009) | 1 line This is going to be Kleopatra 2.0.12 ........ SVN_MERGE ................ r1033292 | tmcguire | 2009-10-09 23:07:38 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1031823 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r1031823 | mutz | 2009-10-06 10:41:21 +0200 (Tue, 06 Oct 2009) | 1 line AddUserIDCommand: only enable when we have a secret key ........ SVN_MERGE ................ r1033293 | tmcguire | 2009-10-09 23:08:18 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1031860 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r1031860 | mutz | 2009-10-06 12:35:01 +0200 (Tue, 06 Oct 2009) | 1 line AboutGpg4winData: try to read the Gpg4win version from the output of gpgconf --version ........ SVN_MERGE ................ r1033294 | tmcguire | 2009-10-09 23:08:53 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1031875 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r1031875 | mutz | 2009-10-06 13:02:39 +0200 (Tue, 06 Oct 2009) | 1 line LearnCardKeysCommand: Fix command line for gpg ........ SVN_MERGE ................ r1033295 | tmcguire | 2009-10-09 23:09:27 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1032208 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r1032208 | mutz | 2009-10-07 11:47:38 +0200 (Wed, 07 Oct 2009) | 1 line MainWindow: suppress kde version and translators tab in the About Gpg4win-dialog (where both would duplicate the information from the About Kleopatra-dialog) ........ SVN_MERGE ................ r1033296 | tmcguire | 2009-10-09 23:09:58 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1032210 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r1032210 | mutz | 2009-10-07 11:53:07 +0200 (Wed, 07 Oct 2009) | 1 line MainWindow: only include "About Gpg4win" on Windows ........ SVN_MERGE ................ r1033297 | tmcguire | 2009-10-09 23:10:28 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1032276 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r1032276 | mutz | 2009-10-07 15:17:24 +0200 (Wed, 07 Oct 2009) | 1 line SysTrayIcon: disable whole smartcard-submenu when none of the child actions are enabled ........ SVN_MERGE ................ r1033299 | tmcguire | 2009-10-09 23:11:01 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1032292 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r1032292 | mutz | 2009-10-07 15:51:40 +0200 (Wed, 07 Oct 2009) | 1 line SysTrayIcon: make it clear that we only support NetKey v3 cards (so far) ........ SVN_MERGE ................ r1033326 | djarvie | 2009-10-09 23:56:21 +0200 (Fri, 09 Oct 2009) | 2 lines Ensure all-day is set consistently for recurrences ................ r1033332 | djarvie | 2009-10-10 00:05:41 +0200 (Sat, 10 Oct 2009) | 1 line Nitpick ................ r1033340 | momeny | 2009-10-10 00:19:35 +0200 (Sat, 10 Oct 2009) | 1 line A little improvement on Editor! And better detection of textCharFormat change to sync toolbar with text! ................ r1033376 | djarvie | 2009-10-10 01:55:29 +0200 (Sat, 10 Oct 2009) | 1 line Don't waste processing time calculating next trigger time for archived alarms ................ r1033438 | sengels | 2009-10-10 12:27:30 +0200 (Sat, 10 Oct 2009) | 1 line we do not need an export for templates ................ r1033489 | tstaerk | 2009-10-10 13:47:32 +0200 (Sat, 10 Oct 2009) | 4 lines Remove memory leak. BUGS:209674 ................ r1033595 | scripty | 2009-10-10 16:26:55 +0200 (Sat, 10 Oct 2009) | 1 line SVN_SILENT made messages (.desktop file) ................ r1033690 | coles | 2009-10-10 21:39:14 +0200 (Sat, 10 Oct 2009) | 6 lines Minor proof-reading changes: - don't -> do not, for consistency with rest of KDE; - the two messages referring to 'not yet completed' now have consistent form. ................ r1033723 | coles | 2009-10-10 23:29:54 +0200 (Sat, 10 Oct 2009) | 6 lines Minor proof-reading changes. (Note that a 'LDAP' was changed to 'an LDAP' as 'ell-DAP' or 'ell-dee-ay-pee' begin with vowel sounds.) ................ r1033732 | djarvie | 2009-10-10 23:55:09 +0200 (Sat, 10 Oct 2009) | 2 lines Fix whatsthis not appearing ................ r1033736 | coles | 2009-10-11 00:15:44 +0200 (Sun, 11 Oct 2009) | 3 lines Proof-reading, and correcting a few plural-form uses (or rather the lack thereof). ................ r1033749 | djarvie | 2009-10-11 00:55:33 +0200 (Sun, 11 Oct 2009) | 2 lines Encapsulate sub-repetitions in new Repetition class ................ r1033794 | cfeck | 2009-10-11 07:17:05 +0200 (Sun, 11 Oct 2009) | 9 lines Do not use add_subdirectory() when there is no CMakeLists.txt Volker, I disabled examples from kdepim/CMakeLists.txt, because I was not sure if the missing examples/CMakeLists.txt was intended to not build the examples. Please uncomment/revert to build them. CCMAIL: vkrause@kde.org CCMAIL: neundorf@kde.org ................ r1033828 | scripty | 2009-10-11 11:43:34 +0200 (Sun, 11 Oct 2009) | 1 line SVN_SILENT made messages (.desktop file) ................ r1033871 | winterz | 2009-10-11 14:49:49 +0200 (Sun, 11 Oct 2009) | 3 lines New feature: show events from my calendar only MERGE: none ................ r1033880 | winterz | 2009-10-11 15:18:38 +0200 (Sun, 11 Oct 2009) | 3 lines CamelCase headers cleanup unused headers, forward class declarations, and namespaces ................ r1033892 | winterz | 2009-10-11 15:39:35 +0200 (Sun, 11 Oct 2009) | 4 lines full tooltips and whatsthis MERGE: none DO_NOT_BACKPORT: new i18n strings ................ r1033905 | winterz | 2009-10-11 16:34:41 +0200 (Sun, 11 Oct 2009) | 4 lines CamelCase headers cleanup unused headers, forward class declarations MERGE: none ................ r1033915 | winterz | 2009-10-11 17:18:33 +0200 (Sun, 11 Oct 2009) | 4 lines helpText for actions. MERGE: none DO_NOT_BACKPORT: new i18n strings ................ r1033916 | winterz | 2009-10-11 17:19:18 +0200 (Sun, 11 Oct 2009) | 3 lines update my copyright years SVN_SILENT: ................ r1033926 | winterz | 2009-10-11 17:46:57 +0200 (Sun, 11 Oct 2009) | 4 lines CamelCase headers cleanup unused headers and forward class declarations MERGE: none ................ r1033930 | winterz | 2009-10-11 17:52:34 +0200 (Sun, 11 Oct 2009) | 3 lines minor coding style SVN_SILENT: ................ r1033937 | djarvie | 2009-10-11 18:07:24 +0200 (Sun, 11 Oct 2009) | 2 lines Remove dependency on kalocale.h ................ r1033942 | winterz | 2009-10-11 18:12:54 +0200 (Sun, 11 Oct 2009) | 4 lines full tooltips and whatsthis MERGE: none DO_NOT_BACKPORT: new i18n strings ................ r1033945 | djarvie | 2009-10-11 18:29:25 +0200 (Sun, 11 Oct 2009) | 2 lines Fix operator==() and operator!=() ................ r1034062 | winterz | 2009-10-11 23:11:32 +0200 (Sun, 11 Oct 2009) | 4 lines CamelCase headers cleanup unused headers and forward class declarations. MERGE: none ................ r1034070 | winterz | 2009-10-11 23:24:15 +0200 (Sun, 11 Oct 2009) | 4 lines full tooltips, whatsthis and helptext MERGE: none DO_NOT_BACKPORT: new i18n strings ................ r1034077 | mkoller | 2009-10-11 23:50:43 +0200 (Sun, 11 Oct 2009) | 4 lines BUG: 160215 On smart-reply, use the ReplyAll template only when it's a reply to a mailing list ................ r1034083 | winterz | 2009-10-12 00:23:57 +0200 (Mon, 12 Oct 2009) | 4 lines CamelCase headers cleanup unused headers and forward class declarations. MERGE: none ................ r1034085 | winterz | 2009-10-12 00:35:42 +0200 (Mon, 12 Oct 2009) | 4 lines full tooltip, whatsthis, and help text MERGE: none DO_NOT_BACKPORT: new i18n strings ................ r1034087 | winterz | 2009-10-12 00:46:58 +0200 (Mon, 12 Oct 2009) | 2 lines --deprecated ................ r1034090 | winterz | 2009-10-12 00:51:26 +0200 (Mon, 12 Oct 2009) | 4 lines QTextEdit -> KTextEdit MERGE: none ................ r1034092 | winterz | 2009-10-12 01:01:35 +0200 (Mon, 12 Oct 2009) | 4 lines CamelCase headers cleanup unused headers MERGE: none ................ r1034093 | winterz | 2009-10-12 01:02:57 +0200 (Mon, 12 Oct 2009) | 4 lines add helptext to the New action MERGE: none DO_NOT_BACKPORT: new i18n string ................ r1034095 | winterz | 2009-10-12 01:08:33 +0200 (Mon, 12 Oct 2009) | 4 lines CamelCase headers remove unused headers MERGE: none ................ r1034097 | winterz | 2009-10-12 01:11:08 +0200 (Mon, 12 Oct 2009) | 3 lines minor coding style fixes SVN_SILENT: ................ r1034104 | winterz | 2009-10-12 01:37:38 +0200 (Mon, 12 Oct 2009) | 4 lines help text MERGE: none DO_NOT_BACKPORT: new i18n strings ................ r1034105 | winterz | 2009-10-12 01:42:17 +0200 (Mon, 12 Oct 2009) | 4 lines CamelCase headers remove unused headers MERGE: none ................ r1034106 | winterz | 2009-10-12 01:44:41 +0200 (Mon, 12 Oct 2009) | 4 lines help text for the New Page and New Book actions MERGE: none DO_NOT_BACKPORT: new i18n strings ................ r1034107 | winterz | 2009-10-12 01:50:09 +0200 (Mon, 12 Oct 2009) | 3 lines CamelCase headers remove unused headers ................ r1034108 | winterz | 2009-10-12 01:51:25 +0200 (Mon, 12 Oct 2009) | 4 lines add a help text for the New Article action MERGE: none DO_NOT_BACKPORT: new i18n string ................ r1034110 | winterz | 2009-10-12 01:56:10 +0200 (Mon, 12 Oct 2009) | 4 lines CamelCase headers remove unused headers MERGE: none ................ r1034111 | winterz | 2009-10-12 01:58:04 +0200 (Mon, 12 Oct 2009) | 4 lines add help text for New Task MERGE: none DO_NOT_BACKPORT: new i18n string ................ r1034268 | winterz | 2009-10-12 12:50:27 +0200 (Mon, 12 Oct 2009) | 2 lines tell Krazy to look for more stuff as this is shiny new code. ................ r1034274 | vkrause | 2009-10-12 13:17:12 +0200 (Mon, 12 Oct 2009) | 2 lines Make sure new tags have a useful label. ................ r1034275 | vkrause | 2009-10-12 13:17:58 +0200 (Mon, 12 Oct 2009) | 2 lines Move clients/kabc to examples as well and re-enable compilation of them. ................ r1034285 | winterz | 2009-10-12 13:37:23 +0200 (Mon, 12 Oct 2009) | 2 lines the kabc subdir is gone ................ r1034311 | skelly | 2009-10-12 14:40:17 +0200 (Mon, 12 Oct 2009) | 1 line Use the move actions in akonadi console. ................ r1034323 | coles | 2009-10-12 15:06:21 +0200 (Mon, 12 Oct 2009) | 5 lines A couple of minor typo corrections. SVN_SILENT ................ r1034325 | coles | 2009-10-12 15:09:37 +0200 (Mon, 12 Oct 2009) | 4 lines Minor proof-reading. Couldn't -> Could not for consistency with rest of KDE, and hyphenated Server-Side. ................ r1034336 | coles | 2009-10-12 15:30:52 +0200 (Mon, 12 Oct 2009) | 3 lines Minor proof-reading changes. ................ r1034337 | coles | 2009-10-12 15:36:35 +0200 (Mon, 12 Oct 2009) | 3 lines Proof-reading messages. ................ svn path=/branches/work/akonadi-ports/kdepim/; revision=1034401
17 years ago · 3130f917f9
parent 19379a4dd2 ae7d2ee166
commit 3130f917f9
9 changed files with 19 additions and 15 deletions
--- a/callback.cpp
+++ b/callback.cpp
@ -75,10 +75,10 @@ QString Callback::askForTransport( bool nullIdentity ) const

  QString text;
  if ( nullIdentity )
-    text = i18n( "<qt>The receiver of this invitation doesn't match any of your identities.<br>"
+    text = i18n( "<qt>The receiver of this invitation does not match any of your identities.<br>"
                 "Please select the transport which should be used to send your reply.</qt>" );
  else
-    text = i18n( "<qt>The identity matching the receiver of this invitation doesn't have an "
+    text = i18n( "<qt>The identity matching the receiver of this invitation does not have an "
                 "associated transport configured.<br>"
                 "Please select the transport which should be used to send your reply.</qt>");
  bool ok;
--- a/kmail.kcfg.cmake
+++ b/kmail.kcfg.cmake
@ -152,7 +152,7 @@
      <entry name="MaildirFilenameSeparator" type="String">
        <label>
          The filename separator for maildir files "uniq:info" - see the original maildir specification at http://cr.yp.to/proto/maildir.html
-          The default depends on the OS we're currently on. WIN='!', all others ':'.
+          The default depends on the current operating system. WIN='!', all others ':'.
        </label>
        <default>${MAILDIR_FILENAME_SEPARATOR}</default>
      </entry>
@ -307,7 +307,7 @@
      </entry>
      <entry name="AllowSemicolonAsAddressSeparator" type="Bool">
        <default>${ALLOW_SEMICOLON_AS_ADDRESS_SEPARATOR_DEFAULT}</default>
-        <label>Allow the semicolon charactor (';') to be used as separator in the message composer.</label>
+        <label>Allow the semicolon character (';') to be used as separator in the message composer.</label>
      </entry>
      <entry name="ForceReplyCharset" type="Bool" key="force-reply-charset">
        <label>Keep original charset when replying or forwarding if possible</label>
--- a/kmail.notifyrc
+++ b/kmail.notifyrc
@ -61,6 +61,7 @@ Comment[zh_TW]=KMail 郵件軟體

 [Event/mail-check-error]
 Name=Error While Checking Mail
+Name[en_GB]=Error While Checking Mail
 Name[es]=Error al comprobar el correo
 Name[gl]=Produciuse un erro ao comprobar o correo
 Name[nb]=Feil under sjekking av e-post
@ -75,6 +76,7 @@ Name[uk]=Помилка під час спроби отримання пошти
 Name[x-test]=xxError While Checking Mailxx
 Name[zh_TW]=檢查郵件時發生錯誤
 Comment=There was an error while checking for new mail
+Comment[en_GB]=There was an error while checking for new mail
 Comment[es]=Ha ocurrido un error mientras se comprobaba el correo nuevo
 Comment[gl]=Aconteceu un erro cando se comprobaba o correo novo
 Comment[nb]=Det oppsto en feil mens det ble sett etter ny e-post
--- a/kmfilteraction.cpp
+++ b/kmfilteraction.cpp
@ -2239,11 +2239,11 @@ KMFilterAction::ReturnCode KMFilterActionAddToAddressBook::process( KMMessage* m
    }

    if ( !ab->save( ticket ) ) {
-      ab->error( i18n( "Can't save new addresses to address book." ) );
+      ab->error( i18n( "Cannot save new addresses to address book." ) );
      return ErrorButGoOn;
    }
  } else {
-    ab->error( i18n( "Can't save to address book. Address book is locked." ) );
+    ab->error( i18n( "Cannot save to address book: address book is locked." ) );
    return ErrorButGoOn;
  }

@ -2267,13 +2267,13 @@ QWidget* KMFilterActionAddToAddressBook::createParamWidget( QWidget* parent ) co
  le->setObjectName( "ledit" );
  gridlayout->addWidget( le, 0, 2 );

-  l = new QLabel( i18n( "in addressbook" ), w );
+  l = new QLabel( i18n( "in address book" ), w );
  gridlayout->addWidget( l, 1, 1 );

  KComboBox *cbAdressBook = new KComboBox( w );
  cbAdressBook->setObjectName( "AddressBookCombo" );
-  cbAdressBook->setToolTip( i18n( "<p>This defines the preferred addressbook.<br />"
-        "If it is not accessible, the filter will fallback to the default addressbook.</p>" ) );
+  cbAdressBook->setToolTip( i18n( "<p>This defines the preferred address book.<br />"
+        "If it is not accessible, the filter will fallback to the default address book.</p>" ) );
  cbAdressBook->setInsertPolicy( QComboBox::InsertAtBottom );
  gridlayout->addWidget( cbAdressBook, 1, 2 );

--- a/kmfolderdialog.cpp
+++ b/kmfolderdialog.cpp
@ -442,8 +442,8 @@ KMail::FolderDialogGeneralTab::FolderDialogGeneralTab( KMFolderDialog* dlg,
  mHideInSelectionDialogCheckBox =
      new QCheckBox( i18n( "Hide this folder in the folder selection dialog" ), this );
  mHideInSelectionDialogCheckBox->setWhatsThis(
-                  i18nc( "@info:whatsthis", "Check this option if you do not want that this folder "
-                         "is shown in the folder selection dialogs, like the <interface>"
+                  i18nc( "@info:whatsthis", "Check this option if you do not want this folder "
+                         "to be shown in folder selection dialogs, such as the <interface>"
                          "Jump to Folder</interface> dialog." ) );
  hbl->addWidget( mHideInSelectionDialogCheckBox );
  hbl->addStretch( 1 );
--- a/kmmessage.cpp
+++ b/kmmessage.cpp
@ -618,8 +618,10 @@ KMMessage* KMMessage::createReply( ReplyStrategy replyStrategy,
      toStr = headerField( "Mail-Followup-To" );
    }
    else if ( !replyToStr.isEmpty() ) {
-      // assume a Reply-To header mangling mailing list
      toStr = replyToStr;
+      // use the ReplyAll template only when it's a reply to a mailing list
+      if ( mailingListAddresses.isEmpty() )
+        replyAll = false;
    }
    else if ( !mailingListAddresses.isEmpty() ) {
      toStr = mailingListAddresses[0];
--- a/ui/accountspagereceivingtab.ui
+++ b/ui/accountspagereceivingtab.ui
@ -122,7 +122,7 @@
           </sizepolicy>
          </property>
          <property name="toolTip">
-           <string>Show for each  folder the number of newly arrived messages</string>
+           <string>Show for each folder the number of newly arrived messages</string>
          </property>
          <property name="text">
           <string>Deta&amp;iled new mail notification</string>
--- a/ui/imapsettings.ui
+++ b/ui/imapsettings.ui
@ -258,7 +258,7 @@ However, if KWallet is not available, the password will be stored in KMail's con
       <item>
        <widget class="QCheckBox" name="subscribedFoldersCheck">
         <property name="text">
-          <string>Show only serverside s&amp;ubscribed folders</string>
+          <string>Show only server-side s&amp;ubscribed folders</string>
         </property>
        </widget>
       </item>
--- a/util.cpp
+++ b/util.cpp
@ -140,7 +140,7 @@ bool KMail::Util::validateAddresses( QWidget *parent, const QString &addresses )
    KPIMUtils::isValidAddressList( StringUtil::expandAliases( addresses,distributionListEmpty ),
                                   brokenAddress );
  if ( !distributionListEmpty.isEmpty() ) {
-    QString errorMsg = i18n( "Distribution list \"%1\" is empty. You can not use it.", distributionListEmpty.join( ", " ) );
+    QString errorMsg = i18n( "Distribution list \"%1\" is empty, it cannot be used.", distributionListEmpty.join( ", " ) );
    KMessageBox::sorry( parent , errorMsg, i18n("Invalid Email Address") );
    return false;
  }