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
cc2e6fc96c
commit
7c9fb68b14
1 changed files with 1 additions and 1 deletions
|
@ -115,7 +115,7 @@
|
|||
"Name[ja]": "応答しないアプリケーションの彩度を下げる",
|
||||
"Name[ka]": "უსიცოცხლო აპლიკაციების გაუფერულება",
|
||||
"Name[ko]": "응답 없는 앱을 무채색으로 전환",
|
||||
"Name[lt]": "Nusodrinti neatsakančias programas",
|
||||
"Name[lt]": "Nusodrinti nereaguojančias programas",
|
||||
"Name[lv]": "Nereaģējošās programmas padarīt melnbaltas",
|
||||
"Name[nl]": "Verzadiging van niet responsieve toepassingen verminderen",
|
||||
"Name[nn]": "Fjern fargemetting på ikkje-responsive program",
|
||||
|
|
Loading…
Reference in a new issue