1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-08-27 09:49:28 +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-06 05:21:26 +02:00
parent 13e8791213
commit de35075eac

View File

@ -5,6 +5,7 @@ Name[ca@valencia]=Activa el menú del llançador del Latte
Name[de]=Latte-Anwendungsmenü öffnen
Name[en_GB]=Activate Latte Launcher Menu
Name[es]=Activar menú de lanzadores de Latte
Name[it]=Attiva il menu del lanciatore di Latte
Name[nl]=Latte-startprogramma activeren
Name[pt]=Activar o Menu de Lançamento do Latte
Name[sv]=Aktivera Latte startmeny
@ -16,6 +17,7 @@ Comment[ca@valencia]=Activa el menú del llançador del Latte des de la vora de
Comment[de]=Latte-Anwendungsmenü über eine Bildschirmecke öffnen
Comment[en_GB]=Activate Latte Launcher Menu from screen edge
Comment[es]=Activar menú de lanzadores de Latte desde el borde de la pantalla
Comment[it]=Attiva il menu del lanciatore di Latte dal bordo dello schermo
Comment[nl]=Latte-startprogramma activeren vanaf de schermrand
Comment[pt]=Activar o Menu de Lançamento do Latte no extremo do ecrã
Comment[sv]=Aktivera Latte startmeny från skärmkant