kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-10 04:58:16 +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-02-17 05:36:03 +01:00
parent 39bb6efb21
commit aedea03193
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ Name[et]=Plasma kaardistiil
Name[it]=Stile delle schede di Plasma Name[it]=Stile delle schede di Plasma
Name[lt]=Plasma kortelių stilius Name[lt]=Plasma kortelių stilius
Name[nl]=Plasma-tabbladstijl Name[nl]=Plasma-tabbladstijl
Name[nn]=Faner i Plasma-stil
Name[pt]=Estilo de Páginas do Plasma Name[pt]=Estilo de Páginas do Plasma
Name[pt_BR]=Estilo de abas do Plasma Name[pt_BR]=Estilo de abas do Plasma
Name[sv]=Plasma flikstil Name[sv]=Plasma flikstil
@ -21,6 +22,7 @@ Comment[et]=Latte Plasma kaardistiili indikaator
Comment[it]=Indicatore stile delle schede di Plasma di Latte Comment[it]=Indicatore stile delle schede di Plasma di Latte
Comment[lt]=Plasma kortelių stiliaus indikatorius skirtas Latte Comment[lt]=Plasma kortelių stiliaus indikatorius skirtas Latte
Comment[nl]=Plasma tabbladstijlindicator voor Latte Comment[nl]=Plasma tabbladstijlindicator voor Latte
Comment[nn]=Fanemarkør i Plasma-stil
Comment[pt]=Indicador do estilo de Páginas do Plasma para o Latte Comment[pt]=Indicador do estilo de Páginas do Plasma para o Latte
Comment[pt_BR]=Indicador de estilo de abas do Plasma para o Latte Comment[pt_BR]=Indicador de estilo de abas do Plasma para o Latte
Comment[sv]=Plasma flikstilsindikator för Latte Comment[sv]=Plasma flikstilsindikator för Latte