Merge branch 'master' into 0.8.2-RC

2021-04-21 22:51:21 +02:00 · 2021-04-21 22:51:21 +02:00 · 576cd0f569
parent 9699e95688 70d6b7f06e
commit 576cd0f569
5 changed files with 62 additions and 101 deletions
--- a/appveyor.yml
+++ b/appveyor.yml
@ -77,25 +77,19 @@ after_build:
    - mkdir installer\packages\io.github.nhekoreborn.nheko
    - mkdir installer\packages\io.github.nhekoreborn.nheko\data
    - mkdir installer\packages\io.github.nhekoreborn.nheko\meta
-    - mkdir installer\packages\io.github.nhekoreborn.nheko.cleanup\meta
    # Copy installer data
    - copy %BUILD%\resources\nheko.ico installer\config
    - copy %BUILD%\resources\nheko.png installer\config
    - copy %BUILD%\COPYING installer\packages\io.github.nhekoreborn.nheko\meta\license.txt
-    - copy %BUILD%\COPYING installer\packages\io.github.nhekoreborn.nheko.cleanup\meta\license.txt
    - copy %BUILD%\deploy\installer\config.xml installer\config
    - copy %BUILD%\deploy\installer\controlscript.qs installer\config
    - copy %BUILD%\deploy\installer\uninstall.qs installer\packages\io.github.nhekoreborn.nheko\data
    - copy %BUILD%\deploy\installer\gui\package.xml installer\packages\io.github.nhekoreborn.nheko\meta
    - copy %BUILD%\deploy\installer\gui\installscript.qs installer\packages\io.github.nhekoreborn.nheko\meta
-    - copy %BUILD%\deploy\installer\cleanup\package.xml installer\packages\io.github.nhekoreborn.nheko.cleanup\meta
-    - copy %BUILD%\deploy\installer\cleanup\installscript.qs installer\packages\io.github.nhekoreborn.nheko.cleanup\meta
    # Amend version and date
    - sed -i "s/__VERSION__/0.8.2/" installer\config\config.xml
    - sed -i "s/__VERSION__/0.8.2/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
-    - sed -i "s/__VERSION__/0.8.2/" installer\packages\io.github.nhekoreborn.nheko.cleanup\meta\package.xml
    - sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
-    - sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko.cleanup\meta\package.xml
    # Copy nheko data
    - xcopy NhekoData\*.* installer\packages\io.github.nhekoreborn.nheko\data\*.* /s /e /c /y
    - move NhekoRelease\nheko.exe installer\packages\io.github.nhekoreborn.nheko\data
@ -107,7 +101,8 @@ after_build:
    - set PATH=%BUILD%\tools\bin;%PATH%
    - binarycreator.exe -f -c installer\config\config.xml -p installer\packages nheko-installer.exe

-    - mv nheko-installer.exe nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe
+    - copy nheko-installer.exe nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe
+    - copy nheko-installer.exe nheko-%APPVEYOR_PULL_REQUEST_HEAD_COMMIT%-installer.exe
    - ps: .\.ci\upload-nightly.ps1

 on_success:
@ -127,3 +122,4 @@ deploy:
 artifacts:
    - path: nheko_win_64.zip
    - path: nheko-$(APPVEYOR_REPO_TAG_NAME)-installer.exe
