CI re-enable FreeBSD Qt6

.gitlab-ci.yml

@@ -8,7 +8,7 @@ include:
       - /gitlab-templates/android-qt6.yml
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/windows-qt6.yml
-#      - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
       - /gitlab-templates/snap-snapcraft-lxd.yml
       - /gitlab-templates/craft-android-qt6-apks.yml

org.kde.neochat.appdata.xml

@@ -61,10 +61,8 @@
   <summary xml:lang="it">Chat su Matrix</summary>
   <summary xml:lang="ka">ისაუბრეთ Matrix-ზე</summary>
   <summary xml:lang="nl">Chat op Matrix</summary>
-  <summary xml:lang="nn">Prat med via Matrix</summary>
   <summary xml:lang="pl">Rozmawiaj na Matriksie</summary>
   <summary xml:lang="sl">Klepet na Matrixu</summary>
-  <summary xml:lang="ta">மேட்ரிக்ஸுக்கான உரையாடல் செயலி</summary>
   <summary xml:lang="tr">Matrix Üzerinde Sohbet</summary>
   <summary xml:lang="uk">Спілкування у Matrix</summary>
   <summary xml:lang="x-test">xxChat on Matrixxx</summary>
@@ -92,7 +90,6 @@
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
     <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
     <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
-    <p xml:lang="ru">NeoChat — приложение для общения, предоставляющее все преимущества сети Matrix. С его помощью можно безопасно отправлять текстовые сообщения, видеозаписи и звуковые файлы родственникам, коллегам и друзьям.</p>
     <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
     <p xml:lang="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</p>
     <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
@@ -186,7 +183,6 @@
       <li xml:lang="nn">Avstemmingar – MSC3381</li>
       <li xml:lang="pl">Ankiety - MSC3381</li>
       <li xml:lang="pt">Inquéritos - MSC3381</li>
-      <li xml:lang="ru">Голосования — MSC3381</li>
       <li xml:lang="sl">Polls - MSC3381</li>
       <li xml:lang="sv">Polls - MSC3381</li>
       <li xml:lang="ta">வாக்கெடுப்புகள் - MSC3381</li>
@@ -347,10 +343,8 @@
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
       <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
-      <caption xml:lang="ru">Поиск новых сообществ с помощью Matrix Spaces</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
       <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
-      <caption xml:lang="ta">மேட்ரிக்ஸு இடங்களின் மூலம் புதிய சமூகங்களைக் கண்டுபிடிக்கலாம்</caption>
       <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
       <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
       <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
@@ -439,7 +433,6 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <release version="24.08.3" date="2024-11-07"/>
     <release version="24.08.2" date="2024-10-10"/>
     <release version="24.08.1" date="2024-09-12"/>
     <release version="24.08.0" date="2024-08-22"/>

po/nn/neochat.po

@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2024-10-27 00:40+0000\n"
-"PO-Revision-Date: 2024-10-27 15:01+0100\n"
+"PO-Revision-Date: 2024-09-25 18:46+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <l10n-no@lister.huftis.org>\n"
 "Language: nn\n"
@@ -2425,13 +2425,15 @@ msgstr "Fjern"
 #: src/qml/DelegateContextMenu.qml:95 src/qml/DelegateContextMenu.qml:100
 #: src/qml/FileDelegateContextMenu.qml:76
 #: src/qml/FileDelegateContextMenu.qml:81
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Remove Message"
 msgctxt "@title:dialog"
 msgid "Remove Message"
 msgstr "Fjern melding"
 
 #: src/qml/DelegateContextMenu.qml:96 src/qml/FileDelegateContextMenu.qml:77
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Reason for removing this message"
 msgctxt "@info:placeholder"
 msgid "Reason for removing this message"
 msgstr "Grunngjeving for fjerning av meldinga"
@@ -2450,13 +2452,15 @@ msgid "Report"
 msgstr "Rapporter"
 
 #: src/qml/DelegateContextMenu.qml:125
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Report Message"
 msgctxt "@title:dialog"
 msgid "Report Message"
 msgstr "Rapporter melding"
 
 #: src/qml/DelegateContextMenu.qml:126
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Reason for reporting this message"
 msgctxt "@info:placeholder"
 msgid "Reason for reporting this message"
 msgstr "Grunngjeving for rapportering av meldinga"
