kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 01: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 2018-02-19 04:57:38 +01:00
parent b607e25a4c
commit cb6d7bda74
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/latte-layouts.knsrc
View File

@ -4,6 +4,7 @@ Name[ar]=مخطّطات لاتيه
Name[ca]=Disposicions del Latte
Name[ca@valencia]=Disposicions del Latte
Name[de]=Latte-Profile
Name[en_GB]=Latte Layouts
Name[es]=Distribuciones de Latte
Name[fi]=Latte-asettelut
Name[it]=Disposizioni di Latte

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

@ -2,6 +2,7 @@
Name=Standard Latte Menu
Name[ca]=Menú estàndard del Latte
Name[ca@valencia]=Menú estàndard del Latte
Name[en_GB]=Standard Latte Menu
Name[es]=Menú estándar de Latte
Name[it]=Menu standard di Latte
Name[nl]=Standaard menu van Latte
@ -13,6 +14,7 @@ Name[zh_CN]=标准 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@valencia]=El menú Latte que es mostra normalment amb un clic del botó dret
Comment[en_GB]=The latte menu that normally shows on right-click
Comment[es]=Este es el menú de Latte que normalmente se muestra tras un clic derecho
Comment[it]=Il menu di Latte che normalmente viene mostrato al clic destro
Comment[nl]=Het menu van latte dat normaal getoond wordt bij rechtsklikken