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:
@@ -254,7 +254,7 @@ Action=Popup
|
|||||||
[Event/Share]
|
[Event/Share]
|
||||||
Name=Share
|
Name=Share
|
||||||
Name[ca]=Compartició
|
Name[ca]=Compartició
|
||||||
Name[ca@valencia]=Compartició
|
Name[ca@valencia]=Compartiu
|
||||||
Name[cs]=Sdílet
|
Name[cs]=Sdílet
|
||||||
Name[eo]=Kundividi
|
Name[eo]=Kundividi
|
||||||
Name[es]=Compartir
|
Name[es]=Compartir
|
||||||
|
|||||||
Reference in New Issue
Block a user