Skip to content

Commit

Permalink
Fix some issues copy/pasting between specials
Browse files Browse the repository at this point in the history
This fixes some issues around copying and pasting to or from special
memory channels, where we assume memory numbers are integers and
other problems.

Fixes #10689
  • Loading branch information
kk7ds committed Jun 29, 2023
1 parent 7faaf83 commit 64974a7
Show file tree
Hide file tree
Showing 15 changed files with 764 additions and 746 deletions.
104 changes: 52 additions & 52 deletions chirp/locale/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CHIRP\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-06-28 16:31-0700\n"
"POT-Creation-Date: 2023-06-28 17:09-0700\n"
"PO-Revision-Date: 2012-10-02 22:11+0100\n"
"Last-Translator: Benjamin, HB9EUK <hb9euk@hb9d.org>\n"
"Language-Team: German\n"
Expand Down Expand Up @@ -35,17 +35,17 @@ msgstr ""
msgid "%(value)s must be between %(min)i and %(max)i"
msgstr ""

#: ../wxui/memedit.py:1483
#: ../wxui/memedit.py:1487
#, fuzzy, python-format
msgid "%i Memories"
msgstr "Speicher"

#: ../wxui/memedit.py:1490
#: ../wxui/memedit.py:1494
#, fuzzy, python-format
msgid "%i Memories and shift all up"
msgstr "Löschen (und nach oben verschieben)"

#: ../wxui/memedit.py:1486
#: ../wxui/memedit.py:1490
#, fuzzy, python-format
msgid "%i Memories and shift block up"
msgstr "Löschen (und nach oben verschieben)"
Expand All @@ -59,7 +59,7 @@ msgstr "Datei wurde geändert, speichern Sie die Änderungen vor dem Schliessen?
msgid "(none)"
msgstr ""

#: ../wxui/memedit.py:1791
#: ../wxui/memedit.py:1809
#, python-format
msgid "...and %i more"
msgstr ""
Expand Down Expand Up @@ -688,7 +688,7 @@ msgstr ""
msgid "Canada"
msgstr ""

#: ../wxui/memedit.py:1169
#: ../wxui/memedit.py:1173
#, python-format
msgid ""
"Channels with equivalent TX and RX %s are represented by tone mode of \"%s\""
Expand All @@ -702,22 +702,22 @@ msgstr ""
msgid "Choice Required"
msgstr ""

#: ../wxui/memedit.py:1148
#: ../wxui/memedit.py:1152
#, fuzzy, python-format
msgid "Choose %s DTCS Code"
msgstr "DTCS Code"

#: ../wxui/memedit.py:1145
#: ../wxui/memedit.py:1149
#, python-format
msgid "Choose %s Tone"
msgstr ""

#: ../wxui/memedit.py:1179
#: ../wxui/memedit.py:1183
#, fuzzy
msgid "Choose Cross Mode"
msgstr "Cross Mode"

#: ../wxui/memedit.py:1209
#: ../wxui/memedit.py:1213
msgid "Choose duplex"
msgstr ""

Expand Down Expand Up @@ -766,7 +766,7 @@ msgstr ""
msgid "Close file"
msgstr ""

#: ../wxui/memedit.py:1543
#: ../wxui/memedit.py:1547
#, fuzzy, python-format
msgid "Cluster %i memories"
msgstr "Vergleiche Rohspeicher"
Expand All @@ -790,7 +790,7 @@ msgid ""
"back of the 'TX/RX' unit. NOT the Com Port on the head.\n"
msgstr ""

#: ../wxui/memedit.py:1468
#: ../wxui/memedit.py:1472
msgid "Copy"
msgstr "Kopieren"

Expand All @@ -806,7 +806,7 @@ msgstr "Cross Mode"
msgid "Custom..."
msgstr ""

#: ../wxui/memedit.py:1464
#: ../wxui/memedit.py:1468
msgid "Cut"
msgstr "Ausschneiden"

Expand All @@ -822,7 +822,7 @@ msgid ""
"Polarity"
msgstr "DTCS Pol"

#: ../wxui/memedit.py:2044
#: ../wxui/memedit.py:2062
msgid "DV Memory"
msgstr ""

Expand All @@ -835,7 +835,7 @@ msgstr ""
msgid "Dec"
msgstr "Erkennung"

