kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 14:50:21 +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 2018-02-22 07:22:07 +01:00
parent c573f8f0c1
commit 2962d212ef
7 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lattedock.notifyrc
View File

@ -12,6 +12,7 @@ Name[it]=Latte Dock
Name[nl]=Latte Dock
Name[pl]=Dok Latte
Name[pt]=Área Acoplável do Latte
Name[pt_BR]=Latte Dock
Name[sv]=Latte dockningsfönster
Name[uk]=Панель Латте
Name[x-test]=xxLatte Dockxx
@ -29,6 +30,7 @@ Comment[it]=Latte Dock
Comment[nl]=Latte Dock
Comment[pl]=Dok Latte
Comment[pt]=Área Acoplável do Latte
Comment[pt_BR]=Latte Dock
Comment[sv]=Latte dockningsfönster
Comment[uk]=Панель Латте
Comment[x-test]=xxLatte Dockxx

2
applets/separator/metadata.desktop.cmake
View File

@ -14,6 +14,7 @@ Name[it]=Separatore
Name[nl]=Scheidingshulpmiddel
Name[pl]=Oddzielacz
Name[pt]=Separador
Name[pt_BR]=Separador
Name[sk]=Oddeľovač
Name[sv]=Avskiljare
Name[uk]=Роздільник
@ -54,6 +55,7 @@ Keywords[it]=separatore
Keywords[nl]=scheiding
Keywords[pl]=oddzielacz
Keywords[pt]=separador
Keywords[pt_BR]=separador
Keywords[sk]=oddeľovač
Keywords[sv]=avskiljare
Keywords[uk]=Роздільник

2
applets/separator/package/metadata.desktop
View File

@ -14,6 +14,7 @@ Name[it]=Separatore
Name[nl]=Scheidingshulpmiddel
Name[pl]=Oddzielacz
Name[pt]=Separador
Name[pt_BR]=Separador
Name[sk]=Oddeľovač
Name[sv]=Avskiljare
Name[uk]=Роздільник
@ -54,6 +55,7 @@ Keywords[it]=separatore
Keywords[nl]=scheiding
Keywords[pl]=oddzielacz
Keywords[pt]=separador
Keywords[pt_BR]=separador
Keywords[sk]=oddeľovač
Keywords[sv]=avskiljare
Keywords[uk]=Роздільник

1
plasmoid/metadata.desktop.cmake
View File

@ -29,6 +29,7 @@ Comment[it]=Plasmoide da Latte Dock
Comment[nl]=Plasmoid uit de Latte Dock
Comment[pl]=Plazmoid dla doku Latte
Comment[pt]=Plasmóide da Área Acoplável do Latte
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

1
plasmoid/package/metadata.desktop
View File

@ -29,6 +29,7 @@ Comment[it]=Plasmoide da Latte Dock
Comment[nl]=Plasmoid uit de Latte Dock
Comment[pl]=Plazmoid dla doku Latte
Comment[pt]=Plasmóide da Área Acoplável do Latte
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

3
shell/metadata.desktop.cmake
View File

@ -12,6 +12,7 @@ Name[it]=shell Latte
Name[nl]=Latte-shell
Name[pl]=Powłoka Latte
Name[pt]=Consola do Latte
Name[pt_BR]=Latte Shell
Name[sv]=Latte skal
Name[uk]=Оболонка Латте
Name[x-test]=xxLatte Shellxx
@ -29,6 +30,7 @@ Comment[it]=Shell fornita per Latte Dock
Comment[nl]=Shell geleverd voor de Latte Dock
Comment[pl]=Powłoka dla doku Latte
Comment[pt]=Consola oferecida para a área acoplável do Latte
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
@ -46,6 +48,7 @@ Keywords[it]=shell
Keywords[nl]=shell
Keywords[pl]=powłoka
Keywords[pt]=consola
Keywords[pt_BR]=shell
Keywords[sk]=shell
Keywords[sv]=skal
Keywords[uk]=оболонка

3
shell/package/metadata.desktop
View File

@ -12,6 +12,7 @@ Name[it]=shell Latte
Name[nl]=Latte-shell
Name[pl]=Powłoka Latte
Name[pt]=Consola do Latte
Name[pt_BR]=Latte Shell
Name[sv]=Latte skal
Name[uk]=Оболонка Латте
Name[x-test]=xxLatte Shellxx
@ -29,6 +30,7 @@ Comment[it]=Shell fornita per Latte Dock
Comment[nl]=Shell geleverd voor de Latte Dock
Comment[pl]=Powłoka dla doku Latte
Comment[pt]=Consola oferecida para a área acoplável do Latte
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
@ -46,6 +48,7 @@ Keywords[it]=shell
Keywords[nl]=shell
Keywords[pl]=powłoka
Keywords[pt]=consola
Keywords[pt_BR]=shell
Keywords[sk]=shell
Keywords[sv]=skal
Keywords[uk]=оболонка