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
22b7ac02b4
commit
84a5c7b314
1 changed files with 1 additions and 1 deletions
|
@ -3,7 +3,7 @@
|
|||
"Category": "Appearance",
|
||||
"Description": "Improve contrast and readability behind semi-transparent windows",
|
||||
"Description[az]": "Yarımşəffaf pəncərənin altındakı fonun kontrastını yaxşılaşdırır",
|
||||
"Description[ca]": "Millora el contrast i la legibilitat darrere de les finestres semitransparents",
|
||||
"Description[ca]": "Millora el contrast i la llegibilitat darrere de les finestres semitransparents",
|
||||
"Description[cs]": "Vylepšit kontrast a čitelnost za poloprůhlednými okny",
|
||||
"Description[es]": "Mejora el contraste y la legibilidad detrás de las ventanas semitransparentes",
|
||||
"Description[fr]": "Améliore le contraste et la lisibilité derrière les fenêtres semi transparentes",
|
||||
|
|
Loading…
Reference in a new issue