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-06-27 01:19:29 +00:00
parent 2fae8b3381
commit fe3a39a5a9
1 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
layout-templates/org.kde.plasma.mobile.defaultMobileLayout/metadata.json
View file

@ -4,7 +4,43 @@
"Authors": [
{
"Email": "devin@kde.org",
"Name": "Devin Lin"
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[eo]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[gl]": "Devin Lin",
"Name[he]": "דווין לין",
"Name[hu]": "Devin Lin",
"Name[ia]": "Devin Lin",
"Name[is]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[ko]": "Devin Lin",
"Name[lv]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[nn]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[ru]": "Devin Lin",
"Name[sk]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx",
"Name[zh_CN]": "Devin Lin",
"Name[zh_TW]": "Devin Lin"
}
],
"Category": "",
@ -20,4 +56,3 @@
],
"X-Plasma-Shell": "plasmashell"
}