diff options
| author | l10n daemon script <[email protected]> | 2020-09-20 09:20:49 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-20 09:20:49 +0200 |
| commit | a32cb1c915960320812e7d1d63fe68ffb729ba37 (patch) | |
| tree | 338bc70e017ddb0d17e13525b9ab066bc4635fcf /src | |
| parent | 65c2d95a7dca988f0ead00e105b8aad0c57732f7 (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Diffstat (limited to 'src')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 81b93426e..c90ef9046 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -109,7 +109,7 @@ X-DocPath=dolphin/index.html#preferences-dialog-navigation Name=Navigation Name[ar]=التّنقّل Name[ast]=Navegación -Name[az]=Naviqasiy +Name[az]=Naviqasiya Name[ca]=Navegació Name[ca@valencia]=Navegació Name[cs]=Navigace |