#: ../wxui/memedit.py:1477
#: ../wxui/memedit.py:1481
msgid "Delete"
msgstr "Löschen"

Expand All @@ -849,11 +849,11 @@ msgstr "Entwickler"
msgid "Developer state is now %s. CHIRP must be restarted to take effect"
msgstr ""

#: ../wxui/memedit.py:1577
#: ../wxui/memedit.py:1581
msgid "Diff Raw Memories"
msgstr "Vergleiche Rohspeicher"

#: ../wxui/memedit.py:1969
#: ../wxui/memedit.py:1987
msgid "Digital Code"
msgstr "Digital Code"

Expand Down Expand Up @@ -897,12 +897,12 @@ msgstr "Download vom Gerät"
msgid "Duplex"
msgstr "Duplex"

#: ../wxui/memedit.py:1999
#: ../wxui/memedit.py:2017
#, python-format
msgid "Edit details for %i memories"
msgstr ""

#: ../wxui/memedit.py:1997
#: ../wxui/memedit.py:2015
#, python-format
msgid "Edit details for memory %i"
msgstr ""
Expand All @@ -921,11 +921,11 @@ msgstr "Aktiviert"
msgid "Enter Frequency"
msgstr "Frequenz"

#: ../wxui/memedit.py:1196
#: ../wxui/memedit.py:1200
msgid "Enter Offset (MHz)"
msgstr ""

#: ../wxui/memedit.py:1188
#: ../wxui/memedit.py:1192
msgid "Enter TX Frequency (MHz)"
msgstr ""

Expand Down Expand Up @@ -957,7 +957,7 @@ msgstr ""
msgid "Experimental driver"
msgstr "Weiter mit dem experimentellen Treiber?"

#: ../wxui/memedit.py:1929
#: ../wxui/memedit.py:1947
msgid "Export can only write CSV files"
msgstr ""

Expand All @@ -966,7 +966,7 @@ msgstr ""
msgid "Export to CSV"
msgstr "In Datei exportieren"

#: ../wxui/memedit.py:2033
#: ../wxui/memedit.py:2051
msgid "Extra"
msgstr ""

Expand Down Expand Up @@ -1259,11 +1259,11 @@ msgstr "Index"
msgid "Info"
msgstr ""

#: ../wxui/memedit.py:1171
#: ../wxui/memedit.py:1175
msgid "Information"
msgstr ""

#: ../wxui/memedit.py:1458
#: ../wxui/memedit.py:1462
#, fuzzy
msgid "Insert Row Above"
msgstr "Zeile oben einfügen"
Expand All @@ -1285,7 +1285,7 @@ msgstr "Ungültiger Wert. Muss eine ganze Zahl sein."
msgid "Invalid ZIP code"
msgstr ""

#: ../wxui/memedit.py:1313 ../wxui/memedit.py:2124
#: ../wxui/memedit.py:1317 ../wxui/memedit.py:2142
#, python-format
msgid "Invalid edit: %s"
msgstr ""
Expand Down Expand Up @@ -1359,7 +1359,7 @@ msgstr ""
msgid "Memories"
msgstr "Speicher"

#: ../wxui/memedit.py:1352
#: ../wxui/memedit.py:1356
#, python-format
msgid "Memory %i is not deletable"
msgstr ""
Expand Down Expand Up @@ -1425,7 +1425,7 @@ msgstr ""
msgid "New version available"
msgstr "Eine neue Version von CHIRP ist verfügbar:"

#: ../wxui/memedit.py:1613
#: ../wxui/memedit.py:1617
#, fuzzy
msgid "No empty rows below!"
msgstr "Zeile unten einfügen"
Expand Down Expand Up @@ -1515,7 +1515,7 @@ msgstr ""
msgid "Optional: County, Hospital, etc"
msgstr ""

#: ../wxui/memedit.py:1746
#: ../wxui/memedit.py:1750
#, fuzzy
msgid "Overwrite memories?"
msgstr "Überschreiben?"
Expand All @@ -1527,28 +1527,28 @@ msgid ""
"are supported in this release.\n"
msgstr ""

#: ../wxui/memedit.py:1472
#: ../wxui/memedit.py:1476
msgid "Paste"
msgstr "Einfügen"

#: ../wxui/memedit.py:1740
#: ../wxui/memedit.py:1744
#, python-format
msgid "Pasted memories will overwrite %i existing memories"
msgid "Pasted memories will overwrite %s existing memories"
msgstr ""

