Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
299ea32a
Commit
299ea32a
authored
Feb 25, 2010
by
Friedemann Kleint
Browse files
tr()-Fixes.
parent
cc9b6071
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/git/gitclient.cpp
View file @
299ea32a
...
...
@@ -421,6 +421,7 @@ bool GitClient::synchronousCheckoutBranch(const QString &workingDirectory,
VCSBase
::
VCSBaseOutputWindow
::
instance
()
->
append
(
output
);
if
(
!
rc
)
{
const
QString
stdErr
=
commandOutputFromLocal8Bit
(
errorText
);
//: Meaning of the arguments: %1: Branch, %2: Repository, %3: Error message
const
QString
msg
=
tr
(
"Unable to checkout %1 of %2: %3"
).
arg
(
branch
,
workingDirectory
,
stdErr
);
if
(
errorMessage
)
{
*
errorMessage
=
msg
;
...
...
@@ -583,6 +584,8 @@ bool GitClient::synchronousCheckoutFiles(const QString &workingDirectory,
const
bool
rc
=
synchronousGit
(
workingDirectory
,
arguments
,
&
outputText
,
&
errorText
);
if
(
!
rc
)
{
const
QString
fileArg
=
files
.
join
(
QLatin1String
(
", "
));
//: Meaning of the arguments: %1: revision, %2: files, %3: repository,
//: %4: Error message
const
QString
msg
=
tr
(
"Unable to checkout %1 of %2 in %3: %4"
).
arg
(
revision
,
fileArg
,
workingDirectory
,
commandOutputFromLocal8Bit
(
errorText
));
if
(
errorMessage
)
{
...
...
@@ -599,6 +602,7 @@ static inline QString msgParentRevisionFailed(const QString &workingDirectory,
const
QString
&
revision
,
const
QString
&
why
)
{
//: Failed to find parent revisions of a SHA1 for "annotate previous"
return
GitClient
::
tr
(
"Unable to find parent revisions of %1 in %2: %3"
).
arg
(
revision
,
workingDirectory
,
why
);
}
...
...
@@ -897,6 +901,7 @@ bool GitClient::stashNameFromMessage(const QString &workingDirectory,
return
true
;
}
}
//: Look-up of a stash via its descriptive message failed.
const
QString
msg
=
tr
(
"Unable to resolve stash message '%1' in %2"
).
arg
(
message
,
workingDirectory
);
if
(
errorMessage
)
{
*
errorMessage
=
msg
;
...
...
src/plugins/perforce/perforceplugin.cpp
View file @
299ea32a
...
...
@@ -348,7 +348,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString * e
mperforce
->
addAction
(
command
);
m_commandLocator
->
appendCommand
(
command
);
m_logProjectAction
=
new
Utils
::
ParameterAction
(
tr
(
"Log Project
Log
"
),
tr
(
"Log Project
\"
%1
\"
"
),
Utils
::
ParameterAction
::
EnabledWithParameter
,
this
);
m_logProjectAction
=
new
Utils
::
ParameterAction
(
tr
(
"Log Project"
),
tr
(
"Log Project
\"
%1
\"
"
),
Utils
::
ParameterAction
::
EnabledWithParameter
,
this
);
command
=
am
->
registerAction
(
m_logProjectAction
,
CMD_ID_PROJECTLOG
,
globalcontext
);
command
->
setAttribute
(
Core
::
Command
::
CA_UpdateText
);
connect
(
m_logProjectAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
logProject
()));
...
...
@@ -1387,6 +1387,8 @@ void PerforcePlugin::setSettings(const Settings &newSettings)
static
inline
QString
msgWhereFailed
(
const
QString
&
file
,
const
QString
&
why
)
{
//: Failed to run p4 "where" to resolve a Perforce file name to a local
//: file system name.
return
PerforcePlugin
::
tr
(
"Error running
\"
where
\"
on %1: %2"
).
arg
(
file
,
why
);
}
...
...
@@ -1417,6 +1419,7 @@ QString PerforcePlugin::fileNameFromPerforceName(const QString& perforceName,
output
.
chop
(
1
);
if
(
output
.
isEmpty
())
{
//: File is not managed by Perforce
*
errorMessage
=
msgWhereFailed
(
perforceName
,
tr
(
"The file is not mapped"
));
return
QString
();
}
...
...
src/plugins/projectexplorer/projectexplorersettingspage.ui
View file @
299ea32a
...
...
@@ -14,7 +14,7 @@
<item>
<widget
class=
"QGroupBox"
name=
"directoryGroupBox"
>
<property
name=
"title"
>
<string>
Projects Directory
</string>
<string>
Projects Directory
</string>
</property>
<layout
class=
"QFormLayout"
name=
"formLayout"
>
<property
name=
"fieldGrowthPolicy"
>
...
...
src/plugins/subversion/subversionplugin.cpp
View file @
299ea32a
...
...
@@ -377,7 +377,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
subversionMenu
->
addAction
(
command
);
m_commandLocator
->
appendCommand
(
command
);
m_logProjectAction
=
new
Utils
::
ParameterAction
(
tr
(
"Log Project
Log
"
),
tr
(
"Log Project
\"
%1
\"
"
),
Utils
::
ParameterAction
::
EnabledWithParameter
,
this
);
m_logProjectAction
=
new
Utils
::
ParameterAction
(
tr
(
"Log Project"
),
tr
(
"Log Project
\"
%1
\"
"
),
Utils
::
ParameterAction
::
EnabledWithParameter
,
this
);
command
=
ami
->
registerAction
(
m_logProjectAction
,
CMD_ID_PROJECTLOG
,
globalcontext
);
command
->
setAttribute
(
Core
::
Command
::
CA_UpdateText
);
connect
(
m_logProjectAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
logProject
()));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment