kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +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 2015-11-17 12:50:56 +00:00
parent c96add9c68
commit e0dfcb9e1d
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dolphinpart.desktop
View file

@ -54,6 +54,7 @@ Actions=icons;details;compact;
[Desktop Action icons]
Name=Icons
Name[ast]=Iconos
Name[ca]=Icones
Name[ca@valencia]=Icones
Name[cs]=Ikony