Merge branch 'dev' into release

CMakeLists.txt

@@ -18,20 +18,20 @@
 cmake_minimum_required (VERSION 3.9)
 
 project (Lagrange
-    VERSION 1.17.0
+    VERSION 1.17.1
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
 set (COPYRIGHT_YEAR 2023)
 if (IOS)
-    set (PROJECT_VERSION 1.16)
-    set (IOS_BUNDLE_VERSION 5)
-    set (IOS_BUILD_DATE "2023-07-31")
+    set (PROJECT_VERSION 1.17)
+    set (IOS_BUNDLE_VERSION 3)
+    set (IOS_BUILD_DATE "2023-10-21")
 endif ()
 if (ANDROID)
-    set (PROJECT_VERSION 1.16)
-    set (ANDROID_BUILD_VERSION b21)  # remember to update Gradle, AndroidManifest.xml
-    set (ANDROID_BUILD_DATE "2023-07-31")
+    set (PROJECT_VERSION 1.17)
+    set (ANDROID_BUILD_VERSION b23)  # remember to update Gradle, AndroidManifest.xml
+    set (ANDROID_BUILD_DATE "2023-10-21")
 endif ()
 
 # Load modules from the source tree
@@ -207,8 +207,10 @@ set (SOURCES
     src/resources.h
     src/sitespec.c
     src/sitespec.h
+    src/snippets.c
+    src/snippets.h
     src/stb_image.h
-    src/stb_image_resize.h
+    src/stb_image_resize2.h
     src/stb_truetype.h
     src/updater.h
     src/visited.c
@@ -379,9 +381,7 @@ endif ()
 
 # Target.
 if (NOT ANDROID)
-    add_executable (app ${SOURCES} ${RESOURCES} ${EMB_FONTS}
-        src/snippets.h
-        src/snippets.c)
+    add_executable (app ${SOURCES} ${RESOURCES} ${EMB_FONTS})
 else ()
     # The whole app becomes one shared library, based on this static one.
     add_library (app SHARED ${SOURCES})
@@ -534,6 +534,9 @@ if (APPLE AND NOT ENABLE_TUI)
     endif ()
 endif ()
 if (ANDROID)
+    if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+        target_compile_options (app PUBLIC -mfpu=neon-vfpv4) # 32-bit stb_image_resize2
+    endif ()
     target_compile_definitions (app PUBLIC
         LAGRANGE_ANDROID_VERSION="${ANDROID_BUILD_VERSION}"
         LAGRANGE_ANDROID_BUILD_DATE="${ANDROID_BUILD_DATE}"
@@ -545,11 +548,11 @@ if (MSYS)
         target_link_libraries (app PUBLIC winsparkle)
     endif ()
 endif ()
-if (UNIX)
-    target_link_libraries (app PUBLIC m)
-endif ()
+#if (UNIX)
+#    target_link_libraries (app PUBLIC m)
+#endif ()
 if (HAIKU)
-    target_link_libraries (app PUBLIC m network bsd)
+    target_link_libraries (app PUBLIC network bsd)
 endif ()
 
 # Deployment.

README.md

@@ -95,7 +95,6 @@ Note that the `install` target also deploys an XDG .desktop file for launching t
 | `ENABLE_KERNING` | Use kerning information in the fonts to adjust glyph placement. Setting this **ON** improves text appearance in subtle ways but slows down text rendering. It may be a good idea to set this to **OFF** when running on a slow CPU. This option only affects the simple built-in text renderer, and has no effect on HarfBuzz. |
 | `ENABLE_MPG123` | Use the mpg123 library for decoding MPEG audio files. |
 | `ENABLE_RELATIVE_EMBED` | Locate resources only in relation to the executable. Useful when any system/predefined directories are not supposed to be accessed, e.g., in the Windows portable build. |
-| `ENABLE_RESOURCE_EMBED` | Embed all resource files into the Lagrange executable instead of keeping them in a separate file that gets loaded at launch. Setting this **ON** makes it much slower to run CMake and to compile Lagrange. |
 | `ENABLE_TUI` | Build the TUI version (`clagrange`). The SEALCurses library is required: it is used instead of SDL. |
 | `ENABLE_WEBP` | Use libwebp to decode .webp images, if `pkg-config` can find the library. |
 | `ENABLE_WINDOWPOS_FIX` | Set correct window position after the window has already been shown. This may be necessary on some platforms to prevent the window from being restored to the wrong position. |

po/en.po

@@ -927,7 +927,7 @@ msgid "menu.input.clear"
 msgstr "Clear History"
 
 msgid "menu.input.restore"
-msgstr "Restore previous:"
+msgstr "Restore Previous:"
 
 # Paste the line preceding the clicked link into the input prompt.
 msgid "menu.input.precedingline"
@@ -1281,7 +1281,10 @@ msgid "dlg.upload.id.none"
 msgstr "None"
 
 msgid "dlg.upload.id.default"
-msgstr "Default"
+msgstr "Default Identity"
+
+msgid "heading.upload.dest"
+msgstr "Address"
 
 msgid "heading.upload.text"
 msgstr "Text"
@@ -1966,6 +1969,9 @@ msgstr "Colorful Dark"
 msgid "prefs.doctheme.name.colorfullight"
 msgstr "Colorful Light"
 
+msgid "prefs.doctheme.name.vibrantlight"
+msgstr "Vibrant Light"
+
 msgid "prefs.doctheme.name.black"
 msgstr "Black"
 
@@ -2612,9 +2618,12 @@ msgstr "Delete"
 msgid "menu.snip.prefs"
 msgstr "Configure…"
 
-msgid "heading.snip"
+msgid "heading.snip.new"
 msgstr "New Snippet"
 
+msgid "heading.snip.edit"
+msgstr "Edit Snippet"
+
 msgid "snip.name"
 msgstr "Name:"
 

po/es.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2023-02-28 02:15+0000\n"
-"PO-Revision-Date: 2023-10-04 05:14+0000\n"
+"PO-Revision-Date: 2023-10-18 04:14+0000\n"
 "Last-Translator: Wally Hackenslacker <[email protected]>\n"
 "Language-Team: Spanish <http://weblate.skyjake.fi/projects/lagrange/ui/es/>\n"
 "Language: es\n"
@@ -1827,7 +1827,7 @@ msgstr[0] "Borrar Marcador"
 msgstr[1] "Borrar %u Marcadores"
 
 msgid "dlg.upload.id.default"
-msgstr "Por Defecto"
+msgstr "Identidad por Defecto"
 
 # used on mobile
 msgid "dlg.upload.text"
@@ -2605,7 +2605,7 @@ msgid "menu.input.clear"
 msgstr "Limpiar Historial"
 
 msgid "menu.input.restore"
-msgstr "Restaurar anterior:"
+msgstr "Restaurar Anterior:"
 
 msgid "dlg.import.intofolder"
 msgstr "Añadir a la Carpeta:"
@@ -2725,5 +2725,11 @@ msgstr "Contenido:"
 msgid "sniped.new"
 msgstr "Nuevo Fragmento"
 
-msgid "heading.snip"
+msgid "heading.upload.dest"
+msgstr "Dirección"
+
+msgid "heading.snip.new"
 msgstr "Nuevo Fragmento"
+
+msgid "heading.snip.edit"
+msgstr "Editar Fragmento"

po/eu.po

@@ -2789,9 +2789,6 @@ msgstr "Ezabatu"
 msgid "menu.snip.prefs"
 msgstr "Ezarri…"
 
-msgid "heading.snip"
-msgstr "Mozkin berria"
-
 msgid "snip.name"
 msgstr "Izena:"
 

po/fi.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2023-03-09 05:32+0000\n"
-"PO-Revision-Date: 2023-10-01 15:16+0000\n"
+"PO-Revision-Date: 2023-10-21 04:38+0000\n"
 "Last-Translator: Weblate Admin <[email protected]>\n"
 "Language-Team: Finnish <http://weblate.skyjake.fi/projects/lagrange/ui/fi/>\n"
 "Language: fi\n"
@@ -1770,7 +1770,7 @@ msgid "dlg.upload.id.none"
 msgstr "Ei identiteettiä"
 
 msgid "dlg.upload.id.default"
-msgstr "Oletus"
+msgstr "Oletusidentiteetti"
 
 # used on mobile
 msgid "dlg.upload.file"
@@ -2576,9 +2576,6 @@ msgstr "Poista"
 msgid "menu.snip.prefs"
 msgstr "Asetukset…"
 
-msgid "heading.snip"
-msgstr "Uusi katkelma"
-
 msgid "snip.name"
 msgstr "Nimi:"
 
@@ -2679,3 +2676,15 @@ msgstr "Syötteiden päivitysväli:"
 
 msgid "prefs.feedinterval.manual"
 msgstr "Manuaalinen"
+
+msgid "prefs.doctheme.name.vibrantlight"
+msgstr "Eloisa"
+
+msgid "heading.upload.dest"
+msgstr "Osoite"
+
+msgid "heading.snip.new"
+msgstr "Uusi katkelma"
+
+msgid "heading.snip.edit"
+msgstr "Muokkaa katkelmaa"

po/gl.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2023-01-25 09:20+0000\n"
-"PO-Revision-Date: 2023-10-04 05:14+0000\n"
+"PO-Revision-Date: 2023-10-18 04:14+0000\n"
 "Last-Translator: Xosé M. <[email protected]>\n"
 "Language-Team: Galician <http://weblate.skyjake.fi/projects/lagrange/ui/gl/>"
 "\n"
@@ -1828,7 +1828,7 @@ msgid "dlg.certimport.pickfile"
 msgstr "Importar ficheiro de Certificado/Chave"
 
 msgid "dlg.upload.id.default"
-msgstr "Por defecto"
+msgstr "Identidade por defecto"
 
 # used on mobile
 msgid "dlg.upload.text"
@@ -2630,7 +2630,7 @@ msgid "menu.input.clear"
 msgstr "Limpar Historial"
 
 msgid "menu.input.restore"
-msgstr "Restablecer anterior:"
+msgstr "Restablecer Anterior:"
 
 msgid "dlg.import.intofolder"
 msgstr "Engadir ao Cartafol:"
@@ -2713,14 +2713,20 @@ msgstr "Eliminar"
 msgid "menu.snip.prefs"
 msgstr "Configurar…"
 
-msgid "heading.snip"
-msgstr "Novo Anaco"
-
 msgid "snip.name"
 msgstr "Nome:"
 
 msgid "snip.content"
 msgstr "Contido:"
 
 msgid "snip.accept"
-msgstr "Gardar Anaco"
+msgstr "Gardar Atallo"
+
+msgid "heading.upload.dest"
+msgstr "Enderezo"
+
+msgid "heading.snip.new"
+msgstr "Novo Atallo"
+
+msgid "heading.snip.edit"
+msgstr "Editar Atallo"