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-10-28 01:24:44 +00:00
parent 83229e44f0
commit 6759ec9307
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcms/wifi/kcm_mobile_wifi.json
View file

@ -85,8 +85,8 @@
"Name[zh_TW]": "Wi-Fi"
},
"X-KDE-Keywords": "wifi,network",
"X-KDE-Keywords[ca@valencia]": "wi-fi,xarxa",
"X-KDE-Keywords[ca]": "wi-fi,xarxa",
"X-KDE-Keywords[ca@valencia]": "wifi,wi-fi,xarxa",
"X-KDE-Keywords[ca]": "wifi,wi-fi,xarxa",
"X-KDE-Keywords[cs]": "wifi,síť",
"X-KDE-Keywords[en_GB]": "wifi,network",
"X-KDE-Keywords[es]": "wifi,red",