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 2019-01-06 08:36:19 +01:00
parent 6fc4e467f4
commit f6921063d2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applets/separator/metadata.desktop.cmake
View File

@ -76,7 +76,7 @@ Keywords[sk]=oddeľovač
Keywords[sv]=avskiljare
Keywords[uk]=Роздільник
Keywords[x-test]=xxseparatorxx
Keywords[zh_CN]=分隔栏
Keywords[zh_CN]=分隔符
Keywords[zh_TW]=分隔器
Type=Service

2
applets/separator/package/metadata.desktop
View File

@ -76,7 +76,7 @@ Keywords[sk]=oddeľovač
Keywords[sv]=avskiljare
Keywords[uk]=Роздільник
Keywords[x-test]=xxseparatorxx
Keywords[zh_CN]=分隔栏
Keywords[zh_CN]=分隔符
Keywords[zh_TW]=分隔器
Type=Service