1
0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 13:33:50 +03:00

SVN_SILENT made messages (.desktop file) - always resolve ours

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-05 05:07:21 +01:00
parent 15cff730ab
commit e6f275939a

View File

@ -1,6 +1,16 @@
[Desktop Entry]
Name=Standard Latte Menu
Name[ca]=Menú estàndard del Latte
Name[pt]=Menu Normal do Latte
Name[sv]=Latte standardmeny
Name[uk]=Стандартне меню Латте
Name[x-test]=xxStandard Latte Menuxx
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[pt]=O menu do Latte que normalmente aparece com o botão direito do rato
Comment[sv]=Menyn i Latte som normalt visas vid högerklick
Comment[uk]=Меню Латте, яке буде показано у відповідь на клацання правою кнопкою миші
Comment[x-test]=xxThe latte menu that normally shows on right-clickxx
Type=Service
Icon=help-contextual