marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +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-20 01:21:12 +00:00
parent 96779d18a5
commit ffdf4511cb
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

@ -27,6 +27,7 @@
"Description[tr]": "Cep için öntanımlı dolaşım paneli",
"Description[uk]": "Типова панель навігації для мобільних",
"Description[x-test]": "xxDefault navigation panel for mobilexx",
"Description[zh_CN]": "手机的默认导航面板",
"EnabledByDefault": true,
"Id": "org.kde.plasma.mobile.defaultNavigationPanel",
"License": "LGPLv2+",
@ -45,6 +46,7 @@
"Name[tr]": "Öntanımlı Taşınabilir Dolaşım Paneli",
"Name[uk]": "Типова панель навігації для мобільних",
"Name[x-test]": "xxDefault Mobile Navigation Panelxx",
"Name[zh_CN]": "默认手机导航面板",
"Website": "https://www.kde.org/plasma-desktop"
},
"X-Plasma-ContainmentCategories": [

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

@ -27,6 +27,7 @@
"Description[tr]": "Cep için öntanımlı durum çubuğu",
"Description[uk]": "Типова смужка стану для мобільних",
"Description[x-test]": "xxDefault status bar for mobilexx",
"Description[zh_CN]": "手机的默认状态栏",
"EnabledByDefault": true,
"Id": "org.kde.plasma.mobile.defaultStatusBar",
"License": "LGPLv2+",
@ -45,6 +46,7 @@
"Name[tr]": "Öntanımlı Taşınabilir Durum Çubuğu",
"Name[uk]": "Типова смужка стану для мобільних",
"Name[x-test]": "xxDefault Mobile Status Barxx",
"Name[zh_CN]": "默认手机状态栏",
"Website": "https://www.kde.org/plasma-desktop"
},
"X-Plasma-ContainmentCategories": [