marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-07-26 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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 2024-07-28 01:23:22 +00:00
parent 8ca80841d2
commit 5237d20ad9
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
layout-templates/org.kde.plasma.mobile.defaultNavigationPanel/metadata.json
View file

@ -32,6 +32,7 @@
"Description[uk]": "Типова панель навігації для мобільних", "Description[uk]": "Типова панель навігації для мобільних",
"Description[x-test]": "xxDefault navigation panel for mobilexx", "Description[x-test]": "xxDefault navigation panel for mobilexx",
"Description[zh_CN]": "手机的默认导航面板", "Description[zh_CN]": "手机的默认导航面板",
"Description[zh_TW]": "手機用的預設導覽面板",
"EnabledByDefault": true, "EnabledByDefault": true,
"Id": "org.kde.plasma.mobile.defaultNavigationPanel", "Id": "org.kde.plasma.mobile.defaultNavigationPanel",
"License": "LGPLv2+", "License": "LGPLv2+",
@ -55,6 +56,7 @@
"Name[uk]": "Типова панель навігації для мобільних", "Name[uk]": "Типова панель навігації для мобільних",
"Name[x-test]": "xxDefault Mobile Navigation Panelxx", "Name[x-test]": "xxDefault Mobile Navigation Panelxx",
"Name[zh_CN]": "默认手机导航面板", "Name[zh_CN]": "默认手机导航面板",
"Name[zh_TW]": "預設手機導覽面板",
"Website": "https://www.kde.org/plasma-desktop" "Website": "https://www.kde.org/plasma-desktop"
}, },
"X-Plasma-ContainmentCategories": [ "X-Plasma-ContainmentCategories": [

2
layout-templates/org.kde.plasma.mobile.defaultStatusBar/metadata.json
View file

@ -32,6 +32,7 @@
"Description[uk]": "Типова смужка стану для мобільних", "Description[uk]": "Типова смужка стану для мобільних",
"Description[x-test]": "xxDefault status bar for mobilexx", "Description[x-test]": "xxDefault status bar for mobilexx",
"Description[zh_CN]": "手机的默认状态栏", "Description[zh_CN]": "手机的默认状态栏",
"Description[zh_TW]": "手機用的預設狀態列",
"EnabledByDefault": true, "EnabledByDefault": true,
"Id": "org.kde.plasma.mobile.defaultStatusBar", "Id": "org.kde.plasma.mobile.defaultStatusBar",
"License": "LGPLv2+", "License": "LGPLv2+",
@ -55,6 +56,7 @@
"Name[uk]": "Типова смужка стану для мобільних", "Name[uk]": "Типова смужка стану для мобільних",
"Name[x-test]": "xxDefault Mobile Status Barxx", "Name[x-test]": "xxDefault Mobile Status Barxx",
"Name[zh_CN]": "默认手机状态栏", "Name[zh_CN]": "默认手机状态栏",
"Name[zh_TW]": "預設手機狀態列",
"Website": "https://www.kde.org/plasma-desktop" "Website": "https://www.kde.org/plasma-desktop"
}, },
"X-Plasma-ContainmentCategories": [ "X-Plasma-ContainmentCategories": [