1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-01 22:30:11 +01:00

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

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

View File

@@ -1066,7 +1066,7 @@ msgstr "Data van projectbestand wordt geïnspecteerd"
#, 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"
@@ -1082,7 +1082,7 @@ msgid ""
"project immediately\" on further error alerts."
msgstr ""
"De projectcontrole van de map \"%s\" \n"
"detecteerde %d ontbrekende externe audiobestanden \n"
"detecteerde %lld ontbrekende externe audiobestanden \n"
" ('ge-aliaste bestanden'). Audacity kan deze bestanden \n"
"niet automatisch herstellen. \n"
"\n"
@@ -1118,12 +1118,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 ""
"De projectcontrole van map \"%s\" \n"
"detecteerde %d ontbrekende alias-blokbestanden (.auf). \n"
"detecteerde %lld ontbrekende alias-blokbestanden (.auf). \n"
"Audacity kan deze overzichtbestanden volledig regenereren vanuit de\n"
"oorspronkelijke audiodata van het project."
@@ -1152,7 +1152,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"
@@ -1165,7 +1165,7 @@ msgid ""
"may not show silence."
msgstr ""
"De projectcontrole van map \"%s\" detecteerde \n"
"%d ontbrekende audio-blokbestanden (.au). \n"
"%lld ontbrekende audio-blokbestanden (.au). \n"
"Dit komt waarschijnlijk door een bug, een systeemcrash\n"
"of omdat de bestanden per ongeluk verwijderd zijn.\n"
"Audacity kan deze verloren data niet automatisch herstellen.\n"
@@ -4738,8 +4738,8 @@ msgstr "Stereo maken"
#: src/TrackPanel.cpp:7586
#, c-format
msgid "Changed '%s' to %d Hz"
msgstr "%s omgezet naar %d Hz"
msgid "Changed '%s' to %s Hz"
msgstr "%s omgezet naar %s Hz"
#: src/TrackPanel.cpp:7588
msgid "Rate Change"
@@ -4771,8 +4771,8 @@ msgstr "Bovenlimiet snelheid"
#: src/TrackPanel.cpp:7813
#, c-format
msgid "Set range to '%d' - '%d'"
msgstr "Snelheidsbereik ingesteld op %d - %d"
msgid "Set range to '%ld' - '%ld'"
msgstr "Snelheidsbereik ingesteld op %ld - %ld"
#: src/TrackPanel.cpp:7818
msgid "Set Range"
@@ -8567,13 +8567,13 @@ msgstr "Niet in staat het doelbestand te openen voor schrijven"
#: src/export/ExportMP2.cpp:279
#, c-format
msgid "Exporting selected audio at %d kbps"
msgstr "Geselecteerde audio exporteren in %d kbps"
msgid "Exporting selected audio at %ld kbps"
msgstr "Geselecteerde audio exporteren in %ld kbps"
#: src/export/ExportMP2.cpp:280
#, c-format
msgid "Exporting entire file at %d kbps"
msgstr "Hele bestand exporteren in %d kbps"
msgid "Exporting entire file at %ld kbps"
msgstr "Hele bestand exporteren in %ld kbps"
#: src/export/ExportMP3.cpp:218 src/export/ExportMP3.cpp:236
#: src/export/ExportMP3.cpp:251
@@ -8772,8 +8772,8 @@ msgstr "Het gehele bestand exporteren met %d kbps"
#: src/export/ExportMP3.cpp:1802
#, c-format
msgid "Error %d returned from MP3 encoder"
msgstr "Foutmelding %d teruggekregen van mp3-codeerprogramma"
msgid "Error %ld returned from MP3 encoder"
msgstr "Foutmelding %ld teruggekregen van mp3-codeerprogramma"
#: src/export/ExportMP3.cpp:1893
#, c-format
@@ -8889,30 +8889,30 @@ msgstr "Kies een locatie voor de geëxporteerde bestanden"
#: src/export/ExportMultiple.cpp:538
#, c-format
msgid "Successfully exported the following %ld file(s)."
msgstr "%ld bestand(en) met succes geëxporteerd."
msgid "Successfully exported the following %lld file(s)."
msgstr "%lld bestand(en) met succes geëxporteerd."
#: src/export/ExportMultiple.cpp:539
#, c-format
msgid "Something went wrong after exporting the following %ld file(s)."
msgstr "Er ging iets mis na het exporteren van volgende %ld-bestanden."
msgid "Something went wrong after exporting the following %lld file(s)."
msgstr "Er ging iets mis na het exporteren van volgende %lld-bestanden."
#: src/export/ExportMultiple.cpp:540
#, c-format
msgid "Export canceled after exporting the following %ld file(s)."
msgid "Export canceled after exporting the following %lld file(s)."
msgstr ""
"Exporteren geannuleerd na het exporteren van de volgende %ld bestanden."
"Exporteren geannuleerd na het exporteren van de volgende %lld bestanden."
#: src/export/ExportMultiple.cpp:541
#, c-format
msgid "Export stopped after exporting the following %ld file(s)."
msgstr "Exporteren stopte na het exporteren van de volgende %ld bestanden."
msgid "Export stopped after exporting the following %lld file(s)."
msgstr "Exporteren stopte na het exporteren van de volgende %lld bestanden."
#: 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 ""
"Er ging iets serieus mis na het exporteren van de volgende %ld bestanden."
"Er ging iets serieus mis na het exporteren van de volgende %lld bestanden."
#: src/export/ExportMultiple.cpp:577
#, c-format
@@ -9259,9 +9259,9 @@ msgstr "FFmpeg-compatibele bestanden"
#: src/import/ImportFFmpeg.cpp:443
#, c-format
msgid ""
"Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
"Index[%02x] Codec[%s], Language[%s], Bitrate[%s], Channels[%d], Duration[%d]"
msgstr ""
"Index[%02x] Codec[%S], Taal[%S], Bitfrequentie[%S], Kanalen[%d], Duur[%d]"
"Index[%02x] Codec[%s], Taal[%s], Bitfrequentie[%s], Kanalen[%d], Duur[%d]"
#: src/import/ImportFLAC.cpp:45 src/ondemand/ODDecodeFlacTask.cpp:28
msgid "FLAC files"