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-21 01:55:48 +00:00
parent 677d14d1a4
commit fe1a7e5f7c
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

@ -32,7 +32,7 @@
],
"Description": "Power menu quick setting",
"Description[ca@valencia]": "Configuració ràpida del menú d'energia",
"Description[ca]": "Configuració ràpida del menú d'energia",
"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",
"Description[eu]": "Indar-menuaren ezarpen azkarra",
@ -56,7 +56,7 @@
"Name": "Power Menu",
"Name[az]": "Güc menyusu",
"Name[ca@valencia]": "Menú d'energia",
"Name[ca]": "Menú d'energia",
"Name[ca]": "Menú d'engegada",
"Name[en_GB]": "Power Menu",
"Name[es]": "Menú de energía",
"Name[eu]": "Energia menua",