+    - path: nheko-$(APPVEYOR_PULL_REQUEST_HEAD_COMMIT)-installer.exe
--- a/deploy/installer/cleanup/installscript.qs
+++ b/deploy/installer/cleanup/installscript.qs
@ -1,28 +0,0 @@
-function Component()
-{
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    try
-    {
-        if( installer.value("os") === "win" )
-        {
-            /**
-             * Cleanup AppData and registry
-             */
-            component.addElevatedOperation("Execute","UNDOEXECUTE","cmd /C reg delete HKEY_CURRENT_USER\Software\nheko\nheko /f");
-            var localappdata = installer.environmentVariable("LOCALAPPDATA");
-            if( localappdata != "" )
-            {
-                component.addElevatedOperation("Execute","UNDOEXECUTE","cmd /C rmdir "+localappdata+"\nheko /f");
-            }
-        }
-    }
-    catch( e )
-    {
-        print( e );
-    }
-}
--- a/deploy/installer/cleanup/package.xml
+++ b/deploy/installer/cleanup/package.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Package>
-    <DisplayName>Cleanup AppData and Registry</DisplayName>
-    <Description>Cleans up AppData and Registry when selected (logs you out) - Broken</Description>
-    <Version>__VERSION__</Version>
-    <ReleaseDate>__DATE__</ReleaseDate>
-    <SortingPriority>80</SortingPriority>
-    <Script>installscript.qs</Script>
-    <Checkable>false</Checkable>
-</Package>
--- a/resources/langs/nheko_et.ts
+++ b/resources/langs/nheko_et.ts
@ -843,22 +843,22 @@ Näiteks: https://server.minu:8787</translation>
    <message>
        <location filename="../qml/MessageView.qml" line="+82"/>
        <source>Edit</source>
-        <translation type="unfinished">Muuda</translation>
+        <translation>Muuda</translation>
    </message>
    <message>
        <location line="+14"/>
        <source>React</source>
-        <translation type="unfinished">Reageeri</translation>
+        <translation>Reageeri</translation>
    </message>
    <message>
        <location line="+12"/>
        <source>Reply</source>
-        <translation type="unfinished">Vasta</translation>
+        <translation>Vasta</translation>
    </message>
    <message>
        <location line="+11"/>
        <source>Options</source>
-        <translation type="unfinished">Valikud</translation>
+        <translation>Valikud</translation>
    </message>
 </context>
 <context>
@ -926,41 +926,41 @@ Näiteks: https://server.minu:8787</translation>
        <location filename="../../src/notifications/ManagerMac.cpp" line="+44"/>
        <location filename="../../src/notifications/ManagerWin.cpp" line="+78"/>
        <source>%1 sent an encrypted message</source>
-        <translation type="unfinished">%1 saatis krüptitud sõnumi</translation>
+        <translation>%1 saatis krüptitud sõnumi</translation>
    </message>
    <message>
        <location line="+4"/>
        <source>* %1 %2</source>
        <comment>Format an emote message in a notification, %1 is the sender, %2 the message</comment>
-        <translation type="unfinished"></translation>
+        <translation>* %1 %2</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>%1 replied: %2</source>
        <comment>Format a reply in a notification. %1 is the sender, %2 the message</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 vastas: %2</translation>
    </message>
    <message>
        <location line="+4"/>
        <source>%1: %2</source>
        <comment>Format a normal message in a notification. %1 is the sender, %2 the message</comment>
-        <translation type="unfinished">%1: %2</translation>
+        <translation>%1: %2</translation>
    </message>
    <message>
        <location filename="../../src/notifications/ManagerMac.cpp" line="-1"/>
        <location filename="../../src/notifications/ManagerWin.cpp" line="-1"/>
        <source>%1 replied with an encrypted message</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 vastas krüptitud sõnumiga</translation>
    </message>
    <message>
        <location line="+6"/>
        <source>%1 replied to a message</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 vastas sõnumile</translation>
    </message>
    <message>
        <location line="+0"/>
        <source>%1 sent a message</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 saatis sõnumi</translation>
    </message>
 </context>
 <context>
