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
82c8d50f9a
commit
aca5cb0e1c
|
@ -1,6 +1,19 @@
|
|||
[Desktop Entry]
|
||||
Name=MiddleClickLoader
|
||||
Name[ca]=MiddleClickLoader
|
||||
Name[ca@valencia]=MiddleClickLoader
|
||||
Name[es]=Cargador de clic central
|
||||
Name[nl]=MiddleClickLoader
|
||||
Name[pt]=CarregadorBotãoMeio
|
||||
Name[uk]=Завантажувач за клацанням середньою
|
||||
Name[x-test]=xxMiddleClickLoaderxx
|
||||
Comment=Load text in selection clipboard as URL
|
||||
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[nl]=Tekst laden in selectieklembord als URL
|
||||
Comment[pt]=Carrega o texto na área de transferência como um URL
|
||||
Comment[uk]=Завантажує текст у буфері обміну як адресу
|
||||
Comment[x-test]=xxLoad text in selection clipboard as URLxx
|
||||
|
||||
Icon=
|
||||
Type=Service
|
||||
|
|
Loading…
Reference in New Issue
Block a user