1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-01 14:20: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:
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

View File

@@ -1065,7 +1065,7 @@ msgstr "Vérification des données du fichier projet"
#, 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"
@@ -1081,7 +1081,7 @@ msgid ""
"project immediately\" on further error alerts."
msgstr ""
"La vérification de projet du dossier \"%s\" \n"
"indique %d fichier(s) audio externe(s) \n"
"indique %lld fichier(s) audio externe(s) \n"
"(\"liens\"') manquant(s). Audacity n'a aucun moyen\n"
"de récupérer ces fichiers automatiquement.\n"
"\n"
@@ -1118,12 +1118,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 ""
"La vérification de projet du dossier \"%s\" \n"
"indique %d lien(s) de blocs \n"
"indique %lld lien(s) de blocs \n"
"de fichier(s) manquant (s)(.auf).Audacity peut totalement \n"
"reconstituer ces fichiers à partir de l'audio du projet."
@@ -1154,7 +1154,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"
@@ -1167,7 +1167,7 @@ msgid ""
"may not show silence."
msgstr ""
"La vérification de projet du dossier \"%s\" \n"
"indique %d bloc(s) de données audio(.au)\n"
"indique %lld bloc(s) de données audio(.au)\n"
"manquant(s) probablement à cause d'un bogue, d'un crash \n"
"système ou d'un effacement accidentel. Il est impossible \n"
"à Audacity de récupérer ces fichiers manquants automatiquement.\n"
@@ -4759,8 +4759,8 @@ msgstr "Rendre stéréo"
#: src/TrackPanel.cpp:7586
#, c-format
msgid "Changed '%s' to %d Hz"
msgstr " '%s' changé en %d Hz"
msgid "Changed '%s' to %s Hz"
msgstr " '%s' changé en %s Hz"
#: src/TrackPanel.cpp:7588
msgid "Rate Change"
@@ -4792,8 +4792,8 @@ msgstr "Vitesse maximale"
#: src/TrackPanel.cpp:7813
#, c-format
msgid "Set range to '%d' - '%d'"
msgstr "Passer la sélection de '%d' à '%d'"
msgid "Set range to '%ld' - '%ld'"
msgstr "Passer la sélection de '%ld' à '%ld'"
#: src/TrackPanel.cpp:7818
msgid "Set Range"
@@ -8597,13 +8597,13 @@ msgstr "Impossible d'ouvrir le fichier cible en écriture"
#: src/export/ExportMP2.cpp:279
#, c-format
msgid "Exporting selected audio at %d kbps"
msgstr "Exportation de la sélection audio à %d kbps"
msgid "Exporting selected audio at %ld kbps"
msgstr "Exportation de la sélection audio à %ld kbps"
#: src/export/ExportMP2.cpp:280
#, c-format
msgid "Exporting entire file at %d kbps"
msgstr "Exportation du fichier entier à %d kbps"
msgid "Exporting entire file at %ld kbps"
msgstr "Exportation du fichier entier à %ld kbps"
#: src/export/ExportMP3.cpp:218 src/export/ExportMP3.cpp:236
#: src/export/ExportMP3.cpp:251
@@ -8802,8 +8802,8 @@ msgstr "Exportation du fichier entier à %d kbps"
#: src/export/ExportMP3.cpp:1802
#, c-format
msgid "Error %d returned from MP3 encoder"
msgstr "Erreur %d retournée par l'encodeur MP3"
msgid "Error %ld returned from MP3 encoder"
msgstr "Erreur %ld retournée par l'encodeur MP3"
#: src/export/ExportMP3.cpp:1893
#, c-format
@@ -8921,29 +8921,29 @@ msgstr "Choisir un emplacement pour placer les fichiers temporaires"
#: src/export/ExportMultiple.cpp:538
#, c-format
msgid "Successfully exported the following %ld file(s)."
msgstr "%ld fichier(s) exporté(s) avec succès."
msgid "Successfully exported the following %lld file(s)."
msgstr "%lld fichier(s) exporté(s) avec succès."
#: src/export/ExportMultiple.cpp:539
#, c-format
msgid "Something went wrong after exporting the following %ld file(s)."
msgstr "Quelque chose a mal tourné après l'export du (des) fichier(s) %ld."
msgid "Something went wrong after exporting the following %lld file(s)."
msgstr "Quelque chose a mal tourné après l'export du (des) fichier(s) %lld."
#: src/export/ExportMultiple.cpp:540
#, c-format
msgid "Export canceled after exporting the following %ld file(s)."
msgstr "Export annulé après l'exportation du (des) fichier(s) %ld."
msgid "Export canceled after exporting the following %lld file(s)."
msgstr "Export annulé après l'exportation du (des) fichier(s) %lld."
#: src/export/ExportMultiple.cpp:541
#, c-format
msgid "Export stopped after exporting the following %ld file(s)."
msgstr "Export stoppé après l'exportation du (des) fichier(s) %ld."
msgid "Export stopped after exporting the following %lld file(s)."
msgstr "Export stoppé après l'exportation du (des) fichier(s) %lld."
#: 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 ""
"Quelque chose a vraiment mal tourné après l'export du (des) fichier(s) %ld."
"Quelque chose a vraiment mal tourné après l'export du (des) fichier(s) %lld."
#: src/export/ExportMultiple.cpp:577
#, c-format
@@ -9294,8 +9294,8 @@ msgstr "Fichiers compatibles - FFmpeg"
#: src/import/ImportFFmpeg.cpp:443
#, c-format
msgid ""
"Index[%02x] Codec[%S], Language[%S], Bitrate[%S], Channels[%d], Duration[%d]"
msgstr "Index[%02x] Codec[%S], Langage[%S], Débit[%S], Canaux[%d], Durée[%d]"
"Index[%02x] Codec[%s], Language[%s], Bitrate[%s], Channels[%d], Duration[%d]"
msgstr "Index[%02x] Codec[%s], Langage[%s], Débit[%s], Canaux[%d], Durée[%d]"
#: src/import/ImportFLAC.cpp:45 src/ondemand/ODDecodeFlacTask.cpp:28
msgid "FLAC files"