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
b4eaa10c10
commit
fd9af37dc5
|
@ -9,6 +9,7 @@ Name[pt]=Mac
|
|||
Name[sv]=Mac
|
||||
Name[uk]=Mac
|
||||
Name[x-test]=xxMacxx
|
||||
Name[zh_CN]=Mac
|
||||
Comment=Mac like theme for Falkon based on Firefox Mac OS X theme
|
||||
Comment[ca]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefox
|
||||
Comment[ca@valencia]=Tema paregut al Mac pel Falkon basat en el tema Mac OS X del Firefox
|
||||
|
|
Loading…
Reference in New Issue
Block a user