From 1c2c8ab9829bc7707581a39fc4433021865e7eca Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 15 Jul 2021 01:14:50 +0000 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" --- linux/applications/org.kde.falkon.desktop | 2 +- src/plugins/AutoScroll/metadata.desktop | 2 +- src/scripts/middleclickloader/metadata.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index e4522bb63..5205f450f 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -140,7 +140,7 @@ Name[nn]=Opna ny fane Name[pa]=ਨਵਾਂ ਟੈਬ ਖੋਲ੍ਹੋ Name[pl]=Otwórz nową kartę Name[pt]=Abrir uma nova página -Name[pt_BR]=Abrir uma nova guia +Name[pt_BR]=Abrir uma nova aba Name[ru]=Открыть новую вкладку Name[sk]=Otvoriť novú záložku Name[sl]=Odpri novi zavihek diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index 0fe898e51..9012635df 100644 --- a/src/plugins/AutoScroll/metadata.desktop +++ b/src/plugins/AutoScroll/metadata.desktop @@ -23,7 +23,7 @@ Name[nl]=Auto-schuiven Name[nn]=Autorulling Name[pl]=Automatyczne przewijanie Name[pt]=Deslocamento Automático -Name[pt_BR]=AutoScroll +Name[pt_BR]=Rolagem automática Name[ru]=Автопрокрутка Name[sk]=Automatické posúvanie Name[sl]=Samodejno drsenje diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 1719a0f46..641a05e15 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -23,7 +23,7 @@ Name[nl]=MiddleClickLoader Name[nn]=Lasting med midtklikk Name[pl]=MiddleClickLoader Name[pt]=CarregadorBotãoMeio -Name[pt_BR]=CarregadorBotãoMeio +Name[pt_BR]=Carregador do botão do meio Name[ru]=MiddleClickLoader Name[sk]=MiddleClickLoader Name[sl]=MiddleClickLoader