From 257a03b6187086998d9d25b3cc30bf60e5264a1b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 26 Jun 2018 07:18:45 +0200 Subject: [PATCH] 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" --- app/lattedock.notifyrc | 5 +++++ app/org.kde.latte-dock.desktop.cmake | 3 +++ applets/separator/metadata.desktop.cmake | 1 + applets/separator/package/metadata.desktop | 1 + applets/spacer/metadata.desktop.cmake | 3 +++ applets/spacer/package/metadata.desktop | 3 +++ containment/metadata.desktop.cmake | 2 ++ containment/package/metadata.desktop | 2 ++ plasmoid/metadata.desktop.cmake | 1 + plasmoid/package/metadata.desktop | 1 + shell/metadata.desktop.cmake | 2 +- shell/package/contents/controls/latte-separator.desktop | 3 +++ shell/package/metadata.desktop | 2 +- 13 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index 5299f5805..98c2054fb 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -62,6 +62,7 @@ Name[nl]=Configuration met succes geïmporteerd Name[nn]=Oppsettet er no importert Name[pl]=Pomyślnie zaimportowano ustawienia Name[pt]=A configuração foi importada com sucesso +Name[pt_BR]=Configuração importada com sucesso Name[sv]=Inställning importerad med lyckat resultat Name[uk]=Налаштування успішно імпортовано Name[x-test]=xxConfiguration imported successfullyxx @@ -86,6 +87,7 @@ Name[nl]=Configuratie importeren is mislukt Name[nn]=Klarte ikkje importera oppsett Name[pl]=Nie udało się zaimportować ustawień Name[pt]=Não foi possível importar a configuração +Name[pt_BR]=Ocorreu um erro ao importar a configuração Name[sv]=Misslyckades importera inställning Name[uk]=Не вдалося імпортувати налаштування Name[x-test]=xxFailed to import configurationxx @@ -110,6 +112,7 @@ Name[nl]=Configuration met succes geëxporteerd Name[nn]=Oppsettet er no eksportert Name[pl]=Pomyślnie wyeksportowano ustawienia Name[pt]=A configuração foi exportada com sucesso +Name[pt_BR]=Configuração exportada com sucesso Name[sv]=Inställning exporterad med lyckat resultat Name[uk]=Налаштування успішно експортовано Name[x-test]=xxConfiguration exported successfullyxx @@ -134,6 +137,7 @@ Name[nl]=Configuratie exporteren is mislukt Name[nn]=Klarte ikkje eksportera oppsettet Name[pl]=Nie udało się wyeksportować ustawień Name[pt]=Não foi possível exportar a configuração +Name[pt_BR]=Ocorreu um erro ao exportar a configuração Name[sv]=Misslyckades exportera inställning Name[uk]=Не вдалося експортувати налаштування Name[x-test]=xxFailed to export configurationxx @@ -158,6 +162,7 @@ Name[nl]=Naar indeling omschakelen Name[nn]=Byt til utforming Name[pl]=Przełącz układ Name[pt]=Mudar para a disposição +Name[pt_BR]=Mudar para o layout Name[sv]=Byt till layout Name[uk]=Перемкнутися на компонування Name[x-test]=xxSwitch to layoutxx diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake index 828da5b00..76e607db7 100644 --- a/app/org.kde.latte-dock.desktop.cmake +++ b/app/org.kde.latte-dock.desktop.cmake @@ -15,6 +15,7 @@ Name[nl]=Latte Name[nn]=Latte Name[pl]=Latte Name[pt]=Latte +Name[pt_BR]=Latte Name[sv]=Latte Name[uk]=Латте Name[x-test]=xxLattexx @@ -36,6 +37,7 @@ Comment[nl]=Dock voor de massa Comment[nn]=Dokk for massane Comment[pl]=Dok dla mas Comment[pt]=Área acoplável para as massas +Comment[pt_BR]=Área acoplável para todos Comment[sv]=Dockningsfönster för alla Comment[uk]=Панель для усіх Comment[x-test]=xxDock for the massesxx @@ -57,6 +59,7 @@ GenericName[nl]=Dock GenericName[nn]=Dokk GenericName[pl]=Dok GenericName[pt]=Área Acoplável +GenericName[pt_BR]=Área acoplável GenericName[sk]=Dok GenericName[sv]=Dockningsfönster GenericName[uk]=Панель diff --git a/applets/separator/metadata.desktop.cmake b/applets/separator/metadata.desktop.cmake index 4c34fa587..6c017ad0f 100644 --- a/applets/separator/metadata.desktop.cmake +++ b/applets/separator/metadata.desktop.cmake @@ -39,6 +39,7 @@ Comment[nl]=Voor al uw scheidingstaken Comment[nn]=For alle dine skiljebehov Comment[pl]=Dla wszystkich twoich oddzielonych zadań Comment[pt]=Para todas as suas tarefas de separação +Comment[pt_BR]=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 diff --git a/applets/separator/package/metadata.desktop b/applets/separator/package/metadata.desktop index 4c34fa587..6c017ad0f 100644 --- a/applets/separator/package/metadata.desktop +++ b/applets/separator/package/metadata.desktop @@ -39,6 +39,7 @@ Comment[nl]=Voor al uw scheidingstaken Comment[nn]=For alle dine skiljebehov Comment[pl]=Dla wszystkich twoich oddzielonych zadań Comment[pt]=Para todas as suas tarefas de separação +Comment[pt_BR]=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 diff --git a/applets/spacer/metadata.desktop.cmake b/applets/spacer/metadata.desktop.cmake index dbef2d21d..28e18e82f 100644 --- a/applets/spacer/metadata.desktop.cmake +++ b/applets/spacer/metadata.desktop.cmake @@ -15,6 +15,7 @@ Name[nl]=Latte Dock paneelscheider Name[nn]=Mellomrom for Latte-dokk Name[pl]=Wypełniacz doku Latte Name[pt]=Espaço da Área Acoplável do Latte +Name[pt_BR]=Espaçador do Latte Dock Name[sv]=Avskiljare för Latte dockningsfönster Name[uk]=Розпірка панелі Латте Name[x-test]=xxLatte Dock Spacerxx @@ -35,6 +36,7 @@ Comment[nl]=Reserveer lege ruimte in het dok. Comment[nn]=Fjern tomrom i dokken. Comment[pl]=Zajmij puste powierzchnie w doku. Comment[pt]=Reservar espaços em branco dentro da área acoplável. +Comment[pt_BR]=Reserva espaços em branco dentro da área acoplável. Comment[sv]=Reservera tomt utrymme inne i dockningsfönstret. Comment[uk]=Створює прогалини на панелі. Comment[x-test]=xxReserve empty spaces within the dock.xx @@ -58,6 +60,7 @@ Keywords[nl]=paneelscheider Keywords[nn]=mellomrom Keywords[pl]=wypełniacz Keywords[pt]=espaço +Keywords[pt_BR]=espaçador Keywords[sv]=mellanrum Keywords[uk]=розпірка Keywords[x-test]=xxspacerxx diff --git a/applets/spacer/package/metadata.desktop b/applets/spacer/package/metadata.desktop index dbef2d21d..28e18e82f 100644 --- a/applets/spacer/package/metadata.desktop +++ b/applets/spacer/package/metadata.desktop @@ -15,6 +15,7 @@ Name[nl]=Latte Dock paneelscheider Name[nn]=Mellomrom for Latte-dokk Name[pl]=Wypełniacz doku Latte Name[pt]=Espaço da Área Acoplável do Latte +Name[pt_BR]=Espaçador do Latte Dock Name[sv]=Avskiljare för Latte dockningsfönster Name[uk]=Розпірка панелі Латте Name[x-test]=xxLatte Dock Spacerxx @@ -35,6 +36,7 @@ Comment[nl]=Reserveer lege ruimte in het dok. Comment[nn]=Fjern tomrom i dokken. Comment[pl]=Zajmij puste powierzchnie w doku. Comment[pt]=Reservar espaços em branco dentro da área acoplável. +Comment[pt_BR]=Reserva espaços em branco dentro da área acoplável. Comment[sv]=Reservera tomt utrymme inne i dockningsfönstret. Comment[uk]=Створює прогалини на панелі. Comment[x-test]=xxReserve empty spaces within the dock.xx @@ -58,6 +60,7 @@ Keywords[nl]=paneelscheider Keywords[nn]=mellomrom Keywords[pl]=wypełniacz Keywords[pt]=espaço +Keywords[pt_BR]=espaçador Keywords[sv]=mellanrum Keywords[uk]=розпірка Keywords[x-test]=xxspacerxx diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake index b17dbb1b2..ddfa6abb4 100644 --- a/containment/metadata.desktop.cmake +++ b/containment/metadata.desktop.cmake @@ -16,6 +16,7 @@ Name[nl]=Latte Name[nn]=Latte Name[pl]=Latte Name[pt]=Latte +Name[pt_BR]=Latte Name[sv]=Latte Name[uk]=Латте Name[x-test]=xxLattexx @@ -35,6 +36,7 @@ Comment[nl]=Container geleverd voor de Latte Dock Comment[nn]=Behaldar for Latte-dokk Comment[pl]=Pojemnik dla doku Latte Comment[pt]=Contentor oferecido para a área acoplável do Latte +Comment[pt_BR]=Contêiner fornecido pelo Latte Dock Comment[sv]=Omgivning tillhandahållen för Latte dockningsfönster Comment[uk]=Контейнер панелі Латте Comment[x-test]=xxContainment provided for the Latte Dockxx diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index 45478d2d0..9379b4453 100644 --- a/containment/package/metadata.desktop +++ b/containment/package/metadata.desktop @@ -16,6 +16,7 @@ Name[nl]=Latte Name[nn]=Latte Name[pl]=Latte Name[pt]=Latte +Name[pt_BR]=Latte Name[sv]=Latte Name[uk]=Латте Name[x-test]=xxLattexx @@ -35,6 +36,7 @@ Comment[nl]=Container geleverd voor de Latte Dock Comment[nn]=Behaldar for Latte-dokk Comment[pl]=Pojemnik dla doku Latte Comment[pt]=Contentor oferecido para a área acoplável do Latte +Comment[pt_BR]=Contêiner fornecido pelo Latte Dock Comment[sv]=Omgivning tillhandahållen för Latte dockningsfönster Comment[uk]=Контейнер панелі Латте Comment[x-test]=xxContainment provided for the Latte Dockxx diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake index 23daf128f..3d0f2584a 100644 --- a/plasmoid/metadata.desktop.cmake +++ b/plasmoid/metadata.desktop.cmake @@ -15,6 +15,7 @@ Name[nl]=Latte-plasmoid Name[nn]=Latte-skjermelement Name[pl]=Plazmoid Latte Name[pt]=Plasmóide do Latte +Name[pt_BR]=Plasmoide do Latte Name[sv]=Latte Plasmoid Name[uk]=Плазмоїд Латте Name[x-test]=xxLatte Plasmoidxx diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index a12c8a177..f97e6e791 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -15,6 +15,7 @@ Name[nl]=Latte-plasmoid Name[nn]=Latte-skjermelement Name[pl]=Plazmoid Latte Name[pt]=Plasmóide do Latte +Name[pt_BR]=Plasmoide do Latte Name[sv]=Latte Plasmoid Name[uk]=Плазмоїд Латте Name[x-test]=xxLatte Plasmoidxx diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake index 94390c7bc..324392138 100644 --- a/shell/metadata.desktop.cmake +++ b/shell/metadata.desktop.cmake @@ -35,7 +35,7 @@ Comment[nl]=Shell geleverd voor de Latte Dock Comment[nn]=Skal frå Latte-dokk 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[pt_BR]=Shell fornecido pelo Latte Dock Comment[sv]=Skal tillhandahållet för Latte dockningsfönster Comment[uk]=Оболонка панелі Латте Comment[x-test]=xxShell provided for the Latte Dockxx diff --git a/shell/package/contents/controls/latte-separator.desktop b/shell/package/contents/controls/latte-separator.desktop index 894787be2..ef0f6fb5c 100644 --- a/shell/package/contents/controls/latte-separator.desktop +++ b/shell/package/contents/controls/latte-separator.desktop @@ -15,6 +15,7 @@ Name[nl]=Latte-scheidingsteken Name[nn]=Latte-skiljar Name[pl]=Oddzielacz Latte Name[pt]=Separador do Latte +Name[pt_BR]=Separador do Latte Name[sv]=Latte avskiljare Name[uk]=Роздільник Латте Name[x-test]=xxLatte Separatorxx @@ -33,6 +34,7 @@ Comment[nl]=Latte Ghost-scheidingsteken (Ghost-bestand) Comment[nn]=Spøkjelsesskiljar for Latte (spøkjelsesfil) Comment[pl]=Oddzielacz Ghost Latte (plik Ghost) Comment[pt]=Separador Ghost do Latte (ficheiro Ghost) +Comment[pt_BR]=Separador Ghost do Latte (arquivo Ghost) Comment[sv]=Latte spökavskiljare (spökfil) Comment[uk]=Роздільник-привид Латте (файл-привид) Comment[x-test]=xxLatte Ghost Separator (Ghost file)xx @@ -54,6 +56,7 @@ GenericName[nl]=Dock GenericName[nn]=Dokk GenericName[pl]=Dok GenericName[pt]=Área Acoplável +GenericName[pt_BR]=Área acoplável GenericName[sk]=Dok GenericName[sv]=Dockningsfönster GenericName[uk]=Панель diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop index bc9e52876..e027b9632 100644 --- a/shell/package/metadata.desktop +++ b/shell/package/metadata.desktop @@ -35,7 +35,7 @@ Comment[nl]=Shell geleverd voor de Latte Dock Comment[nn]=Skal frå Latte-dokk 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[pt_BR]=Shell fornecido pelo Latte Dock Comment[sv]=Skal tillhandahållet för Latte dockningsfönster Comment[uk]=Оболонка панелі Латте Comment[x-test]=xxShell provided for the Latte Dockxx