marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 06:13: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 2026-04-06 01:38:32 +00:00
parent 9c9fd112ae
commit 86cea76edd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
initialstart/modules/wifi/package/metadata.json
View file

@ -92,7 +92,7 @@
"Name[es]": "Wifi",
"Name[eu]": "Wi-Fi",
"Name[fi]": "Langaton verkko",
"Name[fr]": "WiFi",
"Name[fr]": "Wifi",
"Name[gl]": "Rede sen fíos",
"Name[he]": "רשת אלחוטית",
"Name[hu]": "WiFi",

2
quicksettings/wifi/metadata.json
View file

@ -95,7 +95,7 @@
"Name[es]": "Wifi",
"Name[eu]": "Wi-Fi",
"Name[fi]": "Langaton verkko",
"Name[fr]": "Wi-Fi",
"Name[fr]": "Wifi",
"Name[gl]": "Redes sen fíos",
"Name[he]": "רשת אלחוטית",
"Name[hu]": "Wi-Fi",