Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-13 08:05:52 +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

50
locale/nb.po
View File

@@ -1050,7 +1050,7 @@ msgstr ""
#, 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"
@@ -1086,7 +1086,7 @@ 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 ""
@@ -1116,7 +1116,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"
@@ -4736,8 +4736,8 @@ msgstr "Gj
#: src/TrackPanel.cpp:7586
#, c-format
msgid "Changed '%s' to %d Hz"
msgstr "Endret <20>%s<> til %d Hz"
msgid "Changed '%s' to %s Hz"
msgstr "Endret <20>%s<> til %s Hz"
#: src/TrackPanel.cpp:7588
msgid "Rate Change"
@@ -4769,8 +4769,8 @@ msgstr "
#: src/TrackPanel.cpp:7813
#, c-format
msgid "Set range to '%d' - '%d'"
msgstr "Sett omr<6D>de til <20>%d<> - <20>%d<>"
msgid "Set range to '%ld' - '%ld'"
msgstr "Sett omr<6D>de til <20>%ld<EFBFBD> - <20>%ld<EFBFBD>"
#: src/TrackPanel.cpp:7818
msgid "Set Range"
@@ -8569,13 +8569,13 @@ msgstr "Klarte ikke
#: src/export/ExportMP2.cpp:279
#, c-format
msgid "Exporting selected audio at %d kbps"
msgstr "Eksporterer markert lyd med %d kbps"
msgid "Exporting selected audio at %ld kbps"
msgstr "Eksporterer markert lyd med %ld kbps"
#: src/export/ExportMP2.cpp:280
#, c-format
msgid "Exporting entire file at %d kbps"
msgstr "Eksporterer hele fila med %d kbps"
msgid "Exporting entire file at %ld kbps"
msgstr "Eksporterer hele fila med %ld kbps"
#: src/export/ExportMP3.cpp:218 src/export/ExportMP3.cpp:236
#: src/export/ExportMP3.cpp:251
@@ -8779,8 +8779,8 @@ msgstr "Eksportere hele fila med %d Kbps"
#: src/export/ExportMP3.cpp:1802
#, c-format
msgid "Error %d returned from MP3 encoder"
msgstr "Feilkode %d returnert fra MP3-omkoder"
msgid "Error %ld returned from MP3 encoder"
msgstr "Feilkode %ld returnert fra MP3-omkoder"
#: src/export/ExportMP3.cpp:1893
#, c-format
@@ -8893,28 +8893,28 @@ msgstr "Velg en plassering for
#: src/export/ExportMultiple.cpp:538
#, c-format
msgid "Successfully exported the following %ld file(s)."
msgstr "Eksporterte f<>lgende %ld fil(er)."
msgid "Successfully exported the following %lld file(s)."
msgstr "Eksporterte f<>lgende %lld fil(er)."
#: src/export/ExportMultiple.cpp:539
#, c-format
msgid "Something went wrong after exporting the following %ld file(s)."
msgstr "Noe gikk galt etter eksportering av f<>lgende %ld fil(er)."
msgid "Something went wrong after exporting the following %lld file(s)."
msgstr "Noe gikk galt etter eksportering av f<>lgende %lld fil(er)."
#: src/export/ExportMultiple.cpp:540
#, c-format
msgid "Export canceled after exporting the following %ld file(s)."
msgstr "Eksportering avbrutt etter f<>lgende %ld fil(er)."
msgid "Export canceled after exporting the following %lld file(s)."
msgstr "Eksportering avbrutt etter f<>lgende %lld fil(er)."
#: src/export/ExportMultiple.cpp:541
#, c-format
msgid "Export stopped after exporting the following %ld file(s)."
msgstr "Eksportering stanset etter f<>lgende %ld fil(er)."
msgid "Export stopped after exporting the following %lld file(s)."
msgstr "Eksportering stanset etter f<>lgende %lld fil(er)."
#: src/export/ExportMultiple.cpp:542
#, c-format
msgid "Something went really wrong after exporting the following %ld file(s)."
msgstr "Noe gikk virkelig galt etter eksportering av f<>lgende %ld fil(er)."
msgid "Something went really wrong after exporting the following %lld file(s)."
msgstr "Noe gikk virkelig galt etter eksportering av f<>lgende %lld fil(er)."
#: src/export/ExportMultiple.cpp:577
#, c-format
@@ -9239,9 +9239,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] Kodek[%S], Spr<70>k[%S], Bitrate[%S], Kanaler[%d], Varighet[%d]"
"Indeks[%02x] Kodek[%s], Spr<70>k[%s], Bitrate[%s], Kanaler[%d], Varighet[%d]"
#: src/import/ImportFLAC.cpp:45 src/ondemand/ODDecodeFlacTask.cpp:28
msgid "FLAC files"