mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 02: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
684d4cd1d2
commit
a8a9a5d7e5
@ -2,7 +2,7 @@
|
||||
Name=Translate page
|
||||
Name[az]=Səhifənin tərcümə etmək
|
||||
Name[ca]=Tradueix la pàgina
|
||||
Name[ca@valencia]=Tradueix la pàgina
|
||||
Name[ca@valencia]=Traduïx la pàgina
|
||||
Name[cs]=Přeložit stránku
|
||||
Name[da]=Oversæt side
|
||||
Name[de]=Seite übersetzen
|
||||
|
Loading…
Reference in New Issue
Block a user