kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-09 00:58:15 +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 2022-06-13 02:36:06 +00:00
parent a014f386fb
commit 2157c0d455
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/org.kde.latte-dock.desktop.cmake
View File

@ -73,7 +73,7 @@ GenericName=Dock
GenericName[ar]=مرسى
GenericName[az]=Dok
GenericName[ca]=Acobla
GenericName[ca@valencia]=Acopla
GenericName[ca@valencia]=Acobla
GenericName[cs]=Dok
GenericName[da]=Dok
GenericName[de]=Dock