1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01: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 2021-07-15 01:14:50 +00:00
parent b5edc951d4
commit 1c2c8ab982
3 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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