1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 14:50:21 +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 2018-05-19 08:01:33 +02:00
parent 897889c3a1
commit 083c136836
13 changed files with 20 additions and 6 deletions

View File

@ -17,6 +17,7 @@ Name[pt_BR]=Latte Dock
Name[sv]=Latte dockningsfönster
Name[uk]=Панель Латте
Name[x-test]=xxLatte Dockxx
Name[zh_CN]=Latte 停靠栏
Name[zh_TW]=Latte Dock
Comment=Latte Dock
Comment[ca]=Acoblable del Latte
@ -36,6 +37,7 @@ Comment[pt_BR]=Latte Dock
Comment[sv]=Latte dockningsfönster
Comment[uk]=Панель Латте
Comment[x-test]=xxLatte Dockxx
Comment[zh_CN]=Latte 停靠栏
Comment[zh_TW]=Latte Dock
IconName=latte-dock

View File

@ -57,7 +57,7 @@ GenericName[sk]=Dok
GenericName[sv]=Dockningsfönster
GenericName[uk]=Панель
GenericName[x-test]=xxDockxx
GenericName[zh_CN]=
GenericName[zh_CN]=
GenericName[zh_TW]=Dock
Icon=latte-dock
Categories=Utility;X-SuSE-DesktopUtility;

View File

@ -20,7 +20,7 @@ Name[sk]=Oddeľovač
Name[sv]=Avskiljare
Name[uk]=Роздільник
Name[x-test]=xxSeparatorxx
Name[zh_CN]=
Name[zh_CN]=
Name[zh_TW]=
Comment=For all your separation tasks
Comment[ca]=Per a totes les tasques de separació
@ -39,6 +39,7 @@ Comment[pt]=Para todas as suas tarefas de separação
Comment[sv]=För alla dina separationsuppgifter
Comment[uk]=Для відокремлення усіх ваших завдань
Comment[x-test]=xxFor all your separation tasksxx
Comment[zh_CN]=
Comment[zh_TW]=
Encoding=UTF-8
@ -63,7 +64,7 @@ Keywords[sk]=oddeľovač
Keywords[sv]=avskiljare
Keywords[uk]=Роздільник
Keywords[x-test]=xxseparatorxx
Keywords[zh_CN]=
Keywords[zh_CN]=
Keywords[zh_TW]=
Type=Service

View File

@ -20,7 +20,7 @@ Name[sk]=Oddeľovač
Name[sv]=Avskiljare
Name[uk]=Роздільник
Name[x-test]=xxSeparatorxx
Name[zh_CN]=
Name[zh_CN]=
Name[zh_TW]=
Comment=For all your separation tasks
Comment[ca]=Per a totes les tasques de separació
@ -39,6 +39,7 @@ Comment[pt]=Para todas as suas tarefas de separação
Comment[sv]=För alla dina separationsuppgifter
Comment[uk]=Для відокремлення усіх ваших завдань
Comment[x-test]=xxFor all your separation tasksxx
Comment[zh_CN]=
Comment[zh_TW]=
Encoding=UTF-8
@ -63,7 +64,7 @@ Keywords[sk]=oddeľovač
Keywords[sv]=avskiljare
Keywords[uk]=Роздільник
Keywords[x-test]=xxseparatorxx
Keywords[zh_CN]=
Keywords[zh_CN]=
Keywords[zh_TW]=
Type=Service

View File

@ -16,6 +16,7 @@ Name[pt]=Espaço da Área Acoplável do Latte
Name[sv]=Avskiljare för Latte dockningsfönster
Name[uk]=Розпірка панелі Латте
Name[x-test]=xxLatte Dock Spacerxx
Name[zh_CN]=Latte
Name[zh_TW]=Latte Dock
Comment=Reserve empty spaces within the dock.
Comment[ca]=Reserva espais buits dins de l'acoblador.

View File

