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

List:       kde-i18n-doc
Subject:    KDE/kdepimlibs
From:       David Jarvie <djarvie () kde ! org>
Date:       2010-06-06 19:18:27
Message-ID: 20100606191827.5AE65AC8CC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1135196 by djarvie:

Fix typos, spelling, grammar

CCMAIL:kde-i18n-doc@kde.org


 M  +1 -1      akonadi/agentinstancecreatejob.cpp  
 M  +4 -8      akonadi/contact/actions/contactactionssettings.kcfg  
 M  +1 -1      akonadi/contact/actions/qskypedialer.cpp  
 U             akonadi/contact/contactgroupmodel.cpp  
 M  +1 -1      kabc/plugins/file/resourcefile.cpp  
 M  +1 -1      kabc/plugins/net/resourcenet.cpp  
 U             kpimutils/email.cpp  
 M  +5 -15     mailtransport/mailtransport.kcfg  


--- trunk/KDE/kdepimlibs/akonadi/agentinstancecreatejob.cpp #1135195:1135196
@@ -80,7 +80,7 @@
           delete agentControlIface;
 
         q->setError( KJob::UserDefinedError );
-        q->setErrorText( i18n( "Unable to access dbus interface of created agent." ) \
); +        q->setErrorText( i18n( "Unable to access D-Bus interface of created \
agent." ) );  q->emitResult();
         return;
       }
--- trunk/KDE/kdepimlibs/akonadi/contact/actions/contactactionssettings.kcfg \
#1135195:1135196 @@ -17,8 +17,7 @@
     </entry>
     <entry type="String" name="AddressUrl">
       <default>http://maps.google.com/maps?f=q&amp;hl=%1&amp;q=%n,%l,%s</default>
-      <whatsthis>This URL defines the website that shall be used to show a contact's
-                 postal address.</whatsthis>
+      <whatsthis>This URL defines the website that shall be used to show a contact's \
postal address.</whatsthis>  <tooltip>The following placeholders can be used in the \
URL:  %s: Street
    %r: Region
@@ -28,8 +27,7 @@
     </entry>
     <entry type="String" name="AddressCommand">
       <label>Address Command</label>
-      <whatsthis>This command defines the application that shall be executed to show \
                a contact's
-                 postal address.</whatsthis>
+      <whatsthis>This command defines the application that shall be executed to show \
a contact's postal address.</whatsthis>  <tooltip>The following placeholders can be \
used in the command:  %s: Street
    %r: Region
@@ -50,12 +48,10 @@
     </entry>
     <entry type="String" name="PhoneCommand">
       <label>Phone Command</label>
-      <whatsthis>This command defines the application that shall be executed to dial \
                a contact's
-                 phone number.</whatsthis>
+      <whatsthis>This command defines the application that shall be executed to dial \
a contact's phone number.</whatsthis>  <tooltip>The following placeholders can be \
used in the command:  %N: The raw number as stored in the address book.
-   %n: The normalized number with all non-digit characters removed.
-      </tooltip>
+   %n: The normalized number with all non-digit characters removed.</tooltip>
     </entry>
   </group>
 
--- trunk/KDE/kdepimlibs/akonadi/contact/actions/qskypedialer.cpp #1135195:1135196
@@ -91,7 +91,7 @@
   if ( !interface->isValid() ) {
     delete interface;
 
-    mErrorMessage = i18n( "Skype Public API (DBus) seems to be disabled." );
+    mErrorMessage = i18n( "Skype Public API (D-Bus) seems to be disabled." );
     return false;
   }
 
--- trunk/KDE/kdepimlibs/kabc/plugins/file/resourcefile.cpp #1135195:1135196
@@ -213,7 +213,7 @@
   }
 
   if ( !clearAndLoad( &file ) ) {
-      addressBook()->error( i18n( "Problems during parsing file '%1'.", mFileName ) \
); +      addressBook()->error( i18n( "Problems parsing file '%1'.", mFileName ) );
     return false;
   }
 
--- trunk/KDE/kdepimlibs/kabc/plugins/net/resourcenet.cpp #1135195:1135196
@@ -156,7 +156,7 @@
 
   bool result = clearAndLoad( &file );
   if ( !result ) {
-    addressBook()->error( i18n( "Problems during parsing file '%1'.", tempFile ) );
+    addressBook()->error( i18n( "Problems parsing file '%1'.", tempFile ) );
   }
 
   KIO::NetAccess::removeTempFile( tempFile );
--- trunk/KDE/kdepimlibs/mailtransport/mailtransport.kcfg #1135195:1135196
@@ -47,28 +47,18 @@
     </entry>
     <entry name="precommand" type="String">
       <label>Command to execute before sending a mail</label>
-      <whatsthis>
-        A command to run locally, prior to sending email.
-        This can be used to set up SSH tunnels, for example.
-        Leave it empty if no command should be run.
-      </whatsthis>
+      <whatsthis>A command to run locally, prior to sending email. This can be used \
to set up SSH tunnels, for example. Leave it empty if no command should be \
run.</whatsthis>  </entry>
     <entry name="requiresAuthentication" type="Bool" key="auth">
       <label>Server requires authentication</label>
-      <whatsthis>
-        Check this option if your SMTP server requires authentication before \
                accepting mail.
-        This is known as 'Authenticated SMTP' or simply ASMTP.
-      </whatsthis>
+      <whatsthis>Check this option if your SMTP server requires authentication \
before accepting mail. This is known as 'Authenticated SMTP' or simply \
ASMTP.</whatsthis>  <default>false</default>
     </entry>
     <entry name="storePassword" type="Bool" key="storepass">
       <label>Store password</label>
-      <whatsthis>
-        Check this option to have your password stored.
-        If KWallet is available the password will be stored there which is \
                considered safe.
-        However, if KWallet is not available, the password will be stored in the \
                configuration file.
-        The password is stored in an obfuscated format, but should not be considered \
                secure from decryption efforts if access to the configuration file is \
                obtained.
-      </whatsthis>
+      <whatsthis>Check this option to have your password stored.
+If KWallet is available the password will be stored there, which is considered safe.
+However, if KWallet is not available, the password will be stored in the \
configuration file. The password is stored in an obfuscated format, but should not be \
considered secure from decryption efforts if access to the configuration file is \
obtained.</whatsthis>  <default>false</default>
     </entry>
     <entry name="encryption" type="Enum">


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

Configure | About | News | Add a list | Sponsored by KoreLogic