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"
work/fuf/qt6
l10n daemon script 2 years ago
parent a111d8153a
commit a7e875e567

@ -16,6 +16,7 @@
"Name[ka]": "Michail Vourlakos, Smith Ar",
"Name[ko]": "Michail Vourlakos, Smith Ar",
"Name[nl]": "Michail Vourlakos, Smith Ar",
"Name[nn]": "Michail Vourlakos, Smith Ar",
"Name[pl]": "Michail Vourlakos, Smith Ar",
"Name[pt]": "Michail Vourlakos, Smith Ar",
"Name[pt_BR]": "Michail Vourlakos, Smith Ar",
@ -41,6 +42,7 @@
"Description[it]": "Contenitore fornito per Latte Dock",
"Description[ko]": "Latte 독 컨테이너",
"Description[nl]": "Container geleverd voor de Latte Dock",
"Description[nn]": "Behaldar for Latte-dokk",
"Description[pl]": "Pojemnik dla doku Latte",
"Description[pt]": "Contentor oferecido para a área acoplável do Latte",
"Description[pt_BR]": "Contêiner fornecido pelo Latte Dock",
@ -67,6 +69,7 @@
"Name[ko]": "Latte 컨테이너",
"Name[lt]": "Latte suvaržymas",
"Name[nl]": "Latte-container",
"Name[nn]": "Latte-behaldar",
"Name[pl]": "Pojemnik Latte",
"Name[pt]": "Contentor do Latte",
"Name[pt_BR]": "Contêiner do Latte",

@ -16,6 +16,7 @@
"Name[ka]": "Michail Vourlakos",
"Name[ko]": "Michail Vourlakos",
"Name[nl]": "Michail Vourlakos",
"Name[nn]": "Michail Vourlakos",
"Name[pl]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[pt_BR]": "Michail Vourlakos",
@ -40,6 +41,7 @@
"Description[it]": "Il menu di Latte che normalmente viene mostrato al clic destro",
"Description[ko]": "오른쪽 클릭 시 일반적으로 표시되는 Latte 메뉴",
"Description[nl]": "Het menu van latte dat normaal getoond wordt bij rechtsklikken",
"Description[nn]": "Latte-menyen som som standard vert vist ved høgreklikk",
"Description[pl]": "Menu Latte, które normalnie pokazuj się po kliknięciu prawym",
"Description[pt]": "O menu do Latte que normalmente aparece com o botão direito do rato",
"Description[pt_BR]": "O menu do Latte que normalmente aparece ao clicar com o botão direito do mouse",

@ -16,6 +16,7 @@
"Name[ka]": "Michail Vourlakos",
"Name[ko]": "Michail Vourlakos",
"Name[nl]": "Michail Vourlakos",
"Name[nn]": "Michail Vourlakos",
"Name[pl]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[pt_BR]": "Michail Vourlakos",
@ -40,6 +41,7 @@
"Description[it]": "Indicatore predefinito di Latte",
"Description[ko]": "Latte 기본 표시기",
"Description[nl]": "Standaard indicator van Latte",
"Description[nn]": "Standard Latte-markør",
"Description[pl]": "Domyślny wskaźnik Latte",
"Description[pt]": "Indicador predefinido do Latte",
"Description[pt_BR]": "Indicador padrão do Latte",

@ -16,6 +16,7 @@
"Name[ka]": "Michail Vourlakos",
"Name[ko]": "Michail Vourlakos",
"Name[nl]": "Michail Vourlakos",
"Name[nn]": "Michail Vourlakos",
"Name[pl]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[pt_BR]": "Michail Vourlakos",
@ -40,6 +41,7 @@
"Description[it]": "Indicatore stile di Plasma di Latte",
"Description[ko]": "Latte Plasma 스타일 표시기",
"Description[nl]": "Plasma stijlindicator van Latte",
"Description[nn]": "Latte-markør i Plasma-stil",
"Description[pl]": "Wskaźnik Latte dla Plazmy",
"Description[pt]": "Indicador de estilo do Plasma no Latte",
"Description[pt_BR]": "Indicador de estilo do Plasma no Latte",

@ -16,6 +16,7 @@
"Name[ka]": "Michail Vourlakos",
"Name[ko]": "Michail Vourlakos",
"Name[nl]": "Michail Vourlakos",
"Name[nn]": "Michail Vourlakos",
"Name[pl]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[pt_BR]": "Michail Vourlakos",
@ -40,6 +41,7 @@
"Description[it]": "Indicatore stile delle schede di Plasma di Latte",
"Description[ko]": "Latte Plasma 탭 스타일 표시기",
"Description[nl]": "Plasma-tabblad stijl indicator voor Latte",
"Description[nn]": "Fanemarkør i Plasma-stil",
"Description[pl]": "Wskaźnik wyglądu karty Plazmy dla Latte",
"Description[pt]": "Indicador do estilo de Páginas do Plasma para o Latte",
"Description[pt_BR]": "Indicador de estilo de abas do Plasma para o Latte",

@ -16,6 +16,7 @@
"Name[ka]": "Michail Vourlakos, Smith Ar",
"Name[ko]": "Michail Vourlakos, Smith Ar",
"Name[nl]": "Michail Vourlakos, Smith Ar",
"Name[nn]": "Michail Vourlakos, Smith Ar",
"Name[pl]": "Michail Vourlakos, Smith Ar",
"Name[pt]": "Michail Vourlakos, Smith Ar",
"Name[pt_BR]": "Michail Vourlakos, Smith Ar",
@ -40,6 +41,7 @@
"Description[it]": "Plasmoide dei processi da Latte Dock",
"Description[ko]": "Latte 독의 작업 Plasmoid",
"Description[nl]": "Widget voor taken uit Latte Dock",
"Description[nn]": "Oppgåve-skjermelement frå Latte-dokk",
"Description[pl]": "Plazmoidy zadań dla doku Latte",
"Description[pt]": "Plasmóide de tarefas da Área Acoplável do Latte",
"Description[pt_BR]": "Plasmoide de tarefas do Latte Dock",

@ -16,6 +16,7 @@
"Name[ka]": "Michail Vourlakos, Smith Ar",
"Name[ko]": "Michail Vourlakos, Smith Ar",
"Name[nl]": "Michail Vourlakos, Smith Ar",
"Name[nn]": "Michail Vourlakos, Smith Ar",
"Name[pl]": "Michail Vourlakos, Smith Ar",
"Name[pt]": "Michail Vourlakos, Smith Ar",
"Name[pt_BR]": "Michail Vourlakos, Smith Ar",
@ -39,6 +40,7 @@
"Description[it]": "Shell fornita per Latte Dock",
"Description[ko]": "Latte 독용 셸",
"Description[nl]": "Shell geleverd voor de Latte Dock",
"Description[nn]": "Skal for Latte-dokk",
"Description[pl]": "Powłoka dla doku Latte",
"Description[pt]": "Consola oferecida para a área acoplável do Latte",
"Description[pt_BR]": "Shell fornecido pelo Latte Dock",

Loading…
Cancel
Save