@@ -2921,37 +2925,43 @@ msgid "Accept"
 msgstr "Godta"
 
 #: src/qml/InviteUserPage.qml:21
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Invite a User"
 msgctxt "@title:dialog"
 msgid "Invite a User"
 msgstr "Inviter ein brukar"
 
 #: src/qml/InviteUserPage.qml:23
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Find a user..."
 msgctxt "@info:placeholder"
 msgid "Find a user…"
 msgstr "Finn brukar …"
 
 #: src/qml/InviteUserPage.qml:24
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "No rooms found"
 msgctxt "@info:placeholder"
 msgid "No users found"
-msgstr "Fann ingen brukarar"
+msgstr "Fann ingen rom"
 
 #: src/qml/InviteUserPage.qml:31
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Invite this user"
 msgctxt "@action:button"
 msgid "Invite this User"
 msgstr "Inviter brukaren"
 
 #: src/qml/InviteUserPage.qml:34 src/qml/InviteUserPage.qml:84
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "User is either already a member or has been invited"
 msgctxt "@info:tooltip"
 msgid "User is either already a member or has been invited"
 msgstr "Brukaren er alt medlem eller invitert"
 
 #: src/qml/InviteUserPage.qml:75
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Send invitation"
 msgctxt "@action:button"
 msgid "Send invitation"
 msgstr "Send invitasjon"
@@ -3871,13 +3881,15 @@ msgid "Remove Messages"
 msgstr "Fjern meldingar"
 
 #: src/qml/UserDetailDialog.qml:229
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Reason for removing this user's recent messages"
 msgctxt "@info:placeholder"
 msgid "Reason for removing this user's recent messages"
 msgstr "Grunngjeving for fjerning av brukaren sine nylege meldingar"
 
 #: src/qml/UserDetailDialog.qml:230
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Remove"
 msgctxt "@action:button 'Remove' as in 'Remove these messages'"
 msgid "Remove"
 msgstr "Fjern"
@@ -4151,9 +4163,10 @@ msgid "Malformed or empty Matrix id<br />%1 is not a correct Matrix identifier"
 msgstr "%1 er ikkje ein gyldig Matrix-identifikator"
 
 #: src/roommanager.cpp:350
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Failed to join room"
 msgid "Failed to join room<br />%1"
-msgstr "Klarte ikkje verta med i rommet<br />%1"
+msgstr "Klarte ikkje verta med i rommet"
 
 #: src/roommanager.cpp:386
 #, kde-format
@@ -4161,9 +4174,10 @@ msgid "You requested to join '%1'"
 msgstr "Du har bedt om å få verta med i «%1»"
 
 #: src/roommanager.cpp:390
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Failed to request joining room"
 msgid "Failed to request joining room<br />%1"
-msgstr "Klarte ikkje be om å få verta med i rommet<br />%1"
+msgstr "Klarte ikkje be om å få verta med i rommet"
 
 #: src/settings/AccountEditorPage.qml:20
 #, kde-format
@@ -4829,10 +4843,12 @@ msgstr "Nullstill alle innstillingane til standardverdiar"
 
 #: src/settings/NeoChatSecurityPage.qml:19
 #: src/settings/NeoChatSettingsView.qml:51
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "@label:textbox"
+#| msgid "Security Key:"
 msgctxt "@title"
 msgid "Security & Safety"
-msgstr "Tryggleik"
+msgstr "Tryggleiksnøkkel:"
 
 #: src/settings/NeoChatSecurityPage.qml:32
 #, kde-format
@@ -4847,10 +4863,12 @@ msgid "Ignored Users"
 msgstr "Ignorerte brukarar"
 
 #: src/settings/NeoChatSecurityPage.qml:44
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "@label:checkbox"
+#| msgid "Hide image and video events by default"
 msgctxt "@label:checkbox"
 msgid "Hide images and videos by default"
-msgstr "Gøym som standard bilete og videoar"
+msgstr "Gøym som standard bilet- og videohendingar"
 
 #: src/settings/NeoChatSecurityPage.qml:45
 #, kde-format
