kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 14:50:21 +03:00
Code Issues 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 2018-01-06 06:11:23 +01:00
parent 66f19f059c
commit 44cc095a2b
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
shell/metadata.desktop.cmake
View File

@ -49,6 +49,7 @@ Keywords[sk]=shell
Keywords[sv]=skal
Keywords[uk]=оболонка
Keywords[x-test]=xxshellxx
Keywords[zh_CN]=shell
Keywords[zh_TW]=shell
Type=Service

1
shell/package/metadata.desktop
View File

@ -49,6 +49,7 @@ Keywords[sk]=shell
Keywords[sv]=skal
Keywords[uk]=оболонка
Keywords[x-test]=xxshellxx
Keywords[zh_CN]=shell
Keywords[zh_TW]=shell
Type=Service