1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-28 09:57:29 +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-04-15 05:21:37 +02:00
parent e439fd79c9
commit 403117e044
3 changed files with 5 additions and 0 deletions

View File

@ -15,6 +15,7 @@ Name[sv]=Latte layouter
Name[uk]=Компонування Латте
Name[x-test]=xxLatte Layoutsxx
Name[zh_CN]=Latte 布局
Name[zh_TW]=Latte 版面
ProvidersUrl=https://download.kde.org/ocs/providers.xml
Categories=Latte Layouts

View File

@ -12,6 +12,7 @@ Name[sv]=Latte standardmeny
Name[uk]=Стандартне меню Латте
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@valencia]=El menú Latte que es mostra normalment amb un clic del botó dret
@ -25,6 +26,7 @@ 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
Comment[zh_CN]= latte
Comment[zh_TW]= Latte
Type=Service
Icon=help-contextual

View File

@ -11,6 +11,7 @@ Name[pt]=Activar o Menu de Lançamento do Latte
Name[sv]=Aktivera Latte startmeny
Name[uk]=Активувати меню запуску Латте
Name[x-test]=xxActivate Latte Launcher Menuxx
Name[zh_TW]= Latte
Comment=Activate Latte Launcher Menu from screen edge
Comment[ca]=Activa el menú del llançador del Latte des de la vora de la pantalla
Comment[ca@valencia]=Activa el menú del llançador del Latte des de la vora de la pantalla
@ -23,6 +24,7 @@ Comment[pt]=Activar o Menu de Lançamento do Latte no extremo do ecrã
Comment[sv]=Aktivera Latte startmeny från skärmkant
Comment[uk]=Активувати меню запуску Латте з краю екрана
Comment[x-test]=xxActivate Latte Launcher Menu from screen edgexx
Comment[zh_TW]= Latte
Icon=latte-dock
Type=Service