mirror of
https://github.com/KDE/latte-dock.git
synced 2025-02-15 02:00:04 +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:
parent
834b6477ac
commit
946dca4475
@ -1,6 +1,22 @@
|
||||
[Desktop Entry]
|
||||
Name=Latte Tasks
|
||||
Name[ca]=Tasques del Latte
|
||||
Name[en_GB]=Latte Tasks
|
||||
Name[gl]=Tarefas de Latte
|
||||
Name[nl]=Latte-taken
|
||||
Name[pt]=Tarefas do Latte
|
||||
Name[sv]=Latte aktiviteter
|
||||
Name[uk]=Завдання Латте
|
||||
Name[x-test]=xxLatte Tasksxx
|
||||
Comment=Tasks plasmoid from Latte Dock
|
||||
Comment[ca]=Plasmoide de tasques del Latte Dock
|
||||
Comment[en_GB]=Tasks plasmoid from Latte Dock
|
||||
Comment[gl]=Plasmoides de tarefas da doca Latte
|
||||
Comment[nl]=Plasmoid voor taken uit Latte Dock
|
||||
Comment[pt]=Plasmóide de tarefas da Área Acoplável do Latte
|
||||
Comment[sv]=Aktivitetsplasmoid för Latte dockningsfönster
|
||||
Comment[uk]=Плазмоїд завдань з панелі Латте
|
||||
Comment[x-test]=xxTasks plasmoid from Latte Dockxx
|
||||
|
||||
Type=Service
|
||||
Icon=latte-dock
|
||||
|
@ -1,6 +1,22 @@
|
||||
[Desktop Entry]
|
||||
Name=Latte Tasks
|
||||
Name[ca]=Tasques del Latte
|
||||
Name[en_GB]=Latte Tasks
|
||||
Name[gl]=Tarefas de Latte
|
||||
Name[nl]=Latte-taken
|
||||
Name[pt]=Tarefas do Latte
|
||||
Name[sv]=Latte aktiviteter
|
||||
Name[uk]=Завдання Латте
|
||||
Name[x-test]=xxLatte Tasksxx
|
||||
Comment=Tasks plasmoid from Latte Dock
|
||||
Comment[ca]=Plasmoide de tasques del Latte Dock
|
||||
Comment[en_GB]=Tasks plasmoid from Latte Dock
|
||||
Comment[gl]=Plasmoides de tarefas da doca Latte
|
||||
Comment[nl]=Plasmoid voor taken uit Latte Dock
|
||||
Comment[pt]=Plasmóide de tarefas da Área Acoplável do Latte
|
||||
Comment[sv]=Aktivitetsplasmoid för Latte dockningsfönster
|
||||
Comment[uk]=Плазмоїд завдань з панелі Латте
|
||||
Comment[x-test]=xxTasks plasmoid from Latte Dockxx
|
||||
|
||||
Type=Service
|
||||
Icon=latte-dock
|
||||
|
Loading…
x
Reference in New Issue
Block a user