StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from qTox/master

Browse Source 
Update from upstream
This commit is contained in:
skeletonium 2020-09-16 18:20:05 +00:00 committed by GitHub
commit 0701712a10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flatpak/build.sh
View File

@ -45,7 +45,7 @@ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flat
for i in {1..5} for i in {1..5}
do do
echo "Download try $i" echo "Download try $i"
flatpak --system install flathub -y org.kde.Sdk/x86_64/5.14 || true flatpak --system install flathub -y org.kde.Sdk/x86_64/5.15 || true
done done
## Workaround end ## Workaround end

8
flatpak/io.github.qtox.qTox.json
View File

@ -2,7 +2,7 @@
"app-id": "io.github.qtox.qTox", "app-id": "io.github.qtox.qTox",
"runtime": "org.kde.Platform", "runtime": "org.kde.Platform",
"sdk": "org.kde.Sdk", "sdk": "org.kde.Sdk",
"runtime-version": "5.14", "runtime-version": "5.15",
"command": "qtox", "command": "qtox",
"rename-icon": "qtox", "rename-icon": "qtox",
"finish-args": [ "finish-args": [
@ -24,7 +24,7 @@
"add-extensions": { "add-extensions": {
"org.freedesktop.Platform.ffmpeg-full": { "org.freedesktop.Platform.ffmpeg-full": {
"directory": "lib/ffmpeg", "directory": "lib/ffmpeg",
"version": "19.08", "version": "20.08",
"add-ld-path": "." "add-ld-path": "."
} }
}, },
@ -75,8 +75,8 @@
{ {
"type": "git", "type": "git",
"url": "https://github.com/sqlcipher/sqlcipher", "url": "https://github.com/sqlcipher/sqlcipher",
"tag": "v4.3.0", "tag": "v4.4.0",
"commit": "ece66fdcbb6b43876d25e8e6308991a097fa8661", "commit": "4a81bea61e1da6fec222d713852830f1fd01aed2",
"disable-fsckobjects" : true "disable-fsckobjects" : true
} }
] ]

8
translations/zh_CN.ts vendored
View File

@ -445,8 +445,8 @@ which may lead to problems with video calls.</source>
<translation>高级</translation> <translation>高级</translation>
</message> </message>
<message> <message>
<source>Unless you %1 know what you are doing, please do %2 change anything here. Changes made here may lead to problems with qTox, and even to loss of your data, e.g. history.</source> <source>Unless you %1 know what you are doing, please do %2 change anything here. Changes made here may lead to problems with qTox, and even to loss of your data, e.g. history.%3</source>
<translation>除非您 %1 知道自己在做什么，否则请 %2 改变这里的任何设置。此处所做的更改可能导致 qTox 出现问题，甚至导致数据丢失，比如聊天历史记录丢失。</translation> <translation>除非您%1知道自己在做什么，否则请%2改变这里的任何设置。此处所做的更改可能导致 qTox 出现问题，甚至导致数据丢失，比如聊天历史记录丢失。%3</translation>
</message> </message>
<message> <message>
<source>really</source> <source>really</source>
@ -460,6 +460,10 @@ which may lead to problems with video calls.</source>
<source>IMPORTANT NOTE</source> <source>IMPORTANT NOTE</source>
<translation>重要注意事项</translation> <translation>重要注意事项</translation>
</message> </message>
<message>
<source>Changes here are applied only after restarting qTox.</source>
<translation>此处的更改在重启 qTox 后才会生效。</translation>
</message>
<message> <message>
<source>Reset settings</source> <source>Reset settings</source>
<translation>重置设置</translation> <translation>重置设置</translation>