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
40fcce83ba
commit
0367928d58
1 changed files with 1 additions and 1 deletions
|
@ -20,7 +20,7 @@
|
||||||
"Description[sk]": "Zväčší kurzor pri rýchlom pohybe ukazovateľa tam a späť",
|
"Description[sk]": "Zväčší kurzor pri rýchlom pohybe ukazovateľa tam a späť",
|
||||||
"Description[sl]": "Poveča kazalec, kadar se kazalec hitro premika naprej in nazaj",
|
"Description[sl]": "Poveča kazalec, kadar se kazalec hitro premika naprej in nazaj",
|
||||||
"Description[ta]": "சுட்டியை வேகமாக ஆட்டும்போது சுட்டிக்குறியைப் பெரிதாக்கும்",
|
"Description[ta]": "சுட்டியை வேகமாக ஆட்டும்போது சுட்டிக்குறியைப் பெரிதாக்கும்",
|
||||||
"Description[tr]": "İşaretçi hızla ileri geri hareket ettirildiğinde imleci büyütür",
|
"Description[tr]": "İşaretçi tez ileri geri hareket ettirildiğinde imleci büyütür",
|
||||||
"Description[uk]": "Робити курсор більшим, коли вказівник швидко рухається туди-сюди",
|
"Description[uk]": "Робити курсор більшим, коли вказівник швидко рухається туди-сюди",
|
||||||
"Description[x-test]": "xxMakes the cursor larger when the pointer is quickly moved back and forthxx",
|
"Description[x-test]": "xxMakes the cursor larger when the pointer is quickly moved back and forthxx",
|
||||||
"Description[zh_CN]": "快速往返移动指针后加大显示光标",
|
"Description[zh_CN]": "快速往返移动指针后加大显示光标",
|
||||||
|
|
Loading…
Reference in a new issue