mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +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:
parent
cf5c14872e
commit
e1c4da47a9
|
@ -9,6 +9,7 @@ Name[fi]=Keskipainikelatain
|
|||
Name[fr]=MiddleClickLoader
|
||||
Name[it]=Caricatore al clic centrale
|
||||
Name[nl]=MiddleClickLoader
|
||||
Name[nn]=Lasting med midtklikk
|
||||
Name[pt]=CarregadorBotãoMeio
|
||||
Name[sv]=Mittenklicksinläsning
|
||||
Name[uk]=Завантажувач за клацанням середньою
|
||||
|
@ -18,6 +19,7 @@ Comment[ca]=Carrega text com a URL en una selecció del porta-retalls
|
|||
Comment[ca@valencia]=Carrega text com a URL en una selecció del porta-retalls
|
||||
Comment[cs]=Načíst text ve schránce výběru jako URL
|
||||
Comment[en_GB]=Load text in selection clipboard as URL
|
||||
Comment[es]=Cargar texto seleccionado en el portapapeles como URL
|
||||
Comment[fi]=Lataa leikepöytävalinnan tekstin verkko-osoitteeksi
|
||||
Comment[fr]=Charger l'URL sélectionnée dans le presse-papier
|
||||
Comment[it]=Carica come URL il testo negli appunti della selezione
|
||||
|
|
Loading…
Reference in New Issue
Block a user