diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ef3fa24..72b9d833 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0.0) -project(qdmr VERSION 0.12.0) +project(qdmr VERSION 0.12.1) set(RELEASE_SUFFIX "") diff --git a/README.md b/README.md index ce92a6cc..b2449a93 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ A more [detailed list](https://dm3mat.darc.de/qdmr/#dev) is also available. ## Questions? * If you find any bugs or have suggestions to improve qdmr, consider [opening an issue](https://github.com/hmatuschek/qdmr/issues/new) or participate in one of the [discussions](https://github.com/hmatuschek/qdmr/discussions). + * If you want to help translating qdmr in your language, checkout [qdmr's weblate project](https://translate.codeberg.org/projects/qdmr/graphical-user-interface/). * There is also a *Matrix* chat at [#qdmr:darc.de](https://matrix.to/#/#qdmr:darc.de). * You can also follow me at [mastodon](https://mastodon.radio/@dm3mat), where I usually announce new releases. @@ -46,13 +47,15 @@ tools, that make your day-to-day useage of *qdmr* easier, by providing features, qdmr or dmrconf. * **[dmrfill](https://github.com/jancona/dmrfill)** -- Automatically extemds a qdmr YAML file with repeaters from a selected region. Get them all with one single command. - + * **[anytone-emu](https://github.com/dmr-tools/anytone-emu) -- A tool for emulating radios, reverse engineering and documenting codeplugs. Also generates some [codeplug documentation](https://dmr-tools.github.io/codeplugs/). + ## Releases Packaging status + * **[Version 0.12.1](https://github.com/hmatuschek/qdmr/releases/tag/v0.12.1)** -- Updated support for OpenGD77. * **[Version 0.12.0](https://github.com/hmatuschek/qdmr/releases/tag/v0.12.0)** -- Added support BTech DR-1801UV (A6, still unstable) and Radioddity GD-73. * **[Version 0.11.3](https://github.com/hmatuschek/qdmr/releases/tag/v0.11.3)** -- Added proper support for BTech DMR-6X2UV, device specific settings for AnyTone devices, some bugfixes. * **[Version 0.10.4](https://github.com/hmatuschek/qdmr/releases/tag/v0.10.4)** -- Added support for BTech DM1701, some bugfixes. diff --git a/doc/manual/codeplug/opengd77/extensions.xml b/doc/manual/codeplug/opengd77/extensions.xml index 26af7711..31021a8a 100644 --- a/doc/manual/codeplug/opengd77/extensions.xml +++ b/doc/manual/codeplug/opengd77/extensions.xml @@ -14,14 +14,6 @@ firmware. - - - The OpenGD77 codeplug is a specialization of the GD77 codeplug. Consequently - all extensions described in are also applicable to the OpenGD77 - codeplug. - - - diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml index c11f687e..0f5f2606 100644 --- a/doc/manual/manual.xml +++ b/doc/manual/manual.xml @@ -11,16 +11,16 @@ - August 15th, 2023 + January 2nd, 2025 - 2022-2024 + 2022-2025 Hannes Matuschek - This document covers qdmr version 0.12.0. + This document covers qdmr version 0.12.1. diff --git a/i18n/de.ts b/i18n/de.ts index b9c0a9b7..02639501 100644 --- a/i18n/de.ts +++ b/i18n/de.ts @@ -156,292 +156,292 @@ File server - Dateiserver + Dateiserver HC Future - Hurrikan Vorhersage + Hurrikan Vorhersage Aid station - Erste Hilfe + Erste Hilfe BBS - Mailbox + Mailbox Canoe - Kanu + Kanu Eyeball - Augapfel + Augapfel Tractor - Traktor + Traktor Grid Square - Grid Square + Grid Square Hotel - Hotel + Hotel TCP/IP - TCP/IP + TCP/IP School - Schule + Schule Logon - Logon + Logon MacOS - MacOS + MacOS NTS station - NTS-Station + NTS-Station Balloon - Ballon + Ballon Police car - Polizeiauto + Polizeiauto TBD - TBD + TBD RV - RV + RV Shuttle - Shuttle + Shuttle SSTV - SSTV + SSTV Bus - Bus + Bus ATV - ATV + ATV Weather service - Wetterdienst + Wetterdienst Helo - Helo + Helo Yacht - Yacht + Yacht MS Windows - MS Windows + MS Windows Jogger - Jogger + Jogger Triangle - Dreieck + Dreieck PBBS - PBBS + PBBS Plane large - großes Flugzeug + großes Flugzeug Weather station - Wetterstation + Wetterstation Dish antenna - Parabolantenne + Parabolantenne Ambulance - Krankenwagen + Krankenwagen Bike - Fahrrad + Fahrrad ICP - ICP + ICP Fire station - Feuerwache + Feuerwache Horse - Pferd + Pferd Fire truck - Löschzug + Löschzug Glider - Gleiter + Gleiter Hospital - Krankenhaus + Krankenhaus IOTA - IOTA + IOTA Jeep - Jeep + Jeep Truck small - kleiner Truck + kleiner Truck Laptop - Laptop + Laptop Mic-E - Mic-E + Mic-E Node - Knoten + Knoten EOC - EOC + EOC Rover - Rover + Rover Grid - Grid + Grid Antenna - Antenne + Antenne Power boat - Motorboot + Motorboot Truck stop - Rastplatz + Rastplatz Truck large - großer Truck + großer Truck Van - Van + Van Water - Wasser + Wasser XAPRS - XAPRS + XAPRS Yagi - Yagi + Yagi Shelter - Schutzhütte + Schutzhütte @@ -461,10 +461,6 @@ AboutDialog - About qdrm - Über qdrm - - @@ -472,7 +468,7 @@ Über qdmr - + Supported Radios Unterstützte Geräte @@ -648,310 +644,251 @@ Application - - Settings - Einstellungen - - - - - Radio IDs - Radio IDs - - - - Contacts - Kontakte - - - - Group Lists - Empfangsgruppen - - - - Channels - Kanäle - - - - Zones - Zonen - - - - Scan Lists - Scanlisten - - - - GPS/APRS - GPS/APRS - - - - - Extensions - Erweiterungen - - - - - - + + + Unsaved changes to codeplug. Nicht gespeicherte Änderungen am Codeplug. - - - - + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. Es gibt nicht gespeicherte Änderungen am Codeplug. Diese gehen verloren, wenn Sie fortfahren. - + Open codeplug Codeplug öffnen - + Codeplug Files (*.yaml);;Codeplug Files, old format (*.conf *.csv *.txt);;All Files (*) Codeplug Dateien (*.yaml);;Codeplug Dateien, altes Format (*.conf *.csv *.txt);;Alle Dateien (*) - - - - + + + + Cannot open file Kann Datei nicht öffnen - - - - + + + + Cannot read codeplug from file '%1': %2 Kann Codeplug nicht aus Datei '%1' lesen: %2 - - + + Cannot read codeplug. Kann Codeplug nicht lesen. - + Save codeplug Codeplug speichern - + Codeplug Files (*.yaml *.yml) Codeplug Dateien (*.yaml *.yml) - + Please use new YAML format. Nutze bitte das neue YAML-Format. - + Saving in the old table-based conf format was disabled with 0.9.0. Reading these files still works. Das Speichern der Config im alten tabellenbasierten Format wurde mit Version 0.9.0 deaktiviert. Das Einlesen dieser Dateien funktioniert nach wie vor. - - + + Cannot save codeplug to file '%1': %2 Kann Codeplug nicht in Datei '%1' speichern: %2 - + Cannot save codeplug Kann Codeplug nicht speichern - + Cannot save codeplug to file '%1'. Kann Codeplug nicht in Datei '%1' speichern. - + Export codeplug Codeplug exportieren - + CHIRP CSV Files (*.csv) CHIRP CSV Dateien (*.csv) - + Cannot export codeplug Kann Codeplug nicht exportieren - + Cannot export codeplug to file '%1': %2 Kann Codeplug nich in die Datei '%1' exportieren: %2 - + Import codeplug Codeplug importieren - + CHIRP CSV Files (*.csv);;YAML Files (*.yaml *.yml) CHIRP CSV Dateien (*.csv);;YAML Dateien (*.yaml *.yml) - - - - + + + + Cannot import codeplug Kann Codeplug nicht importieren - - - + + + Cannot import codeplug from '%1': %2 Kann Codeplug nicht aus Datei '%1' importieren: %2 - + Do not know, how to handle file '%1'. Kann Datei '%1' nicht verabreiten. - + No matching devices found. Kein passendes Gerät gefunden. - + Cannot connect to radio Verbindung zum Radio nicht möglich - + Cannot connect to radio: %1 Kann keine Verbindung zum Gerät herstellen: %1 - + Radio found Gerät gefunden - + Found device '%1'. Gerät '%1' gefunden. - + Verification success Verifizierung erfolgreich - + The codeplug was successfully verified with the radio '%1' Der aktuelle Codeplug passt zum Gerät '%1'. - + Read ... Lese … - + Read error Lesefehler - + Read complete Gelesen - + Upload ... Schreibe … - - - + + + Cannot write call-sign DB. Kann Rufzeichendatenbank nicht schreiben. - + The detected radio '%1' does not support a call-sign DB. Das Gerät '%1' unterstützt keine Rufzeichendatenbank. - + The detected radio '%1' does support a call-sign DB. This feature, however, is not implemented yet. Das Gerät '%1' unterstützt eine Rufzeichendatenbank. Diese Feature wurde jedoch noch nicht implementiert. - + QDMR selects the call-signs to be written based on the default DMR ID of the radio. No default ID set. qdmr kuratiert die Rufzeichendatenbank anhand Ihrer DMR ID. Es wurde keine Standard ID definiert. - + Write call-sign DB ... Schreibe Rufzeichendatenbank … - + Write error Schreibfehler - + Write complete Geschrieben - + %1 (alias for %2 %3) %1 (Alias für %2 %3) - - Roaming Channels - Roamingkanäle - - - - Roaming Zones - Roamingzonen - - - - - - - + + + + + No radio found Kein Gerät erkannt - - - - - + + + + + No matching device was found. Kein bekanntes Gerät erkannt. @@ -2242,211 +2179,304 @@ MainWindow - + File Datei - + Device Gerät - - + + Help Hilfe - + Databases Datenbanken - + Toolbar Werkzeugleiste - + New Neu - + Creates a new Codeplug. Erzeugt einen neuen Codeplug - + Ctrl+N Strg+N - + Open ... Öffnen … - + <html><head/><body><p>Imports a codeplug from &quot;conf&quot; files.</p></body></html> Importiert ein Codeplug von "conf" Dateien. - + Ctrl+O Strg+O - + Save ... Speichern … - + <html><head/><body><p>Saves the codeplug in a &quot;conf&quot; file.</p></body></html> Speichert den Codeplug in einer "conf" Datei. - + Ctrl+S Strg+S - + Quit Beenden - + Quits the application. Beendet qdmr. - + Ctrl+Q Strg+Q - + Detect Detektieren - + Detect connected radios. Detektiert angeschlossene Geräte. - + Verify Verifizieren - + <html><head/><body><p>Verifies the current codeplug with connected radios.</p></body></html> Verifiziert den aktuellen Codeplug für angeschlossene Geräte. - + Ctrl+R Strg+R - + Read Lesen - + Reads a codeplug from connected radios. Liest den Codeplug vom angeschlossenen Gerät. - + Write Schreiben - + Writes the codeplug to the connected radio. Schreibt den aktuellen Codeplug auf das angeschlossene Gerät. - + About qdmr Über qdmr - + Read the handbook. Lesen Sie das Handbuch. - + F1 F1 - + + Settings Einstellungen - + Shows settings dialog Zeigt den Einstellungsdialog an. - + Write Callsign DB Rufzeichendatenbank schreiben - + Writes call-sign DB to radio. Schreibt die Rufzeichendatenbank auf das Gerät. - + Refresh Callsign DB Rufzeichendatenbank aktualisieren - + Refreshes the downloaded callsign DB Aktualisiert die lokale Rufzeichendatenbank im Hintergrund aus den Onlinequellen. - + Refresh Talkgroup DB Sprechgruppendatenbank aktualisieren - + Refreshes the downloaded talkgroup DB Aktualisiert die Sprechgruppendatenbank im Hintergrund aus den Onlinequellen. - + Export to CHIRP ... Für CHIRP exportieren ... - + Exports all FM channels to CHRIP CSV. Exportiert alle FM Kanäle als CHIRP CSV. - + Import ... Importieren ... - + Imports and merges a codeplug into the current one. Importiert einen Codeplug und führt diesen mit dem aktuellen Codeplug zusammen. + + + Refresh Orbital Elements + Bahnelement aktualisieren + + + + Refreshes the orbital elements. + Aktualisiert die Bahnelemente. + + + + Edit Satellites ... + Satelliten bearbeiten ... + + + + Opens an editor to edit your satellite database. + Öffnet einen Editor, um die Satellitendatenbank zu bearbeiten. + + + + Write satellites + Satelliten schreiben + + + + Writes the orbital elements and transponder information onto the connected device. + Schreibt die Bahnelemente und Transponderinformationen auf das angeschlossene Gerät. + + + + + Radio IDs + Radio IDs + + + + Contacts + Kontakte + + + + Group Lists + Empfangsgruppen + + + + Channels + Kanäle + + + + Zones + Zonen + + + + Scan Lists + Scanlisten + + + + GPS/APRS + GPS/APRS + + + + Roaming Channels + Roamingkanäle + + + + Roaming Zones + Roamingzonen + + + + + Extensions + Erweiterungen + + + + Unsaved changes to codeplug. + Nicht gespeicherte Änderungen am Codeplug. + + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. + Es gibt nicht gespeicherte Änderungen am Codeplug. Diese gehen verloren, wenn Sie fortfahren. + MultiChannelSelectionDialog @@ -3135,6 +3165,33 @@ Alt+- + + SatelliteDatabaseDialog + + + Edit satellite database + Satellitendatenbank bearbeiten + + + + Add + Hinzufügen + + + + Delete + Löschen + + + + SatelliteSelectionDialog + + + + Select a satellite + Wähle einen Satelliten aus + + ScanListDialog @@ -3297,27 +3354,27 @@ None - + Kein CTCSS - + CTCSS DCS - + DCS Hz - + Hz Inverted - + Invertiert @@ -3350,12 +3407,7 @@ Repeater Info Sources - - - - - repeaterbook.com - + Repeaterinformationsquellen @@ -3363,7 +3415,7 @@ enable - + aktivieren @@ -3415,21 +3467,6 @@ North America Nordamerika - - - repeatermap.de - - - - - hearham.com - - - - - radioid.com - - Programming diff --git a/i18n/empty.ts b/i18n/empty.ts index 05da1a7a..68311fd0 100644 --- a/i18n/empty.ts +++ b/i18n/empty.ts @@ -461,10 +461,6 @@ AboutDialog - About qdrm - - - @@ -472,7 +468,7 @@ - + Supported Radios @@ -648,309 +644,250 @@ Application - - Settings - - - - - - Radio IDs - - - - - Contacts - - - - - Group Lists - - - - - Channels - - - - - Zones - - - - - Scan Lists - - - - - GPS/APRS - - - - - Roaming Channels - - - - - Roaming Zones - - - - - - Extensions - - - - - - - + + + Unsaved changes to codeplug. - - - - + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. - + Open codeplug - + Codeplug Files (*.yaml);;Codeplug Files, old format (*.conf *.csv *.txt);;All Files (*) - - - - + + + + Cannot open file - - - - + + + + Cannot read codeplug from file '%1': %2 - - + + Cannot read codeplug. - + Save codeplug - + Codeplug Files (*.yaml *.yml) - + Please use new YAML format. - + Saving in the old table-based conf format was disabled with 0.9.0. Reading these files still works. - - + + Cannot save codeplug to file '%1': %2 - + Cannot save codeplug - + Cannot save codeplug to file '%1'. - + Export codeplug - + CHIRP CSV Files (*.csv) - + Cannot export codeplug - + Cannot export codeplug to file '%1': %2 - + Import codeplug - + CHIRP CSV Files (*.csv);;YAML Files (*.yaml *.yml) - - - - + + + + Cannot import codeplug - - - + + + Cannot import codeplug from '%1': %2 - + Do not know, how to handle file '%1'. - + No matching devices found. - + Cannot connect to radio - + Cannot connect to radio: %1 - + Radio found - + Found device '%1'. - - - - - + + + + + No radio found - - - - - + + + + + No matching device was found. - + Verification success - + The codeplug was successfully verified with the radio '%1' - + Read ... - + Read error - + Read complete - + Upload ... - - - + + + Cannot write call-sign DB. - + The detected radio '%1' does not support a call-sign DB. - + The detected radio '%1' does support a call-sign DB. This feature, however, is not implemented yet. - + QDMR selects the call-signs to be written based on the default DMR ID of the radio. No default ID set. - + Write call-sign DB ... - + Write error - + Write complete - + %1 (alias for %2 %3) @@ -2241,211 +2178,304 @@ MainWindow - + File - + Device - - + + Help - + Databases - + Toolbar - + New - + Creates a new Codeplug. - + Ctrl+N - + Open ... - + <html><head/><body><p>Imports a codeplug from &quot;conf&quot; files.</p></body></html> - + Ctrl+O - + Save ... - + <html><head/><body><p>Saves the codeplug in a &quot;conf&quot; file.</p></body></html> - + Ctrl+S - + Quit - + Quits the application. - + Ctrl+Q - + Detect - + Detect connected radios. - + Verify - + <html><head/><body><p>Verifies the current codeplug with connected radios.</p></body></html> - + Ctrl+R - + Read - + Reads a codeplug from connected radios. - + Write - + Writes the codeplug to the connected radio. - + About qdmr - + Read the handbook. - + F1 - + + Settings - + Shows settings dialog - + Write Callsign DB - + Writes call-sign DB to radio. - + Refresh Callsign DB - + Refreshes the downloaded callsign DB - + Refresh Talkgroup DB - + Refreshes the downloaded talkgroup DB - + Export to CHIRP ... - + Exports all FM channels to CHRIP CSV. - + Import ... - + Imports and merges a codeplug into the current one. + + + Refresh Orbital Elements + + + + + Refreshes the orbital elements. + + + + + Edit Satellites ... + + + + + Opens an editor to edit your satellite database. + + + + + Write satellites + + + + + Writes the orbital elements and transponder information onto the connected device. + + + + + + Radio IDs + + + + + Contacts + + + + + Group Lists + + + + + Channels + + + + + Zones + + + + + Scan Lists + + + + + GPS/APRS + + + + + Roaming Channels + + + + + Roaming Zones + + + + + + Extensions + + + + + Unsaved changes to codeplug. + + + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. + + MultiChannelSelectionDialog @@ -3131,6 +3161,33 @@ + + SatelliteDatabaseDialog + + + Edit satellite database + + + + + Add + + + + + Delete + + + + + SatelliteSelectionDialog + + + + Select a satellite + + + ScanListDialog @@ -3348,11 +3405,6 @@ Repeater Info Sources - - - repeaterbook.com - - @@ -3411,21 +3463,6 @@ North America - - - repeatermap.de - - - - - hearham.com - - - - - radioid.com - - Programming diff --git a/i18n/en_US.ts b/i18n/en_US.ts index 1c6f5a3d..5acc9e32 100644 --- a/i18n/en_US.ts +++ b/i18n/en_US.ts @@ -461,10 +461,6 @@ AboutDialog - About qdrm - About qdrm - - @@ -472,7 +468,7 @@ About qdmr - + Supported Radios Supported Radios @@ -648,310 +644,251 @@ Application - - Settings - Settings - - - - - Radio IDs - Radio IDs - - - - Contacts - Contacts - - - - Group Lists - Group Lists - - - - Channels - Channels - - - - Zones - Zones - - - - Scan Lists - Scan Lists - - - - GPS/APRS - GPS/APRS - - - - Roaming Channels - Roaming Channels - - - - Roaming Zones - Roaming Zones - - - - - Extensions - Extensions - - - - - - + + + Unsaved changes to codeplug. Unsaved changes to codeplug. - - - - + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. There are unsaved changes to the current codeplug. These changes are lost if you proceed. - + Open codeplug Open codeplug - + Codeplug Files (*.yaml);;Codeplug Files, old format (*.conf *.csv *.txt);;All Files (*) Codeplug Files (*.yaml);;Codeplug Files, old format (*.conf *.csv *.txt);;All Files (*) - - - - + + + + Cannot open file Cannot open file - - - - + + + + Cannot read codeplug from file '%1': %2 Cannot read codeplug from file '%1': %2 - - + + Cannot read codeplug. Cannot read codeplug. - + Save codeplug Save codeplug - + Codeplug Files (*.yaml *.yml) Codeplug Files (*.yaml *.yml) - + Please use new YAML format. Please use new YAML format. - + Saving in the old table-based conf format was disabled with 0.9.0. Reading these files still works. Saving in the old table-based conf format was disabled with 0.9.0. Reading these files still works. - - + + Cannot save codeplug to file '%1': %2 Cannot save codeplug to file '%1': %2 - + Cannot save codeplug Cannot save codeplug - + Cannot save codeplug to file '%1'. Cannot save codeplug to file '%1'. - + Export codeplug Export codeplug - + CHIRP CSV Files (*.csv) CHIRP CSV Files (*.csv) - + Cannot export codeplug Cannot export codeplug - + Cannot export codeplug to file '%1': %2 Cannot export codeplug to file '%1': %2 - + Import codeplug Import codeplug - + CHIRP CSV Files (*.csv);;YAML Files (*.yaml *.yml) CHIRP CSV Files (*.csv);;YAML Files (*.yaml *.yml) - - - - + + + + Cannot import codeplug Cannot import codeplug - - - + + + Cannot import codeplug from '%1': %2 Cannot import codeplug from '%1': %2 - + Do not know, how to handle file '%1'. Do not know, how to handle file '%1'. - + No matching devices found. No matching devices found. - + Cannot connect to radio Cannot connect to radio - + Cannot connect to radio: %1 Cannot connect to radio: %1 - + Radio found Radio found - + Found device '%1'. Found device '%1'. - - - - - + + + + + No radio found No radio found - + Verification success Verification success - + The codeplug was successfully verified with the radio '%1' The codeplug was successfully verified with the radio '%1' - + Read ... Read … - + Read error Read error - + Read complete Read complete - + Upload ... Upload … - - - + + + Cannot write call-sign DB. Cannot write call-sign DB. - + The detected radio '%1' does not support a call-sign DB. The detected radio '%1' does not support a call-sign DB. - - - - - + + + + + No matching device was found. No matching device was found. - + The detected radio '%1' does support a call-sign DB. This feature, however, is not implemented yet. The detected radio '%1' does support a call-sign DB. This feature, however, is not implemented yet. - + QDMR selects the call-signs to be written based on the default DMR ID of the radio. No default ID set. QDMR selects the call-signs to be written based on the default DMR ID of the radio. No default ID set. - + Write call-sign DB ... Write call-sign DB … - + Write error Write error - + Write complete Write complete - + %1 (alias for %2 %3) %1 (alias for %2 %3) @@ -2242,211 +2179,304 @@ MainWindow - + File File - + Device Device - - + + Help Help - + Databases Databases - + Toolbar - + New New - + Creates a new Codeplug. Creates a new Codeplug. - + Ctrl+N Ctrl+N - + Open ... Open … - + <html><head/><body><p>Imports a codeplug from &quot;conf&quot; files.</p></body></html> <html><head/><body><p>Imports a codeplug from &quot;conf&quot; files.</p></body></html> - + Ctrl+O Ctrl+O - + Save ... Save … - + <html><head/><body><p>Saves the codeplug in a &quot;conf&quot; file.</p></body></html> <html><head/><body><p>Saves the codeplug in a &quot;conf&quot; file.</p></body></html> - + Ctrl+S Ctrl+S - + Quit Quit - + Quits the application. Quits the application. - + Ctrl+Q Ctrl+Q - + Detect Detect - + Detect connected radios. Detect connected radios. - + Verify Verify - + <html><head/><body><p>Verifies the current codeplug with connected radios.</p></body></html> Verifies the current codeplug with connected radios. - + Ctrl+R Ctrl+R - + Read Read - + Reads a codeplug from connected radios. Reads a codeplug from connected radios. - + Write Write - + Writes the codeplug to the connected radio. Writes the codeplug to the connected radio. - + About qdmr About qdmr - + Read the handbook. Read the handbook. - + F1 F1 - + + Settings Settings - + Shows settings dialog Shows settings dialog. - + Write Callsign DB Write call-sign DB - + Writes call-sign DB to radio. Writes call-sign DB to radio. - + Refresh Callsign DB Refresh call-sign DB - + Refreshes the downloaded callsign DB Refreshes the downloaded call-sign DB - + Refresh Talkgroup DB Refresh talk-group DB - + Refreshes the downloaded talkgroup DB Refreshes the downloaded talk-group DB - + Export to CHIRP ... Export to CHIRP ... - + Exports all FM channels to CHRIP CSV. Exports all FM channels to CHRIP CSV. - + Import ... Import ... - + Imports and merges a codeplug into the current one. Imports and merges a codeplug into the current one. + + + Refresh Orbital Elements + Refresh Orbital Elements + + + + Refreshes the orbital elements. + Refreshes the orbital elements. + + + + Edit Satellites ... + Edit Satellites ... + + + + Opens an editor to edit your satellite database. + Opens an editor to edit your satellite database. + + + + Write satellites + Write satellites + + + + Writes the orbital elements and transponder information onto the connected device. + Writes the orbital elements and transponder information onto the connected device. + + + + + Radio IDs + Radio IDs + + + + Contacts + Contacts + + + + Group Lists + Group Lists + + + + Channels + Channels + + + + Zones + Zones + + + + Scan Lists + Scan Lists + + + + GPS/APRS + GPS/APRS + + + + Roaming Channels + Roaming Channels + + + + Roaming Zones + Roaming Zones + + + + + Extensions + Extensions + + + + Unsaved changes to codeplug. + Unsaved changes to codeplug. + + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. + There are unsaved changes to the current codeplug. These changes are lost if you proceed. + MultiChannelSelectionDialog @@ -3135,6 +3165,33 @@ Alt+- + + SatelliteDatabaseDialog + + + Edit satellite database + Edit satellite database + + + + Add + Add + + + + Delete + Delete + + + + SatelliteSelectionDialog + + + + Select a satellite + Select a satellite + + ScanListDialog @@ -3297,27 +3354,27 @@ None - + None CTCSS - + CTCSS DCS - + DCS Hz - + Hz Inverted - + Inverted @@ -3350,12 +3407,7 @@ Repeater Info Sources - - - - - repeaterbook.com - + Repeater Info Sources @@ -3363,7 +3415,7 @@ enable - + enable @@ -3415,21 +3467,6 @@ North America North America - - - repeatermap.de - - - - - hearham.com - - - - - radioid.com - - Programming diff --git a/i18n/fr.ts b/i18n/fr.ts index 25ec91c0..3608e8ca 100644 --- a/i18n/fr.ts +++ b/i18n/fr.ts @@ -461,10 +461,6 @@ AboutDialog - About qdrm - À propos de qdrm - - @@ -472,7 +468,7 @@ À propos de qdrm - + Supported Radios Radios prises en charge @@ -648,309 +644,250 @@ Application - - Settings - - - - - - Radio IDs - - - - - Contacts - - - - - Group Lists - - - - - Channels - - - - - Zones - - - - - Scan Lists - - - - - GPS/APRS - - - - - Roaming Channels - - - - - Roaming Zones - - - - - - Extensions - - - - - - - + + + Unsaved changes to codeplug. - - - - + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. - + Open codeplug - + Codeplug Files (*.yaml);;Codeplug Files, old format (*.conf *.csv *.txt);;All Files (*) - - - - + + + + Cannot open file - - - - + + + + Cannot read codeplug from file '%1': %2 - - + + Cannot read codeplug. - + Save codeplug - + Codeplug Files (*.yaml *.yml) - + Please use new YAML format. - + Saving in the old table-based conf format was disabled with 0.9.0. Reading these files still works. - - + + Cannot save codeplug to file '%1': %2 - + Cannot save codeplug - + Cannot save codeplug to file '%1'. - + Export codeplug - + CHIRP CSV Files (*.csv) - + Cannot export codeplug - + Cannot export codeplug to file '%1': %2 - + Import codeplug - + CHIRP CSV Files (*.csv);;YAML Files (*.yaml *.yml) - - - - + + + + Cannot import codeplug - - - + + + Cannot import codeplug from '%1': %2 - + Do not know, how to handle file '%1'. - + No matching devices found. - + Cannot connect to radio - + Cannot connect to radio: %1 - + Radio found - + Found device '%1'. - - - - - + + + + + No radio found - - - - - + + + + + No matching device was found. - + Verification success - + The codeplug was successfully verified with the radio '%1' - + Read ... - + Read error - + Read complete - + Upload ... - - - + + + Cannot write call-sign DB. - + The detected radio '%1' does not support a call-sign DB. - + The detected radio '%1' does support a call-sign DB. This feature, however, is not implemented yet. - + QDMR selects the call-signs to be written based on the default DMR ID of the radio. No default ID set. - + Write call-sign DB ... - + Write error - + Write complete - + %1 (alias for %2 %3) @@ -2241,211 +2178,304 @@ MainWindow - + File - + Device - - + + Help - + Databases - + Toolbar - + New - + Creates a new Codeplug. - + Ctrl+N - + Open ... - + <html><head/><body><p>Imports a codeplug from &quot;conf&quot; files.</p></body></html> - + Ctrl+O - + Save ... - + <html><head/><body><p>Saves the codeplug in a &quot;conf&quot; file.</p></body></html> - + Ctrl+S - + Quit - + Quits the application. - + Ctrl+Q - + Detect - + Detect connected radios. - + Verify - + <html><head/><body><p>Verifies the current codeplug with connected radios.</p></body></html> - + Ctrl+R - + Read - + Reads a codeplug from connected radios. - + Write - + Writes the codeplug to the connected radio. - + About qdmr À propos de qdrm - + Read the handbook. - + F1 - + + Settings - + Shows settings dialog - + Write Callsign DB - + Writes call-sign DB to radio. - + Refresh Callsign DB - + Refreshes the downloaded callsign DB - + Refresh Talkgroup DB - + Refreshes the downloaded talkgroup DB - + Export to CHIRP ... - + Exports all FM channels to CHRIP CSV. - + Import ... - + Imports and merges a codeplug into the current one. + + + Refresh Orbital Elements + + + + + Refreshes the orbital elements. + + + + + Edit Satellites ... + + + + + Opens an editor to edit your satellite database. + + + + + Write satellites + + + + + Writes the orbital elements and transponder information onto the connected device. + + + + + + Radio IDs + + + + + Contacts + + + + + Group Lists + + + + + Channels + + + + + Zones + + + + + Scan Lists + + + + + GPS/APRS + + + + + Roaming Channels + + + + + Roaming Zones + + + + + + Extensions + + + + + Unsaved changes to codeplug. + + + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. + + MultiChannelSelectionDialog @@ -3131,6 +3161,33 @@ + + SatelliteDatabaseDialog + + + Edit satellite database + + + + + Add + + + + + Delete + + + + + SatelliteSelectionDialog + + + + Select a satellite + + + ScanListDialog @@ -3348,11 +3405,6 @@ Repeater Info Sources - - - repeaterbook.com - - @@ -3411,21 +3463,6 @@ North America - - - repeatermap.de - - - - - hearham.com - - - - - radioid.com - - Programming diff --git a/i18n/it.ts b/i18n/it.ts index 64823e25..5bf8a38f 100644 --- a/i18n/it.ts +++ b/i18n/it.ts @@ -461,10 +461,6 @@ AboutDialog - About qdrm - Informazioni su qdmr - - @@ -472,7 +468,7 @@ Informazioni su qdmr - + Supported Radios Radio supportate @@ -648,309 +644,250 @@ Application - - Settings - Impostazioni - - - - - Radio IDs - ID Radio - - - - Contacts - Contatti - - - - Group Lists - Liste Gruppi - - - - Channels - Canali - - - - Zones - Zone - - - - Scan Lists - Liste Scan - - - - GPS/APRS - GPS/APRS - - - - Roaming Channels - Canali Roaming - - - - Roaming Zones - Zone Roaming - - - - - Extensions - Estensioni - - - - - - + + + Unsaved changes to codeplug. Modifiche non salvate al codeplug. - - - - + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. Ci sono modifiche non salvate al codeplug corrente. Queste modifiche andranno perse se procedi. - + Open codeplug Apri codeplug - + Codeplug Files (*.yaml);;Codeplug Files, old format (*.conf *.csv *.txt);;All Files (*) File Codeplug (*.yaml);;File Codeplug, vecchio formato (*.conf *.csv *.txt);;All Files (*) - - - - + + + + Cannot open file Impossibile aprire il file - - - - + + + + Cannot read codeplug from file '%1': %2 Impossibile leggere il codeplug dal file '%1': %2 - - + + Cannot read codeplug. Impossibile leggere il codeplug. - + Save codeplug Salva codeplug - + Codeplug Files (*.yaml *.yml) File Codeplug (*.yaml *.yml) - + Please use new YAML format. Utilizzare il nuovo formato YAML. - + Saving in the old table-based conf format was disabled with 0.9.0. Reading these files still works. Il salvataggio nel vecchio formato conf basato su tabelle è stato disabilitato dalla la versione 0.9.0 in poi. La lettura di questi file è ancora possibile. - - + + Cannot save codeplug to file '%1': %2 Impossibile salvare il codeplug nel file '%1': %2 - + Cannot save codeplug Impossibile salvare il codeplug - + Cannot save codeplug to file '%1'. Impossibile salvare il codeplug nel file '%1'. - + Export codeplug - + CHIRP CSV Files (*.csv) - + Cannot export codeplug - + Cannot export codeplug to file '%1': %2 - + Import codeplug - + CHIRP CSV Files (*.csv);;YAML Files (*.yaml *.yml) - - - - + + + + Cannot import codeplug - - - + + + Cannot import codeplug from '%1': %2 - + Do not know, how to handle file '%1'. - + No matching devices found. Nessun dispositivo corrispondente trovato. - + Cannot connect to radio Impossibile connettersi alla radio - + Cannot connect to radio: %1 Impossibile connettersi alla radio: %1 - + Radio found Radio rilevata - + Found device '%1'. Rilevato dispositivo '%1'. - - - - - + + + + + No radio found Nessuna radio rilevata - - - - - + + + + + No matching device was found. Nessun dispositivo corrispondente trovato. - + Verification success Verifica riuscita - + The codeplug was successfully verified with the radio '%1' Il codeplug è stato verificato con successo con la radio '%1 - + Read ... Lettura … - + Read error Errore di lettura - + Read complete Lettura completata - + Upload ... Caricamento … - - - + + + Cannot write call-sign DB. Impossibile scrivere il DB dei nominativi. - + The detected radio '%1' does not support a call-sign DB. La radio rilevata '%1' non supporta un DB dei nominativi. - + The detected radio '%1' does support a call-sign DB. This feature, however, is not implemented yet. La radio rilevata '%1' supporta un DB dei nominativi. Tuttavia, questa funzione non è ancora stata implementata. - + QDMR selects the call-signs to be written based on the default DMR ID of the radio. No default ID set. QDMR seleziona i nominativi da scrivere in base all'ID DMR predefinito della radio. Non è stato impostato alcun ID predefinito. - + Write call-sign DB ... Scrittura del DB dei nominativi … - + Write error Errore di scrittura - + Write complete Scrittura completata - + %1 (alias for %2 %3) %1 (alias for %2 %3) @@ -2241,211 +2178,304 @@ MainWindow - + File File - + Device Dispositivo - - + + Help Aiuto - + Databases Database - + Toolbar - + New Nuovo - + Creates a new Codeplug. Crea un nuovo Codeplug. - + Ctrl+N Ctrl+N - + Open ... Apri … - + <html><head/><body><p>Imports a codeplug from &quot;conf&quot; files.</p></body></html> <html><head/><body><p>Importa un codeplug da file &quot;conf&quot;.</p></body></html> - + Ctrl+O Ctrl+O - + Save ... Salva … - + <html><head/><body><p>Saves the codeplug in a &quot;conf&quot; file.</p></body></html> <html><head/><body><p>Salva il codeplug in un file &quot;conf&quot;.</p></body></html> - + Ctrl+S Ctrl+S - + Quit Esci - + Quits the application. Esci dall'applicazione. - + Ctrl+Q Ctrl+Q - + Detect Rileva - + Detect connected radios. Rileva le radio collegate. - + Verify Verifica - + <html><head/><body><p>Verifies the current codeplug with connected radios.</p></body></html> Verifica il codeplug corrente con le radio collegate. - + Ctrl+R Ctrl+R - + Read Leggi - + Reads a codeplug from connected radios. Legge il codeplug dalle radio collegate. - + Write Scrivi - + Writes the codeplug to the connected radio. Scrive il codeplug sulla radio collegata. - + About qdmr Informazioni su qdmr - + Read the handbook. Leggi il manuale. - + F1 F1 - + + Settings Impostazioni - + Shows settings dialog Mostra la finestra delle impostazioni. - + Write Callsign DB Scrivi il DB dei nominativi - + Writes call-sign DB to radio. Scrive il DB dei nominativi sulla radio. - + Refresh Callsign DB Aggiorna il DB dei nominativi - + Refreshes the downloaded callsign DB Aggiorna il DB dei nominativi scaricati - + Refresh Talkgroup DB Aggiorna DB dei talk-group - + Refreshes the downloaded talkgroup DB Aggiorna il DB dei talk-group scaricati - + Export to CHIRP ... - + Exports all FM channels to CHRIP CSV. - + Import ... - + Imports and merges a codeplug into the current one. + + + Refresh Orbital Elements + + + + + Refreshes the orbital elements. + + + + + Edit Satellites ... + + + + + Opens an editor to edit your satellite database. + + + + + Write satellites + + + + + Writes the orbital elements and transponder information onto the connected device. + + + + + + Radio IDs + ID Radio + + + + Contacts + Contatti + + + + Group Lists + Liste Gruppi + + + + Channels + Canali + + + + Zones + Zone + + + + Scan Lists + Liste Scan + + + + GPS/APRS + GPS/APRS + + + + Roaming Channels + Canali Roaming + + + + Roaming Zones + Zone Roaming + + + + + Extensions + Estensioni + + + + Unsaved changes to codeplug. + Modifiche non salvate al codeplug. + + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. + Ci sono modifiche non salvate al codeplug corrente. Queste modifiche andranno perse se procedi. + MultiChannelSelectionDialog @@ -3133,6 +3163,33 @@ Alt+- + + SatelliteDatabaseDialog + + + Edit satellite database + + + + + Add + + + + + Delete + + + + + SatelliteSelectionDialog + + + + Select a satellite + + + ScanListDialog @@ -3350,11 +3407,6 @@ Repeater Info Sources - - - repeaterbook.com - - @@ -3413,21 +3465,6 @@ North America - - - repeatermap.de - - - - - hearham.com - - - - - radioid.com - - Programming diff --git a/i18n/nl.ts b/i18n/nl.ts index 91b34d16..2ed17a8c 100644 --- a/i18n/nl.ts +++ b/i18n/nl.ts @@ -261,7 +261,7 @@ ATV - + ATV @@ -356,7 +356,7 @@ IOTA - + IOTA @@ -376,7 +376,7 @@ Mic-E - + Mic-E @@ -431,7 +431,7 @@ XAPRS - + XAPRS @@ -461,10 +461,6 @@ AboutDialog - About qdrm - - - @@ -472,7 +468,7 @@ - + Supported Radios Ondersteunde Radios @@ -508,12 +504,12 @@ Rx Frequency - + RX Frequentie Tx Frequency - + TX Frequentie @@ -533,7 +529,7 @@ Mid - Mid + Middel @@ -556,7 +552,7 @@ Tx Timeout - + TX Timeout @@ -648,309 +644,250 @@ Application - - Settings - Instellingen - - - - - Radio IDs - Radio IDs - - - - Contacts - Contacten - - - - Group Lists - - - - - Channels - Kanalen - - - - Zones - Zones - - - - Scan Lists - Scan Lijsten - - - - GPS/APRS - GPS/APRS - - - - Roaming Channels - Roaming Kanalen - - - - Roaming Zones - Roaming Zones - - - - - Extensions - Extensies - - - - - - + + + Unsaved changes to codeplug. - - - - + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. - + Open codeplug Open codeplug - + Codeplug Files (*.yaml);;Codeplug Files, old format (*.conf *.csv *.txt);;All Files (*) - - - - + + + + Cannot open file - + Kan bestand niet openen - - - - + + + + Cannot read codeplug from file '%1': %2 - - + + Cannot read codeplug. - + Kan codeplug niet lezen. - + Save codeplug - + Codeplug opslaan - + Codeplug Files (*.yaml *.yml) - + Codeplug Bestanden (*.yaml *.yml) - + Please use new YAML format. - + Saving in the old table-based conf format was disabled with 0.9.0. Reading these files still works. - - + + Cannot save codeplug to file '%1': %2 - + Cannot save codeplug - + Kan codeplug niet opslaan - + Cannot save codeplug to file '%1'. - + Export codeplug - + CHIRP CSV Files (*.csv) - + CHIRP CSV Bestanden (*.csv) - + Cannot export codeplug - + Cannot export codeplug to file '%1': %2 - + Import codeplug - + CHIRP CSV Files (*.csv);;YAML Files (*.yaml *.yml) - - - - + + + + Cannot import codeplug - - - + + + Cannot import codeplug from '%1': %2 - + Do not know, how to handle file '%1'. - + No matching devices found. - + Cannot connect to radio Kan niet verbinden met radio - + Cannot connect to radio: %1 - + Radio found Radio gevonden - + Found device '%1'. - - - - - + + + + + No radio found Geen radio gevonden - - - - - + + + + + No matching device was found. - + Verification success - + The codeplug was successfully verified with the radio '%1' - + Read ... - + Lees … - + Read error Leesfout - + Read complete - + Upload ... Upload … - - - + + + Cannot write call-sign DB. - + The detected radio '%1' does not support a call-sign DB. - + The detected radio '%1' does support a call-sign DB. This feature, however, is not implemented yet. - + QDMR selects the call-signs to be written based on the default DMR ID of the radio. No default ID set. - + Write call-sign DB ... - + Write error Schrijffout - + Write complete - + %1 (alias for %2 %3) @@ -981,7 +918,7 @@ Delete channel? - + Kanaal verwijderen? @@ -991,7 +928,7 @@ Delete %1 channels? - + %1 kanalen verwijderen? @@ -1001,7 +938,7 @@ Alt+A - + Alt+A @@ -1011,12 +948,12 @@ Alt+D - + Alt+D Clone Channel - + Kanaal Klonen @@ -1026,12 +963,12 @@ Delete Channel - + Kanaal Verwijderen Alt+- - + Alt+- @@ -1039,12 +976,12 @@ FM - + FM DMR - + DMR @@ -1058,60 +995,60 @@ Max - + Max High - + Hoog Mid - + Middel Low - + Laag Min - + Min Off - + Uit On - + Aan Always - + Altijd Free - + Vrij Color - + Kleur Tone - + Toon @@ -1125,52 +1062,52 @@ [None] - + [Geen] Open - + Open Wide - + Breed Narrow - + Smal Type - + Type Name - + Naam Rx Frequency - + RX Frequentie Tx Frequency - + TX Frequentie Power - + Vermogen Timeout - + Timeout @@ -1185,7 +1122,7 @@ Scanlist - + Scanlijst @@ -1210,27 +1147,27 @@ TX Contact - + TX Contact DMR ID - + DMR ID GPS/APRS - + GPS/APRS Roaming - + Roaming Squelch - + Squelch @@ -1529,7 +1466,7 @@ Alt++ - + Alt++ @@ -1549,7 +1486,7 @@ Alt+- - + Alt+- @@ -1557,19 +1494,19 @@ DTMF - + DTMF On - + Aan Off - + Uit @@ -1589,7 +1526,7 @@ Type - + Type @@ -1642,7 +1579,7 @@ Type - + Type @@ -1652,7 +1589,7 @@ Number - + Nummer @@ -1662,7 +1599,7 @@ Extensions - + Extensies @@ -1680,12 +1617,12 @@ DMR ID - + DMR ID Extensions - + Extensies @@ -1708,12 +1645,12 @@ Name - + Naam Number - + Nummer @@ -1723,7 +1660,7 @@ Extensions - + Extensies @@ -1773,17 +1710,17 @@ Name - + Naam Rx Frequency - + RX Frequentie Tx Frequency - + TX Frequentie @@ -1793,7 +1730,7 @@ Tx Timeout - + TX Timeout @@ -1861,12 +1798,12 @@ Always - + Altijd Channel Free - + Kanaal Vrij @@ -1882,12 +1819,12 @@ TS 1 - + TS 1 TS 2 - + TS 2 @@ -1907,12 +1844,12 @@ Roaming Zone - + Roaming Zone DMR ID - + DMR ID @@ -1935,12 +1872,12 @@ Error: %1 - + Fout: %1 Traceback: - + Traceback: @@ -2006,7 +1943,7 @@ Name - + Naam @@ -2016,7 +1953,7 @@ Update period [s] - + Updateperiode [s] @@ -2026,7 +1963,7 @@ Extensions - + Extensies @@ -2034,17 +1971,17 @@ DMR Radio ID - + DMR Radio ID DMR ID - + DMR ID Radio Name - + Radionaam @@ -2054,7 +1991,7 @@ Name/Callsign - + Naam/Roepletters @@ -2114,42 +2051,42 @@ Power - + Vermogen Max - + Max High - + Hoog Mid - + Middel Low - + Laag Min - + Min Squelch - + Squelch Open - + Open @@ -2160,7 +2097,7 @@ Off - + Uit @@ -2170,7 +2107,7 @@ Extensions - + Extensies @@ -2178,7 +2115,7 @@ Contact - + Contact @@ -2217,7 +2154,7 @@ Alt++ - + Alt++ @@ -2227,7 +2164,7 @@ Alt+- - + Alt+- @@ -2241,211 +2178,304 @@ MainWindow - + File - + Bestand - + Device - - + + Help - + Databases - + Toolbar - + New - + Nieuw - + Creates a new Codeplug. - + Ctrl+N - + Ctrl+N - + Open ... - + <html><head/><body><p>Imports a codeplug from &quot;conf&quot; files.</p></body></html> - + Ctrl+O - + Ctrl+O - + Save ... - + Opslaan … - + <html><head/><body><p>Saves the codeplug in a &quot;conf&quot; file.</p></body></html> - + Ctrl+S - + Ctrl+S - + Quit - + Quits the application. - + Ctrl+Q - + Ctrl+Q - + Detect - + Detecteren - + Detect connected radios. - + Verify - + Verifiëren - + <html><head/><body><p>Verifies the current codeplug with connected radios.</p></body></html> - + Ctrl+R - + Ctrl+R - + Read - + Reads a codeplug from connected radios. - + Write - + Writes the codeplug to the connected radio. - + About qdmr - + Read the handbook. - + F1 - + F1 - + + Settings - + Instellingen - + Shows settings dialog - + Write Callsign DB - + Writes call-sign DB to radio. - + Refresh Callsign DB - + Refreshes the downloaded callsign DB - + Refresh Talkgroup DB - + Refreshes the downloaded talkgroup DB - + Export to CHIRP ... - + Exports all FM channels to CHRIP CSV. - + Import ... - + Imports and merges a codeplug into the current one. + + + Refresh Orbital Elements + + + + + Refreshes the orbital elements. + + + + + Edit Satellites ... + + + + + Opens an editor to edit your satellite database. + + + + + Write satellites + + + + + Writes the orbital elements and transponder information onto the connected device. + + + + + + Radio IDs + Radio IDs + + + + Contacts + Contacten + + + + Group Lists + Groepenlijst + + + + Channels + Kanalen + + + + Zones + Zones + + + + Scan Lists + Scan Lijsten + + + + GPS/APRS + GPS/APRS + + + + Roaming Channels + Roaming Kanalen + + + + Roaming Zones + Roaming Zones + + + + + Extensions + Extensies + + + + Unsaved changes to codeplug. + + + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. + + MultiChannelSelectionDialog @@ -2532,7 +2562,7 @@ Alt+A - + Alt+A @@ -2542,7 +2572,7 @@ Alt+- - + Alt+- @@ -2550,18 +2580,18 @@ DMR - + DMR APRS - + APRS [None] - + [Geen] @@ -2571,12 +2601,12 @@ Type - + Type Name - + Naam @@ -2704,7 +2734,7 @@ Name - + Naam @@ -2714,7 +2744,7 @@ Alt++ - + Alt++ @@ -2724,12 +2754,12 @@ Alt+- - + Alt+- Extensions - + Extensies @@ -2785,17 +2815,17 @@ Type - + Type Name - + Naam Number - + Nummer @@ -2883,12 +2913,12 @@ TS 1 - + TS 1 TS 2 - + TS 2 @@ -2946,7 +2976,7 @@ Name - + Naam @@ -2971,7 +3001,7 @@ Zones - + Zones @@ -3040,7 +3070,7 @@ Alt++ - + Alt++ @@ -3050,7 +3080,7 @@ Alt+- - + Alt+- @@ -3113,7 +3143,7 @@ Alt++ - + Alt++ @@ -3128,6 +3158,33 @@ Alt+- + Alt+- + + + + SatelliteDatabaseDialog + + + Edit satellite database + + + + + Add + + + + + Delete + + + + + SatelliteSelectionDialog + + + + Select a satellite @@ -3147,7 +3204,7 @@ Name - + Naam @@ -3172,7 +3229,7 @@ Alt++ - + Alt++ @@ -3182,12 +3239,12 @@ Alt+- - + Alt+- Extensions - + Extensies @@ -3198,7 +3255,7 @@ [None] - + [Geen] @@ -3253,7 +3310,7 @@ Alt++ - + Alt++ @@ -3263,7 +3320,7 @@ Alt+- - + Alt+- @@ -3348,11 +3405,6 @@ Repeater Info Sources - - - repeaterbook.com - - @@ -3411,21 +3463,6 @@ North America - - - repeatermap.de - - - - - hearham.com - - - - - radioid.com - - Programming @@ -3509,7 +3546,7 @@ Extensions - + Extensies @@ -3643,7 +3680,7 @@ Alt++ - + Alt++ @@ -3653,7 +3690,7 @@ Alt+- - + Alt+- @@ -3709,12 +3746,12 @@ Update period [s] - + Updateperiode [s] Message - + Bericht diff --git a/i18n/pl.ts b/i18n/pl.ts index 539fa052..45335a91 100644 --- a/i18n/pl.ts +++ b/i18n/pl.ts @@ -461,10 +461,6 @@ AboutDialog - About qdrm - O qdrm - - @@ -472,7 +468,7 @@ O qdrm - + Supported Radios Wspierane radia @@ -648,309 +644,250 @@ Application - - Settings - Ustawienia - - - - - Radio IDs - Identyfikatory radia - - - - Contacts - Kontakty - - - - Group Lists - - - - - Channels - Kanały - - - - Zones - Strefy - - - - Scan Lists - Skanuj listy - - - - GPS/APRS - GPS/APRS - - - - Roaming Channels - - - - - Roaming Zones - - - - - - Extensions - Rozszerzenia - - - - - - + + + Unsaved changes to codeplug. - - - - + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. - + Open codeplug - + Codeplug Files (*.yaml);;Codeplug Files, old format (*.conf *.csv *.txt);;All Files (*) - - - - + + + + Cannot open file - - - - + + + + Cannot read codeplug from file '%1': %2 - - + + Cannot read codeplug. - + Save codeplug - + Codeplug Files (*.yaml *.yml) - + Please use new YAML format. - + Saving in the old table-based conf format was disabled with 0.9.0. Reading these files still works. - - + + Cannot save codeplug to file '%1': %2 - + Cannot save codeplug - + Cannot save codeplug to file '%1'. - + Export codeplug - + CHIRP CSV Files (*.csv) - + Cannot export codeplug - + Cannot export codeplug to file '%1': %2 - + Import codeplug - + CHIRP CSV Files (*.csv);;YAML Files (*.yaml *.yml) - - - - + + + + Cannot import codeplug - - - + + + Cannot import codeplug from '%1': %2 - + Do not know, how to handle file '%1'. - + No matching devices found. - + Cannot connect to radio - + Cannot connect to radio: %1 - + Radio found - + Found device '%1'. - - - - - + + + + + No radio found - - - - - + + + + + No matching device was found. - + Verification success - + The codeplug was successfully verified with the radio '%1' - + Read ... - + Read error - + Read complete - + Upload ... - - - + + + Cannot write call-sign DB. - + The detected radio '%1' does not support a call-sign DB. - + The detected radio '%1' does support a call-sign DB. This feature, however, is not implemented yet. - + QDMR selects the call-signs to be written based on the default DMR ID of the radio. No default ID set. - + Write call-sign DB ... - + Write error - + Write complete - + %1 (alias for %2 %3) @@ -2241,211 +2178,304 @@ MainWindow - + File - + Device - - + + Help - + Databases - + Toolbar - + New - + Creates a new Codeplug. - + Ctrl+N - + Open ... - + <html><head/><body><p>Imports a codeplug from &quot;conf&quot; files.</p></body></html> - + Ctrl+O - + Save ... - + <html><head/><body><p>Saves the codeplug in a &quot;conf&quot; file.</p></body></html> - + Ctrl+S - + Quit - + Quits the application. - + Ctrl+Q - + Detect - + Detect connected radios. - + Verify - + <html><head/><body><p>Verifies the current codeplug with connected radios.</p></body></html> - + Ctrl+R - + Read - + Reads a codeplug from connected radios. - + Write - + Writes the codeplug to the connected radio. - + About qdmr O qdrm - + Read the handbook. - + F1 - + + Settings Ustawienia - + Shows settings dialog - + Write Callsign DB - + Writes call-sign DB to radio. - + Refresh Callsign DB - + Refreshes the downloaded callsign DB - + Refresh Talkgroup DB - + Refreshes the downloaded talkgroup DB - + Export to CHIRP ... - + Exports all FM channels to CHRIP CSV. - + Import ... - + Imports and merges a codeplug into the current one. + + + Refresh Orbital Elements + + + + + Refreshes the orbital elements. + + + + + Edit Satellites ... + + + + + Opens an editor to edit your satellite database. + + + + + Write satellites + + + + + Writes the orbital elements and transponder information onto the connected device. + + + + + + Radio IDs + Identyfikatory radia + + + + Contacts + Kontakty + + + + Group Lists + + + + + Channels + Kanały + + + + Zones + Strefy + + + + Scan Lists + Skanuj listy + + + + GPS/APRS + GPS/APRS + + + + Roaming Channels + + + + + Roaming Zones + + + + + + Extensions + Rozszerzenia + + + + Unsaved changes to codeplug. + + + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. + + MultiChannelSelectionDialog @@ -3131,6 +3161,33 @@ + + SatelliteDatabaseDialog + + + Edit satellite database + + + + + Add + + + + + Delete + + + + + SatelliteSelectionDialog + + + + Select a satellite + + + ScanListDialog @@ -3348,11 +3405,6 @@ Repeater Info Sources - - - repeaterbook.com - - @@ -3411,21 +3463,6 @@ North America - - - repeatermap.de - - - - - hearham.com - - - - - radioid.com - - Programming diff --git a/i18n/pt_BR.ts b/i18n/pt_BR.ts index bb4cc8ba..14f0f7ec 100644 --- a/i18n/pt_BR.ts +++ b/i18n/pt_BR.ts @@ -461,10 +461,6 @@ AboutDialog - About qdrm - - - @@ -472,7 +468,7 @@ - + Supported Radios @@ -648,309 +644,250 @@ Application - - Settings - - - - - - Radio IDs - - - - - Contacts - - - - - Group Lists - - - - - Channels - - - - - Zones - - - - - Scan Lists - - - - - GPS/APRS - - - - - Roaming Channels - - - - - Roaming Zones - - - - - - Extensions - - - - - - - + + + Unsaved changes to codeplug. - - - - + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. - + Open codeplug - + Codeplug Files (*.yaml);;Codeplug Files, old format (*.conf *.csv *.txt);;All Files (*) - - - - + + + + Cannot open file - - - - + + + + Cannot read codeplug from file '%1': %2 - - + + Cannot read codeplug. - + Save codeplug - + Codeplug Files (*.yaml *.yml) - + Please use new YAML format. - + Saving in the old table-based conf format was disabled with 0.9.0. Reading these files still works. - - + + Cannot save codeplug to file '%1': %2 - + Cannot save codeplug - + Cannot save codeplug to file '%1'. - + Export codeplug - + CHIRP CSV Files (*.csv) - + Cannot export codeplug - + Cannot export codeplug to file '%1': %2 - + Import codeplug - + CHIRP CSV Files (*.csv);;YAML Files (*.yaml *.yml) - - - - + + + + Cannot import codeplug - - - + + + Cannot import codeplug from '%1': %2 - + Do not know, how to handle file '%1'. - + No matching devices found. - + Cannot connect to radio - + Cannot connect to radio: %1 - + Radio found - + Found device '%1'. - - - - - + + + + + No radio found - - - - - + + + + + No matching device was found. - + Verification success - + The codeplug was successfully verified with the radio '%1' - + Read ... - + Read error - + Read complete - + Upload ... - - - + + + Cannot write call-sign DB. - + The detected radio '%1' does not support a call-sign DB. - + The detected radio '%1' does support a call-sign DB. This feature, however, is not implemented yet. - + QDMR selects the call-signs to be written based on the default DMR ID of the radio. No default ID set. - + Write call-sign DB ... - + Write error - + Write complete - + %1 (alias for %2 %3) @@ -2241,211 +2178,304 @@ MainWindow - + File - + Device - - + + Help - + Databases - + Toolbar - + New - + Creates a new Codeplug. - + Ctrl+N - + Open ... - + <html><head/><body><p>Imports a codeplug from &quot;conf&quot; files.</p></body></html> - + Ctrl+O - + Save ... - + <html><head/><body><p>Saves the codeplug in a &quot;conf&quot; file.</p></body></html> - + Ctrl+S - + Quit - + Quits the application. - + Ctrl+Q - + Detect - + Detect connected radios. - + Verify - + <html><head/><body><p>Verifies the current codeplug with connected radios.</p></body></html> - + Ctrl+R - + Read - + Reads a codeplug from connected radios. - + Write - + Writes the codeplug to the connected radio. - + About qdmr - + Read the handbook. - + F1 - + + Settings - + Shows settings dialog - + Write Callsign DB - + Writes call-sign DB to radio. - + Refresh Callsign DB - + Refreshes the downloaded callsign DB - + Refresh Talkgroup DB - + Refreshes the downloaded talkgroup DB - + Export to CHIRP ... - + Exports all FM channels to CHRIP CSV. - + Import ... - + Imports and merges a codeplug into the current one. + + + Refresh Orbital Elements + + + + + Refreshes the orbital elements. + + + + + Edit Satellites ... + + + + + Opens an editor to edit your satellite database. + + + + + Write satellites + + + + + Writes the orbital elements and transponder information onto the connected device. + + + + + + Radio IDs + + + + + Contacts + + + + + Group Lists + + + + + Channels + + + + + Zones + + + + + Scan Lists + + + + + GPS/APRS + + + + + Roaming Channels + + + + + Roaming Zones + + + + + + Extensions + + + + + Unsaved changes to codeplug. + + + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. + + MultiChannelSelectionDialog @@ -3131,6 +3161,33 @@ + + SatelliteDatabaseDialog + + + Edit satellite database + + + + + Add + + + + + Delete + + + + + SatelliteSelectionDialog + + + + Select a satellite + + + ScanListDialog @@ -3348,11 +3405,6 @@ Repeater Info Sources - - - repeaterbook.com - - @@ -3411,21 +3463,6 @@ North America - - - repeatermap.de - - - - - hearham.com - - - - - radioid.com - - Programming diff --git a/i18n/sv.ts b/i18n/sv.ts index 9880c5a8..ad40f35f 100644 --- a/i18n/sv.ts +++ b/i18n/sv.ts @@ -461,10 +461,6 @@ AboutDialog - About qdrm - Om qdmr - - @@ -472,7 +468,7 @@ Om qdmr - + Supported Radios Radio som stöds @@ -648,309 +644,250 @@ Application - - Settings - Inställningar - - - - - Radio IDs - Radio ID-nummrar - - - - Contacts - Kontakter - - - - Group Lists - Grupplistor - - - - Channels - Kanaler - - - - Zones - Zoner - - - - Scan Lists - Scan Lists - - - - GPS/APRS - GPS/APRS - - - - Roaming Channels - Roaming-kanaler - - - - Roaming Zones - Roamingzoner - - - - - Extensions - Extensions - - - - - - + + + Unsaved changes to codeplug. Ej sparade ändringar i codeplug. - - - - + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. Det finns osparade ändringar av den aktuella kodpluggen. Dessa ändringar går förlorade om du fortsätter. - + Open codeplug Öppna kodpluggen - + Codeplug Files (*.yaml);;Codeplug Files, old format (*.conf *.csv *.txt);;All Files (*) Codeplug-filer (*.yaml);;Codeplug-filer, gammalt format (*.conf *.csv *.txt);;Alla filer (*) - - - - + + + + Cannot open file Kan inte öppna filen - - - - + + + + Cannot read codeplug from file '%1': %2 Kan inte läsa codeplug från filen '%1': %2 - - + + Cannot read codeplug. Kan inte läsa kodpluggen. - + Save codeplug Spara kodpluggen - + Codeplug Files (*.yaml *.yml) Codeplug-filer (*.yaml *.yml) - + Please use new YAML format. Använd det nya YAML-formatet. - + Saving in the old table-based conf format was disabled with 0.9.0. Reading these files still works. Spara i det gamla tabellbaserade conf-formatet inaktiverades med 0.9.0. Att läsa dessa filer fungerar fortfarande. - - + + Cannot save codeplug to file '%1': %2 Det går inte att spara codeplug till filen '%1': %2 - + Cannot save codeplug Det går inte att spara codepluggen - + Cannot save codeplug to file '%1'. Det går inte att spara codeplug till filen '%1'. - + Export codeplug - + CHIRP CSV Files (*.csv) - + Cannot export codeplug - + Cannot export codeplug to file '%1': %2 - + Import codeplug - + CHIRP CSV Files (*.csv);;YAML Files (*.yaml *.yml) - - - - + + + + Cannot import codeplug - - - + + + Cannot import codeplug from '%1': %2 - + Do not know, how to handle file '%1'. - + No matching devices found. Inga matchande enheter hittades. - + Cannot connect to radio Kan inte ansluta till radio - + Cannot connect to radio: %1 Kan inte ansluta till radio: %1 - + Radio found Radio hittad - + Found device '%1'. Hittade enheten '%1'. - - - - - + + + + + No radio found Ingen radio hittades - - - - - + + + + + No matching device was found. Ingen matchande enhet hittades. - + Verification success Verifieringen lyckades - + The codeplug was successfully verified with the radio '%1' Kodpluggen har verifierats med radion '%1'. - + Read ... Läs… - + Read error Läsfel - + Read complete Läs komplett - + Upload ... Skriv… - - - + + + Cannot write call-sign DB. Kan inte skriva anropssignal DB. - + The detected radio '%1' does not support a call-sign DB. Den upptäckta radion '%1' stöder inte en anropssignal-DB. - + The detected radio '%1' does support a call-sign DB. This feature, however, is not implemented yet. Den upptäckta radion '%1' stöder en anropssignal-DB. Denna funktion är dock inte implementerad ännu. - + QDMR selects the call-signs to be written based on the default DMR ID of the radio. No default ID set. QDMR väljer de anropssignaler som ska skrivas baserat på radions standard DMR-ID. Inget standard-ID inställt. - + Write call-sign DB ... Skriv anropssignal DB … - + Write error Skrivfel - + Write complete Skriv komplett - + %1 (alias for %2 %3) %1 (alias för %2 %3) @@ -2241,211 +2178,304 @@ MainWindow - + File Fil - + Device Enhet - - + + Help Hjälp - + Databases Databaser - + Toolbar - + New Ny - + Creates a new Codeplug. Skapar en ny Codeplug. - + Ctrl+N Ctrl+N - + Open ... Öppna … - + <html><head/><body><p>Imports a codeplug from &quot;conf&quot; files.</p></body></html> <html><head/><body><p>Importerar en codeplug från &quot;conf&quot; filer.</p></body></html> - + Ctrl+O Ctrl+O - + Save ... Spara … - + <html><head/><body><p>Saves the codeplug in a &quot;conf&quot; file.</p></body></html> <html><head/><body><p>Sparar codepluggen i en &quot;conf&quot; fil.</p></body></html> - + Ctrl+S Ctrl+S - + Quit Sluta - + Quits the application. Avsluter applikationen. - + Ctrl+Q Ctrl+Q - + Detect Upptäck - + Detect connected radios. Upptäck anslutna radioapparater. - + Verify Verifiera - + <html><head/><body><p>Verifies the current codeplug with connected radios.</p></body></html> Verifierar den aktuella kodpluggen med anslutna radioapparater. - + Ctrl+R Ctrl+R - + Read Läsa - + Reads a codeplug from connected radios. Läser en kodplugg från anslutna radioapparater. - + Write Skriva - + Writes the codeplug to the connected radio. Skriver kodpluggen till den anslutna radion. - + About qdmr Om qdmr - + Read the handbook. Läs handboken. - + F1 F1 - + + Settings Inställningar - + Shows settings dialog Visar inställningsdialog. - + Write Callsign DB Skriv anropssignal DB - + Writes call-sign DB to radio. Skriver anropssignal DB till radio. - + Refresh Callsign DB Uppdatera anropssignal DB - + Refreshes the downloaded callsign DB Uppdaterar den nedladdade anropssignal-DB - + Refresh Talkgroup DB Uppdatera samtalsgrupp DB - + Refreshes the downloaded talkgroup DB Uppdaterar den nedladdade samtalsgruppens DB - + Export to CHIRP ... - + Exports all FM channels to CHRIP CSV. - + Import ... - + Imports and merges a codeplug into the current one. + + + Refresh Orbital Elements + + + + + Refreshes the orbital elements. + + + + + Edit Satellites ... + + + + + Opens an editor to edit your satellite database. + + + + + Write satellites + + + + + Writes the orbital elements and transponder information onto the connected device. + + + + + + Radio IDs + Radio ID-nummrar + + + + Contacts + Kontakter + + + + Group Lists + Grupplistor + + + + Channels + Kanaler + + + + Zones + Zoner + + + + Scan Lists + Scan Lists + + + + GPS/APRS + GPS/APRS + + + + Roaming Channels + Roaming-kanaler + + + + Roaming Zones + Roamingzoner + + + + + Extensions + + + + + Unsaved changes to codeplug. + Ej sparade ändringar i codeplug. + + + + There are unsaved changes to the current codeplug. These changes are lost if you proceed. + Det finns osparade ändringar av den aktuella kodpluggen. Dessa ändringar går förlorade om du fortsätter. + MultiChannelSelectionDialog @@ -3137,6 +3167,33 @@ Alt+- + + SatelliteDatabaseDialog + + + Edit satellite database + + + + + Add + + + + + Delete + + + + + SatelliteSelectionDialog + + + + Select a satellite + + + ScanListDialog @@ -3354,11 +3411,6 @@ Repeater Info Sources - - - repeaterbook.com - - @@ -3418,21 +3470,6 @@ North America - - - repeatermap.de - - - - - hearham.com - - - - - radioid.com - - Programming diff --git a/lib/channel.hh b/lib/channel.hh index c8e4cd03..973c81af 100644 --- a/lib/channel.hh +++ b/lib/channel.hh @@ -232,7 +232,7 @@ public: enum class Admit { Always, ///< Allow always. Free, ///< Allow when channel free. - Tone ///< Allow when admit tone is present. + Tone ///< Allow when free or wrong ctcss/dcs tone is present. }; Q_ENUM(Admit) @@ -381,7 +381,7 @@ public: enum class Admit { Always, ///< No admit criteria, allows one to transmit any time. Free, ///< Transmit only if channel is free. - ColorCode ///< Transmit only if channel is free and matches given color code. + ColorCode ///< Transmit if channel is free or differs given color code. }; Q_ENUM(Admit) diff --git a/lib/opengd77_codeplug.cc b/lib/opengd77_codeplug.cc index 91bb582d..868ea409 100644 --- a/lib/opengd77_codeplug.cc +++ b/lib/opengd77_codeplug.cc @@ -1,11 +1,8 @@ #include "opengd77_codeplug.hh" #include "config.hh" #include "channel.hh" -#include "utils.hh" -#include "logger.hh" #include #include -#include "opengd77_extension.hh" /* ******************************************************************************************** * diff --git a/lib/opengd77base_codeplug.cc b/lib/opengd77base_codeplug.cc index 7e76c179..2c2dd8af 100644 --- a/lib/opengd77base_codeplug.cc +++ b/lib/opengd77base_codeplug.cc @@ -82,16 +82,30 @@ OpenGD77BaseCodeplug::ChannelElement::~ChannelElement() { void OpenGD77BaseCodeplug::ChannelElement::clear() { setName(""); - setRXFrequency(0); - setTXFrequency(0); + setRXFrequency(Frequency()); + setTXFrequency(Frequency()); setMode(MODE_ANALOG); + setPower(Channel::Power::High); + clearFixedPosition(); setRXTone(SelectiveCall()); setTXTone(SelectiveCall()); - setColorCode(0); - clearGroupListIndex(); + enableSimplex(false); + enablePowerSave(false); + enableBeep(false); clearDMRId(); + setGroupListIndex(0); + setColorCode(0); clearAPRSIndex(); clearTXContact(); + setAliasTimeSlot1(OpenGD77ChannelExtension::TalkerAlias::None); + setAliasTimeSlot2(OpenGD77ChannelExtension::TalkerAlias::None); + setTimeSlot(DMRChannel::TimeSlot::TS1); + setBandwidth(FMChannel::Bandwidth::Narrow); + enableRXOnly(false); + enableSkipScan(false); + enableSkipZoneScan(false); + enableVOX(false); + setSquelch(SquelchMode::Global, 0); } @@ -106,25 +120,25 @@ OpenGD77BaseCodeplug::ChannelElement::setName(const QString &n) { } -uint32_t +Frequency OpenGD77BaseCodeplug::ChannelElement::rxFrequency() const { - return getBCD8_le(Offset::rxFrequency())*10; + return Frequency::fromHz(((unsigned long long)getBCD8_le(Offset::rxFrequency()))*10); } void -OpenGD77BaseCodeplug::ChannelElement::setRXFrequency(uint32_t freq) { - setBCD8_le(Offset::rxFrequency(), freq/10); +OpenGD77BaseCodeplug::ChannelElement::setRXFrequency(const Frequency &freq) { + setBCD8_le(Offset::rxFrequency(), freq.inHz()/10); } -uint32_t +Frequency OpenGD77BaseCodeplug::ChannelElement::txFrequency() const { - return getBCD8_le(Offset::txFrequency())*10; + return Frequency::fromHz(((unsigned long long)getBCD8_le(Offset::txFrequency()))*10); } void -OpenGD77BaseCodeplug::ChannelElement::setTXFrequency(uint32_t freq) { - setBCD8_le(Offset::txFrequency(), freq/10); +OpenGD77BaseCodeplug::ChannelElement::setTXFrequency(const Frequency &freq) { + setBCD8_le(Offset::txFrequency(), freq.inHz()/10); } @@ -522,11 +536,11 @@ OpenGD77BaseCodeplug::ChannelElement::decode(Codeplug::Context &ctx, const Error // Apply common settings ch->setName(name()); - ch->setRXFrequency(Frequency::fromHz(rxFrequency())); + ch->setRXFrequency(rxFrequency()); if (isSimplex()) - ch->setTXFrequency(Frequency::fromHz(rxFrequency())); + ch->setTXFrequency(rxFrequency()); else - ch->setTXFrequency(Frequency::fromHz(txFrequency())); + ch->setTXFrequency(txFrequency()); if (globalPower()) ch->setDefaultPower(); else @@ -592,8 +606,8 @@ OpenGD77BaseCodeplug::ChannelElement::encode(const Channel *c, Context &ctx, con setName(c->name()); - setRXFrequency(c->rxFrequency().inHz()); - setTXFrequency(c->txFrequency().inHz()); + setRXFrequency(c->rxFrequency()); + setTXFrequency(c->txFrequency()); enableSimplex(false); clearPower(); diff --git a/lib/opengd77base_codeplug.hh b/lib/opengd77base_codeplug.hh index 4df8f499..19758dbb 100644 --- a/lib/opengd77base_codeplug.hh +++ b/lib/opengd77base_codeplug.hh @@ -74,13 +74,13 @@ public: virtual void setName(const QString &n); /** Returns the RX frequency of the channel. */ - virtual uint32_t rxFrequency() const; + virtual Frequency rxFrequency() const; /** Sets the RX frequency of the channel. */ - virtual void setRXFrequency(uint32_t freq); + virtual void setRXFrequency(const Frequency &freq); /** Returns the TX frequency of the channel. */ - virtual uint32_t txFrequency() const; + virtual Frequency txFrequency() const; /** Sets the TX frequency of the channel. */ - virtual void setTXFrequency(uint32_t freq); + virtual void setTXFrequency(const Frequency &freq); /** Returns the channel mode. */ virtual Mode mode() const; @@ -246,7 +246,7 @@ public: static constexpr unsigned int rxTone() { return 0x0020; } static constexpr unsigned int txTone() { return 0x0022; } static constexpr unsigned int longitude2() { return 0x0024; } - static constexpr Bit simplex() { return {0x0026, 3}; } + static constexpr Bit simplex() { return {0x0026, 2}; } static constexpr Bit useFixedLocation() { return {0x0026, 3}; } static constexpr Bit disablePowerSave() { return {0x0026, 5}; } static constexpr Bit disableBeep() { return {0x0026, 6}; } diff --git a/lib/satellitedatabase.cc b/lib/satellitedatabase.cc index ef2fff31..6da5a565 100644 --- a/lib/satellitedatabase.cc +++ b/lib/satellitedatabase.cc @@ -282,15 +282,15 @@ SatelliteDatabase::headerData(int section, Qt::Orientation orientation, int role switch (section) { case 0: return tr("NORAD"); case 1: return tr("Name"); - case 2: return tr("FM Downlink Frquency"); - case 3: return tr("FM Uplink Frquency"); + case 2: return tr("FM Downlink Frequency"); + case 3: return tr("FM Uplink Frequency"); case 4: return tr("FM Downlink Tone"); case 5: return tr("FM Uplink Tone"); - case 6: return tr("APRS Downlink Frquency"); - case 7: return tr("APRS Uplink Frquency"); + case 6: return tr("APRS Downlink Frequency"); + case 7: return tr("APRS Uplink Frequency"); case 8: return tr("APRS Downlink Tone"); case 9: return tr("APRS Uplink Tone"); - case 10: return tr("Beacon Frquency"); + case 10: return tr("Beacon Frequency"); } return QVariant(); diff --git a/shared/icons/dark/16x16/actions/device-write-satellites.png b/shared/icons/dark/16x16/actions/device-write-satellites.png new file mode 100644 index 00000000..1a2306e1 Binary files /dev/null and b/shared/icons/dark/16x16/actions/device-write-satellites.png differ diff --git a/shared/icons/dark/32x32/actions/device-write-satellites.png b/shared/icons/dark/32x32/actions/device-write-satellites.png new file mode 100644 index 00000000..ffd6173b Binary files /dev/null and b/shared/icons/dark/32x32/actions/device-write-satellites.png differ diff --git a/shared/icons/light/16x16/actions/device-write-satellites.png b/shared/icons/light/16x16/actions/device-write-satellites.png new file mode 100644 index 00000000..08d25471 Binary files /dev/null and b/shared/icons/light/16x16/actions/device-write-satellites.png differ diff --git a/shared/icons/light/32x32/actions/device-write-satellites.png b/shared/icons/light/32x32/actions/device-write-satellites.png new file mode 100644 index 00000000..5ab3ddb7 Binary files /dev/null and b/shared/icons/light/32x32/actions/device-write-satellites.png differ diff --git a/shared/icons/light/scalable/actions/device-write-satellites.svg b/shared/icons/light/scalable/actions/device-write-satellites.svg new file mode 100644 index 00000000..3407d0e5 --- /dev/null +++ b/shared/icons/light/scalable/actions/device-write-satellites.svg @@ -0,0 +1,39 @@ + + diff --git a/shared/resources.qrc b/shared/resources.qrc index d03e83ac..da1f620b 100644 --- a/shared/resources.qrc +++ b/shared/resources.qrc @@ -76,6 +76,9 @@ icons/light/scalable/actions/help-about.svg icons/light/scalable/actions/help-contents.svg icons/light/scalable/apps/qdmr.svg + icons/light/scalable/actions/device-write-satellites.svg + icons/light/32x32/actions/device-write-satellites.png + icons/light/16x16/actions/device-write-satellites.png icons/dark/16x16/actions/application-exit.png @@ -117,5 +120,7 @@ icons/dark/32x32/actions/help-contents.png icons/dark/32x32/apps/qdmr.png icons/dark/index.theme + icons/dark/32x32/actions/device-write-satellites.png + icons/dark/16x16/actions/device-write-satellites.png diff --git a/shared/ui/aboutdialog.ui b/shared/ui/aboutdialog.ui index babb6e06..59a12d32 100644 --- a/shared/ui/aboutdialog.ui +++ b/shared/ui/aboutdialog.ui @@ -50,9 +50,12 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><title>About qdmr</title><style type="text/css"> +<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><title>About qdmr</title><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +hr { height: 1px; border-width: 0; } +li.unchecked::marker { content: "\2610"; } +li.checked::marker { content: "\2612"; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p align="center" style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'.SF NS Text'; font-size:13pt; font-weight:600;">qdmr</span></p> <p align="center" style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'.SF NS Text'; font-size:13pt; font-weight:600;">Version %1</span></p> <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'.SF NS Text'; font-size:13pt; font-weight:600;">Hannes Matuschek, DM3MAT<br /> dm3mat@darc.de</span></p> diff --git a/snapcraft.yaml b/snapcraft.yaml deleted file mode 100644 index 9edc5652..00000000 --- a/snapcraft.yaml +++ /dev/null @@ -1,78 +0,0 @@ -name: qdmr - -#version: git -#grade: devel -version: 0.12.0 -grade: stable - -summary: Graphical code-plug programming tool for DMR radios. -description: | - qDMR is a simple to use and feature-rich code-plug programming software (CPS) for cheap DMR - radios. Currently supported devices are: - * TYT MD-380, MD-390, MD-UV380, MD-UV390, MD-2017 - * Retevis RT8, RT82, RT3, RT3S, RT84 - * Open GD77 firmware (GD77, RD-5R & DM-1801) - * AnyTone AT-D868UVE, AT-D878UV AT-D878UVII, AT-D578UV - * Radioddity GD-73, GD-77, RD-5R - * Baofeng/BTech DMR-6X2, DM-1701, DR-1801UV (A6) - -confinement: strict -base: core20 - -architectures: - - build-on: amd64 - -apps: - qdmr: - command: qdmr - desktop: usr/share/applications/qdmr.desktop - plugs: - - home - - desktop - - network - - raw-usb - - serial-port - extensions: - - kde-neon - -#slots: -# opengd77: -# interface: serial-port -# usb-vendor: 0x1fc9 -# usb-product: 0x0094 -# path: /dev/serial-port-opengd77 -# anytone: -# interface: serial-port -# usb-vendor: 0x28e9 -# usb-product: 0x018a -# path: /dev/serial-port-anytone - -parts: - qdmr: - plugin: cmake - build-packages: - - qtbase5-dev - - qttools5-dev - - qttools5-dev-tools - - qtpositioning5-dev - - libqt5serialport5-dev - - libusb-1.0-0-dev - - libyaml-cpp-dev - - xsltproc - - docbook-xsl - stage-packages: - - libqt5core5a - - libqt5gui5 - - libqt5network5 - - libqt5positioning5 - - libqt5serialport5 - - libqt5widgets5 - - libusb-1.0-0 - - libyaml-cpp0.6 - source: https://github.com/hmatuschek/qdmr.git - source-type: git - source-tag: "v$SNAPCRAFT_PROJECT_VERSION" - cmake-parameters: - - "-DCMAKE_INSTALL_PREFIX=/usr" - - "-DCMAKE_BUILD_TYPE=Release" - - "-DBUILD_TESTS=Off" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f2398a13..2a0c7bf9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,7 +49,8 @@ SET(qdmr_UI_FORMS dmrcontactdialog.ui dtmfcontactdialog.ui rxgrouplistdialog.ui configmergedialog.ui satellitedatabasedialog.ui satelliteselectiondialog.ui mainwindow.ui) -set(qdmr_TS_FILES ../i18n/de.ts ../i18n/en_US.ts) +set(qdmr_TS_FILES ../i18n/de.ts ../i18n/en_US.ts ../i18n/sv.ts ../i18n/it.ts ../i18n/nl.ts + ../i18n/pl.ts ../i18n/fr.ts) qt5_wrap_cpp(qdmr_MOC_SOURCES ${qdmr_MOC_HEADERS}) qt5_wrap_ui(qdmr_UI_SOURCES ${qdmr_UI_FORMS}) diff --git a/src/application.cc b/src/application.cc index 86266c13..605dea26 100644 --- a/src/application.cc +++ b/src/application.cc @@ -732,6 +732,11 @@ Application::uploadCallsignDB() { } +void +Application::uploadSatellites() { + +} + void Application::onCodeplugUploadError(Radio *radio) { _mainWindow->statusBar()->showMessage(tr("Write error")); diff --git a/src/application.hh b/src/application.hh index b3f56e86..9b1357a8 100644 --- a/src/application.hh +++ b/src/application.hh @@ -67,6 +67,7 @@ public slots: void downloadCodeplug(); void uploadCodeplug(); void uploadCallsignDB(); + void uploadSatellites(); void showSettings(); void showAbout(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index cbd4dd8f..cb4d3cf9 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -92,6 +92,7 @@ + @@ -141,6 +142,7 @@ + @@ -352,6 +354,9 @@ Refreshes the orbital elements. + + false + @@ -360,6 +365,20 @@ Opens an editor to edit your satellite database. + + false + + + + + Write satellites + + + Writes the orbital elements and transponder information onto the connected device. + + + false + diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui index b18eefe1..6411c245 100644 --- a/src/settingsdialog.ui +++ b/src/settingsdialog.ui @@ -72,7 +72,7 @@ - repeaterbook.com + repeaterbook.com @@ -110,7 +110,7 @@ - repeatermap.de + repeatermap.de @@ -124,7 +124,7 @@ - hearham.com + hearham.com @@ -138,7 +138,7 @@ - radioid.com + radioid.com