kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-24 05:33:50 +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 2020-08-21 06:15:43 +02:00
parent 0e0e8fe5be
commit 15c1f46ae5
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

@ -42,6 +42,7 @@ Comment[es]=Contención proporcionada para Latte Dock
Comment[et]=Latte doki konteiner
Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
Comment[fi]=Latte-telakalla tarjottu sisällytys
Comment[fr]=Confinement fourni par le panneau « Latte »
Comment[gl]=Contedor fornecido para a doca Latte.
Comment[id]=Kontainmen disediakan untuk Dock Latte
Comment[it]=Contenitore fornito per Latte Dock

1
containment/package/metadata.desktop
View File

@ -42,6 +42,7 @@ Comment[es]=Contención proporcionada para Latte Dock
Comment[et]=Latte doki konteiner
Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
Comment[fi]=Latte-telakalla tarjottu sisällytys
Comment[fr]=Confinement fourni par le panneau « Latte »
Comment[gl]=Contedor fornecido para a doca Latte.
Comment[id]=Kontainmen disediakan untuk Dock Latte
Comment[it]=Contenitore fornito per Latte Dock