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-29 02:04:14 +00:00
parent ed8caf4cda
commit 9dbe4cd03f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quicksettings/airplanemode/metadata.json
View file

@ -57,7 +57,7 @@
"Name[ca]": "Mode avió",
"Name[cs]": "Režim v Letadle",
"Name[da]": "Flytilstand",
"Name[de]": "Flugzeug-Modus",
"Name[de]": "Flugmodus",
"Name[en_GB]": "Airplane Mode",
"Name[es]": "Modo avión",
"Name[eu]": "Hegaldi modua",