kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-30 14:50:12 +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-16 09:48:41 +01:00
parent 47aa6cb0f4
commit 27c8cda791
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plasmoid/metadata.desktop.cmake
View File

@ -22,7 +22,7 @@ Name[sv]=Latte aktiviteter
Name[uk]=Завдання Латте
Name[x-test]=xxLatte Tasksxx
Name[zh_CN]=Latte 任务管理器
Name[zh_TW]=Latte 任務
Name[zh_TW]=Latte 工作
Comment=Tasks plasmoid from Latte Dock
Comment[ca]=Plasmoide de tasques del Latte Dock
Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
@ -46,7 +46,7 @@ Comment[sv]=Aktivitetsplasmoid för Latte dockningsfönster
Comment[uk]=Плазмоїд завдань з панелі Латте
Comment[x-test]=xxTasks plasmoid from Latte Dockxx
Comment[zh_CN]=Latte 停靠栏的任务管理 Plasma 部件
Comment[zh_TW]=來自 Latte Dock 的任務 Plasmoid
Comment[zh_TW]=來自 Latte Dock 的工作 Plasmoid
Type=Service
Icon=latte-dock

4
plasmoid/package/metadata.desktop
View File

@ -22,7 +22,7 @@ Name[sv]=Latte aktiviteter
Name[uk]=Завдання Латте
Name[x-test]=xxLatte Tasksxx
Name[zh_CN]=Latte 任务管理器
Name[zh_TW]=Latte 任務
Name[zh_TW]=Latte 工作
Comment=Tasks plasmoid from Latte Dock
Comment[ca]=Plasmoide de tasques del Latte Dock
Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
@ -46,7 +46,7 @@ Comment[sv]=Aktivitetsplasmoid för Latte dockningsfönster
Comment[uk]=Плазмоїд завдань з панелі Латте
Comment[x-test]=xxTasks plasmoid from Latte Dockxx
Comment[zh_CN]=Latte 停靠栏的任务管理 Plasma 部件
Comment[zh_TW]=來自 Latte Dock 的任務 Plasmoid
Comment[zh_TW]=來自 Latte Dock 的工作 Plasmoid
Type=Service
Icon=latte-dock