diff options
| author | l10n daemon script <[email protected]> | 2022-03-29 02:21:23 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-29 02:21:23 +0000 |
| commit | 447c35868c6268789e8f2ae0abecd28df02029d8 (patch) | |
| tree | 044ad27ca6bee897246b15b827ac1be605ea2091 /src/dolphinpart.desktop.in | |
| parent | d658c7e09024db81266d210fa8932cb5ab2d6190 (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/dolphinpart.desktop.in')
| -rw-r--r-- | src/dolphinpart.desktop.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in index cdd51c832..c0f2be4e4 100644 --- a/src/dolphinpart.desktop.in +++ b/src/dolphinpart.desktop.in @@ -5,7 +5,7 @@ Name[ar]=عرض دولفين Name[ast]=Vista de Dolphin Name[az]=Dolphin görünüşü Name[ca]=Vista del Dolphin -Name[ca@valencia]=Vista del Dolphin +Name[ca@valencia]=Vista de Dolphin Name[cs]=Pohled Dolphin Name[da]=Dolphin-visning Name[de]=Dolphin-Ansicht |