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 2024-08-26 01:22:46 +00:00
parent 52afa8bda8
commit 0c6ac89728
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@
"Name[ast]": "Wi-Fi", "Name[ast]": "Wi-Fi",
"Name[ca@valencia]": "Wi-Fi", "Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi", "Name[ca]": "Wi-Fi",
"Name[de]": "Wi-Fi", "Name[de]": "WLAN",
"Name[es]": "Wifi", "Name[es]": "Wifi",
"Name[eu]": "Wi-Fi", "Name[eu]": "Wi-Fi",
"Name[fi]": "Langaton verkko", "Name[fi]": "Langaton verkko",