mirror of
https://github.com/cookiengineer/audacity
synced 2026-01-13 08:05:52 +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:
56
locale/eu.po
56
locale/eu.po
@@ -1055,7 +1055,7 @@ msgstr "Egitasmo agiri datuak aztertzen"
|
||||
#, 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"
|
||||
@@ -1071,7 +1071,7 @@ msgid ""
|
||||
"project immediately\" on further error alerts."
|
||||
msgstr ""
|
||||
" \"%s\" agiritegiaren egitasmo egiaztapenak \n"
|
||||
"ez dauden %d kanpoko audio agiri atzeman ditu \n"
|
||||
"ez dauden %lld kanpoko audio agiri atzeman ditu \n"
|
||||
"('izenordekoturiko agiriak'). Ez dago biderik Audacity-k \n"
|
||||
"agiri hauek berezgaitasunez berreskuratzeko. \n"
|
||||
"\n"
|
||||
@@ -1108,12 +1108,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 ""
|
||||
"\"%s\" agiritegiaren egitasmo egiaztapenak\n"
|
||||
"atzeman ditu %d izenorde (.auf) bloke-agiri galduta. \n"
|
||||
"atzeman ditu %lld izenorde (.auf) bloke-agiri galduta. \n"
|
||||
"Audacity-k agiri hauek osoki birsortu ditzake \n"
|
||||
"oraingo egitasmoaren audiotik."
|
||||
|
||||
@@ -1142,7 +1142,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"
|
||||
@@ -1155,7 +1155,7 @@ msgid ""
|
||||
"may not show silence."
|
||||
msgstr ""
|
||||
" \"%s\" agiritegiaren egitasmo egiaztapenak \n"
|
||||
"ez dauden %d audio datu (.au) blokeagiri atzeman ditu, \n"
|
||||
"ez dauden %lld audio datu (.au) blokeagiri atzeman ditu, \n"
|
||||
"zihurrenik akats, sistemaren matxura, edo istripuzko \n"
|
||||
"ezabaketa bategaitik. Ez dago biderik Audacity-k \n"
|
||||
"agiri hauek berezgaitasunez berreskuratzeko. \n"
|
||||
@@ -4719,8 +4719,8 @@ msgstr "Egin Estereoa"
|
||||
|
||||
#: src/TrackPanel.cpp:7586
|
||||
#, c-format
|
||||
msgid "Changed '%s' to %d Hz"
|
||||
msgstr "'%s' %d Hz-ra aldatuta"
|
||||
msgid "Changed '%s' to %s Hz"
|
||||
msgstr "'%s' %s Hz-ra aldatuta"
|
||||
|
||||
#: src/TrackPanel.cpp:7588
|
||||
msgid "Rate Change"
|
||||
@@ -4752,8 +4752,8 @@ msgstr "Abiadura muga garaia"
|
||||
|
||||
#: src/TrackPanel.cpp:7813
|
||||
#, c-format
|
||||
msgid "Set range to '%d' - '%d'"
|
||||
msgstr "Ezarri maila: '%d' - '%d'"
|
||||
msgid "Set range to '%ld' - '%ld'"
|
||||
msgstr "Ezarri maila: '%ld' - '%ld'"
|
||||
|
||||
#: src/TrackPanel.cpp:7818
|
||||
msgid "Set Range"
|
||||
@@ -8539,13 +8539,13 @@ msgstr "Ezinezkoa xede agiria idazteko irekitzea"
|
||||
|
||||
#: src/export/ExportMP2.cpp:279
|
||||
#, c-format
|
||||
msgid "Exporting selected audio at %d kbps"
|
||||
msgstr "Hautaturiko audioa %d kbs-ko esportatzen"
|
||||
msgid "Exporting selected audio at %ld kbps"
|
||||
msgstr "Hautaturiko audioa %ld kbs-ko esportatzen"
|
||||
|
||||
#: src/export/ExportMP2.cpp:280
|
||||
#, c-format
|
||||
msgid "Exporting entire file at %d kbps"
|
||||
msgstr "Agiri osoa %d kbs-ko esportatzen"
|
||||
msgid "Exporting entire file at %ld kbps"
|
||||
msgstr "Agiri osoa %ld kbs-ko esportatzen"
|
||||
|
||||
#: src/export/ExportMP3.cpp:218 src/export/ExportMP3.cpp:236
|
||||
#: src/export/ExportMP3.cpp:251
|
||||
@@ -8744,8 +8744,8 @@ msgstr "Agiri osoa %d Kbs-ko esportatzen"
|
||||
|
||||
#: src/export/ExportMP3.cpp:1802
|
||||
#, c-format
|
||||
msgid "Error %d returned from MP3 encoder"
|
||||
msgstr "%d akatsa itzuli du MP3 kodeatzaileak"
|
||||
msgid "Error %ld returned from MP3 encoder"
|
||||
msgstr "%ld akatsa itzuli du MP3 kodeatzaileak"
|
||||
|
||||
#: src/export/ExportMP3.cpp:1893
|
||||
#, c-format
|
||||
@@ -8861,29 +8861,29 @@ msgstr "Hautatu esportaturiko agiriak gordetzeko kokaleku bat"
|
||||
|
||||
#: src/export/ExportMultiple.cpp:538
|
||||
#, c-format
|
||||
msgid "Successfully exported the following %ld file(s)."
|
||||
msgstr "Ongi esportatu d(ir)a hurrengo %ld agiria(k)."
|
||||
msgid "Successfully exported the following %lld file(s)."
|
||||
msgstr "Ongi esportatu d(ir)a hurrengo %lld agiria(k)."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:539
|
||||
#, c-format
|
||||
msgid "Something went wrong after exporting the following %ld file(s)."
|
||||
msgstr "Zerbait okerra gertatu da hurrengo %ld agiria(k) esportatu ondoren."
|
||||
msgid "Something went wrong after exporting the following %lld file(s)."
|
||||
msgstr "Zerbait okerra gertatu da hurrengo %lld agiria(k) esportatu ondoren."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:540
|
||||
#, c-format
|
||||
msgid "Export canceled after exporting the following %ld file(s)."
|
||||
msgstr "Esportazioa ezeztaturik hurrengo %ld agiria(k) esportatu ondoren."
|
||||
msgid "Export canceled after exporting the following %lld file(s)."
|
||||
msgstr "Esportazioa ezeztaturik hurrengo %lld agiria(k) esportatu ondoren."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:541
|
||||
#, c-format
|
||||
msgid "Export stopped after exporting the following %ld file(s)."
|
||||
msgstr "Esportazioa gelditurik hurrengo %ld agiria(k) esportatu ondoren."
|
||||
msgid "Export stopped after exporting the following %lld file(s)."
|
||||
msgstr "Esportazioa gelditurik hurrengo %lld agiria(k) esportatu ondoren."
|
||||
|
||||
#: 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 ""
|
||||
"Zerbait egitan okerra gertatu da hurrengo %ld agiria(k) esportatu ondoren."
|
||||
"Zerbait egitan okerra gertatu da hurrengo %lld agiria(k) esportatu ondoren."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:577
|
||||
#, c-format
|
||||
@@ -9228,9 +9228,9 @@ msgstr "FFmpeg-bateragarri agiriak"
|
||||
#: 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 ""
|
||||
"Aurkibidea[%02x] Kodeka[%S], Hizkuntza[%S], Bitneurria[%S], Bideak[%d], "
|
||||
"Aurkibidea[%02x] Kodeka[%s], Hizkuntza[%s], Bitneurria[%s], Bideak[%d], "
|
||||
"Iraupena[%d]"
|
||||
|
||||
#: src/import/ImportFLAC.cpp:45 src/ondemand/ODDecodeFlacTask.cpp:28
|
||||
|
||||
Reference in New Issue
Block a user