@@ -4869,7 +4887,10 @@ msgid "Reject invitations from unknown users"
 msgstr "Avvis invitasjonar frå ukjende brukarar"
 
 #: src/settings/NeoChatSecurityPage.qml:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgid ""
+#| "If enabled, NeoChat will reject invitations from users you don't share a "
+#| "room with."
 msgctxt "@info"
 msgid ""
 "If enabled, NeoChat will reject invitations from users you don't share a "
@@ -4879,28 +4900,35 @@ msgstr ""
 "brukarar som ikkje er i same rom som deg."
 
 #: src/settings/NeoChatSecurityPage.qml:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Your server does not support this setting."
 msgctxt "@info"
 msgid "Your server does not support this setting."
 msgstr "Tenaren din støttar ikkje denne innstillinga."
 
 #: src/settings/NeoChatSecurityPage.qml:70
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "@option:check"
+#| msgid "Encryption"
 msgctxt "@title"
 msgid "Encryption"
 msgstr "Kryptering"
 
 #: src/settings/NeoChatSecurityPage.qml:77
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "@title"
+#| msgid "Import Keys"
 msgctxt "@action:button"
 msgid "Import Keys"
 msgstr "Importer nøklar"
 
 #: src/settings/NeoChatSecurityPage.qml:78
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "@action:button"
+#| msgid "Import Encryption Keys"
 msgctxt "@info"
 msgid "Import encryption keys from a backup."
-msgstr "Importer krypteringsnøklar frå reservekopi."
+msgstr "Importer krypteringsnøklar"
 
 #: src/settings/NeoChatSecurityPage.qml:87
 #, kde-format
@@ -4909,16 +4937,20 @@ msgid "Keys imported successfully"
 msgstr "Nøklane er no importerte"
 
 #: src/settings/NeoChatSecurityPage.qml:100
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "@title"
+#| msgid "Export Keys"
 msgctxt "@action:button"
 msgid "Export Keys"
 msgstr "Eksporter nøklar"
 
 #: src/settings/NeoChatSecurityPage.qml:101
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "@action:button"
+#| msgid "Export Encryption Keys"
 msgctxt "@info"
 msgid "Export this device's encryption keys."
-msgstr "Eksporter krypteringsnøklane til denne eininga."
+msgstr "Eksporter krypteringsnøklar"
 
 #: src/settings/NeoChatSettingsView.qml:22 src/settings/RoomGeneralPage.qml:22
 #: src/settings/RoomSettingsView.qml:39

src/neochat.notifyrc

@@ -282,7 +282,6 @@ Name[nl]=Gedeelde
 Name[nn]=Del
 Name[pl]=Udostępnij
 Name[pt_BR]=Compartilhar
-Name[ru]=Публикация
 Name[sl]=Deli
 Name[sv]=Dela
 Name[ta]=பகிர்
@@ -313,7 +312,6 @@ Comment[nl]=Het resultaat van het delen van een stukje inhoud
 Comment[nn]=Resultatet av deling av innhald
 Comment[pl]=Wynik udostępniania kawałka treści
 Comment[pt_BR]=O resultado de compartilhar um conteúdo
-Comment[ru]=Результат публикации данных
 Comment[sl]=Rezultat deljenega kosa vsebine
 Comment[sv]=Resultatet av att dela innehåll
 Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவு

src/qml/ExploreRoomsPage.qml

@@ -115,7 +115,7 @@ SearchPage {
     QtObject {
         id: _private
         function openManualRoomDialog() {
-            let dialog = manualRoomDialog.createObject(root.QQC2.Overlay.overlay, {
+            let dialog = manualRoomDialog.createObject(applicationWindow().overlay, {
                 connection: root.connection
             });
             dialog.parent = root.Window.window.overlay;

src/qml/ManualRoomDialog.qml

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 import QtQuick
-import QtQuick.Window
 import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
@@ -25,7 +24,7 @@ Kirigami.Dialog {
 
     title: i18nc("@title", "Room ID or Alias")
 
-    width: Math.min(root.Window.window.width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
     leftPadding: 0
     rightPadding: 0
     topPadding: 0