mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-27 14:33:08 +00:00
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
63e228237f
commit
ec8e5139e6
1 changed files with 2 additions and 2 deletions
|
|
@ -73,7 +73,7 @@
|
||||||
"Description[tr]": "Plasma Cep gece rengi tez ayarı",
|
"Description[tr]": "Plasma Cep gece rengi tez ayarı",
|
||||||
"Description[uk]": "Швидке налаштовування нічних кольорів для Мобільної Плазми",
|
"Description[uk]": "Швидке налаштовування нічних кольорів для Мобільної Плазми",
|
||||||
"Description[x-test]": "xxNight color quick setting for Plasma Mobilexx",
|
"Description[x-test]": "xxNight color quick setting for Plasma Mobilexx",
|
||||||
"Description[zh_CN]": "Plasma Mobile 的夜间颜色快捷设置",
|
"Description[zh_CN]": "Plasma Mobile 的夜间色温快捷设置",
|
||||||
"Description[zh_TW]": "Plasma 行動的夜色模式快速設定",
|
"Description[zh_TW]": "Plasma 行動的夜色模式快速設定",
|
||||||
"Icon": "redshift-status-on",
|
"Icon": "redshift-status-on",
|
||||||
"Id": "org.kde.plasma.quicksetting.nightcolor",
|
"Id": "org.kde.plasma.quicksetting.nightcolor",
|
||||||
|
|
@ -117,7 +117,7 @@
|
||||||
"Name[tr]": "Gece Rengi",
|
"Name[tr]": "Gece Rengi",
|
||||||
"Name[uk]": "Нічні кольори",
|
"Name[uk]": "Нічні кольори",
|
||||||
"Name[x-test]": "xxNight Colorxx",
|
"Name[x-test]": "xxNight Colorxx",
|
||||||
"Name[zh_CN]": "夜间颜色",
|
"Name[zh_CN]": "夜间色温",
|
||||||
"Name[zh_TW]": "夜色",
|
"Name[zh_TW]": "夜色",
|
||||||
"Website": "https://kde.org"
|
"Website": "https://kde.org"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue