kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-30 14:50:12 +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-01-07 09:53:07 +01:00
parent ad074a6dab
commit 7151b76a21
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
View File

@ -26,7 +26,7 @@ Name[x-test]=xxStandard Latte Menuxx
Name[zh_CN]=标准 Latte 菜单
Name[zh_TW]=標準的 Latte 選單
Comment=The latte menu that normally shows on right-click
Comment[ca]=El menú Latte que es mostra normalment amb un clic del botó dret
Comment[ca]=El menú del Latte que es mostra normalment amb un clic del botó dret
Comment[ca@valencia]=El menú Latte que es mostra normalment amb un clic del botó dret
Comment[cs]=Nabídka Latte, jenž se běžně zobrazuje při kliknutí pravým tlačítkem
Comment[de]=Das Latte-Menü, das normalerweise mit der rechten Maustaste angezeigt wird

2
indicators/org.kde.latte.plasma/metadata.desktop
View File

@ -26,7 +26,7 @@ Name[x-test]=xxPlasmaxx
Name[zh_CN]=Plasma
Name[zh_TW]=Plasma
Comment=Latte Plasma style indicator
Comment[ca]=Indicador a l'estil Plasma del Latte
Comment[ca]=Indicador a l'estil Plasma per al Latte
Comment[ca@valencia]=Indicador a l'estil Plasma del Latte
Comment[cs]=Ukazatel Latte ve stylu Plasma
Comment[en_GB]=Latte Plasma style indicator