mirror of
https://github.com/cookiengineer/audacity
synced 2025-11-27 15:50:10 +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/hr.po
56
locale/hr.po
@@ -1062,7 +1062,7 @@ msgstr "Pregledavanje datoteka projekta"
|
||||
#, 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"
|
||||
@@ -1078,7 +1078,7 @@ msgid ""
|
||||
"project immediately\" on further error alerts."
|
||||
msgstr ""
|
||||
"Provjera projekta \"%s\" mape \n"
|
||||
"uočila je %d nedostajuće vanjske alias zvučne datoteke.\n"
|
||||
"uočila je %lld nedostajuće vanjske alias zvučne datoteke.\n"
|
||||
" Mogu se obnoviti samo ručno. \n"
|
||||
"\n"
|
||||
"Ako izaberete prvu ili drugu mogućnost ispod, \n"
|
||||
@@ -1112,12 +1112,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 ""
|
||||
"Provjera projekta mape \"%s\"\n"
|
||||
"uočila je nedostatak %d alias (.auf) blokovske datoteke.\n"
|
||||
"uočila je nedostatak %lld alias (.auf) blokovske datoteke.\n"
|
||||
"Audacity ih može u cijelosti obnoviti\n"
|
||||
"trenutačnim zvukom iz projekta."
|
||||
|
||||
@@ -1145,7 +1145,7 @@ msgstr " Provjera projekta obnovila je nedostajuće alias summary datoteke."
|
||||
#, 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"
|
||||
@@ -1158,7 +1158,7 @@ msgid ""
|
||||
"may not show silence."
|
||||
msgstr ""
|
||||
"Provjera projekta mape \"%s\"\n"
|
||||
"uočila je nedostatak %d zvučnih (.au) blokovskih datoteka(s), \n"
|
||||
"uočila je nedostatak %lld zvučnih (.au) blokovskih datoteka(s), \n"
|
||||
"vjerojatno zbog buga, rušenja sustava ili slučajnoga brisanja\n"
|
||||
"Mogu se obnoviti jedino ručno. \n"
|
||||
"\n"
|
||||
@@ -4729,8 +4729,8 @@ msgstr "Napravi stereo"
|
||||
|
||||
#: src/TrackPanel.cpp:7586
|
||||
#, c-format
|
||||
msgid "Changed '%s' to %d Hz"
|
||||
msgstr "Promijenjen: '%s' u %d Hz"
|
||||
msgid "Changed '%s' to %s Hz"
|
||||
msgstr "Promijenjen: '%s' u %s Hz"
|
||||
|
||||
#: src/TrackPanel.cpp:7588
|
||||
msgid "Rate Change"
|
||||
@@ -4762,8 +4762,8 @@ msgstr "Gornja granica brzine"
|
||||
|
||||
#: src/TrackPanel.cpp:7813
|
||||
#, c-format
|
||||
msgid "Set range to '%d' - '%d'"
|
||||
msgstr "Postavi opseg na '%d' - '%d'"
|
||||
msgid "Set range to '%ld' - '%ld'"
|
||||
msgstr "Postavi opseg na '%ld' - '%ld'"
|
||||
|
||||
#: src/TrackPanel.cpp:7818
|
||||
msgid "Set Range"
|
||||
@@ -8579,13 +8579,13 @@ msgstr "Ciljane datoteke za zapisivanje nije moguće otvoriti"
|
||||
|
||||
#: src/export/ExportMP2.cpp:279
|
||||
#, c-format
|
||||
msgid "Exporting selected audio at %d kbps"
|
||||
msgstr "Izvoz izabranoga zvuka pri %d kb/s"
|
||||
msgid "Exporting selected audio at %ld kbps"
|
||||
msgstr "Izvoz izabranoga zvuka pri %ld kb/s"
|
||||
|
||||
#: src/export/ExportMP2.cpp:280
|
||||
#, c-format
|
||||
msgid "Exporting entire file at %d kbps"
|
||||
msgstr "Izvoz cijele datoteke pri %d kb/s"
|
||||
msgid "Exporting entire file at %ld kbps"
|
||||
msgstr "Izvoz cijele datoteke pri %ld kb/s"
|
||||
|
||||
#: src/export/ExportMP3.cpp:218 src/export/ExportMP3.cpp:236
|
||||
#: src/export/ExportMP3.cpp:251
|
||||
@@ -8784,8 +8784,8 @@ msgstr "Izvoz cijele datoteke pri %d kb/s"
|
||||
|
||||
#: src/export/ExportMP3.cpp:1802
|
||||
#, c-format
|
||||
msgid "Error %d returned from MP3 encoder"
|
||||
msgstr "Koder MP3 javlja pogrješku %d"
|
||||
msgid "Error %ld returned from MP3 encoder"
|
||||
msgstr "Koder MP3 javlja pogrješku %ld"
|
||||
|
||||
#: src/export/ExportMP3.cpp:1893
|
||||
#, c-format
|
||||
@@ -8899,28 +8899,28 @@ msgstr "Izaberi mjesto za spremanje izvezenih datoteka"
|
||||
|
||||
#: src/export/ExportMultiple.cpp:538
|
||||
#, c-format
|
||||
msgid "Successfully exported the following %ld file(s)."
|
||||
msgstr "Uspješan izvoz sljedećih datoteka %ld."
|
||||
msgid "Successfully exported the following %lld file(s)."
|
||||
msgstr "Uspješan izvoz sljedećih datoteka %lld."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:539
|
||||
#, c-format
|
||||
msgid "Something went wrong after exporting the following %ld file(s)."
|
||||
msgstr "Došlo je do pogrješke pri izvozu datoteka %ld."
|
||||
msgid "Something went wrong after exporting the following %lld file(s)."
|
||||
msgstr "Došlo je do pogrješke pri izvozu datoteka %lld."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:540
|
||||
#, c-format
|
||||
msgid "Export canceled after exporting the following %ld file(s)."
|
||||
msgstr "Izvoz je prekinut nakon izvoza datoteka %ld."
|
||||
msgid "Export canceled after exporting the following %lld file(s)."
|
||||
msgstr "Izvoz je prekinut nakon izvoza datoteka %lld."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:541
|
||||
#, c-format
|
||||
msgid "Export stopped after exporting the following %ld file(s)."
|
||||
msgstr "Izvoz se zaustavio nakon izvoza datoteka %ld."
|
||||
msgid "Export stopped after exporting the following %lld file(s)."
|
||||
msgstr "Izvoz se zaustavio nakon izvoza datoteka %lld."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:542
|
||||
#, c-format
|
||||
msgid "Something went really wrong after exporting the following %ld file(s)."
|
||||
msgstr "Došlo je do ozbiljne pogrješke nakon izvoza datoteka %ld."
|
||||
msgid "Something went really wrong after exporting the following %lld file(s)."
|
||||
msgstr "Došlo je do ozbiljne pogrješke nakon izvoza datoteka %lld."
|
||||
|
||||
#: src/export/ExportMultiple.cpp:577
|
||||
#, c-format
|
||||
@@ -9256,9 +9256,9 @@ msgstr "FFmpeg (uskladive datoteke)"
|
||||
#: 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 ""
|
||||
"Kazalo[%02x], kodek[%S], jezik[%S], uzorkovna brzina[%S], kanali[%d], "
|
||||
"Kazalo[%02x], kodek[%s], jezik[%s], uzorkovna brzina[%s], kanali[%d], "
|
||||
"trajanje[%d]"
|
||||
|
||||
#: src/import/ImportFLAC.cpp:45 src/ondemand/ODDecodeFlacTask.cpp:28
|
||||
|
||||
Reference in New Issue
Block a user