@ -1182,57 +1182,57 @@ Näiteks: https://server.minu:8787</translation>
    <message>
        <location filename="../qml/RoomSettings.qml" line="+25"/>
        <source>Room Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Jututoa seadistused</translation>
    </message>
    <message>
        <location line="+79"/>
        <source>%1 member(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 liige(t)</translation>
    </message>
    <message>
        <location line="+43"/>
        <source>SETTINGS</source>
-        <translation type="unfinished"></translation>
+        <translation>SEADISTUSED</translation>
    </message>
    <message>
        <location line="+9"/>
        <source>Notifications</source>
-        <translation type="unfinished"></translation>
+        <translation>Teavitused</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Muted</source>
-        <translation type="unfinished"></translation>
+        <translation>Summutatud</translation>
    </message>
    <message>
        <location line="+0"/>
        <source>Mentions only</source>
-        <translation type="unfinished"></translation>
+        <translation>Vaid mainimised</translation>
    </message>
    <message>
        <location line="+0"/>
        <source>All messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Kõik sõnumid</translation>
    </message>
    <message>
        <location line="+15"/>
        <source>Anyone and guests</source>
-        <translation type="unfinished"></translation>
+        <translation>Kõik (sealhulgas külalised)</translation>
    </message>
    <message>
        <location line="+0"/>
        <source>Anyone</source>
-        <translation type="unfinished"></translation>
+        <translation>Kõik</translation>
    </message>
    <message>
        <location line="+0"/>
        <source>Invited users</source>
-        <translation type="unfinished"></translation>
+        <translation>Kutsutud kasutajad</translation>
    </message>
    <message>
        <location line="+9"/>
        <source>Encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>Krüptimine</translation>
    </message>
    <message>
        <location line="+20"/>
@ -1248,7 +1248,7 @@ Näiteks: https://server.minu:8787</translation>
    <message>
        <location line="+17"/>
        <source>Respond to key requests</source>
-        <translation type="unfinished"></translation>
+        <translation>Vasta krüptovõtmete päringutele</translation>
    </message>
    <message>
        <location line="+5"/>
@ -1262,22 +1262,22 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.<
    <message>
        <location line="+21"/>
        <source>INFO</source>
-        <translation type="unfinished"></translation>
+        <translation>TEAVE</translation>
    </message>
    <message>
        <location line="+9"/>
        <source>Internal ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Sisemine tunnus</translation>
    </message>
    <message>
        <location line="+10"/>
        <source>Room Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Jututoa versioon</translation>
    </message>
    <message>
        <location line="+13"/>
        <source>OK</source>
-        <translation type="unfinished">Sobib</translation>
+        <translation>Sobib</translation>
    </message>
    <message>
        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
@ -1792,12 +1792,12 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.<
    <message>
        <location filename="../qml/UserProfile.qml" line="+24"/>
        <source>Global User Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Üldine kasutajaprofiil</translation>
    </message>
    <message>
        <location line="+0"/>
        <source>Room User Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Kasutajaprofiil jututoas</translation>
    </message>
    <message>
        <location line="+114"/>
@ -1823,7 +1823,7 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.<
    <message>
        <location line="+53"/>
        <source>Unverify</source>
-        <translation type="unfinished"></translation>
+        <translation>Võta verifitseerimine tagasi</translation>
    </message>
    <message>
        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
--- a/resources/langs/nheko_hu.ts
+++ b/resources/langs/nheko_hu.ts
@ -1237,7 +1237,7 @@ Példa: https://szerver.em:8787</translation>
    <message>
        <location line="+20"/>
        <source>End-to-End Encryption</source>
-        <translation type="unfinished">Végponttól végpontig titkosítás</translation>
+        <translation>Végponttól végpontig titkosítás</translation>
    </message>
    <message>
        <location line="+1"/>
@ -1248,65 +1248,67 @@ Példa: https://szerver.em:8787</translation>
    <message>
        <location line="+17"/>
        <source>Respond to key requests</source>
-        <translation type="unfinished"></translation>
+        <translation>Válasz kulcskérelmekre</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Whether or not the client should respond automatically with the session keys
                                upon request. Use with caution, this is a temporary measure to test the
                                E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Válaszoljon-e kérés esetén a kliens munkamenetkulcsokkal automatikusan.
+Óvatosan használandó, mivel ez csak egy átmeneti megoldás a végponttól
+végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközhitelesítés.</translation>
    </message>
    <message>
        <location line="+21"/>
        <source>INFO</source>
-        <translation type="unfinished"></translation>
+        <translation>INFÓ</translation>
    </message>
    <message>
        <location line="+9"/>
        <source>Internal ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Belső azonosító</translation>
    </message>
    <message>
        <location line="+10"/>
        <source>Room Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Szoba verziója</translation>
    </message>
    <message>
        <location line="+13"/>
        <source>OK</source>
-        <translation type="unfinished">OK</translation>
+        <translation>OK</translation>
    </message>
    <message>
        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
        <source>Failed to enable encryption: %1</source>
-        <translation type="unfinished">Nem sikerült a titkosítás aktiválása: %1</translation>
+        <translation>Nem sikerült a titkosítás aktiválása: %1</translation>
    </message>
    <message>
        <location line="+228"/>
        <source>Select an avatar</source>
-        <translation type="unfinished">Profilkép kiválasztása</translation>
+        <translation>Profilkép kiválasztása</translation>
    </message>
    <message>
        <location line="+0"/>
        <source>All Files (*)</source>
-        <translation type="unfinished">Minden fájl (*)</translation>
+        <translation>Minden fájl (*)</translation>
    </message>
    <message>
        <location line="+12"/>
        <source>The selected file is not an image</source>
-        <translation type="unfinished">A kiválasztott fájl nem egy kép</translation>
+        <translation>A kiválasztott fájl nem egy kép</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Error while reading file: %1</source>
-        <translation type="unfinished">Hiba a fájl olvasása közben: %1</translation>
+        <translation>Hiba a fájl olvasása közben: %1</translation>
    </message>
    <message>
        <location line="+34"/>
        <location line="+20"/>
        <source>Failed to upload image: %s</source>
-        <translation type="unfinished">Nem sikerült a kép feltöltése: %s</translation>
+        <translation>Nem sikerült a kép feltöltése: %s</translation>
    </message>
 </context>
 <context>
@ -1314,53 +1316,53 @@ Példa: https://szerver.em:8787</translation>
    <message>
        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
        <source>Share desktop with %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Meg legyen osztva a képernyő %1 felhasználóval?</translation>
    </message>
    <message>
        <location line="+11"/>
        <source>Window:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ablak:</translation>
    </message>
    <message>
        <location line="+20"/>
        <source>Frame rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>Képkockasebesség:</translation>
    </message>
    <message>
        <location line="+19"/>
        <source>Include your camera picture-in-picture</source>
-        <translation type="unfinished"></translation>
+        <translation>A kamera is szerepeljen a kép-a-képben</translation>
    </message>
    <message>
        <location line="+12"/>
        <source>Request remote camera</source>
-        <translation type="unfinished"></translation>
+        <translation>Távoli kamera kérése</translation>
    </message>
    <message>
        <location line="+1"/>
        <location line="+9"/>
        <source>View your callee&apos;s camera like a regular video call</source>
-        <translation type="unfinished"></translation>
+        <translation>A hívó kamerájának megjelenítése, mint egy normál videóhívásban</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Hide mouse cursor</source>
-        <translation type="unfinished"></translation>
+        <translation>Egérkurzor elrejtése</translation>
    </message>
    <message>
        <location line="+20"/>
        <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation>Megosztás</translation>
    </message>
    <message>
        <location line="+19"/>
        <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Előnézet</translation>
    </message>
    <message>
        <location line="+7"/>
        <source>Cancel</source>
-        <translation type="unfinished">Mégse</translation>
+        <translation>Mégse</translation>
    </message>
 </context>
 <context>
@ -1471,6 +1473,7 @@ Példa: https://szerver.em:8787</translation>
        <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
        <translation>
            <numerusform>%1%2 gépel.</numerusform>
+            <numerusform>%1 és %2 gépelnek.</numerusform>
        </translation>
    </message>
    <message>
@ -1789,12 +1792,12 @@ Példa: https://szerver.em:8787</translation>
    <message>
        <location filename="../qml/UserProfile.qml" line="+24"/>
        <source>Global User Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Globális felhasználói profil</translation>
    </message>
    <message>
        <location line="+0"/>
        <source>Room User Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Szobai felhasználói profil</translation>
    </message>
    <message>
        <location line="+114"/>
@ -1820,7 +1823,7 @@ Példa: https://szerver.em:8787</translation>
    <message>
        <location line="+53"/>
        <source>Unverify</source>
-        <translation type="unfinished"></translation>
+        <translation>Hitelesítés visszavonása</translation>
    </message>
    <message>
        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>