kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-26 23:21:37 +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 2019-05-03 05:49:20 +02:00
parent d945c89713
commit afd5e5b749
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plasmoid/metadata.desktop.cmake
View File

@ -5,6 +5,7 @@ Name[ca@valencia]=Tasques del Latte
Name[en_GB]=Latte Tasks
Name[fi]=Latte-tehtävät
Name[gl]=Tarefas de Latte
Name[it]=Processi di Latte
Name[nl]=Latte-taken
Name[pt]=Tarefas do Latte
Name[pt_BR]=Tarefas do Latte
@ -18,6 +19,7 @@ Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
Comment[en_GB]=Tasks plasmoid from Latte Dock
Comment[fi]=Latte-telakan tehtäväsovelma
Comment[gl]=Plasmoides de tarefas da doca Latte
Comment[it]=Plasmoide dei processi da Latte Dock
Comment[nl]=Plasmoid voor taken uit Latte Dock
Comment[pt]=Plasmóide de tarefas da Área Acoplável do Latte
Comment[pt_BR]=Plasmoide de tarefas do Latte Dock

2
plasmoid/package/metadata.desktop
View File

@ -5,6 +5,7 @@ Name[ca@valencia]=Tasques del Latte
Name[en_GB]=Latte Tasks
Name[fi]=Latte-tehtävät
Name[gl]=Tarefas de Latte
Name[it]=Processi di Latte
Name[nl]=Latte-taken
Name[pt]=Tarefas do Latte
Name[pt_BR]=Tarefas do Latte
@ -18,6 +19,7 @@ Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
Comment[en_GB]=Tasks plasmoid from Latte Dock
Comment[fi]=Latte-telakan tehtäväsovelma
Comment[gl]=Plasmoides de tarefas da doca Latte
Comment[it]=Plasmoide dei processi da Latte Dock
Comment[nl]=Plasmoid voor taken uit Latte Dock
Comment[pt]=Plasmóide de tarefas da Área Acoplável do Latte
Comment[pt_BR]=Plasmoide de tarefas do Latte Dock