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 2025-05-13 01:32:13 +00:00
parent a7952ad6ce
commit 9a19db9d94

View file

@ -19,7 +19,8 @@
"Name[sl]": "Micah Stanley",
"Name[tr]": "Micah Stanley",
"Name[uk]": "Micah Stanley",
"Name[x-test]": "xxMicah Stanleyxx"
"Name[x-test]": "xxMicah Stanleyxx",
"Name[zh_CN]": "Micah Stanley"
}
],
"Description": "Auto Hide Panels quick setting for Plasma Mobile",
@ -38,6 +39,7 @@
"Description[tr]": "Plasma Cep panelleri kendiliğinden gizleme tez ayarı",
"Description[uk]": "Пункт швидкого приховування панелей для Мобільної Плазми",
"Description[x-test]": "xxAuto Hide Panels quick setting for Plasma Mobilexx",
"Description[zh_CN]": "Plasma Mobile 的自动隐藏面板快速设置",
"Icon": "view-fullscreen",
"Id": "org.kde.plasma.quicksetting.autohidepanels",
"License": "GPL-2.0+",
@ -57,6 +59,7 @@
"Name[tr]": "Panelleri Kendiliğinden Gizle",
"Name[uk]": "Автоматично ховати панелі",
"Name[x-test]": "xxAuto Hide Panelsxx",
"Name[zh_CN]": "自动隐藏面板",
"Website": "https://kde.org"
}
}