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:
l10n daemon script 2023-10-11 02:34:51 +00:00
parent cc584c87ff
commit 8840193cd7
2 changed files with 5 additions and 2 deletions

View file

@ -16,6 +16,7 @@
"Name[sl]": "Popravek za barvno slepoto",
"Name[tr]": "Renk Körlüğü Düzeltmesi",
"Name[uk]": "Виправлення для дальтонізму",
"Name[x-test]": "xxColorblindness Correctionxx"
"Name[x-test]": "xxColorblindness Correctionxx",
"Name[zh_CN]": "色盲校正"
}
}

View file

@ -17,6 +17,7 @@
"Description[tr]": "Renk körlüğü aralığında renk algısını iyileştirir",
"Description[uk]": "Удосконалює сприйняття кольорів для випадків дальтонізму",
"Description[x-test]": "xxEnhances color perception for color blindnessxx",
"Description[zh_CN]": "增强色盲人士的颜色感知",
"EnabledByDefault": false,
"License": "GPL-2.0+",
"Name": "Colorblindness Correction",
@ -34,7 +35,8 @@
"Name[sl]": "Popravek za barvno slepoto",
"Name[tr]": "Renk Körlüğü Düzeltmesi",
"Name[uk]": "Виправлення для дальтонізму",
"Name[x-test]": "xxColorblindness Correctionxx"
"Name[x-test]": "xxColorblindness Correctionxx",
"Name[zh_CN]": "色盲校正"
},
"X-KDE-ConfigModule": "kwin_colorblindnesscorrection_config"
}