marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03: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 2023-01-07 02:07:46 +00:00
parent 25f3f3b4e7
commit b8e44cae1f
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
shell/metadata.json
View file

@ -50,6 +50,7 @@
"Name[eu]": "Plasma Mugikorra", "Name[eu]": "Plasma Mugikorra",
"Name[ka]": "Plasma Mobile", "Name[ka]": "Plasma Mobile",
"Name[nl]": "Plasma Mobile", "Name[nl]": "Plasma Mobile",
"Name[nn]": "Plasma Mobile",
"Name[pt]": "Plasma Mobile", "Name[pt]": "Plasma Mobile",
"Name[sl]": "Plasma Mobile", "Name[sl]": "Plasma Mobile",
"Name[tr]": "Plasma Mobile", "Name[tr]": "Plasma Mobile",