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 2022-12-22 01:53:41 +00:00
parent e38df038c8
commit bb04c01c68
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
quicksettings/powermenu/package/metadata.json
View file

@ -31,7 +31,7 @@
}
],
"Description": "Power menu quick setting",
"Description[ca@valencia]": "Configuració ràpida del menú d'energia",
"Description[ca@valencia]": "Configuració ràpida del menú d'iniciada",
"Description[ca]": "Configuració ràpida del menú d'engegada",
"Description[en_GB]": "Power menu quick setting",
"Description[es]": "Ajuste rápido del menú de energía",
@ -55,7 +55,7 @@
"License": "GPL",
"Name": "Power Menu",
"Name[az]": "Güc menyusu",
"Name[ca@valencia]": "Menú d'energia",
"Name[ca@valencia]": "Menú d'iniciada",
"Name[ca]": "Menú d'engegada",
"Name[en_GB]": "Power Menu",
"Name[es]": "Menú de energía",