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
5b47c968ea
commit
51a9f26bc1
1 changed files with 1 additions and 1 deletions
|
@ -62,7 +62,7 @@
|
|||
"Description[cs]": "Ovládejte hlasitost systému z vašeho telefonu",
|
||||
"Description[da]": "Kontrollér systemets lydstyrke fra din telefon",
|
||||
"Description[de]": "Steuert die Lautstärke des Systems über Ihr Telefon",
|
||||
"Description[el]": "Έλεγοχς του τόμου του συστήματοα από το τηλέφωνό σας",
|
||||
"Description[el]": "Έλεγχος του τόμου του συστήματος από το τηλέφωνό σας",
|
||||
"Description[en_GB]": "Control the system volume from your phone",
|
||||
"Description[eo]": "Regi la sisteman laŭtecon de via telefono",
|
||||
"Description[es]": "Controle el volumen del sistema desde su teléfono",
|
||||
|
|
Loading…
Reference in a new issue