mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-14 06:31:15 +02: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:
56
locale/da.po
56
locale/da.po
@@ -1054,7 +1054,7 @@ msgstr "Undersøger projektfilens data"
|
||||
#, 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"
|
||||
@@ -1070,7 +1070,7 @@ msgid ""
|
||||
"project immediately\" on further error alerts."
|
||||
msgstr ""
|
||||
"Projektkontrollen af \"%s\"-mappen \n"
|
||||
"fandt, at %d lydfil(er) udefra ('aliasfiler')\n"
|
||||
"fandt, at %lld lydfil(er) udefra ('aliasfiler')\n"
|
||||
"mangler. Der er ingen måde, hvorpå Audacity \n"
|
||||
"kan genskabe disse filer automatisk.\n"
|
||||
"\n"
|
||||
@@ -1105,12 +1105,12 @@ msgstr "Projektkontrolfunktionen erstattede manglende fil(er) med stilhed."
|
||||
#, 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 ""
|
||||
"Kontrollen af \"%s\"-mappen \n"
|
||||
"fandt %d manglende aliasblokfil(er) (.auf). \n"
|
||||
"fandt %lld manglende aliasblokfil(er) (.auf). \n"
|
||||
"Audacity kan fuldtud genskabe disse filer \n"
|
||||
"fra de nuværende lyddata i projektet."
|
||||
|
||||
@@ -1139,7 +1139,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"
|
||||
@@ -1152,7 +1152,7 @@ msgid ""
|
||||
"may not show silence."
|
||||
msgstr ""
|
||||
"Kontrollen af \"%s\"-mappen \n"
|
||||
"fandt %d manglende lyddatablokfil(er) (.au), \n"
|
||||
"fandt %lld manglende lyddatablokfil(er) (.au), \n"
|
||||
"sandsynligvis på grund af en fejl, et nedbrud eller \n"
|
||||
"en fejlagtig sletning. Audacity har ingen mulighed \n"
|
||||
"for at genskabe disse tabte data automatisk. \n"
|
||||
@@ -4704,8 +4704,8 @@ msgstr "Gør til stereo"
|
||||
|
||||
#: src/TrackPanel.cpp:7586
|
||||
#, c-format
|
||||
msgid "Changed '%s' to %d Hz"
|
||||
msgstr "Ændrede '%s' til %d Hz"
|
||||
msgid "Changed '%s' to %s Hz"
|
||||
msgstr "Ændrede '%s' til %s Hz"
|
||||
|
||||
#: src/TrackPanel.cpp:7588
|
||||
msgid "Rate Change"
|
||||
@@ -4737,8 +4737,8 @@ msgstr "Øvre hastigghedsgrænse"
|
||||
|
||||
#: src/TrackPanel.cpp:7813
|
||||
#, c-format
|
||||
msgid "Set range to '%d' - '%d'"
|
||||
msgstr "Sæt område til '%d' - '%d'"
|
||||
msgid "Set range to '%ld' - '%ld'"
|
||||
msgstr "Sæt område til '%ld' - '%ld'"
|
||||
|
||||
#: src/TrackPanel.cpp:7818
|
||||
msgid "Set Range"
|
||||
@@ -8517,13 +8517,13 @@ msgstr "Kan ikke åbne filen til skrivning"
|
||||
|
||||
#: src/export/ExportMP2.cpp:279
|
||||
#, c-format
|
||||
msgid "Exporting selected audio at %d kbps"
|
||||
msgstr "Eksporterer den markerede lyd med %d kbps"
|
||||
msgid "Exporting selected audio at %ld kbps"
|
||||
msgstr "Eksporterer den markerede lyd med %ld kbps"
|
||||
|
||||
#: src/export/ExportMP2.cpp:280
|
||||
#, c-format
|
||||
msgid "Exporting entire file at %d kbps"
|
||||
msgstr "Eksporterer hele projektet med %d kbps"
|
||||
msgid "Exporting entire file at %ld kbps"
|
||||
msgstr "Eksporterer hele projektet med %ld kbps"
|
||||
|
||||
#: src/export/ExportMP3.cpp:218 src/export/ExportMP3.cpp:236
|
||||
#: src/export/ExportMP3.cpp:251
|
||||
@@ -8722,8 +8722,8 @@ msgstr "Eksporterer hele filen med %d Kbps"
|
||||
|
||||
#: src/export/ExportMP3.cpp:1802
|
||||
#, c-format
|
||||
msgid "Error %d returned from MP3 encoder"
|
||||
msgstr "MP3-indkodningen anførte fejlen %d"
|
||||
msgid "Error %ld returned from MP3 encoder"
|
||||
msgstr "MP3-indkodningen anførte fejlen %ld"
|
||||
|
||||
#: src/export/ExportMP3.cpp:1893
|
||||
#, c-format
|
||||
@@ -8839,28 +8839,28 @@ msgstr "Vælg en placering til de eksporterede filer"
|
||||
|
||||
#: src/export/ExportMultiple.cpp:538
|
||||
#, c-format
|
||||
msgid "Successfully exported the following %ld file(s)."
|
||||
msgstr "De følgende %ld-filer blev eksporteret."
|
||||
msgid "Successfully exported the following %lld file(s)."
|
||||
msgstr "De følgende %lld-filer blev eksporteret."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:539
|
||||
#, c-format
|
||||
msgid "Something went wrong after exporting the following %ld file(s)."
|
||||
msgstr "Noget gik galt efter eksportering af de følgende %ld-filer."
|
||||
msgid "Something went wrong after exporting the following %lld file(s)."
|
||||
msgstr "Noget gik galt efter eksportering af de følgende %lld-filer."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:540
|
||||
#, c-format
|
||||
msgid "Export canceled after exporting the following %ld file(s)."
|
||||
msgstr "Eksport annulleret efter eksportering af de følgende %ld-filer."
|
||||
msgid "Export canceled after exporting the following %lld file(s)."
|
||||
msgstr "Eksport annulleret efter eksportering af de følgende %lld-filer."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:541
|
||||
#, c-format
|
||||
msgid "Export stopped after exporting the following %ld file(s)."
|
||||
msgstr "Eksport standset efter eksportering af de følgende %ld-filer."
|
||||
msgid "Export stopped after exporting the following %lld file(s)."
|
||||
msgstr "Eksport standset efter eksportering af de følgende %lld-filer."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:542
|
||||
#, c-format
|
||||
msgid "Something went really wrong after exporting the following %ld file(s)."
|
||||
msgstr "Noget gik galt efter eksportering af de følgende %ld-filer."
|
||||
msgid "Something went really wrong after exporting the following %lld file(s)."
|
||||
msgstr "Noget gik galt efter eksportering af de følgende %lld-filer."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:577
|
||||
#, c-format
|
||||
@@ -9200,9 +9200,9 @@ msgstr "FFmpeg-kompatible filer"
|
||||
#: 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 ""
|
||||
"Indeks[%02x] Codec[%S], Sprog[%S], Bithastighed[%S], Kanaler[%d], Varighed"
|
||||
"Indeks[%02x] Codec[%s], Sprog[%s], Bithastighed[%s], Kanaler[%d], Varighed"
|
||||
"[%d]"
|
||||
|
||||
#: src/import/ImportFLAC.cpp:45 src/ondemand/ODDecodeFlacTask.cpp:28
|
||||
|
Reference in New Issue
Block a user