mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 04:36: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:
parent
d8cdee1cce
commit
3ba386de42
@ -1,9 +1,11 @@
|
||||
[Desktop Entry]
|
||||
Name=AdBlock
|
||||
Name[pt]=AdBlock
|
||||
Name[sv]=Reklamblockering
|
||||
Name[uk]=Блокування реклами
|
||||
Name[x-test]=xxAdBlockxx
|
||||
Comment=Blocks unwanted web content
|
||||
Comment[pt]=Bloqueia o conteúdo Web indesejado
|
||||
Comment[sv]=Blockerar oönskat webbinnehåll
|
||||
Comment[uk]=Блокує небажані інтернет-дані
|
||||
Comment[x-test]=xxBlocks unwanted web contentxx
|
||||
|
Loading…
Reference in New Issue
Block a user