1
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02: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 2019-01-14 05:31:45 +01:00
parent 4c9d503699
commit c8cede5db6
3 changed files with 4 additions and 0 deletions

View File

@ -11,6 +11,7 @@ Name[id]=Hello Qml
Name[it]=Hello Qml
Name[nl]=Hello Qml
Name[pt]=Olá em QML
Name[pt_BR]=Olá Qml
Name[sv]=Hallå QML
Name[uk]=Привіт, Qml
Name[x-test]=xxHello Qmlxx

View File

@ -14,6 +14,7 @@ Name[it]=Caricatore al clic centrale
Name[nl]=MiddleClickLoader
Name[nn]=Lasting med midtklikk
Name[pt]=CarregadorBotãoMeio
Name[pt_BR]=CarregadorBotãoMeio
Name[sv]=Mittenklicksinläsning
Name[uk]=Завантажувач за клацанням середньою
Name[x-test]=xxMiddleClickLoaderxx
@ -32,6 +33,7 @@ Comment[id]=Muat teks dalam seleksi clipboard sebagai URL
Comment[it]=Carica come URL il testo negli appunti della selezione
Comment[nl]=Tekst laden in selectieklembord als URL
Comment[pt]=Carrega o texto na área de transferência como um URL
Comment[pt_BR]=Carrega o texto na área de transferência como uma URL
Comment[sv]=Läs in text i markeringen eller klippbordet som webbadress
Comment[uk]=Завантажує текст у буфері обміну як адресу
Comment[x-test]=xxLoad text in selection clipboard as URLxx

View File

@ -15,6 +15,7 @@ Name[it]=Apri con mpv
Name[nl]=Met mpv openen
Name[nn]=Opna med mpv
Name[pt]=Abrir com o 'mpv'
Name[pt_BR]=Abrir com o mpv
Name[sv]=Öppna med mpv
Name[uk]=Відкрити за допомогою mpv
Name[x-test]=xxOpen with mpvxx