[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/akonadi/resources
From: Andrew Coles <andrew_coles () yahoo ! co ! uk>
Date: 2009-04-05 13:07:02
Message-ID: 1238936822.027012.14647.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 949509 by coles:
Proof-reading.
M +6 -6 distlist/distlistresource.cpp
M +1 -1 distlist/distlistresource.kcfg
M +5 -5 ical/icalresource.cpp
M +3 -3 kabc/kresourceassistant.cpp
M +2 -2 maildir/maildirresource.cpp
M +1 -1 nntp/nntpresource.kcfg
M +1 -1 openchange/profileeditdialog.cpp
M +1 -1 shared/singlefileresourcebase.cpp
M +3 -3 shared/singlefileresourceconfigdialog.ui
M +2 -2 vcard/vcardresource.cpp
M +2 -2 vcarddir/settingsdialog.ui
--- trunk/KDE/kdepim/akonadi/resources/distlist/distlistresource.cpp #949508:949509
@@ -51,8 +51,8 @@
void DistListResource::configure( WId windowId )
{
SingleFileResourceConfigDialog<Settings> dlg( windowId );
- dlg.setFilter( "*.distlist|" + i18nc("Filedialog filter for *.distlist", \
"Distributionlist File" ) );
- dlg.setCaption( i18n("Select Distributionlist File") );
+ dlg.setFilter( "*.distlist|" + i18nc("Filedialog filter for *.distlist", \
"Distribution List File" ) ); + dlg.setCaption( i18n("Select Distribution List \
File") ); if ( dlg.exec() == QDialog::Accepted ) {
reloadFile();
}
@@ -100,7 +100,7 @@
QFile file( KUrl( fileName ).path() );
if ( !file.open( QIODevice::ReadOnly ) ) {
- emit status( Broken, i18n( "Unable to open distributionlist file '%1'.", \
fileName ) ); + emit status( Broken, i18n( "Unable to open distribution list file \
'%1'.", fileName ) ); return false;
}
@@ -171,7 +171,7 @@
{
QFile file( fileName );
if ( !file.open( QIODevice::WriteOnly ) ) {
- emit status( Broken, i18n( "Unable to open distributionlist file '%1'.", \
fileName ) ); + emit status( Broken, i18n( "Unable to open distribution list file \
'%1'.", fileName ) ); return false;
}
@@ -232,7 +232,7 @@
// legacy format only supports ContactGroup::Reference style data
if ( contactGroup.dataCount() > 0 ) {
error( i18nc( "@info:status",
- "Current storage format cannot handle distribution list \
entries for which no address book entry exists" ) ); + "Current \
storage format cannot handle distribution list entries for which no address book \
entry exists." ) ); changeProcessed();
return;
}
@@ -262,7 +262,7 @@
// legacy format only supports ContactGroup::Reference style data
if ( contactGroup.dataCount() > 0 ) {
error( i18nc( "@info:status",
- "Current storage format cannot handle distribution list \
entries for which no address book entry exists" ) ); + "Current \
storage format cannot handle distribution list entries for which no address book \
entry exists." ) ); changeProcessed();
return;
}
--- trunk/KDE/kdepim/akonadi/resources/distlist/distlistresource.kcfg #949508:949509
@@ -6,7 +6,7 @@
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<group name="General">
<entry name="Path" type="Path">
- <label>Path to distributionlist file.</label>
+ <label>Path to distribution list file.</label>
<default></default>
</entry>
<entry name="AutosaveInterval" type="UInt">
--- trunk/KDE/kdepim/akonadi/resources/ical/icalresource.cpp #949508:949509
@@ -74,14 +74,14 @@
kDebug( 5251 ) << "Item:" << item.url();
if ( !mCalendar ) {
- emit error( i18n("Calendar not loaded!") );
+ emit error( i18n("Calendar not loaded.") );
return false;
}
const QString rid = item.remoteId();
IncidencePtr incidence( mCalendar->incidence( rid )->clone() );
if ( !incidence ) {
- emit error( i18n("Incidence with uid '%1' not found!", rid ) );
+ emit error( i18n("Incidence with uid '%1' not found.", rid ) );
return false;
}
@@ -130,7 +130,7 @@
void ICalResource::itemAdded( const Akonadi::Item & item, const Akonadi::Collection& \
) {
if ( !mCalendar ) {
- cancelTask( i18n("Calendar not loaded!") );
+ cancelTask( i18n("Calendar not loaded.") );
return;
}
@@ -152,7 +152,7 @@
Q_UNUSED( parts )
if ( !mCalendar ) {
- cancelTask( i18n("Calendar not loaded!") );
+ cancelTask( i18n("Calendar not loaded.") );
return;
}
@@ -189,7 +189,7 @@
void ICalResource::itemRemoved(const Akonadi::Item & item)
{
if ( !mCalendar ) {
- cancelTask( i18n("Calendar not loaded!") );
+ cancelTask( i18n("Calendar not loaded.") );
return;
}
--- trunk/KDE/kdepim/akonadi/resources/kabc/kresourceassistant.cpp #949508:949509
@@ -53,12 +53,12 @@
"<para>The setup process consists of three steps:</para>"
"<para><list>"
"<item>Step 1: Selecting a plugin suitable for the kind of data "
- "source you want to add</item>"
+ "source you want to add;</item>"
"<item>Step 2: Providing the selected plugin with information on "
- "where to find and how to access the data</item>"
+ "where to find and how to access the data;</item>"
"<item>Step 3: Naming the resulting data source so you can easily "
"identify it in any application presenting you a choice of "
- "which data to process</item></list></para>" );
+ "which data to process.</item></list></para>" );
QLabel *label = new QLabel( this );
label->setWordWrap( true );
--- trunk/KDE/kdepim/akonadi/resources/maildir/maildirresource.cpp #949508:949509
@@ -137,7 +137,7 @@
}
// we can only deal with mail
if ( item.mimeType() != "message/rfc822" ) {
- emit error( i18n("Only email messages can be added to the Maildir resource!") \
); + emit error( i18n("Only email messages can be added to the Maildir \
resource.") ); return;
}
const MessagePtr mail = item.payload<MessagePtr>();
@@ -166,7 +166,7 @@
}
// we can only deal with mail
if ( item.mimeType() != "message/rfc822" ) {
- emit error( i18n("Only email messages can be added to the Maildir \
resource!") ); + emit error( i18n("Only email messages can be added to the \
Maildir resource.") ); return;
}
const MessagePtr mail = item.payload<MessagePtr>();
--- trunk/KDE/kdepim/akonadi/resources/nntp/nntpresource.kcfg #949508:949509
@@ -39,7 +39,7 @@
<default>false</default>
</entry>
<entry name="UserName" type="String">
- <label>User name for login</label>
+ <label>Username for login</label>
<default></default>
</entry>
<entry name="StorePassword" type="Bool">
--- trunk/KDE/kdepim/akonadi/resources/openchange/profileeditdialog.cpp \
#949508:949509 @@ -54,7 +54,7 @@
this, SLOT( checkIfComplete() ) );
mainLayout->addWidget( m_profileNameEdit );
- QLabel *usernameLabel = new QLabel( i18n( "User name" ) );
+ QLabel *usernameLabel = new QLabel( i18n( "Username" ) );
mainLayout->addWidget( usernameLabel );
m_usernameEdit = new QLineEdit();
m_usernameEdit->setText( userName );
--- trunk/KDE/kdepim/akonadi/resources/shared/singlefileresourcebase.cpp \
#949508:949509 @@ -112,7 +112,7 @@
mCurrentUrl = KUrl( lostFoundFileName );
writeFile();
emit warning( i18n( "The file '%1' was changed on disk while there were still \
pending changes in Akonadi. "
- "To avoid dataloss, a backup of the internal changes has been created at \
'%2'.", + "To avoid data loss, a backup of the internal changes has been \
created at '%2'.", prevUrl.prettyUrl(), mCurrentUrl.prettyUrl() ) );
mCurrentUrl = prevUrl;
}
--- trunk/KDE/kdepim/akonadi/resources/shared/singlefileresourceconfigdialog.ui \
#949508:949509 @@ -23,7 +23,7 @@
<item>
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
- <string>File Name</string>
+ <string>Filename</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3" >
<item>
@@ -53,7 +53,7 @@
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
- <string>Select the file which content should be represented by this \
resource. If the file does not exist yet it will be created. You can also specify an \
URL to a remote file, however monitoring the file for changes will not work in this \
case.</string> + <string>Select the file whose contents should be \
represented by this resource. If the file does not exist, it will be created. A URL \
of a remote file can also be specified, but note that monitoring for file changes \
will not work in this case.</string> </property>
<property name="wordWrap" >
<bool>true</bool>
@@ -79,7 +79,7 @@
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
- <string>If you enable the read-only mode no changes will be written to \
the file selected above. Read-only mode will be automatically enabled if you do not \
have write access to the file or the file is on a remote server that does not support \
write access.</string> + <string>If read-only mode is enabled, no changes \
will be written to the file selected above. Read-only mode will be automatically \
enabled if you do not have write access to the file or the file is on a remote server \
that does not support write access.</string> </property>
<property name="wordWrap" >
<bool>true</bool>
--- trunk/KDE/kdepim/akonadi/resources/vcard/vcardresource.cpp #949508:949509
@@ -67,8 +67,8 @@
void VCardResource::configure( WId windowId )
{
SingleFileResourceConfigDialog<Settings> dlg( windowId );
- dlg.setFilter( "*.vcf|" + i18nc("Filedialog filter for *.vcf", "vCard Addressbook \
File" ) );
- dlg.setCaption( i18n("Select Addressbook") );
+ dlg.setFilter( "*.vcf|" + i18nc("Filedialog filter for *.vcf", "vCard Address Book \
File" ) ); + dlg.setCaption( i18n("Select Address Book") );
if ( dlg.exec() == QDialog::Accepted ) {
reloadFile();
}
--- trunk/KDE/kdepim/akonadi/resources/vcarddir/settingsdialog.ui #949508:949509
@@ -46,7 +46,7 @@
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
- <string>Select the directory which content should be represented by \
this resource. If the directory does not exist yet it will be created.</string> + \
<string>Select the directory whose contents should be represented by this resource. \
If the directory does not exist, it will be created.</string> </property>
<property name="wordWrap" >
<bool>true</bool>
@@ -72,7 +72,7 @@
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
- <string>If you enable the read-only mode no changes will be written to \
the directory selected above. Read-only mode will be automatically enabled if you do \
not have write access to the directory.</string> + <string>If read-only \
mode is enabled, no changes will be written to the directory selected above. \
Read-only mode will be automatically enabled if you do not have write access to the \
directory.</string> </property>
<property name="wordWrap" >
<bool>true</bool>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic