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
Multimedia
Kdenlive
Commits
7d3b3756
Commit
7d3b3756
authored
Feb 28, 2021
by
Yuri Chornoivan
Browse files
Fix disambiguations found by gettext 0.21
parent
a7e29e8d
Pipeline
#52509
canceled with stage
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/assets/keyframes/model/keyframemodellist.cpp
View file @
7d3b3756
...
...
@@ -190,7 +190,7 @@ bool KeyframeModelList::moveKeyframe(GenTime oldPos, GenTime pos, bool logUndo)
QWriteLocker
locker
(
&
m_lock
);
Q_ASSERT
(
m_parameters
.
size
()
>
0
);
auto
op
=
[
oldPos
,
pos
](
std
::
shared_ptr
<
KeyframeModel
>
param
,
Fun
&
undo
,
Fun
&
redo
)
{
return
param
->
moveKeyframe
(
oldPos
,
pos
,
QVariant
(),
undo
,
redo
);
};
return
applyOperation
(
op
,
logUndo
?
i18n
(
"Move keyframe"
)
:
QString
());
return
applyOperation
(
op
,
logUndo
?
i18n
c
(
"@action"
,
"Move keyframe"
)
:
QString
());
}
bool
KeyframeModelList
::
moveKeyframeWithUndo
(
GenTime
oldPos
,
GenTime
pos
,
Fun
&
undo
,
Fun
&
redo
)
...
...
src/assets/view/widgets/animationwidget.cpp
View file @
7d3b3756
...
...
@@ -104,7 +104,7 @@ AnimationWidget::AnimationWidget(std::shared_ptr<AssetParameterModel> model, QMo
m_previous
=
tb
->
addAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"media-skip-backward"
)),
i18n
(
"Previous keyframe"
),
this
,
SLOT
(
slotPrevious
()));
// Add/remove keyframe
m_addKeyframe
=
new
KDualAction
(
i18n
(
"Add keyframe"
),
i18n
(
"Remove keyframe"
),
this
);
m_addKeyframe
=
new
KDualAction
(
i18n
c
(
"@action"
,
"Add keyframe"
),
i18n
c
(
"@action"
,
"Remove keyframe"
),
this
);
m_addKeyframe
->
setInactiveIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"list-add"
)));
m_addKeyframe
->
setActiveIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"list-remove"
)));
connect
(
m_addKeyframe
,
SIGNAL
(
activeChangedByUser
(
bool
)),
this
,
SLOT
(
slotAddDeleteKeyframe
(
bool
)));
...
...
src/bin/bincommands.cpp
View file @
7d3b3756
...
...
@@ -30,7 +30,7 @@ MoveBinClipCommand::MoveBinClipCommand(Bin *bin, QString clipId, QString oldPare
,
m_oldParentId
(
std
::
move
(
oldParentId
))
,
m_newParentId
(
std
::
move
(
newParentId
))
{
setText
(
i18n
(
"Move Clip"
));
setText
(
i18n
c
(
"@action"
,
"Move Clip"
));
}
// virtual
void
MoveBinClipCommand
::
undo
()
...
...
src/bin/clipcreator.cpp
View file @
7d3b3756
...
...
@@ -163,7 +163,7 @@ bool ClipCreator::createClipFromFile(const QString &path, const QString &parentF
auto
id
=
ClipCreator
::
createClipFromFile
(
path
,
parentFolder
,
std
::
move
(
model
),
undo
,
redo
);
bool
ok
=
(
id
!=
QStringLiteral
(
"-1"
));
if
(
ok
)
{
pCore
->
pushUndo
(
undo
,
redo
,
i18n
(
"Add clip"
));
pCore
->
pushUndo
(
undo
,
redo
,
i18n
c
(
"@action"
,
"Add clip"
));
}
return
ok
;
}
...
...
src/mainwindow.cpp
View file @
7d3b3756
...
...
@@ -1694,7 +1694,7 @@ void MainWindow::setupActions()
addAction
(
QStringLiteral
(
"delete_space_all_tracks"
),
i18n
(
"Remove Space In All Tracks"
),
this
,
SLOT
(
slotRemoveAllSpace
()));
KActionCategory
*
timelineActions
=
new
KActionCategory
(
i18n
(
"Tracks"
),
actionCollection
());
QAction
*
insertTrack
=
new
QAction
(
QIcon
(),
i18n
(
"Insert Track"
),
this
);
QAction
*
insertTrack
=
new
QAction
(
QIcon
(),
i18n
c
(
"@action"
,
"Insert Track"
),
this
);
connect
(
insertTrack
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotInsertTrack
);
timelineActions
->
addAction
(
QStringLiteral
(
"insert_track"
),
insertTrack
);
...
...
src/project/clipstabilize.cpp
View file @
7d3b3756
...
...
@@ -123,7 +123,7 @@ QString ClipStabilize::destination() const
QString
ClipStabilize
::
desc
()
const
{
return
i18n
(
"Stabilize clip"
);
return
i18n
c
(
"Description"
,
"Stabilize clip"
);
}
bool
ClipStabilize
::
autoAddClip
()
const
...
...
src/project/cliptranscode.cpp
View file @
7d3b3756
...
...
@@ -49,7 +49,7 @@ ClipTranscode::ClipTranscode(QStringList urls, const QString ¶ms, QStringLis
if
(
m_automaticMode
)
{
auto_add
->
setHidden
(
true
);
}
auto_add
->
setText
(
i18np
(
"Add clip to project"
,
"Add clips to project"
,
m_urls
.
count
()));
auto_add
->
setText
(
i18n
c
p
(
"@action"
,
"Add clip to project"
,
"Add clips to project"
,
m_urls
.
count
()));
auto_add
->
setChecked
(
KdenliveSettings
::
add_new_clip
());
if
(
m_urls
.
count
()
==
1
)
{
...
...
src/timeline2/view/dialogs/trackdialog.cpp
View file @
7d3b3756
...
...
@@ -57,7 +57,7 @@ TrackDialog::TrackDialog(const std::shared_ptr<TimelineItemModel> &model, int tr
connect
(
audio_track
,
&
QRadioButton
::
toggled
,
this
,
&
TrackDialog
::
buildCombo
);
connect
(
arec_track
,
&
QRadioButton
::
toggled
,
this
,
&
TrackDialog
::
buildCombo
);
connect
(
tracks_count
,
QOverload
<
int
>::
of
(
&
QSpinBox
::
valueChanged
),
this
,
[
this
]
(
int
count
)
{
tracks_count
->
setSuffix
(
i18np
(
" track"
,
" tracks"
,
count
));
tracks_count
->
setSuffix
(
i18n
c
p
(
"
Spinbox suffix"
,
"
track"
,
" tracks"
,
count
));
track_name
->
setEnabled
(
count
==
1
);
});
}
...
...
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