kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2023-03-06 01:43:29 +00:00
parent 104213acab
commit 7b2a09511d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dolphinpartactions.desktop
View file

@ -107,7 +107,7 @@ Name[nb]=Kompakt
Name[nl]=Compact
Name[nn]=Kompakt
Name[pa]=ਸੰਖੇਪ
Name[pl]=Kompaktowy
Name[pl]=Zwarty
Name[pt]=Compacta
Name[pt_BR]=Compacto
Name[ro]=Compactă