chat: tweak release notes formatting and bump version to v3.3.0 (#2964)

Signed-off-by: Jared Van Bortel <jared@nomic.ai>

gpt4all-chat/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
-## [Unreleased]
+## [3.3.0] - 2024-09-18
 
 ### Added
 - Use greedy sampling when temperature is set to zero ([#2854](https://github.com/nomic-ai/gpt4all/pull/2854))
@@ -117,7 +117,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Fix several Vulkan resource management issues ([#2694](https://github.com/nomic-ai/gpt4all/pull/2694))
 - Fix crash/hang when some models stop generating, by showing special tokens ([#2701](https://github.com/nomic-ai/gpt4all/pull/2701))
 
-[Unreleased]: https://github.com/nomic-ai/gpt4all/compare/v3.2.1...HEAD
+[3.3.0]: https://github.com/nomic-ai/gpt4all/compare/v3.2.1...v3.3.0
 [3.2.1]: https://github.com/nomic-ai/gpt4all/compare/v3.2.0...v3.2.1
 [3.2.0]: https://github.com/nomic-ai/gpt4all/compare/v3.1.1...v3.2.0
 [3.1.1]: https://github.com/nomic-ai/gpt4all/compare/v3.1.0...v3.1.1

gpt4all-chat/CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.25)  # for try_compile SOURCE_FROM_VAR
 
 set(APP_VERSION_MAJOR 3)
-set(APP_VERSION_MINOR 2)
+set(APP_VERSION_MINOR 3)
-set(APP_VERSION_PATCH 2)
+set(APP_VERSION_PATCH 0)
 set(APP_VERSION_BASE "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}")
-set(APP_VERSION "${APP_VERSION_BASE}-dev0")
+set(APP_VERSION "${APP_VERSION_BASE}")
 
 project(gpt4all VERSION ${APP_VERSION_BASE} LANGUAGES CXX C)
 

gpt4all-chat/src/download.cpp

@@ -396,8 +396,9 @@ void Download::parseReleaseJsonFile(const QByteArray &jsonData)
         QJsonObject obj = value.toObject();
 
         QString version = obj["version"].toString();
-        QString notes = obj["notes"].toString();
+        // "notes" field intentionally has a trailing newline for compatibility
-        QString contributors = obj["contributors"].toString();
+        QString notes = obj["notes"].toString().trimmed();
+        QString contributors = obj["contributors"].toString().trimmed();
         ReleaseInfo releaseInfo;
         releaseInfo.version = version;
         releaseInfo.notes = notes;

gpt4all-chat/src/qml/StartupDialog.qml

@@ -64,7 +64,7 @@ MyDialog {
                 id: welcome
                 width: 1024 - 40
                 textFormat: TextEdit.MarkdownText
-                text: qsTr("### Release notes\n%1### Contributors\n%2").arg(Download.releaseInfo.notes).arg(Download.releaseInfo.contributors)
+                text: qsTr("### Release Notes\n%1<br/>\n### Contributors\n%2").arg(Download.releaseInfo.notes).arg(Download.releaseInfo.contributors)
                 focus: false
                 readOnly: true
                 Accessible.role: Accessible.Paragraph

gpt4all-chat/translations/gpt4all_en_US.ts

@@ -1098,37 +1098,37 @@ model to get started</source>
 <context>
     <name>Download</name>
     <message>
-        <location filename="../src/download.cpp" line="278"/>
+        <location filename="../src/download.cpp" line="279"/>
         <source>Model &quot;%1&quot; is installed successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="288"/>
+        <location filename="../src/download.cpp" line="289"/>
         <source>ERROR: $MODEL_NAME is empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="294"/>
+        <location filename="../src/download.cpp" line="295"/>
         <source>ERROR: $API_KEY is empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="300"/>
+        <location filename="../src/download.cpp" line="301"/>
         <source>ERROR: $BASE_URL is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="306"/>
+        <location filename="../src/download.cpp" line="307"/>
         <source>ERROR: Model &quot;%1 (%2)&quot; is conflict.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="325"/>
+        <location filename="../src/download.cpp" line="326"/>
         <source>Model &quot;%1 (%2)&quot; is installed successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="349"/>
+        <location filename="../src/download.cpp" line="350"/>
         <source>Model &quot;%1&quot; is removed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2185,8 +2185,9 @@ NOTE: By turning on this feature, you will be sending your data to the GPT4All O
     </message>
     <message>
         <location filename="../src/qml/StartupDialog.qml" line="67"/>
-        <source>### Release notes
+        <source>### Release Notes
-%1### Contributors
+%1&lt;br/&gt;
+### Contributors
 %2</source>
         <translation type="unfinished"></translation>
     </message>

gpt4all-chat/translations/gpt4all_es_MX.ts

@@ -1134,37 +1134,37 @@ modelo para comenzar
 <context>
     <name>Download</name>
     <message>
-        <location filename="../src/download.cpp" line="278"/>
+        <location filename="../src/download.cpp" line="279"/>
         <source>Model &quot;%1&quot; is installed successfully.</source>
         <translation>El modelo &quot;%1&quot; se ha instalado correctamente.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="288"/>
+        <location filename="../src/download.cpp" line="289"/>
         <source>ERROR: $MODEL_NAME is empty.</source>
         <translation>ERROR: $MODEL_NAME está vacío.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="294"/>
+        <location filename="../src/download.cpp" line="295"/>
         <source>ERROR: $API_KEY is empty.</source>
         <translation>ERROR: $API_KEY está vacía.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="300"/>
+        <location filename="../src/download.cpp" line="301"/>
         <source>ERROR: $BASE_URL is invalid.</source>
         <translation>ERROR: $BASE_URL no es válida.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="306"/>
+        <location filename="../src/download.cpp" line="307"/>
         <source>ERROR: Model &quot;%1 (%2)&quot; is conflict.</source>
         <translation>ERROR: El modelo &quot;%1 (%2)&quot; está en conflicto.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="325"/>
+        <location filename="../src/download.cpp" line="326"/>
         <source>Model &quot;%1 (%2)&quot; is installed successfully.</source>
         <translation>El modelo &quot;%1 (%2)&quot; se ha instalado correctamente.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="349"/>
+        <location filename="../src/download.cpp" line="350"/>
         <source>Model &quot;%1&quot; is removed.</source>
         <translation>El modelo &quot;%1&quot; ha sido eliminado.</translation>
     </message>
@@ -2283,6 +2283,14 @@ NOTA: Al activar esta función, estarás enviando tus datos al Datalake de Códi
         <source>Welcome!</source>
         <translation>¡Bienvenido!</translation>
     </message>
+    <message>
+        <location filename="../src/qml/StartupDialog.qml" line="67"/>
+        <source>### Release Notes
+%1&lt;br/&gt;
+### Contributors
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/qml/StartupDialog.qml" line="71"/>
         <source>Release notes</source>
@@ -2384,11 +2392,10 @@ NOTA: Al activar esta función, estarás enviando tus datos al Datalake de Códi
         <translation>Permitir rechazar el compartir anónimo de chats con el Datalake de GPT4All</translation>
     </message>
     <message>
-        <location filename="../src/qml/StartupDialog.qml" line="67"/>
         <source>### Release notes
 %1### Contributors
 %2</source>
-        <translation>### Notas de la versión
+        <translation type="vanished">### Notas de la versión
 %1### Colaboradores
 %2
         </translation>

gpt4all-chat/translations/gpt4all_it_IT.ts

@@ -1112,37 +1112,37 @@ modello per iniziare</translation>
 <context>
     <name>Download</name>
     <message>
-        <location filename="../src/download.cpp" line="278"/>
+        <location filename="../src/download.cpp" line="279"/>
         <source>Model &quot;%1&quot; is installed successfully.</source>
         <translation>Il modello &quot;%1&quot; è stato installato correttamente.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="288"/>
+        <location filename="../src/download.cpp" line="289"/>
         <source>ERROR: $MODEL_NAME is empty.</source>
         <translation>ERRORE: $MODEL_NAME è vuoto.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="294"/>
+        <location filename="../src/download.cpp" line="295"/>
         <source>ERROR: $API_KEY is empty.</source>
         <translation>ERRORE: $API_KEY è vuoto.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="300"/>
+        <location filename="../src/download.cpp" line="301"/>
         <source>ERROR: $BASE_URL is invalid.</source>
         <translation>ERRORE: $BASE_URL non è valido.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="306"/>
+        <location filename="../src/download.cpp" line="307"/>
         <source>ERROR: Model &quot;%1 (%2)&quot; is conflict.</source>
         <translation>ERRORE: il modello &quot;%1 (%2)&quot; è in conflitto.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="325"/>
+        <location filename="../src/download.cpp" line="326"/>
         <source>Model &quot;%1 (%2)&quot; is installed successfully.</source>
         <translation>Il modello &quot;%1 (%2)&quot; è stato installato correttamente.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="349"/>
+        <location filename="../src/download.cpp" line="350"/>
         <source>Model &quot;%1&quot; is removed.</source>
         <translation>Il modello &quot;%1&quot; è stato rimosso.</translation>
     </message>
@@ -2215,11 +2215,13 @@ NOTA: attivando questa funzione, invierai i tuoi dati al Datalake Open Source di
     </message>
     <message>
         <location filename="../src/qml/StartupDialog.qml" line="67"/>
-        <source>### Release notes
+        <source>### Release Notes
-%1### Contributors
+%1&lt;br/&gt;
+### Contributors
 %2</source>
         <translation>### Note di rilascio
-%1### Contributori
+%1&lt;br/&gt;
+### Contributori
 %2</translation>
     </message>
     <message>

gpt4all-chat/translations/gpt4all_pt_BR.ts

@@ -1115,37 +1115,37 @@ modelo instalado para funcionar</translation>
 <context>
     <name>Download</name>
     <message>
-        <location filename="../src/download.cpp" line="278"/>
+        <location filename="../src/download.cpp" line="279"/>
         <source>Model &quot;%1&quot; is installed successfully.</source>
         <translation>Modelo &quot;%1&quot; instalado com sucesso.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="288"/>
+        <location filename="../src/download.cpp" line="289"/>
         <source>ERROR: $MODEL_NAME is empty.</source>
         <translation>ERRO: O nome do modelo ($MODEL_NAME) está vazio.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="294"/>
+        <location filename="../src/download.cpp" line="295"/>
         <source>ERROR: $API_KEY is empty.</source>
         <translation>ERRO: A chave da API ($API_KEY) está vazia.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="300"/>
+        <location filename="../src/download.cpp" line="301"/>
         <source>ERROR: $BASE_URL is invalid.</source>
         <translation>ERRO: A URL base ($BASE_URL) é inválida.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="306"/>
+        <location filename="../src/download.cpp" line="307"/>
         <source>ERROR: Model &quot;%1 (%2)&quot; is conflict.</source>
         <translation>ERRO: Conflito com o modelo &quot;%1 (%2)&quot;.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="325"/>
+        <location filename="../src/download.cpp" line="326"/>
         <source>Model &quot;%1 (%2)&quot; is installed successfully.</source>
         <translation>Modelo &quot;%1 (%2)&quot; instalado com sucesso.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="349"/>
+        <location filename="../src/download.cpp" line="350"/>
         <source>Model &quot;%1&quot; is removed.</source>
         <translation>Modelo &quot;%1&quot; removido.</translation>
     </message>
@@ -2227,11 +2227,13 @@ OBS.: Ao ativar este recurso, você estará enviando seus dados para o Datalake
     </message>
     <message>
         <location filename="../src/qml/StartupDialog.qml" line="67"/>
-        <source>### Release notes
+        <source>### Release Notes
-%1### Contributors
+%1&lt;br/&gt;
+### Contributors
 %2</source>
         <translation>### Notas de lançamento
-%1### Colaboradores
+%1&lt;br/&gt;
+### Colaboradores
 %2</translation>
     </message>
     <message>

gpt4all-chat/translations/gpt4all_ro_RO.ts

@@ -1200,37 +1200,37 @@ model to get started</source>
 <context>
     <name>Download</name>
     <message>
-        <location filename="../src/download.cpp" line="278"/>
+        <location filename="../src/download.cpp" line="279"/>
         <source>Model &quot;%1&quot; is installed successfully.</source>
         <translation>Modelul &quot;%1&quot; - instalat cu succes.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="288"/>
+        <location filename="../src/download.cpp" line="289"/>
         <source>ERROR: $MODEL_NAME is empty.</source>
         <translation>EROARE: $MODEL_NAME absent.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="294"/>
+        <location filename="../src/download.cpp" line="295"/>
         <source>ERROR: $API_KEY is empty.</source>
         <translation>EROARE: $API_KEY absentă</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="300"/>
+        <location filename="../src/download.cpp" line="301"/>
         <source>ERROR: $BASE_URL is invalid.</source>
         <translation>EROARE: $API_KEY incorecta</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="306"/>
+        <location filename="../src/download.cpp" line="307"/>
         <source>ERROR: Model &quot;%1 (%2)&quot; is conflict.</source>
         <translation>EROARE: Model &quot;%1 (%2)&quot; conflictual.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="325"/>
+        <location filename="../src/download.cpp" line="326"/>
         <source>Model &quot;%1 (%2)&quot; is installed successfully.</source>
         <translation>Modelul &quot;%1 (%2)&quot; - instalat cu succes.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="349"/>
+        <location filename="../src/download.cpp" line="350"/>
         <source>Model &quot;%1&quot; is removed.</source>
         <translation>Modelul &quot;%1&quot; - îndepărtat</translation>
     </message>
@@ -2532,14 +2532,21 @@ NOTE: By turning on this feature, you will be sending your data to the GPT4All O
                 care foloseşte datele tale!</translation>
     </message>
     <message>
-        <location filename="../src/qml/StartupDialog.qml" line="67"/>
         <source>### Release notes
 %1### Contributors
 %2</source>
-        <translation>### Despre versiune
+        <translation type="vanished">### Despre versiune
                 %1### Contributori
                 %2</translation>
     </message>
+    <message>
+        <location filename="../src/qml/StartupDialog.qml" line="67"/>
+        <source>### Release Notes
+%1&lt;br/&gt;
+### Contributors
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/qml/StartupDialog.qml" line="87"/>
         <source>### Opt-ins for anonymous usage analytics and datalake

gpt4all-chat/translations/gpt4all_zh_CN.ts

@@ -1202,37 +1202,37 @@ model to get started</source>
 <context>
     <name>Download</name>
     <message>
-        <location filename="../src/download.cpp" line="278"/>
+        <location filename="../src/download.cpp" line="279"/>
         <source>Model &quot;%1&quot; is installed successfully.</source>
         <translation>模型 &quot;%1&quot; 安装成功</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="288"/>
+        <location filename="../src/download.cpp" line="289"/>
         <source>ERROR: $MODEL_NAME is empty.</source>
         <translation>错误：$MODEL_NAME 为空</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="294"/>
+        <location filename="../src/download.cpp" line="295"/>
         <source>ERROR: $API_KEY is empty.</source>
         <translation>错误：$API_KEY为空</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="300"/>
+        <location filename="../src/download.cpp" line="301"/>
         <source>ERROR: $BASE_URL is invalid.</source>
         <translation>错误：$BASE_URL 非法</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="306"/>
+        <location filename="../src/download.cpp" line="307"/>
         <source>ERROR: Model &quot;%1 (%2)&quot; is conflict.</source>
         <translation>错误: 模型 &quot;%1 (%2)&quot; 有冲突.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="325"/>
+        <location filename="../src/download.cpp" line="326"/>
         <source>Model &quot;%1 (%2)&quot; is installed successfully.</source>
         <translation>模型 &quot;%1 (%2)&quot; 安装成功.</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="349"/>
+        <location filename="../src/download.cpp" line="350"/>
         <source>Model &quot;%1&quot; is removed.</source>
         <translation>模型 &quot;%1&quot; 已删除.</translation>
     </message>
@@ -2370,11 +2370,13 @@ NOTE: By turning on this feature, you will be sending your data to the GPT4All O
     </message>
     <message>
         <location filename="../src/qml/StartupDialog.qml" line="67"/>
-        <source>### Release notes
+        <source>### Release Notes
-%1### Contributors
+%1&lt;br/&gt;
+### Contributors
 %2</source>
         <translation>### 发布日志
-%1### 贡献者
+%1&lt;br/&gt;
+### 贡献者
 %2</translation>
     </message>
     <message>

gpt4all-chat/translations/gpt4all_zh_TW.ts

@@ -1105,37 +1105,37 @@ model to get started</source>
 <context>
     <name>Download</name>
     <message>
-        <location filename="../src/download.cpp" line="278"/>
+        <location filename="../src/download.cpp" line="279"/>
         <source>Model &quot;%1&quot; is installed successfully.</source>
         <translation>模型「%1」已安裝成功。</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="288"/>
+        <location filename="../src/download.cpp" line="289"/>
         <source>ERROR: $MODEL_NAME is empty.</source>
         <translation>錯誤：$MODEL_NAME 未填寫。</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="294"/>
+        <location filename="../src/download.cpp" line="295"/>
         <source>ERROR: $API_KEY is empty.</source>
         <translation>錯誤：$API_KEY 未填寫。</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="300"/>
+        <location filename="../src/download.cpp" line="301"/>
         <source>ERROR: $BASE_URL is invalid.</source>
         <translation>錯誤：$BASE_URL 無效。</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="306"/>
+        <location filename="../src/download.cpp" line="307"/>
         <source>ERROR: Model &quot;%1 (%2)&quot; is conflict.</source>
         <translation>錯誤：模型「%1 （%2）」發生衝突。</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="325"/>
+        <location filename="../src/download.cpp" line="326"/>
         <source>Model &quot;%1 (%2)&quot; is installed successfully.</source>
         <translation>模型「%1（%2）」已安裝成功。</translation>
     </message>
     <message>
-        <location filename="../src/download.cpp" line="349"/>
+        <location filename="../src/download.cpp" line="350"/>
         <source>Model &quot;%1&quot; is removed.</source>
         <translation>模型「%1」已移除。</translation>
     </message>
@@ -2274,11 +2274,13 @@ Nomic AI 將保留附加在您的資料上的所有署名訊息，並且您將
     </message>
     <message>
         <location filename="../src/qml/StartupDialog.qml" line="67"/>
-        <source>### Release notes
+        <source>### Release Notes
-%1### Contributors
+%1&lt;br/&gt;
+### Contributors
 %2</source>
         <translation>### 版本資訊
-%1### 貢獻者
+%1&lt;br/&gt;
+### 貢獻者
 %2</translation>
     </message>
     <message>