kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-23 14:50:35 +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-06-01 02:14:45 +00:00
parent 9d50cb8944
commit e6d3aa5935
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

@ -34,6 +34,7 @@ Name[zh_TW]=Latte
Comment=Containment provided for the Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
Comment[ca@valencia]=Intèrpret d'ordres proporcionat per l'acoblador Latte
Comment[cs]=Kontejner pro Latte Dock
Comment[da]=Beholder til Latte-dokken
Comment[de]=Containment für Latte-Dock
Comment[el]=Περιέκτης της εφαρμογής Latte

1
containment/package/metadata.desktop
View File

@ -34,6 +34,7 @@ Name[zh_TW]=Latte
Comment=Containment provided for the Latte Dock
Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
Comment[ca@valencia]=Intèrpret d'ordres proporcionat per l'acoblador Latte
Comment[cs]=Kontejner pro Latte Dock
Comment[da]=Beholder til Latte-dokken
Comment[de]=Containment für Latte-Dock
Comment[el]=Περιέκτης της εφαρμογής Latte