From bc50e215326294c73036d9fd16d0a18676955936 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Wed, 1 Jul 2020 12:59:38 +0100
Subject: [PATCH] .aup3 Tweaks

- SQLite added to libs in readme.txt
- User message 'aup not associated' updated to 'aup3'
- Typos strind -> string, in -> is
- No translation of debug message
---
 README.txt            |  4 ++++
 src/AudacityApp.cpp   |  2 +-
 src/AutoRecovery.cpp  |  2 +-
 src/ProjectFileIO.cpp | 11 ++++++-----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index e16586a42..8d16139de 100644
--- a/README.txt
+++ b/README.txt
@@ -172,6 +172,10 @@ GPL-compatible license.  Specifically:
     Changes tempo without changing pitch and vice versa.
     Included in audacity
 
+  SQLite: Public Domain
+    Small and fast SQL database engine.
+    Included in audacity
+
   Twolame: LGPL
     Encodes MPEG I layer 2 audio (used in DVDs and Radio). Optional separate
     download.
diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 2da58b896..721984a8c 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -2215,7 +2215,7 @@ void AudacityApp::AssociateFileTypes()
    int wantAssoc =
       AudacityMessageBox(
          XO(
-"Audacity project (.AUP) files are not currently \nassociated with Audacity. \n\nAssociate them, so they open on double-click?"),
+"Audacity project (.aup3) files are not currently \nassociated with Audacity. \n\nAssociate them, so they open on double-click?"),
          XO("Audacity Project Files"),
          wxYES_NO | wxICON_QUESTION);
 
diff --git a/src/AutoRecovery.cpp b/src/AutoRecovery.cpp
index 22fa5904e..a4ac5ade9 100644
--- a/src/AutoRecovery.cpp
+++ b/src/AutoRecovery.cpp
@@ -47,7 +47,7 @@ text or binary format to a file.
 // All strings are in native unicode format, 2-byte or 4-byte.
 //
 // All name "lengths" are 2-byte signed, so are limited to 32767 bytes long.
-// All strind/data "lengths" are 4-byte signed.
+// All string/data "lengths" are 4-byte signed.
 
 enum FieldTypes
 {
diff --git a/src/ProjectFileIO.cpp b/src/ProjectFileIO.cpp
index d364f9a9a..dff23da1f 100644
--- a/src/ProjectFileIO.cpp
+++ b/src/ProjectFileIO.cpp
@@ -216,7 +216,7 @@ sqlite3 *ProjectFileIO::OpenDB(FilePath fileName)
    int rc = sqlite3_open(fileName, &mDB);
    if (rc != SQLITE_OK)
    {
-      // AUD3 TODO COMPLAIN AND THROW - crash in inevitable otherwise
+      // AUD3 TODO COMPLAIN AND THROW - crash is inevitable otherwise
       return nullptr;
    }
 
@@ -228,7 +228,7 @@ sqlite3 *ProjectFileIO::OpenDB(FilePath fileName)
    {
       CloseDB();
 
-      // AUD3 TODO COMPLAIN AND THROW - crash in inevitable otherwise
+      // AUD3 TODO COMPLAIN AND THROW - crash is inevitable otherwise
       return nullptr;
    }
 
@@ -356,7 +356,8 @@ wxString ProjectFileIO::GetValue(const char *sql)
    int rc = Exec(sql, getresult, &value);
    if (rc != SQLITE_OK)
    {
-      wxLogDebug(wxT("SQLITE error %s"), mLastError.Translation());
+      wxLogDebug(wxT("%s"), mLastError.Debug());
+      // AUD TODO Handle error.
    }
 
    return value;
@@ -380,7 +381,7 @@ bool ProjectFileIO::GetBlob(const char *sql, wxMemoryBuffer &buffer)
    if (rc != SQLITE_OK)
    {
       wxLogDebug(wxT("SQLITE error %s"), sqlite3_errmsg(db));
-      // handle error
+      // AUD TODO handle error
       return false;
    }
 
@@ -388,7 +389,7 @@ bool ProjectFileIO::GetBlob(const char *sql, wxMemoryBuffer &buffer)
    if (rc != SQLITE_ROW)
    {
       wxLogDebug(wxT("SQLITE error %s"), sqlite3_errmsg(db));
-      // handle error
+      // AUD TODO handle error
       return false;
    }