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 2020-08-20 09:38:12 +02:00
parent e67298b021
commit ad4fba5243
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

@ -39,6 +39,7 @@ Comment[en_GB]=Containment provided for the Latte Dock
Comment[es]=Contención proporcionada para Latte Dock
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

@ -39,6 +39,7 @@ Comment[en_GB]=Containment provided for the Latte Dock
Comment[es]=Contención proporcionada para Latte Dock
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