1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-27 06:03:51 +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 2019-08-17 05:02:10 +02:00
parent 38663c2534
commit e5a1324862
7 changed files with 9 additions and 0 deletions

View File

@ -19,6 +19,7 @@ Name[ru]=Индикаторы Latte
Name[sv]=Latte indikatorer
Name[uk]=Індикатори Латте
Name[x-test]=xxLatte Indicatorsxx
Name[zh_CN]=Latte 指示器
Name[zh_TW]=Latte 指示器
ProvidersUrl=https://download.kde.org/ocs/providers.xml

View File

@ -22,6 +22,7 @@ Comment[ru]=Индикатор Latte
Comment[sv]=Latte indikator
Comment[uk]=Індикатор Латте
Comment[x-test]=xxLatte indicatorxx
Comment[zh_CN]=Latte
Comment[zh_TW]=Latte
[PropertyDef::X-Latte-API]

View File

@ -19,6 +19,7 @@ Name[ru]=Индикатор
Name[sv]=Indikator
Name[uk]=Індикатор
Name[x-test]=xxIndicatorxx
Name[zh_CN]=
Name[zh_TW]=
Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure

View File

@ -45,6 +45,7 @@ Comment[ru]=Индикатор Latte умолчанию
Comment[sv]=Latte standardindikator
Comment[uk]=Типовий індикатор Латте
Comment[x-test]=xxLatte default indicatorxx
Comment[zh_CN]=Latte
Comment[zh_TW]=Latte
Encoding=UTF-8

View File

@ -44,6 +44,7 @@ Comment[ru]=Индикатор Latte в стиле Plasma
Comment[sv]=Latte Plasmastilindikator
Comment[uk]=Індикатор стилю Плазми Латте
Comment[x-test]=xxLatte Plasma style indicatorxx
Comment[zh_CN]=Latte Plasma
Comment[zh_TW]=Latte Plasma
Encoding=UTF-8

View File

@ -19,6 +19,7 @@ Name[ru]=Процессы Latte
Name[sv]=Latte aktiviteter
Name[uk]=Завдання Латте
Name[x-test]=xxLatte Tasksxx
Name[zh_CN]=Latte
Name[zh_TW]=Latte
Comment=Tasks plasmoid from Latte Dock
Comment[ca]=Plasmoide de tasques del Latte Dock
@ -40,6 +41,7 @@ Comment[ru]=Виджет процессов из Latte Dock
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
Type=Service

View File

@ -19,6 +19,7 @@ Name[ru]=Процессы Latte
Name[sv]=Latte aktiviteter
Name[uk]=Завдання Латте
Name[x-test]=xxLatte Tasksxx
Name[zh_CN]=Latte
Name[zh_TW]=Latte
Comment=Tasks plasmoid from Latte Dock
Comment[ca]=Plasmoide de tasques del Latte Dock
@ -40,6 +41,7 @@ Comment[ru]=Виджет процессов из Latte Dock
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
Type=Service