mirror of
https://invent.kde.org/network/krfb
synced 2024-06-29 06:24:57 +00: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
d43f2c20f7
commit
1d89ef5079
|
@ -8,6 +8,7 @@ X-DocPath=krfb/index.html
|
|||
Terminal=false
|
||||
Name=Krfb
|
||||
Name[ar]=كرفب
|
||||
Name[ast]=Krfb
|
||||
Name[bg]=Krfb
|
||||
Name[bn]=কে-আর-এফ-বি
|
||||
Name[br]=Krfb
|
||||
|
|
Loading…
Reference in New Issue
Block a user