#: ../wxui/memedit.py:1743
#: ../wxui/memedit.py:1747
#, python-format
msgid "Pasted memories will overwrite memories %s"
msgstr ""

#: ../wxui/memedit.py:1737
#: ../wxui/memedit.py:1741
#, python-format
msgid "Pasted memories will overwrite memory %i"
msgid "Pasted memories will overwrite memory %s"
msgstr ""

#: ../wxui/memedit.py:1734
#: ../wxui/memedit.py:1738
#, python-format
msgid "Pasted memory will overwrite memory %i"
msgid "Pasted memory will overwrite memory %s"
msgstr ""

#: ../wxui/common.py:564
Expand Down Expand Up @@ -1623,7 +1623,7 @@ msgstr ""
msgid "Printing"
msgstr ""

#: ../wxui/memedit.py:1451
#: ../wxui/memedit.py:1455
msgid "Properties"
msgstr ""

Expand Down Expand Up @@ -1753,7 +1753,7 @@ msgstr ""
msgid "Settings"
msgstr "Einstellungen"

#: ../wxui/memedit.py:1569
#: ../wxui/memedit.py:1573
msgid "Show Raw Memory"
msgstr "Zeige RAW Speicher"

Expand All @@ -1765,36 +1765,36 @@ msgstr ""
msgid "Show extra fields"
msgstr ""

#: ../wxui/memedit.py:1795
#: ../wxui/memedit.py:1813
#, fuzzy
msgid "Some memories are incompatible with this radio"
msgstr ""
"Eingefügter Speicher {number} ist nicht mit diesem Gerät kompatibel weil:"

#: ../wxui/memedit.py:1687
#: ../wxui/memedit.py:1691
msgid "Some memories are not deletable"
msgstr ""

#: ../wxui/memedit.py:1531
#: ../wxui/memedit.py:1535
#, fuzzy, python-format
msgid "Sort %i memories"
msgstr "Vergleiche Rohspeicher"

#: ../wxui/memedit.py:1534
#: ../wxui/memedit.py:1538
#, python-format
msgid "Sort %i memories ascending"
msgstr ""

#: ../wxui/memedit.py:1553
#: ../wxui/memedit.py:1557
#, python-format
msgid "Sort %i memories descending"
msgstr ""

#: ../wxui/memedit.py:1428
#: ../wxui/memedit.py:1432
msgid "Sort by column:"
msgstr ""

#: ../wxui/memedit.py:1427
#: ../wxui/memedit.py:1431
#, fuzzy
msgid "Sort memories"
msgstr "Überschreiben?"
Expand Down Expand Up @@ -1844,7 +1844,7 @@ msgid ""
"memories across, or proceed with the import?"
msgstr ""

#: ../wxui/memedit.py:1493
#: ../wxui/memedit.py:1497
#, fuzzy
msgid "This Memory"
msgstr "Zeige RAW Speicher"
Expand Down Expand Up @@ -1872,12 +1872,12 @@ msgid ""
"You have been warned. Proceed at your own risk!"
msgstr ""

#: ../wxui/memedit.py:1497
#: ../wxui/memedit.py:1501
#, fuzzy
msgid "This memory and shift all up"
msgstr "Löschen (und nach oben verschieben)"

#: ../wxui/memedit.py:1495
#: ../wxui/memedit.py:1499
#, fuzzy
msgid "This memory and shift block up"
msgstr "Löschen (und nach oben verschieben)"
Expand Down Expand Up @@ -1923,7 +1923,7 @@ msgid ""
"Unable to determine port for your cable. Check your drivers and connections."
msgstr ""

#: ../wxui/memedit.py:1236
#: ../wxui/memedit.py:1240
msgid "Unable to edit memory before radio is loaded"
msgstr ""

Expand Down Expand Up @@ -2017,11 +2017,11 @@ msgstr "Hersteller"
msgid "View"
msgstr "_Ansicht"

#: ../wxui/memedit.py:1320
#: ../wxui/memedit.py:1324
msgid "Warning"
msgstr ""

#: ../wxui/memedit.py:1319
#: ../wxui/memedit.py:1323
#, python-format
msgid "Warning: %s"
msgstr ""
Expand Down
Loading

0 comments on commit 64974a7

Please sign in to comment.