tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests 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-13 01:21:06 +00:00
parent 16ccee7ac9
commit 727364a38d
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/findthisdevice/kdeconnect_findthisdevice.json
View file

@ -110,8 +110,8 @@
"Name[zh_TW]": "尋找這個裝置" "Name[zh_TW]": "尋找這個裝置"
}, },
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_findthisdevice_config", "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_findthisdevice_config",
"X-KdeConnect-OutgoingPacketType": [],
"X-KdeConnect-SupportedPacketType": [ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.findmyphone.request" "kdeconnect.findmyphone.request"
], ]
"X-KdeConnect-OutgoingPacketType": []
} }

4
plugins/pausemusic/kdeconnect_pausemusic.json
View file

@ -115,8 +115,8 @@
"Name[zh_TW]": "在通話過程中暫停媒體" "Name[zh_TW]": "在通話過程中暫停媒體"
}, },
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_pausemusic_config", "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_pausemusic_config",
"X-KdeConnect-OutgoingPacketType": [],
"X-KdeConnect-SupportedPacketType": [ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.telephony" "kdeconnect.telephony"
], ]
"X-KdeConnect-OutgoingPacketType": []
} }

4
plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
View file

@ -113,6 +113,6 @@
"Name[zh_CN]": "禁止屏保", "Name[zh_CN]": "禁止屏保",
"Name[zh_TW]": "停止螢幕保護" "Name[zh_TW]": "停止螢幕保護"
}, },
"X-KdeConnect-SupportedPacketType": [], "X-KdeConnect-OutgoingPacketType": [],
"X-KdeConnect-OutgoingPacketType": [] "X-KdeConnect-SupportedPacketType": []
} }