@ -16,6 +16,7 @@ Name[pt]=Espaço da Área Acoplável do Latte
Name[sv]=Avskiljare för Latte dockningsfönster
Name[uk]=Розпірка панелі Латте
Name[x-test]=xxLatte Dock Spacerxx
Name[zh_CN]=Latte
Name[zh_TW]=Latte Dock
Comment=Reserve empty spaces within the dock.
Comment[ca]=Reserva espais buits dins de l'acoblador.

View File

@ -36,6 +36,7 @@ Comment[pt]=Contentor oferecido para a área acoplável do Latte
Comment[sv]=Omgivning tillhandahållen för Latte dockningsfönster
Comment[uk]=Контейнер панелі Латте
Comment[x-test]=xxContainment provided for the Latte Dockxx
Comment[zh_CN]= Latte
Comment[zh_TW]= Latte Dock 使
Type=Service

View File

@ -36,6 +36,7 @@ Comment[pt]=Contentor oferecido para a área acoplável do Latte
Comment[sv]=Omgivning tillhandahållen för Latte dockningsfönster
Comment[uk]=Контейнер панелі Латте
Comment[x-test]=xxContainment provided for the Latte Dockxx
Comment[zh_CN]= Latte
Comment[zh_TW]= Latte Dock 使
Type=Service

View File

@ -16,6 +16,7 @@ Name[pt]=Plasmóide do Latte
Name[sv]=Latte Plasmoid
Name[uk]=Плазмоїд Латте
Name[x-test]=xxLatte Plasmoidxx
Name[zh_CN]=Latte Plasmoid
Name[zh_TW]=Latte Plasmoid
Comment=Plasmoid from the Latte Dock
Comment[ca]=Plasmoide del Latte Dock
@ -35,6 +36,7 @@ Comment[pt_BR]=Plasmoide do Latte Dock
Comment[sv]=Plasmoid för Latte dockningsfönster
Comment[uk]=Плазмоїд для панелі Латте
Comment[x-test]=xxPlasmoid from the Latte Dockxx
Comment[zh_CN]=Latte Plasmoid
Comment[zh_TW]= Latte Dock Plasmoid
Type=Service

View File

@ -16,6 +16,7 @@ Name[pt]=Plasmóide do Latte
Name[sv]=Latte Plasmoid
Name[uk]=Плазмоїд Латте
Name[x-test]=xxLatte Plasmoidxx
Name[zh_CN]=Latte Plasmoid
Name[zh_TW]=Latte Plasmoid
Comment=Plasmoid from the Latte Dock
Comment[ca]=Plasmoide del Latte Dock
@ -35,6 +36,7 @@ Comment[pt_BR]=Plasmoide do Latte Dock
Comment[sv]=Plasmoid för Latte dockningsfönster
Comment[uk]=Плазмоїд для панелі Латте
Comment[x-test]=xxPlasmoid from the Latte Dockxx
Comment[zh_CN]=Latte Plasmoid
Comment[zh_TW]= Latte Dock Plasmoid
Type=Service

View File

@ -36,6 +36,7 @@ Comment[pt_BR]=Shell fornecido para o Latte Dock
Comment[sv]=Skal tillhandahållet för Latte dockningsfönster
Comment[uk]=Оболонка панелі Латте
Comment[x-test]=xxShell provided for the Latte Dockxx
Comment[zh_CN]= Latte Shell
Comment[zh_TW]= Latte Dock Shell
Keywords=shell

View File

@ -54,7 +54,7 @@ GenericName[sk]=Dok
GenericName[sv]=Dockningsfönster
GenericName[uk]=Панель
GenericName[x-test]=xxDockxx
GenericName[zh_CN]=
GenericName[zh_CN]=
GenericName[zh_TW]=Dock
Version=0.1
Categories=Utility;

View File

@ -36,6 +36,7 @@ Comment[pt_BR]=Shell fornecido para o Latte Dock
Comment[sv]=Skal tillhandahållet för Latte dockningsfönster
Comment[uk]=Оболонка панелі Латте
Comment[x-test]=xxShell provided for the Latte Dockxx
Comment[zh_CN]= Latte Shell
Comment[zh_TW]= Latte Dock Shell
Keywords=shell