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 2021-05-05 02:16:08 +00:00
parent b015228ecd
commit 56837c239b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containment/metadata.desktop.cmake
View File

@ -38,7 +38,7 @@ Comment[da]=Beholder til Latte-dokken
Comment[de]=Containment für Latte-Dock
Comment[el]=Περιέκτης της εφαρμογής Latte
Comment[en_GB]=Containment provided for the Latte Dock
Comment[es]=Contención proporcionada para Latte Dock
Comment[es]=Contenedor proporcionada para Latte Dock
Comment[et]=Latte doki konteiner
Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
Comment[fi]=Latte-telakalla tarjottu sisällytys

2
containment/package/metadata.desktop
View File

@ -38,7 +38,7 @@ Comment[da]=Beholder til Latte-dokken
Comment[de]=Containment für Latte-Dock
Comment[el]=Περιέκτης της εφαρμογής Latte
Comment[en_GB]=Containment provided for the Latte Dock
Comment[es]=Contención proporcionada para Latte Dock
Comment[es]=Contenedor proporcionada para Latte Dock
Comment[et]=Latte doki konteiner
Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
Comment[fi]=Latte-telakalla tarjottu sisällytys