diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0e3036b844eebf1bbc80b64db125ce92adbe3aea..cf5fa16f8246c8d52ead878b6f9e2e52a76ca727 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,13 @@
List of significant changes and bug fixes going back to version 1.1.0
+Changes in version 3.5.1
+
+ This is a hotfix release. It fixes the following bugs:
+
+ * #6322 Fixed a crash on launch on macOS 11 and older.
+ * #6324 Fixed the update notification looking for alpha versions instead of release versions.
+ * #6321 Fixed a freeze when using macros on multiple files.
+
Changes in version 3.5.0
Audacity 3.5 adds cloud saving, beat detection, pitch shifting and more.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3124d80ff0f04c6d6084c04d1fccaf5652f5de67..eebcc2cdcaf6047d1d4d6e4333744df989affbaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,18 +154,25 @@ set( _OPT "audacity_" )
# Our very own project
project( Audacity )
-# XCode 14 no longer allows building unsigned binaries.
-# So for the XCode 14 `-` is passed as the code sign identity, which stands for
-# local signing. `--deep` is passed, because 3d party libraries are copied unsigned.
-# XCODE_VERSION is defined only after the project() command
-
if( APPLE )
+ # XCode 14 no longer allows building unsigned binaries.
+ # So for the XCode 14 `-` is passed as the code sign identity, which stands for
+ # local signing. `--deep` is passed, because 3d party libraries are copied unsigned.
+ # XCODE_VERSION is defined only after the project() command
if (XCODE_VERSION VERSION_LESS 14)
set( CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "" CACHE INTERNAL "" )
else()
set( CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-" CACHE INTERNAL "" )
set( CMAKE_XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS "--deep -o linker-signed --timestamp" CACHE INTERNAL "")
endif()
+
+ # Xcode 15 breaks compatibility with macOS vesions older than 12
+ # https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Linking
+ if (XCODE_VERSION VERSION_GREATER_EQUAL 15)
+ # link_libraries is guaranteed to set the flag for all
+ # linker invocations
+ link_libraries("-Wl,-ld_classic")
+ endif()
endif()
# Load our functions/macros
diff --git a/cmake-proxies/pffft/CMakeLists.txt b/cmake-proxies/pffft/CMakeLists.txt
index cfeba12d8687c1811cbc03357a6c04a6526a9217..11525efa9b5951b6a5a94be5b07f8fee1fa64684 100644
--- a/cmake-proxies/pffft/CMakeLists.txt
+++ b/cmake-proxies/pffft/CMakeLists.txt
@@ -13,3 +13,4 @@ set(INCLUDES
set_target_properties( ${TARGET} PROPERTIES FOLDER "lib-src" )
target_sources( ${TARGET} PRIVATE ${SOURCES} )
target_include_directories( ${TARGET} PUBLIC ${INCLUDES} )
+set_property(TARGET ${TARGET} PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/lib-src/libnyquist/nyquist/xlisp/path.c b/lib-src/libnyquist/nyquist/xlisp/path.c
index 41babde8d8c26714f460ee667d73e5bdaac1503b..67fbb03fa4379477f795e0f3c276031e446fe7cd 100644
--- a/lib-src/libnyquist/nyquist/xlisp/path.c
+++ b/lib-src/libnyquist/nyquist/xlisp/path.c
@@ -25,6 +25,7 @@
*/
#include <string.h>
+#include <stdint.h>
#include "switches.h"
#include "xlisp.h"
diff --git a/libraries/lib-basic-ui/BasicUI.cpp b/libraries/lib-basic-ui/BasicUI.cpp
index dca8c180c6cdc60c823b5227fe898099ffa35c18..947c5600ea4563d40fb66d1a9e829c9f32d1018f 100644
--- a/libraries/lib-basic-ui/BasicUI.cpp
+++ b/libraries/lib-basic-ui/BasicUI.cpp
@@ -29,6 +29,11 @@ Paul Licameli
#include <string>
+#ifdef __FreeBSD__
+extern char** environ;
+#endif
+
+
namespace
{
diff --git a/libraries/lib-project-file-io/SqliteSampleBlock.cpp b/libraries/lib-project-file-io/SqliteSampleBlock.cpp
index f4849f8a2b977a0e331691d5e75035cb36490a96..9ba79f29032dfd0b2f7e40e566c5ef3057db5e37 100644
--- a/libraries/lib-project-file-io/SqliteSampleBlock.cpp
+++ b/libraries/lib-project-file-io/SqliteSampleBlock.cpp
@@ -169,6 +169,11 @@ public:
SampleBlockPtr DoCreateFromId(
sampleFormat srcformat, SampleBlockID id) override;
+ SampleBlock::DeletionCallback GetSampleBlockDeletionCallback() const
+ {
+ return mSampleBlockDeletionCallback;
+ }
+
private:
void OnBeginPurge(size_t begin, size_t end);
void OnEndPurge();
@@ -177,7 +182,7 @@ private:
AudacityProject &mProject;
Observer::Subscription mUndoSubscription;
- std::optional<SampleBlock::DeletionCallback::Scope> mScope;
+ SampleBlock::DeletionCallback mSampleBlockDeletionCallback;
const std::shared_ptr<ConnectionPtr> mppConnection;
// Track all blocks that this factory has created, but don't control
@@ -288,7 +293,7 @@ SampleBlockPtr SqliteSampleBlockFactory::DoCreateFromId(
// This may throw database errors
// It initializes the rest of the fields
ssb->Load(static_cast<SampleBlockID>(id));
-
+
return ssb;
}
@@ -340,7 +345,12 @@ SqliteSampleBlock::SqliteSampleBlock(
SqliteSampleBlock::~SqliteSampleBlock()
{
- DeletionCallback::Call(*this);
+ if (
+ const auto cb = mpFactory ? mpFactory->GetSampleBlockDeletionCallback() :
+ SampleBlock::DeletionCallback {})
+ {
+ cb(*this);
+ }
if (IsSilent()) {
// The block object was constructed but failed to Load() or Commit().
@@ -1104,7 +1114,7 @@ void SqliteSampleBlockFactory::OnBeginPurge(size_t begin, size_t end)
return;
auto purgeStartTime = std::chrono::system_clock::now();
std::shared_ptr<ProgressDialog> progressDialog;
- mScope.emplace([=, nDeleted = 0](auto&) mutable {
+ mSampleBlockDeletionCallback = [=, nDeleted = 0](auto&) mutable {
++nDeleted;
if(!progressDialog)
{
@@ -1115,12 +1125,12 @@ void SqliteSampleBlockFactory::OnBeginPurge(size_t begin, size_t end)
}
else
progressDialog->Poll(nDeleted, nToDelete);
- });
+ };
}
void SqliteSampleBlockFactory::OnEndPurge()
{
- mScope.reset();
+ mSampleBlockDeletionCallback = {};
}
// Inject our database implementation at startup
diff --git a/libraries/lib-wave-track/SampleBlock.h b/libraries/lib-wave-track/SampleBlock.h
index 2fd76d10656003a06864fc42889ddcedfdb1cb29..9552bb6be96703b7743f8b037781473e94f4c720 100644
--- a/libraries/lib-wave-track/SampleBlock.h
+++ b/libraries/lib-wave-track/SampleBlock.h
@@ -46,10 +46,7 @@ public:
class WAVE_TRACK_API SampleBlock
{
public:
- //! Type of function that is informed when a block is about to be deleted
- struct DeletionCallback : GlobalHook<DeletionCallback,
- void(const SampleBlock&)
- >{};
+ using DeletionCallback = std::function<void(const SampleBlock &)>;
virtual ~SampleBlock();
diff --git a/locale/ja.po b/locale/ja.po
index 5cf87d31397051a2a74fe719b780464c4532dba6..4e1c0747f68988a01a413346f63c28775d817e27 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: audacity 3.5.0\n"
"Report-Msgid-Bugs-To: audacity-translation@lists.sourceforge.net\n"
-"POT-Creation-Date: 2024-04-04 21:13+0300\n"
-"PO-Revision-Date: 2024-04-16 16:40+0900\n"
+"POT-Creation-Date: 2024-04-24 09:59+0900\n"
+"PO-Revision-Date: 2024-04-24 10:05+0900\n"
"Last-Translator: SakiPapa <tadahisa.sugisaki@gmail.com>\n"
"Language-Team: Akira Nishimura, Atsushi YOSHIDA, Phroneris, SakiPapa\n"
"Language: ja\n"
@@ -370,7 +370,8 @@ msgstr "メッセージ"
msgid "Cannot proceed to upload."
msgstr "アップロードを続行できません。"
-#. i18n-hint: database operation has failed because the requested item was not found
+#. i18n-hint: database operation has failed because the requested item was not
+#. found
#: libraries/lib-cloud-audiocom/sync/DataUploader.cpp
#: libraries/lib-sqlite-helpers/sqlite/Error.cpp
msgid "File not found"
@@ -436,7 +437,8 @@ msgid "Applying %s..."
msgstr "「%s」を適用中..."
#. i18n-hint: "Nyquist" is an embedded interpreted programming language in
-#. Audacity, named in honor of the Swedish-American Harry Nyquist (or Nyqvist).
+#. Audacity, named in honor of the Swedish-American Harry Nyquist (or
+#. Nyqvist).
#. In the translations of this and other strings, you may transliterate the
#. name into another alphabet.
#: libraries/lib-effects/EffectBase.h
@@ -546,7 +548,8 @@ msgstr "ガウス窓（a=3.5）"
msgid "Gaussian(a=4.5)"
msgstr "ガウス窓（a=4.5）"
-#. i18n-hint: %s will be the error message from the libsndfile software library
+#. i18n-hint: %s will be the error message from the libsndfile software
+#. library
#: libraries/lib-file-formats/FileFormats.cpp
#, c-format
msgid "Error (file may not have been written): %s"
@@ -920,14 +923,12 @@ msgstr "プロジェクトをインポート"
#. i18n-hint: abbreviates "Linux Audio Developer's Simple Plugin API"
#. (Application programming interface)
-#.
#: libraries/lib-ladspa/LadspaEffectBase.h
msgid "LADSPA"
msgstr "LADSPA"
#. i18n-hint: abbreviates "Linux Audio Developer's Simple Plugin API"
#. (Application programming interface)
-#.
#: libraries/lib-ladspa/LadspaEffectsModule.cpp
msgid "LADSPA Effects"
msgstr "LADSPA エフェクト"
@@ -1361,7 +1362,8 @@ msgid "seconds + milliseconds"
msgstr "秒 + ミリ秒"
#. i18n-hint: Format string for displaying time in seconds and milliseconds
-#. * as fractional seconds. Change the comma in the middle to the 1000s separator
+#. * as fractional seconds. Change the comma in the middle to the 1000s
+#. separator
#. * for your locale, and the 'seconds' on the end to the word for seconds.
#. * Don't change the numbers. The decimal separator is specified using '<' if
#. * your languages uses a ',' or to '>' if your language uses a '.'.
@@ -1400,10 +1402,12 @@ msgstr "0100日024時間060分060秒"
#. i18n-hint: Format string for displaying time in hours, minutes, seconds
#. * and hundredths of a second. Change the 'h' to the abbreviation for hours,
-#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for seconds
+#. * 'm' to the abbreviation for minutes and 's' to the abbreviation for
+#. seconds
#. * (the hundredths are shown as decimal seconds). Don't change the numbers
#. * unless there aren't 60 minutes in an hour in your locale.
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "0100 h 060 m 060>0100 s"
@@ -1414,11 +1418,13 @@ msgid "centiseconds"
msgstr "センチ秒"
#. i18n-hint: Format string for displaying time in hours, minutes, seconds
-#. * and milliseconds. Change the 'h' to the abbreviation for hours, 'm' to the
+#. * and milliseconds. Change the 'h' to the abbreviation for hours, 'm' to
+#. the
#. * abbreviation for minutes and 's' to the abbreviation for seconds (the
#. * milliseconds are shown as decimal seconds) . Don't change the numbers
#. * unless there aren't 60 minutes in an hour in your locale.
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "0100 h 060 m 060>01000 s"
@@ -1429,7 +1435,8 @@ msgstr "0100時間060分060>01000秒"
#. * abbreviation for minutes, 's' to the abbreviation for seconds and
#. * translate samples . Don't change the numbers
#. * unless there aren't 60 seconds in a minute in your locale.
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "0100 h 060 m 060 s+># samples"
@@ -1438,7 +1445,6 @@ msgstr "0100時間060分060秒+>#サンプル"
#. i18n-hint: Name of time display format that shows time in samples (at the
#. * current project sample rate). For example the number of a sample at 1
#. * second into a recording at 44.1KHz would be 44,100.
-#.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
#: plug-ins/sample-data-export.ny
msgid "samples"
@@ -1463,7 +1469,8 @@ msgstr "時:分:秒 + フィルムフレーム（24 fps）"
#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
#. * for seconds and translate 'frames' . Don't change the numbers
#. * unless there aren't 60 seconds in a minute in your locale.
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "0100 h 060 m 060 s+>24 frames"
@@ -1494,7 +1501,8 @@ msgstr "時:分:秒 + NTSC ドロップフレーム"
#. * and frames with NTSC drop frames. Change the 'h' to the abbreviation
#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
#. * for seconds and translate 'frames'. Leave the |N alone, it's important!
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "0100 h 060 m 060 s+>30 frames|N"
@@ -1512,7 +1520,8 @@ msgstr "時:分:秒 + NTSC ノンドロップフレーム"
#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
#. * for seconds and translate 'frames'. Leave the | .999000999 alone,
#. * the whole things really is slightly off-speed!
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "0100 h 060 m 060 s+>030 frames| .999000999"
@@ -1543,7 +1552,8 @@ msgstr "時:分:秒 + PAL フレーム（25 fps）"
#. * and frames with PAL TV frames. Change the 'h' to the abbreviation
#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
#. * for seconds and translate 'frames'. Nice simple time code!
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "0100 h 060 m 060 s+>25 frames"
@@ -1574,7 +1584,8 @@ msgstr "時:分:秒 + CDDA フレーム（75 fps）"
#. * and frames with CD Audio frames. Change the 'h' to the abbreviation
#. * for hours, 'm' to the abbreviation for minutes, 's' to the abbreviation
#. * for seconds and translate 'frames'.
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "0100 h 060 m 060 s+>75 frames"
@@ -1598,7 +1609,8 @@ msgstr "0100万010000フレーム|75"
# ja: 元の「010,01000>0100 Hz」では万の位が扱えないので不足すぎると思うが、勝手に桁数を増やすわけにもいかないのでとりあえずこれで。
#. i18n-hint: Format string for displaying frequency in hertz. Change
#. * the decimal point for your locale. Don't change the numbers.
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "010,01000>0100 Hz"
@@ -1615,7 +1627,8 @@ msgstr "kHz"
#. i18n-hint: Format string for displaying frequency in kilohertz. Change
#. * the decimal point for your locale. Don't change the numbers.
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "01000>01000 kHz|0.001"
@@ -1627,7 +1640,8 @@ msgstr "ヘルツ"
#. i18n-hint: Format string for displaying log of frequency in octaves.
#. * Change the decimal points for your locale. Don't change the numbers.
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "100>01000 octaves|1.442695041"
@@ -1647,7 +1661,8 @@ msgstr "半音 + セント"
#. i18n-hint: Format string for displaying log of frequency in semitones
#. * and cents.
#. * Change the decimal points for your locale. Don't change the numbers.
-#. * The decimal separator is specified using '<' if your language uses a ',' or
+#. * The decimal separator is specified using '<' if your language uses a ','
+#. or
#. * to '>' if your language uses a '.'.
#: libraries/lib-numeric-formats/formatters/ParsedNumericConverterFormatter.cpp
msgid "1000 semitones >0100 cents|17.312340491"
@@ -2366,17 +2381,20 @@ msgstr "ストレージが一杯のため挿入できません"
msgid "Unable to open the database file"
msgstr "データベースファイルを開けません"
-#. i18n-hint: database operation has failed because the lock protocol has failed
+#. i18n-hint: database operation has failed because the lock protocol has
+#. failed
#: libraries/lib-sqlite-helpers/sqlite/Error.cpp
msgid "Database lock protocol error"
msgstr "データベースのロックプロトコルエラーです"
-#. i18n-hint: database operation has failed because the database schema has changed
+#. i18n-hint: database operation has failed because the database schema has
+#. changed
#: libraries/lib-sqlite-helpers/sqlite/Error.cpp
msgid "The database schema changed"
msgstr "データベースのスキーマが変更されました"
-#. i18n-hint: database operation has failed because the string or BLOB exceeds size limit
+#. i18n-hint: database operation has failed because the string or BLOB exceeds
+#. size limit
#: libraries/lib-sqlite-helpers/sqlite/Error.cpp
msgid "String or BLOB exceeds size limit"
msgstr "文字列または BLOB がサイズ制限を超過しました"
@@ -2396,7 +2414,8 @@ msgstr "データ型が一致しません"
msgid "Library used incorrectly"
msgstr "ライブラリが正しく使用されていません"
-#. i18n-hint: database operation has failed because the large file support is disabled
+#. i18n-hint: database operation has failed because the large file support is
+#. disabled
#: libraries/lib-sqlite-helpers/sqlite/Error.cpp
msgid "The large file support is disabled"
msgstr "大容量ファイルのサポートが無効です"
@@ -2411,12 +2430,14 @@ msgstr "認証が拒否されました"
msgid "Not used"
msgstr "使用されていません"
-#. i18n-hint: database operation has failed because the parameter is out of range
+#. i18n-hint: database operation has failed because the parameter is out of
+#. range
#: libraries/lib-sqlite-helpers/sqlite/Error.cpp
msgid "2nd parameter to sqlite3_bind out of range"
msgstr "sqlite3_bind の第2パラメータが範囲外です"
-#. i18n-hint: database operation has failed because the file opened is not a database file
+#. i18n-hint: database operation has failed because the file opened is not a
+#. database file
#: libraries/lib-sqlite-helpers/sqlite/Error.cpp
msgid "File opened that is not a database file "
msgstr "データベースファイルではありません "
@@ -2492,7 +2513,8 @@ msgid "Light"
msgstr "ライト"
#. i18n-hint: A theme is a consistent visual style across an application's
-#. graphical user interface, including choices of colors, and similarity of images
+#. graphical user interface, including choices of colors, and similarity of
+#. images
#. such as those on button controls. Audacity can load and save alternative
#. themes.
#: libraries/lib-theme/Theme.cpp
@@ -2652,7 +2674,8 @@ msgstr ""
msgid "Audio In: %d, Audio Out: %d"
msgstr "オーディオ入力: %d、オーディオ出力: %d"
-#. i18n-hint: Abbreviates Virtual Studio Technology, an audio software protocol
+#. i18n-hint: Abbreviates Virtual Studio Technology, an audio software
+#. protocol
#. developed by Steinberg GmbH
#: libraries/lib-vst/VSTEffectBase.h
msgid "VST"
@@ -2823,7 +2846,8 @@ msgstr "問題を解決するために、レポートを送信しますか?"
msgid "All reports are anonymous. See %s for more info."
msgstr "レポートはすべて匿名です。詳細については、%sをご覧ください。"
-#. i18n-hint: Title of hyperlink to the privacy policy. This is an object of "See".
+#. i18n-hint: Title of hyperlink to the privacy policy. This is an object of
+#. "See".
#: libraries/lib-wx-init/ErrorReportDialog.cpp src/AboutDialog.cpp
#: src/prefs/ApplicationPrefs.cpp src/update/UpdateNoticeDialog.cpp
msgid "our Privacy Policy"
@@ -3010,7 +3034,8 @@ msgstr "ログをファイルに保存できません: %s"
msgid "Show Log for Details"
msgstr "ログの詳細を見る"
-#. i18n-hint: In most languages OK is to be translated as OK. It appears on a button.
+#. i18n-hint: In most languages OK is to be translated as OK. It appears on a
+#. button.
#: libraries/lib-wx-init/MultiDialog.cpp
#: modules/mod-cloud-audiocom/ui/dialogs/ConnectionIssuesDialog.cpp
#: modules/mod-cloud-audiocom/ui/dialogs/SyncFailedDialog.cpp
@@ -3330,7 +3355,8 @@ msgstr "出力を表示"
#. i18n-hint: Some programmer-oriented terminology here:
#. "Data" refers to the sound to be exported, "piped" means sent,
#. and "standard in" means the default input stream that the external program,
-#. named by %f, will read. And yes, it's %f, not %s -- this isn't actually used
+#. named by %f, will read. And yes, it's %f, not %s -- this isn't actually
+#. used
#. in the program as a format string. Keep %f unchanged.
#: modules/mod-cl/ExportCL.cpp
#, c-format
@@ -3428,20 +3454,20 @@ msgid "Previews can be updated only for Cloud projects"
msgstr "プレビューはクラウドプロジェクトに対してのみ更新できます"
#: modules/mod-cloud-audiocom/menus/AudioComMenus.cpp
-msgid "Save To Cloud..."
-msgstr "クラウドに保存..."
+msgid "Save &To Cloud..."
+msgstr "クラウドに保存(&T)..."
#: modules/mod-cloud-audiocom/menus/AudioComMenus.cpp
-msgid "Update Cloud Audio Preview"
-msgstr "クラウドオーディオプレビューを更新"
+msgid "&Update Cloud Audio Preview"
+msgstr "クラウドオーディオプレビューを更新(&U)"
#: modules/mod-cloud-audiocom/menus/AudioComMenus.cpp
-msgid "Open From Cloud..."
-msgstr "クラウドから開く..."
+msgid "Open Fro&m Cloud..."
+msgstr "クラウドから開く(&M)..."
#: modules/mod-cloud-audiocom/menus/AudioComMenus.cpp
-msgid "Share Audio..."
-msgstr "オーディオ共有..."
+msgid "S&hare Audio..."
+msgstr "オーディオ共有(&H)..."
#: modules/mod-cloud-audiocom/ui/AudioComPrefsPanel.cpp
msgid "Cloud"
@@ -3971,7 +3997,8 @@ msgstr "アップロードを完了中..."
msgid "Track Title"
msgstr "トラック名"
-#. i18n-hint: %s substitutes for audio.com. %% creates a linebreak in this context.
+#. i18n-hint: %s substitutes for audio.com. %% creates a linebreak in this
+#. context.
#: modules/mod-cloud-audiocom/ui/dialogs/ShareAudioDialog.cpp
#, c-format
msgid ""
@@ -4809,15 +4836,19 @@ msgstr ""
"オプション\n"
"0 - デフォルト"
-#. i18n-hint: 'mux' is short for multiplexor, a device that selects between several inputs
-#. 'Mux Rate' is a parameter that has some bearing on compression ratio for MPEG
+#. i18n-hint: 'mux' is short for multiplexor, a device that selects between
+#. several inputs
+#. 'Mux Rate' is a parameter that has some bearing on compression ratio for
+#. MPEG
#. it has a hard to predict effect on the degree of compression
#: modules/mod-ffmpeg/ExportFFmpegOptions.cpp
msgid "Mux Rate:"
msgstr "Mux レート:"
-#. i18n-hint: 'Packet Size' is a parameter that has some bearing on compression ratio for MPEG
-#. compression. It measures how big a chunk of audio is compressed in one piece.
+#. i18n-hint: 'Packet Size' is a parameter that has some bearing on
+#. compression ratio for MPEG
+#. compression. It measures how big a chunk of audio is compressed in one
+#. piece.
#: modules/mod-ffmpeg/ExportFFmpegOptions.cpp
msgid ""
"Packet size\n"
@@ -4828,8 +4859,10 @@ msgstr ""
"オプション\n"
"0 - デフォルト"
-#. i18n-hint: 'Packet Size' is a parameter that has some bearing on compression ratio for MPEG
-#. compression. It measures how big a chunk of audio is compressed in one piece.
+#. i18n-hint: 'Packet Size' is a parameter that has some bearing on
+#. compression ratio for MPEG
+#. compression. It measures how big a chunk of audio is compressed in one
+#. piece.
#: modules/mod-ffmpeg/ExportFFmpegOptions.cpp
msgid "Packet Size:"
msgstr "パケットサイズ:"
@@ -5395,7 +5428,8 @@ msgstr "固定"
msgid "Quality"
msgstr "品質"
-#. i18n-hint: LAME is the name of an MP3 converter and should not be translated
+#. i18n-hint: LAME is the name of an MP3 converter and should not be
+#. translated
#: modules/mod-mp3/ExportMP3.cpp
msgid "Locate LAME"
msgstr "LAME の場所を指定"
@@ -6413,97 +6447,113 @@ msgstr "WavPack ファイルのデコード中に %d 個のエラーが見つか
msgid "No revision identifier was provided"
msgstr "リビジョン識別子が提供されていません"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, system administration"
msgstr "システム管理: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, co-founder and developer"
msgstr "共同創業、開発: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, designer"
msgstr "デザイン: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, developer"
msgstr "開発: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, developer and support"
msgstr "開発、サポート: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, documentation and support"
msgstr "ドキュメンテーション、サポート: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, QA tester, documentation and support"
msgstr "品質保証テスト、ドキュメンテーション、サポート: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, documentation and support, French"
msgstr "仏語ドキュメンテーション、仏語サポート: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, quality assurance"
msgstr "品質保証: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, accessibility advisor"
msgstr "アクセシビリティ・アドバイザー: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, graphic artist"
msgstr "グラフィックアーティスト: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, composer"
msgstr "コンポーザー: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, tester"
msgstr "テスター: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, Nyquist plug-ins"
msgstr "Nyquist プラグイン: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, web developer"
msgstr "ウェブ開発: %s"
-#. i18n-hint: For "About Audacity..." credits, substituting a person's proper name
+#. i18n-hint: For "About Audacity..." credits, substituting a person's proper
+#. name
#: src/AboutDialog.cpp
#, c-format
msgid "%s, graphics"
@@ -6711,16 +6761,13 @@ msgid "MP3 Import"
msgstr "MP3 インポート"
#. i18n-hint: LAME is the codec name. This name should not be translated
-#.
#: src/AboutDialog.cpp
msgid "MP3 Export"
msgstr "MP3 エクスポート"
#. i18n-hint: Opus is the codec name. This name should not be translated
-#.
#. i18n-hint: Opus is the codec name. This name should not be translated
#. i18n-hint: Opus is the codec name. This name should not be translated
-#.
#: src/AboutDialog.cpp
msgid "Opus Import and Export"
msgstr "Opus インポートとエクスポート"
@@ -6824,7 +6871,6 @@ msgstr "タイムライン"
#. i18n-hint: These commands assist the user in finding a sound by ear. ...
#. "Scrubbing" is variable-speed playback, ...
#. "Seeking" is normal speed playback but with skips
-#.
#: src/AdornedRulerPanel.cpp
msgid "Click or drag to begin Seek"
msgstr "クリックまたはドラッグしてシーク開始"
@@ -6832,7 +6878,6 @@ msgstr "クリックまたはドラッグしてシーク開始"
#. i18n-hint: These commands assist the user in finding a sound by ear. ...
#. "Scrubbing" is variable-speed playback, ...
#. "Seeking" is normal speed playback but with skips
-#.
#: src/AdornedRulerPanel.cpp
msgid "Click or drag to begin Scrub"
msgstr "クリックまたはドラッグしてスクラブ開始"
@@ -6840,7 +6885,6 @@ msgstr "クリックまたはドラッグしてスクラブ開始"
#. i18n-hint: These commands assist the user in finding a sound by ear. ...
#. "Scrubbing" is variable-speed playback, ...
#. "Seeking" is normal speed playback but with skips
-#.
#: src/AdornedRulerPanel.cpp
msgid "Click & move to Scrub. Click & drag to Seek."
msgstr "クリック&移動してスクラブ、クリック&ドラッグしてシークします。"
@@ -6848,7 +6892,6 @@ msgstr "クリック&移動してスクラブ、クリック&ドラッグして
#. i18n-hint: These commands assist the user in finding a sound by ear. ...
#. "Scrubbing" is variable-speed playback, ...
#. "Seeking" is normal speed playback but with skips
-#.
#: src/AdornedRulerPanel.cpp
msgid "Move to Seek"
msgstr "移動してシーク"
@@ -6856,7 +6899,6 @@ msgstr "移動してシーク"
#. i18n-hint: These commands assist the user in finding a sound by ear. ...
#. "Scrubbing" is variable-speed playback, ...
#. "Seeking" is normal speed playback but with skips
-#.
#: src/AdornedRulerPanel.cpp
msgid "Move to Scrub"
msgstr "移動してスクラブ"
@@ -7286,7 +7328,8 @@ msgstr "オーディオを貼り付け"
msgid "How would you like to paste your audio?"
msgstr "どのようにオーディオを貼り付けますか?"
-#. i18n-hint: %s substitutes for a file size, e.g. "345 MB". A "smart clip" is an audio clip containing hidden trimmed data.
+#. i18n-hint: %s substitutes for a file size, e.g. "345 MB". A "smart clip" is
+#. an audio clip containing hidden trimmed data.
#: src/AudioPasteDialog.cpp
#, c-format
msgid "The full smart clip is %s. Larger sizes will take longer to paste."
@@ -7420,7 +7463,8 @@ msgstr "メニューコマンド（パラメーター有り）"
msgid "Menu Command (No Parameters)"
msgstr "メニューコマンド（パラメーター無し）"
-#. i18n-hint: %s will be replaced by the name of an action, such as "Remove Tracks".
+#. i18n-hint: %s will be replaced by the name of an action, such as "Remove
+#. Tracks".
#: src/BatchCommands.cpp src/CommonCommandFlags.cpp
#, c-format
msgid "\"%s\" requires one or more tracks to be selected."
@@ -7639,7 +7683,8 @@ msgstr "新規マクロ名"
msgid "Name must not be blank"
msgstr "名前は空白にできません"
-#. i18n-hint: The %c will be replaced with 'forbidden characters', like '/' and '\'.
+#. i18n-hint: The %c will be replaced with 'forbidden characters', like '/'
+#. and '\'.
#: src/BatchProcessDialog.cpp
#, c-format
msgid "Names may not contain '%c' and '%c'"
@@ -7856,7 +7901,8 @@ msgstr "※※※ テスト失敗 ※※※\n"
msgid "Benchmark completed successfully.\n"
msgstr "ベンチマークは正常に完了しました。\n"
-#. i18n-hint: %s will be replaced by the name of an action, such as Normalize, Cut, Fade.
+#. i18n-hint: %s will be replaced by the name of an action, such as Normalize,
+#. Cut, Fade.
#: src/CommonCommandFlags.cpp
#, c-format
msgid ""
@@ -7866,7 +7912,8 @@ msgstr ""
"%s に利用するオーディオを選択して（例えば Cmd+A ですべてを選択）やり直してく"
"ださい。"
-#. i18n-hint: %s will be replaced by the name of an action, such as Normalize, Cut, Fade.
+#. i18n-hint: %s will be replaced by the name of an action, such as Normalize,
+#. Cut, Fade.
#: src/CommonCommandFlags.cpp
#, c-format
msgid ""
@@ -7880,7 +7927,8 @@ msgstr ""
msgid "No Audio Selected"
msgstr "オーディオが選択されていません"
-#. i18n-hint: %s will be replaced by the name of an effect, usually 'Noise Reduction'.
+#. i18n-hint: %s will be replaced by the name of an effect, usually 'Noise
+#. Reduction'.
#: src/CommonCommandFlags.cpp
#, c-format
msgid ""
@@ -8241,26 +8289,30 @@ msgstr "選択したデータ量が不十分です。"
msgid "s"
msgstr "秒"
-#. i18n-hint: The %d's are replaced by numbers, the %s by musical notes, e.g. A#
+#. i18n-hint: The %d's are replaced by numbers, the %s by musical notes, e.g.
+#. A#
#: src/FreqWindow.cpp
#, c-format
msgid "%d Hz (%s) = %d dB"
msgstr "%d Hz（%s）= %d dB"
-#. i18n-hint: The %d's are replaced by numbers, the %s by musical notes, e.g. A#
+#. i18n-hint: The %d's are replaced by numbers, the %s by musical notes, e.g.
+#. A#
#: src/FreqWindow.cpp
#, c-format
msgid "%d Hz (%s) = %.1f dB"
msgstr "%d Hz（%s）= %.1f dB"
-#. i18n-hint: The %d's are replaced by numbers, the %s by musical notes, e.g. A#
+#. i18n-hint: The %d's are replaced by numbers, the %s by musical notes, e.g.
+#. A#
#. * the %.4f are numbers, and 'sec' should be an abbreviation for seconds
#: src/FreqWindow.cpp
#, c-format
msgid "%.4f sec (%d Hz) (%s) = %f"
msgstr "%.4f 秒（%d Hz）（%s）= %f"
-#. i18n-hint: The %d's are replaced by numbers, the %s by musical notes, e.g. A#
+#. i18n-hint: The %d's are replaced by numbers, the %s by musical notes, e.g.
+#. A#
#. * the %.4f are numbers, and 'sec' should be an abbreviation for seconds
#: src/FreqWindow.cpp
#, c-format
@@ -8572,7 +8624,8 @@ msgid "Gain"
msgstr "ゲイン"
#. i18n-hint: title of the MIDI Velocity slider
-#. i18n-hint: Title of the Velocity slider, used to adjust the volume of note tracks
+#. i18n-hint: Title of the Velocity slider, used to adjust the volume of note
+#. tracks
#: src/MixerBoard.cpp
#: src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
#: src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp
@@ -8712,27 +8765,32 @@ msgstr "A♭"
msgid "B♭"
msgstr "B♭"
-#. i18n-hint: Two, alternate names of a musical note in the 12-tone chromatic scale
+#. i18n-hint: Two, alternate names of a musical note in the 12-tone chromatic
+#. scale
#: src/PitchName.cpp
msgid "C♯/D♭"
msgstr "C♯/D♭"
-#. i18n-hint: Two, alternate names of a musical note in the 12-tone chromatic scale
+#. i18n-hint: Two, alternate names of a musical note in the 12-tone chromatic
+#. scale
#: src/PitchName.cpp
msgid "D♯/E♭"
msgstr "D♯/E♭"
-#. i18n-hint: Two, alternate names of a musical note in the 12-tone chromatic scale
+#. i18n-hint: Two, alternate names of a musical note in the 12-tone chromatic
+#. scale
#: src/PitchName.cpp
msgid "F♯/G♭"
msgstr "F♯/G♭"
-#. i18n-hint: Two, alternate names of a musical note in the 12-tone chromatic scale
+#. i18n-hint: Two, alternate names of a musical note in the 12-tone chromatic
+#. scale
#: src/PitchName.cpp
msgid "G♯/A♭"
msgstr "G♯/A♭"
-#. i18n-hint: Two, alternate names of a musical note in the 12-tone chromatic scale
+#. i18n-hint: Two, alternate names of a musical note in the 12-tone chromatic
+#. scale
#: src/PitchName.cpp
msgid "A♯/B♭"
msgstr "A♯/B♭"
@@ -8854,7 +8912,8 @@ msgstr ""
msgid "Too Few Compatible Tracks Selected"
msgstr "適合するトラック数が足りません"
-#. i18n-hint a numerical suffix added to distinguish otherwise like-named clips when new record started
+#. i18n-hint a numerical suffix added to distinguish otherwise like-named
+#. clips when new record started
#: src/ProjectAudioManager.cpp
#, c-format
msgctxt "clip name template"
@@ -9421,7 +9480,8 @@ msgstr "［プロジェクト %02i］ "
msgid "Welcome to Audacity version %s"
msgstr "Audacity バージョン %s へようこそ"
-#. i18n-hint: The first %s numbers the project, the second %s is the project name.
+#. i18n-hint: The first %s numbers the project, the second %s is the project
+#. name.
#: src/ProjectManager.cpp
#, c-format
msgid "%sSave changes to %s?"
@@ -9504,7 +9564,6 @@ msgstr "%s（未検出）"
#. i18n-hint: undo history record
#. first parameter - realtime effect name
#. second parameter - track name
-#.
#: src/RealtimeEffectPanel.cpp
#, c-format
msgid "Removed %s from %s"
@@ -9519,7 +9578,6 @@ msgstr "%s を消去"
#. i18n-hint: undo history,
#. first and second parameters - realtime effect names
-#.
#: src/RealtimeEffectPanel.cpp
#, c-format
msgid "Replaced %s with %s"
@@ -9550,7 +9608,6 @@ msgstr "動画を視聴"
#. i18n-hint: undo history record
#. first parameter - realtime effect name
#. second parameter - track name
-#.
#: src/RealtimeEffectPanel.cpp
#, c-format
msgid "Moved %s up in %s"
@@ -9559,7 +9616,6 @@ msgstr "%s（ %s ）を上に移動"
#. i18n-hint: undo history record
#. first parameter - realtime effect name
#. second parameter - track name
-#.
#: src/RealtimeEffectPanel.cpp
#, c-format
msgid "Moved %s down in %s"
@@ -9602,7 +9658,6 @@ msgstr "プラグインエラー"
#. i18n-hint: undo history record
#. first parameter - realtime effect name
#. second parameter - track name
-#.
#: src/RealtimeEffectPanel.cpp
#, c-format
msgid "Added %s to %s"
@@ -9895,14 +9950,18 @@ msgstr "メタデータタグ"
msgid "&Metadata Editor"
msgstr "メタデータエディタ(&M)"
-#. i18n-hint: This string is used to configure the controls which shows the recording
-#. * duration. As such it is important that only the alphabetic parts of the string
+#. i18n-hint: This string is used to configure the controls which shows the
+#. recording
+#. * duration. As such it is important that only the alphabetic parts of the
+#. string
#. * are translated, with the numbers left exactly as they are.
-#. * The string 'days' indicates that the first number in the control will be the number of days,
-#. * then the 'h' indicates the second number displayed is hours, the 'm' indicates the third
-#. * number displayed is minutes, and the 's' indicates that the fourth number displayed is
+#. * The string 'days' indicates that the first number in the control will be
+#. the number of days,
+#. * then the 'h' indicates the second number displayed is hours, the 'm'
+#. indicates the third
+#. * number displayed is minutes, and the 's' indicates that the fourth number
+#. displayed is
#. * seconds.
-#.
#: src/TimeDialog.h src/TimerRecordDialog.cpp src/effects/DtmfGen.cpp
#: src/effects/Noise.cpp src/effects/Silence.cpp src/effects/ToneGen.cpp
#: src/effects/VST/VSTEditor.cpp src/effects/VST3/VST3Editor.cpp
@@ -10111,12 +10170,15 @@ msgstr "099時060分060秒"
msgid "099 days 024 h 060 m 060 s"
msgstr "099日024時間060分060秒"
-#. i18n-hint: This string is used to configure the controls for times when the recording is
-#. * started and stopped. As such it is important that only the alphabetic parts of the string
+#. i18n-hint: This string is used to configure the controls for times when the
+#. recording is
+#. * started and stopped. As such it is important that only the alphabetic
+#. parts of the string
#. * are translated, with the numbers left exactly as they are.
-#. * The 'h' indicates the first number displayed is hours, the 'm' indicates the second number
-#. * displayed is minutes, and the 's' indicates that the third number displayed is seconds.
-#.
+#. * The 'h' indicates the first number displayed is hours, the 'm' indicates
+#. the second number
+#. * displayed is minutes, and the 's' indicates that the third number
+#. displayed is seconds.
#: src/TimerRecordDialog.cpp
msgid "Start Date and Time"
msgstr "開始日時"
@@ -10398,14 +10460,16 @@ msgstr "トラックを上へ移動"
msgid "Move Track Down"
msgstr "トラックを下へ移動"
-#. i18n-hint: These are strings for the status bar, and indicate whether Audacity
+#. i18n-hint: These are strings for the status bar, and indicate whether
+#. Audacity
#. is playing or recording or stopped, and whether it is paused;
#. progressive verb form
#: src/TransportUtilities.cpp src/toolbars/ControlToolBar.cpp
msgid "Playing"
msgstr "再生"
-#. i18n-hint: These are strings for the status bar, and indicate whether Audacity
+#. i18n-hint: These are strings for the status bar, and indicate whether
+#. Audacity
#. is playing or recording or stopped, and whether it is paused;
#. progressive verb form
#: src/TransportUtilities.cpp src/prefs/MidiIOPrefs.cpp
@@ -10426,7 +10490,8 @@ msgstr "ボイスキーを使うには選択範囲が小さすぎます。"
msgid "Calibration Results\n"
msgstr "校正結果\n"
-#. i18n-hint: %1.4f is replaced by a number. sd stands for 'Standard Deviations'
+#. i18n-hint: %1.4f is replaced by a number. sd stands for 'Standard
+#. Deviations'
#: src/VoiceKey.cpp
#, c-format
msgid "Energy -- mean: %1.4f sd: (%1.4f)\n"
@@ -10446,7 +10511,8 @@ msgstr "方向の変化 -- 平均: %1.4f 標準偏差:（%1.4f）\n"
msgid "Calibration Complete"
msgstr "校正完了"
-#. i18n-hint: An item name followed by a value, with appropriate separating punctuation
+#. i18n-hint: An item name followed by a value, with appropriate separating
+#. punctuation
#: src/commands/AudacityCommand.cpp src/effects/EffectUIServices.cpp
#: src/effects/EqualizationCurves.cpp src/effects/vamp/VampEffect.cpp
#: src/import/ImportRaw.cpp src/menus/MenuHelper.cpp
@@ -10574,7 +10640,8 @@ msgid "Preferences"
msgstr "環境設定"
#. i18n-hint: "Tracks" include audio recordings but also other collections of
-#. * data associated with a time line, such as sequences of labels, and musical
+#. * data associated with a time line, such as sequences of labels, and
+#. musical
#. * notes
#: src/commands/GetInfoCommand.cpp src/commands/GetTrackInfoCommand.cpp
#: src/export/ExportAudioDialog.cpp src/prefs/TracksPrefs.cpp
@@ -11449,7 +11516,8 @@ msgstr "トラックの再生速度を変更（ピッチも変化）します"
msgid "&Speed Multiplier:"
msgstr "速度乗数(&S):"
-#. i18n-hint: "rpm" is an English abbreviation meaning "revolutions per minute".
+#. i18n-hint: "rpm" is an English abbreviation meaning "revolutions per
+#. minute".
#. "vinyl" refers to old-fashioned phonograph records
#: src/effects/ChangeSpeed.cpp
msgid "Standard Vinyl rpm:"
@@ -11457,7 +11525,6 @@ msgstr "標準レコード回転数:"
#. i18n-hint: changing speed of audio "from" one value "to" another
#. "rpm" means "revolutions per minute" as on a vinyl record turntable
-#.
#: src/effects/ChangeSpeed.cpp
msgid "From rpm"
msgstr "変更前回転数"
@@ -11470,7 +11537,6 @@ msgstr "変更前(&F)"
#. i18n-hint: changing speed of audio "from" one value "to" another
#. "rpm" means "revolutions per minute" as on a vinyl record turntable
-#.
#: src/effects/ChangeSpeed.cpp
msgid "To rpm"
msgstr "変更後回転数"
@@ -11684,20 +11750,23 @@ msgid "Attack Time"
msgstr "アタックタイム"
#. i18n-hint: Particularly in percussion, sounds can be regarded as having
-#. * an 'attack' phase where the sound builds up and a 'decay' or 'release' where the
+#. * an 'attack' phase where the sound builds up and a 'decay' or 'release'
+#. where the
#. * sound dies away.
#: src/effects/Compressor.cpp
msgid "R&elease Time:"
msgstr "リリースタイム(&E):"
#. i18n-hint: Particularly in percussion, sounds can be regarded as having
-#. * an 'attack' phase where the sound builds up and a 'decay' or 'release' where the
+#. * an 'attack' phase where the sound builds up and a 'decay' or 'release'
+#. where the
#. * sound dies away.
#: src/effects/Compressor.cpp
msgid "Release Time"
msgstr "リリースタイム"
-#. i18n-hint: Make-up, i.e. correct for any reduction, rather than fabricate it.
+#. i18n-hint: Make-up, i.e. correct for any reduction, rather than fabricate
+#. it.
#: src/effects/Compressor.cpp
msgid "Ma&ke-up gain for 0 dB after compressing"
msgstr "圧縮後 0 dB になるようメイクアップ(&K)"
@@ -11884,7 +11953,8 @@ msgstr "背景音のレベルが小さすぎます"
msgid "Background higher than foreground"
msgstr "背景音が前景音よりも大きいです"
-#. i18n-hint: WCAG2 is the 'Web Content Accessibility Guidelines (WCAG) 2.0', see http://www.w3.org/TR/WCAG20/
+#. i18n-hint: WCAG2 is the 'Web Content Accessibility Guidelines (WCAG) 2.0',
+#. see http://www.w3.org/TR/WCAG20/
#: src/effects/Contrast.cpp
msgid "WCAG2 Pass"
msgstr "WCAG2 合格"
@@ -12617,7 +12687,8 @@ msgstr "%d Hz"
msgid "%g kHz"
msgstr "%g kHz"
-#. i18n-hint k is SI abbreviation for x1,000. Usually unchanged in translation.
+#. i18n-hint k is SI abbreviation for x1,000. Usually unchanged in
+#. translation.
#: src/effects/EqualizationBandSliders.cpp
#, c-format
msgid "%gk"
@@ -12929,7 +13000,6 @@ msgstr "クリッピング"
#. size of a set, the first is the size of a subset, and not
#. understood as an ordinal (i.e., not meaning "first", or
#. "second", etc.)
-#.
#: src/effects/FindClipping.cpp
#, c-format
msgctxt "find clipping"
@@ -13197,7 +13267,8 @@ msgstr "低減(&D)"
msgid "&Isolate"
msgstr "分離(&I)"
-#. i18n-hint: Means the difference between effect and original sound. Translate differently from "Reduce" !
+#. i18n-hint: Means the difference between effect and original sound.
+#. Translate differently from "Reduce" !
#: src/effects/NoiseReduction.cpp
msgid "Resid&ue"
msgstr "残差(&U)"
@@ -13392,7 +13463,6 @@ msgstr "Paul ストレッチは、極端なタイムストレッチや「停滞
#. i18n-hint: This is how many times longer the sound will be, e.g. applying
#. * the effect to a 1-second sample, with the default Stretch Factor of 10.0
#. * will give an (approximately) 10 second sound
-#.
#: src/effects/Paulstretch.cpp
msgid "&Stretch Factor:"
msgstr "ストレッチ倍数(&S):"
@@ -13401,7 +13471,8 @@ msgstr "ストレッチ倍数(&S):"
msgid "&Time Resolution (seconds):"
msgstr "時間分解能（秒）(&T):"
-#. i18n-hint: 'Time Resolution' is the name of a control in the Paulstretch effect.
+#. i18n-hint: 'Time Resolution' is the name of a control in the Paulstretch
+#. effect.
#: src/effects/Paulstretch.cpp
#, c-format
msgid ""
@@ -13415,7 +13486,8 @@ msgstr ""
"オーディオ選択時間を少なくとも %.1f 秒以上に増やすか、\n"
"「時間分解能」を %.1f 秒未満にしてください。"
-#. i18n-hint: 'Time Resolution' is the name of a control in the Paulstretch effect.
+#. i18n-hint: 'Time Resolution' is the name of a control in the Paulstretch
+#. effect.
#: src/effects/Paulstretch.cpp
#, c-format
msgid ""
@@ -13429,7 +13501,8 @@ msgstr ""
"現在のオーディオ選択において、「時間分解能」の\n"
"最大値は %.1f 秒です。"
-#. i18n-hint: 'Time Resolution' is the name of a control in the Paulstretch effect.
+#. i18n-hint: 'Time Resolution' is the name of a control in the Paulstretch
+#. effect.
#: src/effects/Paulstretch.cpp
#, c-format
msgid ""
@@ -13687,17 +13760,20 @@ msgstr "選択したオーディオを逆方向に反転"
msgid "SBSMS Time / Pitch Stretch"
msgstr "SBSMS タイム/ピッチストレッチ"
-#. i18n-hint: Butterworth is the name of the person after whom the filter type is named.
+#. i18n-hint: Butterworth is the name of the person after whom the filter type
+#. is named.
#: src/effects/ScienFilter.cpp
msgid "Butterworth"
msgstr "バターワース"
-#. i18n-hint: Chebyshev is the name of the person after whom the filter type is named.
+#. i18n-hint: Chebyshev is the name of the person after whom the filter type
+#. is named.
#: src/effects/ScienFilter.cpp
msgid "Chebyshev Type I"
msgstr "チェビシェフ（タイプ 1）"
-#. i18n-hint: Chebyshev is the name of the person after whom the filter type is named.
+#. i18n-hint: Chebyshev is the name of the person after whom the filter type
+#. is named.
#: src/effects/ScienFilter.cpp
msgid "Chebyshev Type II"
msgstr "チェビシェフ（タイプ 2）"
@@ -13729,7 +13805,8 @@ msgstr ""
msgid "&Filter Type:"
msgstr "フィルター形式(&F):"
-#. i18n-hint: 'Order' means the complexity of the filter, and is a number between 1 and 10.
+#. i18n-hint: 'Order' means the complexity of the filter, and is a number
+#. between 1 and 10.
#: src/effects/ScienFilter.cpp
msgid "O&rder:"
msgstr "次数(&R):"
@@ -13799,32 +13876,40 @@ msgstr "無音しきい値:"
msgid "Silence Threshold"
msgstr "無音のしきい値"
-#. i18n-hint: The English would be clearer if it had 'Duration' rather than 'Time'
-#. This is a NEW experimental effect, and until we have it documented in the user
+#. i18n-hint: The English would be clearer if it had 'Duration' rather than
+#. 'Time'
+#. This is a NEW experimental effect, and until we have it documented in the
+#. user
#. manual we don't have a clear description of what this parameter does.
#. It is OK to leave it in English.
#: src/effects/ScoreAlignDialog.cpp
msgid "Presmooth Time:"
msgstr "Presmooth Time:"
-#. i18n-hint: The English would be clearer if it had 'Duration' rather than 'Time'
-#. This is a NEW experimental effect, and until we have it documented in the user
+#. i18n-hint: The English would be clearer if it had 'Duration' rather than
+#. 'Time'
+#. This is a NEW experimental effect, and until we have it documented in the
+#. user
#. manual we don't have a clear description of what this parameter does.
#. It is OK to leave it in English.
#: src/effects/ScoreAlignDialog.cpp
msgid "Presmooth Time"
msgstr "Presmooth Time"
-#. i18n-hint: The English would be clearer if it had 'Duration' rather than 'Time'
-#. This is a NEW experimental effect, and until we have it documented in the user
+#. i18n-hint: The English would be clearer if it had 'Duration' rather than
+#. 'Time'
+#. This is a NEW experimental effect, and until we have it documented in the
+#. user
#. manual we don't have a clear description of what this parameter does.
#. It is OK to leave it in English.
#: src/effects/ScoreAlignDialog.cpp
msgid "Line Time:"
msgstr "Line Time:"
-#. i18n-hint: The English would be clearer if it had 'Duration' rather than 'Time'
-#. This is a NEW experimental effect, and until we have it documented in the user
+#. i18n-hint: The English would be clearer if it had 'Duration' rather than
+#. 'Time'
+#. This is a NEW experimental effect, and until we have it documented in the
+#. user
#. manual we don't have a clear description of what this parameter does.
#. It is OK to leave it in English.
#: src/effects/ScoreAlignDialog.cpp
@@ -13835,8 +13920,10 @@ msgstr "Line Time"
msgid "Smooth Time:"
msgstr "Smooth Time:"
-#. i18n-hint: The English would be clearer if it had 'Duration' rather than 'Time'
-#. This is a NEW experimental effect, and until we have it documented in the user
+#. i18n-hint: The English would be clearer if it had 'Duration' rather than
+#. 'Time'
+#. This is a NEW experimental effect, and until we have it documented in the
+#. user
#. manual we don't have a clear description of what this parameter does.
#. It is OK to leave it in English.
#: src/effects/ScoreAlignDialog.cpp
@@ -14313,8 +14400,10 @@ msgstr "一般"
msgid "Basic"
msgstr "基本"
-#. i18n-hint: An item name introducing a value, which is not part of the string but
-#. appears in a following text box window; translate with appropriate punctuation
+#. i18n-hint: An item name introducing a value, which is not part of the
+#. string but
+#. appears in a following text box window; translate with appropriate
+#. punctuation
#: src/effects/ladspa/LadspaEditor.cpp src/effects/nyquist/Nyquist.cpp
#: src/effects/vamp/VampEffect.cpp
#: src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp
@@ -14390,7 +14479,8 @@ msgstr "Nyquist エフェクトを Audacity で使用可能にする"
msgid "Applying Nyquist Effect..."
msgstr "Nyquist エフェクトを適用中..."
-#. i18n-hint: It is acceptable to translate this the same as for "Nyquist Prompt"
+#. i18n-hint: It is acceptable to translate this the same as for "Nyquist
+#. Prompt"
#: src/effects/nyquist/Nyquist.cpp
msgid "Nyquist Worker"
msgstr "Nyquist ワーカー"
@@ -14626,7 +14716,8 @@ msgstr "プラグインの設定"
msgid "Program"
msgstr "プログラム"
-#. i18n-hint: Vamp is the proper name of a software protocol for sound analysis.
+#. i18n-hint: Vamp is the proper name of a software protocol for sound
+#. analysis.
#. It is not an abbreviation for anything. See http://vamp-plugins.org
#: src/effects/vamp/VampEffect.h
msgid "Vamp"
@@ -14942,7 +15033,6 @@ msgstr "データサイズが正しくありません。オーディオをイン
#. last number counts all clips,
#. and the last string is the name of the track containing the
#. clips.
-#.
#: src/menus/ClipMenus.cpp
#, c-format
msgid "%s %s, %d of %d clip %s"
@@ -14966,7 +15056,6 @@ msgstr "終わり"
#. last number counts all clips,
#. and the last string is the name of the track containing the
#. clips.
-#.
#: src/menus/ClipMenus.cpp
#, c-format
msgid "%s %s and %s %s, %d and %d of %d clip %s"
@@ -15332,8 +15421,8 @@ msgid "&Export Audio..."
msgstr "オーディオをエクスポート(&E)..."
#: src/menus/FileMenus.cpp
-msgid "Export Other"
-msgstr "ほかをエクスポート"
+msgid "Expo&rt Other"
+msgstr "ほかをエクスポート(&R)"
#: src/menus/FileMenus.cpp
msgid "Export &Labels..."
@@ -16027,7 +16116,6 @@ msgstr "カーソルを右へ大ジャンプ(&M)"
#. i18n-hint: These commands assist the user in finding a sound by ear. ...
#. "Scrubbing" is variable-speed playback, ...
#. "Seeking" is normal speed playback but with skips, ...
-#.
#: src/menus/SelectMenus.cpp src/tracks/ui/Scrubbing.cpp
msgid "See&k"
msgstr "シーク(&K)"
@@ -16482,7 +16570,6 @@ msgstr "フォーカストラックやその下のトラックに、ラベルト
#. first number gives the position of that label in a sequence
#. of labels,
#. and the last number is the total number of labels in the sequence.
-#.
#: src/menus/TransportMenus.cpp src/tracks/labeltrack/ui/LabelTrackView.cpp
#, c-format
msgid "%s %d of %d"
@@ -16746,7 +16833,8 @@ msgstr "波形にクリッピングを表示(&S)"
msgid "Preferences for Application"
msgstr "アプリケーションの環境設定"
-#. i18n-hint: Title for the update notifications panel in the preferences dialog.
+#. i18n-hint: Title for the update notifications panel in the preferences
+#. dialog.
#: src/prefs/ApplicationPrefs.cpp
msgid "Update notifications"
msgstr "更新通知"
@@ -17539,7 +17627,8 @@ msgstr "MIDI シンセサイザーのレイテンシは整数である必要が
msgid "Midi IO"
msgstr "MIDI 入出力"
-#. i18n-hint: Modules are optional extensions to Audacity that add NEW features.
+#. i18n-hint: Modules are optional extensions to Audacity that add NEW
+#. features.
#: src/prefs/ModulePrefs.cpp
msgid "Modules"
msgstr "モジュール"
@@ -17653,7 +17742,8 @@ msgstr "リアルタイム変換"
msgid "Sample Rate Con&verter:"
msgstr "サンプリング周波数変換(&V):"
-#. i18n-hint: technical term for randomization to reduce undesirable resampling artifacts
+#. i18n-hint: technical term for randomization to reduce undesirable
+#. resampling artifacts
#: src/prefs/QualityPrefs.cpp
msgid "&Dither:"
msgstr "ディザリング(&D):"
@@ -17666,7 +17756,8 @@ msgstr "高品質変換"
msgid "Sample Rate Conver&ter:"
msgstr "サンプリング周波数変換(&T):"
-#. i18n-hint: technical term for randomization to reduce undesirable resampling artifacts
+#. i18n-hint: technical term for randomization to reduce undesirable
+#. resampling artifacts
#: src/prefs/QualityPrefs.cpp
msgid "Dit&her:"
msgstr "ディザリング(&H):"
@@ -17691,7 +17782,8 @@ msgstr "オーディオ入力をモニタリング(&M)"
msgid "Record on a new track"
msgstr "新規トラックに録音"
-#. i18n-hint: Dropout is a loss of a short sequence audio sample data from the recording
+#. i18n-hint: Dropout is a loss of a short sequence audio sample data from the
+#. recording
#: src/prefs/RecordingPrefs.cpp
msgid "Detect dropouts"
msgstr "ドロップアウトを検出"
@@ -17792,12 +17884,14 @@ msgstr "クロスフェード(&F):"
msgid "Mel"
msgstr "メル尺度"
-#. i18n-hint: The name of a frequency scale in psychoacoustics, named for Heinrich Barkhausen
+#. i18n-hint: The name of a frequency scale in psychoacoustics, named for
+#. Heinrich Barkhausen
#: src/prefs/SpectrogramSettings.cpp
msgid "Bark"
msgstr "バーク尺度"
-#. i18n-hint: The name of a frequency scale in psychoacoustics, abbreviates Equivalent Rectangular Bandwidth
+#. i18n-hint: The name of a frequency scale in psychoacoustics, abbreviates
+#. Equivalent Rectangular Bandwidth
#: src/prefs/SpectrogramSettings.cpp
msgid "ERB"
msgstr "ERB尺度"
@@ -17807,7 +17901,8 @@ msgstr "ERB尺度"
msgid "Period"
msgstr "周期"
-#. i18n-hint: New color scheme for spectrograms, Roseus is proper name of the color scheme
+#. i18n-hint: New color scheme for spectrograms, Roseus is proper name of the
+#. color scheme
#: src/prefs/SpectrogramSettings.cpp
msgctxt "spectrum prefs"
msgid "Color (Roseus)"
@@ -17958,7 +18053,8 @@ msgstr "スペクトル選択を有効化(&B)"
msgid "Show a grid along the &Y-axis"
msgstr "グリッドを Y 軸に沿って表示(&Y)"
-#. i18n-hint: FFT stands for Fast Fourier Transform and probably shouldn't be translated
+#. i18n-hint: FFT stands for Fast Fourier Transform and probably shouldn't be
+#. translated
#: src/prefs/SpectrumPrefs.cpp
msgid "FFT Find Notes"
msgstr "FFT による音符検出"
@@ -18020,7 +18116,8 @@ msgid "The maximum number of notes must be in the range 1..128"
msgstr "最大ノート番号は 1～128 の範囲内である必要があります"
#. i18n-hint: A theme is a consistent visual style across an application's
-#. graphical user interface, including choices of colors, and similarity of images
+#. graphical user interface, including choices of colors, and similarity of
+#. images
#. such as those on button controls. Audacity can load and save alternative
#. themes.
#: src/prefs/ThemePrefs.cpp src/prefs/ThemePrefs.h
@@ -18347,7 +18444,8 @@ msgstr "2（ステレオ）録音チャンネル"
msgid "&Audio Setup Toolbar"
msgstr "オーディオ設定ツールバー(&A)"
-#. i18n-hint: These are strings for the status bar, and indicate whether Audacity
+#. i18n-hint: These are strings for the status bar, and indicate whether
+#. Audacity
#. is playing or recording or stopped, and whether it is paused;
#. progressive verb form
#: src/toolbars/ControlToolBar.cpp
@@ -18395,7 +18493,8 @@ msgid "Select to Start"
msgstr "最初まで選択"
# 末尾の ”.” は不要と思われる
-#. i18n-hint: These are strings for the status bar, and indicate whether Audacity
+#. i18n-hint: These are strings for the status bar, and indicate whether
+#. Audacity
#. is playing or recording or stopped, and whether it is paused.
#: src/toolbars/ControlToolBar.cpp src/tracks/ui/Scrubbing.cpp
#, c-format
@@ -18546,12 +18645,14 @@ msgstr " クリッピング "
msgid "Record Meter"
msgstr "録音メーター"
-#. i18n-hint: (noun) The meter that shows the loudness of the audio being recorded.
+#. i18n-hint: (noun) The meter that shows the loudness of the audio being
+#. recorded.
#: src/toolbars/MeterToolBar.cpp
msgid "Recording Level"
msgstr "録音レベル"
-#. i18n-hint: (noun) The meter that shows the loudness of the audio being recorded.
+#. i18n-hint: (noun) The meter that shows the loudness of the audio being
+#. recorded.
#. This is the name used in screen reader software, where having 'Meter' first
#. apparently is helpful to partially sighted people.
#: src/toolbars/MeterToolBar.cpp
@@ -19217,19 +19318,22 @@ msgstr[0] "%1$s、クリップ%3$d個中%2$d個目"
msgid "&Multi-view"
msgstr "同時表示(&M)"
-#. i18n-hint: This is about trimming a clip, a length in seconds like "2.4 seconds" is shown
+#. i18n-hint: This is about trimming a clip, a length in seconds like "2.4
+#. seconds" is shown
#: src/tracks/playabletrack/wavetrack/ui/WaveClipAdjustBorderHandle.cpp
#, c-format
msgid "Adjust left trim by %.02f seconds"
msgstr "左トリミングを %.02f 秒単位で調節"
-#. i18n-hint: This is about trimming a clip, a length in seconds like "2.4s" is shown
+#. i18n-hint: This is about trimming a clip, a length in seconds like "2.4s"
+#. is shown
#: src/tracks/playabletrack/wavetrack/ui/WaveClipAdjustBorderHandle.cpp
#, c-format
msgid "Trim by %.02fs"
msgstr "%.02f トリミング"
-#. i18n-hint: This is about trimming a clip, a length in seconds like "2.4 seconds" is shown
+#. i18n-hint: This is about trimming a clip, a length in seconds like "2.4
+#. seconds" is shown
#: src/tracks/playabletrack/wavetrack/ui/WaveClipAdjustBorderHandle.cpp
#, c-format
msgid "Adjust right trim by %.02f seconds"
@@ -19740,7 +19844,6 @@ msgstr "エンベロープを調整しました。"
#. i18n-hint: These commands assist the user in finding a sound by ear. ...
#. "Scrubbing" is variable-speed playback, ...
#. "Seeking" is normal speed playback but with skips, ...
-#.
#: src/tracks/ui/Scrubbing.cpp
msgid "&Scrub"
msgstr "スクラブ(&S)"
@@ -19758,7 +19861,6 @@ msgstr "シーク"
#. i18n-hint: These commands assist the user in finding a sound by ear. ...
#. "Scrubbing" is variable-speed playback, ...
#. "Seeking" is normal speed playback but with skips, ...
-#.
#: src/tracks/ui/Scrubbing.cpp
msgid "Scrub &Ruler"
msgstr "スクラブルーラー(&R)"
@@ -19820,7 +19922,8 @@ msgstr "クリック&ドラッグして周波数帯域を調整します。"
msgid "Edit, Preferences..."
msgstr "編集、環境設定..."
-#. i18n-hint: %s is usually replaced by "Ctrl+P" for Windows/Linux, "Command+," for Mac
+#. i18n-hint: %s is usually replaced by "Ctrl+P" for Windows/Linux,
+#. "Command+," for Mac
#: src/tracks/ui/SelectHandle.cpp
#, c-format
msgid "Multi-Tool Mode: %s for Mouse and Keyboard Preferences."
@@ -19834,7 +19937,8 @@ msgstr "クリック&ドラッグして周波数帯域を設定します。"
msgid "Click and drag to select audio"
msgstr "クリック&ドラッグしてオーディオを選択"
-#. i18n-hint: "Snapping" means automatic alignment of selection edges to any nearby label or clip boundaries
+#. i18n-hint: "Snapping" means automatic alignment of selection edges to any
+#. nearby label or clip boundaries
#: src/tracks/ui/SelectHandle.cpp
msgid "(snapping)"
msgstr "(スナップ中)"
@@ -19899,7 +20003,8 @@ msgstr "Command+クリック"
msgid "Ctrl+Click"
msgstr "Ctrl+クリック"
-#. i18n-hint: %s is replaced by (translation of) 'Ctrl+Click' on windows, 'Command+Click' on Mac
+#. i18n-hint: %s is replaced by (translation of) 'Ctrl+Click' on windows,
+#. 'Command+Click' on Mac
#: src/tracks/ui/TrackSelectHandle.cpp
#, c-format
msgid "%s to select or deselect track. Drag up or down to change track order."
@@ -19907,7 +20012,8 @@ msgstr ""
"%s してトラックを選択/選択解除します。上下にドラッグしてトラックの順番を変更"
"します。"
-#. i18n-hint: %s is replaced by (translation of) 'Ctrl+Click' on windows, 'Command+Click' on Mac
+#. i18n-hint: %s is replaced by (translation of) 'Ctrl+Click' on windows,
+#. 'Command+Click' on Mac
#: src/tracks/ui/TrackSelectHandle.cpp
#, c-format
msgid "%s to select or deselect track."
@@ -19959,7 +20065,8 @@ msgstr ""
"更新の自動確認についての環境設定を変更したい場合は、%s から行うことができま"
"す。"
-#. i18n-hint: Hyperlink title that opens Preferences dialog on Application page and is substituted into "... you can find it in %s." string.
+#. i18n-hint: Hyperlink title that opens Preferences dialog on Application
+#. page and is substituted into "... you can find it in %s." string.
#. i18n-hint: a page in the Preferences dialog; use same name
#: src/update/NoUpdatesAvailableDialog.cpp src/update/UpdateNoticeDialog.cpp
msgid "Preferences > Application"
@@ -20022,7 +20129,8 @@ msgstr ""
"利用者のプライバシーを守るため、個人情報の収集は行いません。しかし、更新を確"
"認するためにはネットワーク接続が必要です。"
-#. i18n-hint: Hint to the user about how to turn the app update off. %s is replaced with "Preferences > Application" link
+#. i18n-hint: Hint to the user about how to turn the app update off. %s is
+#. replaced with "Preferences > Application" link
#: src/update/UpdateNoticeDialog.cpp
#, c-format
msgid "You can turn off app update checking at any time in %s."
@@ -20247,7 +20355,8 @@ msgstr ""
msgid "You can change the directory in %s."
msgstr "ディレクトリ設定は、%s から変更することができます。"
-#. i18n-hint: Hyperlink title that opens Preferences dialog on Directories page.
+#. i18n-hint: Hyperlink title that opens Preferences dialog on Directories
+#. page.
#: src/widgets/UnwritableLocationErrorDialog.cpp
msgid "Preferences > Directories"
msgstr "［環境設定］>［ディレクトリ］"
@@ -21022,7 +21131,8 @@ msgstr "ソフトリミッティング"
msgid "Hard Limit"
msgstr "ハードリミッティング"
-#. i18n-hint: clipping of wave peaks and troughs, not division of a track into clips
+#. i18n-hint: clipping of wave peaks and troughs, not division of a track into
+#. clips
#: plug-ins/limiter.ny
msgid "Soft Clip"
msgstr "ソフトクリッピング"
@@ -21610,13 +21720,15 @@ msgstr "<b>サンプリング周波数:</b> ~a Hz."
msgid "<b>Peak Amplitude:</b> ~a (linear) ~a dB."
msgstr "<b>ピーク振幅:</b> ~a（リニア）, ~a dB."
-#. i18n-hint: RMS abbreviates root-mean-square, a method of averaging a signal; there also "weighted" versions of it but this isn't that
+#. i18n-hint: RMS abbreviates root-mean-square, a method of averaging a
+#. signal; there also "weighted" versions of it but this isn't that
#: plug-ins/sample-data-export.ny
#, lisp-format
msgid "<b>RMS</b> (unweighted): ~a dB."
msgstr "<b>RMS</b>（重みなし): ~a dB."
-#. i18n-hint: DC derives from "direct current" in electronics, really means the zero frequency component of a signal
+#. i18n-hint: DC derives from "direct current" in electronics, really means
+#. the zero frequency component of a signal
#: plug-ins/sample-data-export.ny
#, lisp-format
msgid "<b>DC Offset:</b> ~a"
diff --git a/src/ListNavigationPanel.h b/src/ListNavigationPanel.h
index 1618d7865e1c0c345be74290129b756b7f20de1e..509fd0e6c752b5dfb58bc72873e2a971f59cd9b3 100644
--- a/src/ListNavigationPanel.h
+++ b/src/ListNavigationPanel.h
@@ -13,7 +13,9 @@
#include <wx/window.h>
#include <wx/containr.h>
+#ifndef __FreeBSD__
extern template class WXDLLIMPEXP_CORE wxNavigationEnabled<wxWindow>;
+#endif
#include "ListNavigationEnabled.h"
diff --git a/src/audacity_config.h.in b/src/audacity_config.h.in
index d165cd1c44b7a6144e0569db48d6160b8decd819..dae1e96547874ce6f09be04f8ebf69c844596648 100755
--- a/src/audacity_config.h.in
+++ b/src/audacity_config.h.in
@@ -119,3 +119,5 @@
/* Define if opusfile support should be enabled */
#cmakedefine USE_OPUSFILE 1
+
+#cmakedefine AUDACITY_BUILD_LEVEL @AUDACITY_BUILD_LEVEL@