marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-28 22:53: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-09-19 01:47:55 +00:00
parent a4d47849e7
commit 9b692c6ef6
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
containments/homescreens/folio/package/metadata.json
View file

@ -49,6 +49,7 @@
"Name": "Folio",
"Name[ca@valencia]": "Folio",
"Name[ca]": "Folio",
"Name[en_GB]": "Folio",
"Name[es]": "Folio",
"Name[eu]": "Folio",
"Name[fr]": "Porte-feuille",

2
quicksettings/donotdisturb/metadata.json
View file

@ -31,6 +31,7 @@
"Description": "Quick setting to toggle do not disturb mode",
"Description[ca@valencia]": "Configuració ràpida per a canviar el mode no destorbar",
"Description[ca]": "Configuració ràpida per canviar el mode no destorbar",
"Description[en_GB]": "Quick setting to toggle do not disturb mode",
"Description[es]": "Ajuste rápido para cambiar el modo «no molestar»",
"Description[eu]": "Zaratarik ez modua txandakatzeko ezarpen azkarra",
"Description[fr]": "Configuration rapide pour basculer ou non en mode « Ne pas déranger »",
@ -47,6 +48,7 @@
"Name": "Do Not Disturb",
"Name[ca@valencia]": "No destorbar",
"Name[ca]": "No destorbar",
"Name[en_GB]": "Do Not Disturb",
"Name[es]": "No molestar",
"Name[eu]": "Zatarik ez",
"Name[fr]": "Ne pas déranger",