[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdevplatform
From: Andrew Coles <andrew_coles () yahoo ! co ! uk>
Date: 2009-03-08 22:34:03
Message-ID: 1236551643.742621.6656.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 937055 by coles:
Proof-reading, and corrected plural usage.
M +1 -1 language/duchain/navigation/useswidget.cpp
M +1 -1 plugins/appwizard/appwizardplugin.cpp
M +2 -2 plugins/projectmanagerview/projectmanagerviewplugin.cpp
M +1 -1 plugins/quickopen/quickopenplugin.cpp
M +1 -1 plugins/snippet/snippetview.cpp
M +1 -1 plugins/subversion/ui/importmetadatawidget.ui
M +1 -1 plugins/subversion/ui/logviewoptiondlg.ui
M +1 -1 plugins/subversion/ui/statusoptiondlg.ui
M +1 -1 plugins/subversion/ui/updateoptiondlg.ui
M +3 -3 plugins/vcscommon/kdevvcscommonplugin.cpp
M +6 -6 shell/mainwindow_p.cpp
M +1 -1 shell/settings/ccsettings.ui
M +1 -1 shell/settings/projectsettings.ui
M +1 -1 shell/settings/runpreferences/runsettings.ui
M +9 -9 shell/settings/uiconfig.ui
M +6 -6 vcs/dvcs/ui/branchmanager.cpp
--- trunk/KDE/kdevplatform/language/duchain/navigation/useswidget.cpp #937054:937055
@@ -424,7 +424,7 @@
if(topContext.isLoaded())
usesCount = DUChainUtils::contextCountUses(topContext.data(), \
declaration.data());
- label->setText(i18n("<b>Project:</b> %1 <b>File:</b> %2 <i>(%3 \
uses)</i>", projectName, fileName, usesCount)); + \
label->setText(i18np("<b>Project:</b> %2 <b>File:</b> %3 <i>(1 \
use)</i>", "<b>Project:</b> %2 <b>File:</b> %3 <i>(%1 uses)</i>", \
usesCount, projectName, fileName));
m_button->setIcon(KIcon("go-next"));
connect(m_button, SIGNAL(clicked(bool)), this, SLOT(labelClicked()));
--- trunk/KDE/kdevplatform/plugins/appwizard/appwizardplugin.cpp #937054:937055
@@ -163,7 +163,7 @@
IBasicVersionControl::Recursive);
if (!job || !job->exec() || job->status() != VcsJob::JobSucceeded)
{
- vcsError(i18n("Could not import project into") + dvcs->name(), scratchArea, \
dest); + vcsError(i18n("Could not import project into %1.", dvcs->name()), \
scratchArea, dest); return false;
}
--- trunk/KDE/kdevplatform/plugins/projectmanagerview/projectmanagerviewplugin.cpp \
#937054:937055 @@ -449,7 +449,7 @@
KUrl url = item->folder()->url();
url.addPath( name );
if ( !KIO::NetAccess::mkdir( url, window ) ) {
- KMessageBox::error( window, i18n( "Can't create folder." ) );
+ KMessageBox::error( window, i18n( "Cannot create folder." ) );
continue;
}
item->project()->projectFileManager()->addFolder( url, \
item->folder() ); @@ -516,7 +516,7 @@
KSaveFile file(url.path());
if ( ! file.open() ) {
- KMessageBox::error( window, i18n( "Can't create file." ) );
+ KMessageBox::error( window, i18n( "Cannot create file." ) );
return 0;
}
file.finalize();
--- trunk/KDE/kdevplatform/plugins/quickopen/quickopenplugin.cpp #937054:937055
@@ -88,7 +88,7 @@
};
K_PLUGIN_FACTORY(KDevQuickOpenFactory, registerPlugin<QuickOpenPlugin>(); )
-K_EXPORT_PLUGIN(KDevQuickOpenFactory(KAboutData("kdevquickopen","kdevquickopen", \
ki18n("Quick Open"), "0.1", ki18n("Quickly open resources like files, classes, \
methods"), KAboutData::License_GPL))) \
+K_EXPORT_PLUGIN(KDevQuickOpenFactory(KAboutData("kdevquickopen","kdevquickopen", \
ki18n("Quick Open"), "0.1", ki18n("Quickly open resources such as files, classes and \
methods."), KAboutData::License_GPL)))
Declaration* cursorDeclaration() {
IDocument* doc = ICore::self()->documentController()->activeDocument();
--- trunk/KDE/kdevplatform/plugins/snippet/snippetview.cpp #937054:937055
@@ -275,7 +275,7 @@
QString subdir = KInputDialog::getText(
i18n("Create a new subrepository"),
- i18n("Directoryname"), QString(), 0, this);
+ i18n("Directory name"), QString(), 0, this);
if (!subdir.isEmpty()) {
repo->createSubRepo( subdir );
}
--- trunk/KDE/kdevplatform/plugins/subversion/ui/importmetadatawidget.ui \
#937054:937055 @@ -33,7 +33,7 @@
<string>Repository Location to import into</string>
</property>
<property name="whatsThis" >
- <string>Choose the repository into which the source directory is imported \
to</string> + <string>Choose the repository into which the source directory is \
imported</string> </property>
</widget>
</item>
--- trunk/KDE/kdevplatform/plugins/subversion/ui/logviewoptiondlg.ui #937054:937055
@@ -10,7 +10,7 @@
</rect>
</property>
<property name="windowTitle" >
- <string>SvnLogViewOptionDlgBase</string>
+ <string>Subversion Log View Options</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
--- trunk/KDE/kdevplatform/plugins/subversion/ui/statusoptiondlg.ui #937054:937055
@@ -75,7 +75,7 @@
<item row="6" column="0" >
<widget class="QCheckBox" name="noignore" >
<property name="text" >
- <string>Don't ignore svn:ignore</string>
+ <string>Do not ignore svn:ignore</string>
</property>
</widget>
</item>
--- trunk/KDE/kdevplatform/plugins/subversion/ui/updateoptiondlg.ui #937054:937055
@@ -31,7 +31,7 @@
<item row="1" column="0" >
<widget class="QCheckBox" name="nonrecurseChk" >
<property name="text" >
- <string>Update immediate childrens only (non-recursive)</string>
+ <string>Update immediate children only (non-recursive)</string>
</property>
</widget>
</item>
--- trunk/KDE/kdevplatform/plugins/vcscommon/kdevvcscommonplugin.cpp #937054:937055
@@ -285,7 +285,7 @@
core()->documentController()->openDocumentFromText( diff );
} else
{
- KMessageBox::error( core()->uiController()->activeMainWindow(), \
vcsjob->errorString(), i18n("Couldn't get difference") ); + \
KMessageBox::error( core()->uiController()->activeMainWindow(), \
vcsjob->errorString(), i18n("Unable to get difference.") ); }
vcsjob->disconnect( this );
@@ -335,13 +335,13 @@
viewiface->setAnnotationBorderVisible( true );
}else
{
- KMessageBox::error( 0, i18n( "Cannot display annotations, missing \
interface KTextEditor::AnnotationInterface for the editor" ) ); + \
KMessageBox::error( 0, i18n( "Cannot display annotations, missing interface \
KTextEditor::AnnotationInterface for the editor." ) ); delete job;
}
}else
{
KMessageBox::error( 0, i18n("Cannot execute annotate action because the "
- "document wasn't found or was not a text document:\n%1", url.pathOrUrl() ) \
); + "document was not found, or was not a text document:\n%1", \
url.pathOrUrl() ) ); }
}
--- trunk/KDE/kdevplatform/shell/mainwindow_p.cpp #937054:937055
@@ -171,25 +171,25 @@
action = KStandardAction::showStatusbar( this, SLOT( toggleStatusbar() ),
actionCollection());
- action->setText( i18n( "Show &Statusbar" ) );
- action->setToolTip( i18n( "Show statusbar" ) );
- action->setWhatsThis( i18n( "<b>Show statusbar</b><p>Hides or shows the \
statusbar.</p>" ) ); + action->setText( i18n( "Show &Status Bar" ) );
+ action->setToolTip( i18n( "Show status bar" ) );
+ action->setWhatsThis( i18n( "<b>Show status bar</b><p>Hides or shows the status \
bar.</p>" ) );
action = actionCollection()->addAction( "configure_sessions", this, SLOT( \
configureSessions() ) ); action->setText( i18n("Configure Sessions...") );
action->setToolTip( i18n("Create/Delete/Activate Sessions") );
- action->setWhatsThis( i18n( "<b>Configure Sessions</b><p>Shows a dialog to \
Create/Delete Sessions and set a new active session</p>" ) ); + \
action->setWhatsThis( i18n( "<b>Configure Sessions</b><p>Shows a dialog to \
Create/Delete Sessions and set a new active session.</p>" ) );
action = KStandardAction::configureNotifications(this, \
SLOT(configureNotifications()), actionCollection()); action->setText( \
i18n("Configure Notifications...") ); action->setToolTip( i18n("Configure \
Notifications") );
- action->setWhatsThis( i18n( "<b>Configure Notification</b><p>Shows a dialog that \
lets you configure notifications</p>" ) ); + action->setWhatsThis( i18n( \
"<b>Configure Notifications</b><p>Shows a dialog that lets you configure \
notifications.</p>" ) );
action = actionCollection()->addAction( "about_platform", this, SLOT( \
showAboutPlatform() ) ); action->setText( i18n("About KDevelop Platform") );
action->setStatusTip( i18n("Show Information about KDevelop Platform") );
- action->setWhatsThis( i18n( "<b>About KDevelop Platform</b><p>Shows a dialog \
with information about KDevelop Platform</p>" ) ); + action->setWhatsThis( i18n( \
"<b>About KDevelop Platform</b><p>Shows a dialog with information about KDevelop \
Platform.</p>" ) );
// KToolBarPopupAction *popupAction;
--- trunk/KDE/kdevplatform/shell/settings/ccsettings.ui #937054:937055
@@ -124,7 +124,7 @@
<item row="2" column="0" >
<widget class="QCheckBox" name="kcfg_highlightSemanticProblems" >
<property name="toolTip" >
- <string>Highlight semantic problems like not found or not accessible \
declarations.</string> + <string>Highlight semantic problems, such as \
non-existent or inaccessible declarations.</string> </property>
<property name="text" >
<string>Highlight Semantic Problems</string>
--- trunk/KDE/kdevplatform/shell/settings/projectsettings.ui #937054:937055
@@ -23,7 +23,7 @@
<item row="0" column="1" >
<widget class="KUrlRequester" name="kcfg_projectsBaseDirectory" >
<property name="toolTip" >
- <string>Select the base directory where new projects are being \
created.</string> + <string>Select the base directory where new projects are to \
be created.</string> </property>
</widget>
</item>
--- trunk/KDE/kdevplatform/shell/settings/runpreferences/runsettings.ui \
#937054:937055 @@ -77,7 +77,7 @@
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
- <string>Behaviour</string>
+ <string>Behavior</string>
</property>
<layout class="QGridLayout" name="gridLayout_2" >
<item row="1" column="0" >
--- trunk/KDE/kdevplatform/shell/settings/uiconfig.ui #937054:937055
@@ -16,7 +16,7 @@
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
- <string>Dockwindow Behaviour</string>
+ <string>Dock Window Behavior</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
@@ -37,12 +37,12 @@
<widget class="QComboBox" name="kcfg_TopLeftCornerOwner" >
<item>
<property name="text" >
- <string>LeftDock</string>
+ <string>Left Dock</string>
</property>
</item>
<item>
<property name="text" >
- <string>TopDock</string>
+ <string>Top Dock</string>
</property>
</item>
</widget>
@@ -51,12 +51,12 @@
<widget class="QComboBox" name="kcfg_TopRightCornerOwner" >
<item>
<property name="text" >
- <string>RightDock</string>
+ <string>Right Dock</string>
</property>
</item>
<item>
<property name="text" >
- <string>TopDock</string>
+ <string>Top Dock</string>
</property>
</item>
</widget>
@@ -85,12 +85,12 @@
</property>
<item>
<property name="text" >
- <string>LeftDock</string>
+ <string>Left Dock</string>
</property>
</item>
<item>
<property name="text" >
- <string>BottomDock</string>
+ <string>Bottom Dock</string>
</property>
</item>
</widget>
@@ -105,12 +105,12 @@
</property>
<item>
<property name="text" >
- <string>RightDock</string>
+ <string>Right Dock</string>
</property>
</item>
<item>
<property name="text" >
- <string>BottomDock</string>
+ <string>Bottom Dock</string>
</property>
</item>
</widget>
--- trunk/KDE/kdevplatform/vcs/dvcs/ui/branchmanager.cpp #937054:937055
@@ -132,8 +132,8 @@
}
int ret = KMessageBox::messageBox(this, KMessageBox::WarningYesNo,
- i18n("You're going to rename the branch!\n"
- "%1->%2\nAre you sure?",baseBranch, \
newBranch)); + i18n("The branch is going to be \
renamed from\n" + "%1 to %2.\nAre you \
sure?",baseBranch, newBranch));
if (ret == QMessageBox::Cancel)
return;
@@ -153,15 +153,15 @@
if (baseBranch == d->curBranch(repo))
{
KMessageBox::messageBox(this, KMessageBox::Sorry,
- i18n("You're on the branch \"%1\"\n"
- "To remove it you have to checkout to \
another branch!", + i18n("Currently at the branch \
\"%1\".\n" + "To remove it, another branch \
has to be checked out.", baseBranch));
return;
}
int ret = KMessageBox::messageBox(this, KMessageBox::WarningYesNo,
- i18n("You're going to remove branch \"%1\"!\n" \
- "You will not be able to restore \
it!\nAre you sure?", + i18n("About to remove the \
branch \"%1\".\n" + "Once removed, it \
cannot be restored.\nAre you sure?", baseBranch));
if (ret == QMessageBox::Cancel)
return;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic