Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-14 08:35:46 +01:00
Code Issues Releases Wiki Activity

From: martin@steghoefer.eu [PATCHES 02-15 of 15] Fix runtime problem with wxWidgets 3.0:

Browse Source 
Correct string formatting for:
2/15  %d + enum => %d + int
3/15  %lld + int64_t => %lld + long long
4/15  %d + int64_t => %lld + long long
5/15  %d + double => %f + double
6/15  %d + int32_t => %d + int
7/15  %d + intptr_t => %p + void*
8/15  gint, guint
9/15  %d + long => %ld + long
10/15 %n + int => %d + int
11/15 %x + int => %x + unsigned int
12/15 %f + int => %d + int
13/15 %S + wxChar* => %s + wxChar*
14/15 %d + size_t => %d + int
15/15 %d + size_t => %lld + long long

"The functions wxString::Format, wxString::Printf (and others indirectly) have become stricter about parameter types that don't match (format specifier vs. function parameters). So the bugs (that were already present in audacity before) become visible in wx3.0 as error message dialogs. I've checked all occurrences of Printf, wxPrintf, PrintfV, Format, FormatV, wxLogDebug and wxLogError systematically and made the type match."

Note (9/15): In TrackPanel.cpp, ExportMP2.cpp and CompareAudioCommand.cpp this patch supersedes related change done in r13466 because the new solution requires fewer casts and therefore simplifies the code.

Note: Many .po files are affected, and we need to be very careful about this.  Incorrect "%d" and similar in translation files may lead to crashes in those languages (only).  This is something we should actually have been more careful about in the past.  We need to write a script to check that the "%d" and similar format specifiers match between English and translation.
This commit is contained in:
james.k.crook@gmail.com
2014-11-08 16:42:34 +00:00
parent a9a0d576cc
commit 8a9987a0d9
71 changed files with 3565 additions and 3563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
locale/de.po
View File

@@ -1074,7 +1074,7 @@ msgstr "Projektdaten überprüfen"
#, c-format
msgid ""
"Project check of \"%s\" folder \n"
"detected %d missing external audio file(s) \n"
"detected %lld missing external audio file(s) \n"
"('aliased files'). There is no way for Audacity \n"
"to recover these files automatically. \n"
"\n"
@@ -1090,7 +1090,7 @@ msgid ""
"project immediately\" on further error alerts."
msgstr ""
"Die Überprüfung des Ordners \"%s\" ergab, dass \n"
"%d externe Audiodatei(en) fehlen. \n"
"%lld externe Audiodatei(en) fehlen. \n"
"Audacity kann diese Dateien nicht automatisch \n"
"wiederherstellen. \n"
"\n"
@@ -1124,12 +1124,12 @@ msgstr ""
#, c-format
msgid ""
"Project check of \"%s\" folder \n"
"detected %d missing alias (.auf) blockfile(s). \n"
"detected %lld missing alias (.auf) blockfile(s). \n"
"Audacity can fully regenerate these files \n"
"from the current audio in the project."
msgstr ""
"Die Projekt-Überprüfung des Ordners \"%s\" \n"
"fand %d fehlende (.auf-)Datei(en). \n"
"fand %lld fehlende (.auf-)Datei(en). \n"
"Audacity kann diese Dateien vollständig \n"
"wiederherstellen aus dem vorhandenen Audio."
@@ -1158,7 +1158,7 @@ msgstr ""
#, c-format
msgid ""
"Project check of \"%s\" folder \n"
"detected %d missing audio data (.au) blockfile(s), \n"
"detected %lld missing audio data (.au) blockfile(s), \n"
"probably due to a bug, system crash, or accidental \n"
"deletion. There is no way for Audacity to recover \n"
"these missing files automatically. \n"
@@ -1171,7 +1171,7 @@ msgid ""
"may not show silence."
msgstr ""
"Die Projekt-Überprüfung des Ordners \"%s\" \n"
"ergab, dass %d Audio(.au)-Blockdatei(en) fehlen. \n"
"ergab, dass %lld Audio(.au)-Blockdatei(en) fehlen. \n"
"Ursache könnte ein Bug sein, ein Systemabsturz oder \n"
"versehentliches Löschen. Audacity kann die fehlenden \n"
"Dateien nicht automatisch wiederherstellen. \n"
@@ -4733,8 +4733,8 @@ msgstr "In Stereo umwandeln"
#: src/TrackPanel.cpp:7586
#, c-format
msgid "Changed '%s' to %d Hz"
msgstr "'%s' in %d Hz konvertiert"
msgid "Changed '%s' to %s Hz"
msgstr "'%s' in %s Hz konvertiert"
#: src/TrackPanel.cpp:7588
msgid "Rate Change"
@@ -4766,8 +4766,8 @@ msgstr "Maximalwert einstellen"
#: src/TrackPanel.cpp:7813
#, c-format
msgid "Set range to '%d' - '%d'"
msgstr "Bereich einstellen von '%d' bis '%d'"
msgid "Set range to '%ld' - '%ld'"
msgstr "Bereich einstellen von '%ld' bis '%ld'"
#: src/TrackPanel.cpp:7818
msgid "Set Range"
@@ -8577,13 +8577,13 @@ msgstr "Kann Zieldatei nicht zum Schreiben öffnen"
#: src/export/ExportMP2.cpp:279
#, c-format
msgid "Exporting selected audio at %d kbps"
msgstr "Ausgewähltes Audio exportieren bei einer Bitrate von %d kbit/s"
msgid "Exporting selected audio at %ld kbps"
msgstr "Ausgewähltes Audio exportieren bei einer Bitrate von %ld kbit/s"
#: src/export/ExportMP2.cpp:280
#, c-format
msgid "Exporting entire file at %d kbps"
msgstr "Gesamte Datei mit einer Bitrate von %d kbit/s exportieren"
msgid "Exporting entire file at %ld kbps"
msgstr "Gesamte Datei mit einer Bitrate von %ld kbit/s exportieren"
#: src/export/ExportMP3.cpp:218 src/export/ExportMP3.cpp:236
#: src/export/ExportMP3.cpp:251
@@ -8782,8 +8782,8 @@ msgstr "Ganze Datei exportieren mit %d kbit/s"
#: src/export/ExportMP3.cpp:1802
#, c-format
msgid "Error %d returned from MP3 encoder"
msgstr "Der MP3-Encoder meldet Fehler %d"
msgid "Error %ld returned from MP3 encoder"
msgstr "Der MP3-Encoder meldet Fehler %ld"
#: src/export/ExportMP3.cpp:1893
#, c-format
@@ -8899,29 +8899,29 @@ msgstr "Wählen Sie einen Ort für das Export-Verzeichnis aus"
#: src/export/ExportMultiple.cpp:538
#, c-format
msgid "Successfully exported the following %ld file(s)."
msgstr "%ld Datei/en wurde/n erfolgreich exportiert:"
msgid "Successfully exported the following %lld file(s)."
msgstr "%lld Datei/en wurde/n erfolgreich exportiert:"
#: src/export/ExportMultiple.cpp:539
#, c-format
msgid "Something went wrong after exporting the following %ld file(s)."
msgstr "Irgendwas ging schief beim Exportieren der folgenden %ld Datei/en."
msgid "Something went wrong after exporting the following %lld file(s)."
msgstr "Irgendwas ging schief beim Exportieren der folgenden %lld Datei/en."
#: src/export/ExportMultiple.cpp:540
#, c-format
msgid "Export canceled after exporting the following %ld file(s)."
msgstr "Abgebrochen nach dem Exportieren der folgenden %ld Datei/en."
msgid "Export canceled after exporting the following %lld file(s)."
msgstr "Abgebrochen nach dem Exportieren der folgenden %lld Datei/en."
#: src/export/ExportMultiple.cpp:541
#, c-format
msgid "Export stopped after exporting the following %ld file(s)."
msgstr "Gestoppt nach dem Exportieren der folgenden %ld Datei/en."
msgid "Export stopped after exporting the following %lld file(s)."
msgstr "Gestoppt nach dem Exportieren der folgenden %lld Datei/en."
#: src/export/ExportMultiple.cpp:542
#, c-format
msgid "Something went really wrong after exporting the following %ld file(s)."
msgid "Something went really wrong after exporting the following %lld file(s)."
msgstr ""
"Irgendwas ging ernsthaft schief beim Exportieren der folgenden %ld Datei/en."
"Irgendwas ging ernsthaft schief beim Exportieren der folgenden %lld Datei/en."
#: src/export/ExportMultiple.cpp:577
#, c-format
@@ -9274,8 +9274,8 @@ msgstr "FFmpeg-kompatible Dateien"
#: src/import/ImportFFmpeg.cpp:443
#, c-format
msgid ""
"Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
msgstr "Index[%02x] Codec[%S], Sprache[%S], Bitrate[%S], Kanäle[%d], Dauer[%d]"
"Index[%02x] Codec[%s], Language[%s], Bitrate[%s], Channels[%d], Duration[%d]"
msgstr "Index[%02x] Codec[%s], Sprache[%s], Bitrate[%s], Kanäle[%d], Dauer[%d]"
#: src/import/ImportFLAC.cpp:45 src/ondemand/ODDecodeFlacTask.cpp:28
msgid "FLAC files"