Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-14 06:31:15 +02: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

56
locale/sk.po
View File

@@ -1070,7 +1070,7 @@ msgstr "Kontrolujú sa dáta o súboroch projektu"
#, 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 @@ msgid ""
"project immediately\" on further error alerts."
msgstr ""
"Pri kontrole projektu bolo v priečinku \"%s\" \n"
"zistených %d chýbajúcich externých audio súborov \n"
"zistených %lld chýbajúcich externých audio súborov \n"
"('náhradných súborov'). Audacity nedokáže automaticky tieto súbory obnoviť\n"
"\n"
"Ak si nižšie vyberiete prvú alebo druhú možnosť, \n"
@@ -1122,11 +1122,11 @@ 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 ""
"Kontrola projektu zistila v priečinku \"%s\" %d chýbajúcich náhradných "
"Kontrola projektu zistila v priečinku \"%s\" %lld chýbajúcich náhradných "
"blokov-ych \n"
"súborov (.auf). Audacity môže tieto súbory úplne\n"
"obnoviť podľa pôvodných zvukových dát v projekte."
@@ -1157,7 +1157,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"
@@ -1170,7 +1170,7 @@ msgid ""
"may not show silence."
msgstr ""
"Pri kontrole projektu \"%s\" sa našlo \n"
"%d chýbajúcich blokových audio súborov (.au). \n"
"%lld chýbajúcich blokových audio súborov (.au). \n"
"Ku strate došlo pravdepodobne v dôsledku chyby\n"
"programu, pádu systému alebo nechceným vymazaním. \n"
"Audacity nedokáže tieto súbory obnoviť automaticky.\n"
@@ -4816,8 +4816,8 @@ msgstr "Zmeniť na stereo"
#: src/TrackPanel.cpp:7586
#, c-format
msgid "Changed '%s' to %d Hz"
msgstr "'%s' zmenená na %d Hz"
msgid "Changed '%s' to %s Hz"
msgstr "'%s' zmenená na %s Hz"
#: src/TrackPanel.cpp:7588
msgid "Rate Change"
@@ -4849,8 +4849,8 @@ msgstr "Horný limit rýchlosti"
#: src/TrackPanel.cpp:7813
#, c-format
msgid "Set range to '%d' - '%d'"
msgstr "Nastaviť rozsah na '%d' - '%d'"
msgid "Set range to '%ld' - '%ld'"
msgstr "Nastaviť rozsah na '%ld' - '%ld'"
#: src/TrackPanel.cpp:7818
msgid "Set Range"
@@ -8708,13 +8708,13 @@ msgstr "Cieľový súbor nie je možné otvoriť pre zápis"
#: src/export/ExportMP2.cpp:279
#, c-format
msgid "Exporting selected audio at %d kbps"
msgstr "Vybrané zvukové dáta sa exportujú pri %d kbit/s"
msgid "Exporting selected audio at %ld kbps"
msgstr "Vybrané zvukové dáta sa exportujú pri %ld kbit/s"
#: src/export/ExportMP2.cpp:280
#, c-format
msgid "Exporting entire file at %d kbps"
msgstr "Celý súbor sa exportuje pri %d kbit/s"
msgid "Exporting entire file at %ld kbps"
msgstr "Celý súbor sa exportuje pri %ld kbit/s"
#: src/export/ExportMP3.cpp:218 src/export/ExportMP3.cpp:236
#: src/export/ExportMP3.cpp:251
@@ -8914,8 +8914,8 @@ msgstr "Exportuje sa celý súbor vo vzorkovaní %d kbit/s"
#: src/export/ExportMP3.cpp:1802
#, c-format
msgid "Error %d returned from MP3 encoder"
msgstr "MP3 enkóder vrátil chybu %d"
msgid "Error %ld returned from MP3 encoder"
msgstr "MP3 enkóder vrátil chybu %ld"
#: src/export/ExportMP3.cpp:1893
#, c-format
@@ -9031,28 +9031,28 @@ msgstr "Zvoľte umiestnenie pre exportované súbory"
#: src/export/ExportMultiple.cpp:538
#, c-format
msgid "Successfully exported the following %ld file(s)."
msgstr "Úspešne bolo exportovaných nasledujúcich %ld súborov."
msgid "Successfully exported the following %lld file(s)."
msgstr "Úspešne bolo exportovaných nasledujúcich %lld súborov."
#: src/export/ExportMultiple.cpp:539
#, c-format
msgid "Something went wrong after exporting the following %ld file(s)."
msgstr "Po exporte nasledujúcich %ld súborov došlo k chybám."
msgid "Something went wrong after exporting the following %lld file(s)."
msgstr "Po exporte nasledujúcich %lld súborov došlo k chybám."
#: src/export/ExportMultiple.cpp:540
#, c-format
msgid "Export canceled after exporting the following %ld file(s)."
msgstr "Export bol zrušený po exporte nasledujúcich %ld súborov."
msgid "Export canceled after exporting the following %lld file(s)."
msgstr "Export bol zrušený po exporte nasledujúcich %lld súborov."
#: src/export/ExportMultiple.cpp:541
#, c-format
msgid "Export stopped after exporting the following %ld file(s)."
msgstr "Export bol zastavený po exporte nasledujúcich %ld súborov."
msgid "Export stopped after exporting the following %lld file(s)."
msgstr "Export bol zastavený po exporte nasledujúcich %lld súborov."
#: src/export/ExportMultiple.cpp:542
#, c-format
msgid "Something went really wrong after exporting the following %ld file(s)."
msgstr "Po exporte nasledujúcich %ld súborov došlo k chybám."
msgid "Something went really wrong after exporting the following %lld file(s)."
msgstr "Po exporte nasledujúcich %lld súborov došlo k chybám."
#: src/export/ExportMultiple.cpp:577
#, c-format
@@ -9391,9 +9391,9 @@ msgstr "Súbory kompatibilné s FFmpeg"
#: 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] Kodek[%S], Jazyk[%S], Bitová rýchlosť[%S], Kanály[%d], Dĺžka[%d]"
"Index[%02x] Kodek[%s], Jazyk[%s], Bitová rýchlosť[%s], Kanály[%d], Dĺžka[%d]"
#: src/import/ImportFLAC.cpp:45 src/ondemand/ODDecodeFlacTask.cpp:28
msgid "FLAC files"