kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-09 17:18:11 +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 2021-08-13 01:18:37 +00:00
parent 66ddda956b
commit 9f89d13c7b
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
containment/metadata.desktop.cmake
View File

@ -21,6 +21,7 @@ Name[sv]=Latte-omgivning
Name[uk]=контейнер Латте
Name[x-test]=xxLatte Containmentxx
Name[zh_CN]=Latte 容器
Name[zh_TW]=Latte Containment
Comment=Containment provided for the Latte Dock
Comment[az]=Latte Dok paneli üçün təmin edilən qoruma
Comment[ca]=Contenidor proporcionat per l'acoblador Latte

1
containment/package/metadata.desktop
View File

@ -21,6 +21,7 @@ Name[sv]=Latte-omgivning
Name[uk]=контейнер Латте
Name[x-test]=xxLatte Containmentxx
Name[zh_CN]=Latte 容器
Name[zh_TW]=Latte Containment
Comment=Containment provided for the Latte Dock
Comment[az]=Latte Dok paneli üçün təmin edilən qoruma
Comment[ca]=Contenidor proporcionat per l'acoblador Latte