Skip to content

Commit d086be4

Browse files
skyjakeskyjake
committed
Merge branch 'dev' into release
2 parents d7284d0 + 82a9a30 commit d086be4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2737
-297
lines changed

‎CMakeLists.txt

+12-7
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@
1818
cmake_minimum_required (VERSION 3.9)
1919

2020
project (Lagrange
21-
VERSION 1.18.1
21+
VERSION 1.18.2
2222
DESCRIPTION "A Beautiful Gemini Client"
2323
LANGUAGES C
2424
)
2525
set (COPYRIGHT_YEAR 2024)
2626
if (IOS)
27-
set (PROJECT_VERSION 1.17)
28-
set (IOS_BUNDLE_VERSION 13)
29-
set (IOS_BUILD_DATE "2024-07-06")
27+
set (PROJECT_VERSION 1.18)
28+
set (IOS_BUNDLE_VERSION 4)
29+
set (IOS_BUILD_DATE "2024-10-13")
3030
endif ()
3131
if (ANDROID)
32-
set (PROJECT_VERSION 1.17)
33-
set (ANDROID_BUILD_VERSION b30) # remember to update Gradle, AndroidManifest.xml
34-
set (ANDROID_BUILD_DATE "2024-07-07")
32+
set (PROJECT_VERSION 1.18)
33+
set (ANDROID_BUILD_VERSION b33) # remember to update Gradle, AndroidManifest.xml
34+
set (ANDROID_BUILD_DATE "2024-10-06")
3535
endif ()
3636

3737
# Load modules from the source tree
@@ -593,6 +593,11 @@ if (ENABLE_TUI)
593593
target_link_libraries (tuiapp PUBLIC ${SEALCURSES_LDFLAGS})
594594
endif ()
595595
set_common_app_properties (tuiapp)
596+
if (NOT ENABLE_IDLE_SLEEP)
597+
# SEALCurses does not have a waiting event getter, so ease the CPU load by sleeping
598+
# when nothing is happening.
599+
target_compile_definitions (tuiapp PUBLIC LAGRANGE_ENABLE_IDLE_SLEEP=1)
600+
endif ()
596601
endif ()
597602

598603
# Deployment.

‎ios/cmake-ios-lagrange.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ cmake ../lagrange \
1010
-Dthe_Foundation_DIR=$IOS_DIR/lib/cmake/the_Foundation \
1111
-DXCODE_DEVELOPMENT_TEAM=XXXXXXXXXX \
1212
-DENABLE_BINCAT_SH=YES \
13-
-DENABLE_DOWNLOAD_EDIT=NO
13+
-DENABLE_DOWNLOAD_EDIT=NO \
14+
-DENABLE_IPC=NO

‎lib/sealcurses

Submodule sealcurses updated from fa54118 to a28af17

‎lib/the_Foundation

Submodule the_Foundation updated from f2f2e6a to 4072d83

‎po/en.po

+8-5
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,7 @@ msgid "upload.to"
13551355
msgstr "To:"
13561356

13571357
msgid "heading.upload.id"
1358-
msgstr "Authorization"
1358+
msgstr "Credentials"
13591359

13601360
msgid "dlg.upload.id.none"
13611361
msgstr "None"
@@ -1366,6 +1366,9 @@ msgstr "Default Identity"
13661366
msgid "heading.upload.dest"
13671367
msgstr "Address"
13681368

1369+
msgid "upload.type"
1370+
msgstr "Content"
1371+
13691372
msgid "heading.upload.text"
13701373
msgstr "Text"
13711374

@@ -1429,7 +1432,7 @@ msgid "dlg.upload.sendmsg"
14291432
msgstr "Send Message"
14301433

14311434
msgid "dlg.upload.edit"
1432-
msgstr "Edit"
1435+
msgstr "Submit"
14331436

14341437
msgid "upload.port"
14351438
msgstr "Port…"
@@ -1445,15 +1448,15 @@ msgstr "Set Port"
14451448

14461449
# used on mobile
14471450
msgid "dlg.upload.text"
1448-
msgstr "Upload Plain Text"
1451+
msgstr "Enter text to upload"
14491452

14501453
# used on mobile
14511454
msgid "dlg.upload.file"
1452-
msgstr "Upload a File"
1455+
msgstr "No file selected"
14531456

14541457
# used on mobile
14551458
msgid "dlg.upload.pickfile"
1456-
msgstr "Select File"
1459+
msgstr "Select File…"
14571460

14581461
msgid "heading.translate"
14591462
msgstr "Translate Page"

‎po/es.po

+9-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
55
"POT-Creation-Date: 2023-02-28 02:15+0000\n"
6-
"PO-Revision-Date: 2024-09-10 03:07+0000\n"
6+
"PO-Revision-Date: 2024-10-10 08:49+0000\n"
77
"Last-Translator: Wally Hackenslacker <[email protected]>\n"
88
"Language-Team: Spanish <http://weblate.skyjake.fi/projects/lagrange/ui/es/>\n"
99
"Language: es\n"
@@ -1831,15 +1831,15 @@ msgstr "Identidad por Defecto"
18311831

18321832
# used on mobile
18331833
msgid "dlg.upload.text"
1834-
msgstr "Cargar Texto Plano"
1834+
msgstr "Escribir texto a cargar"
18351835

18361836
# used on mobile
18371837
msgid "dlg.upload.file"
1838-
msgstr "Cargar un Archivo"
1838+
msgstr "No hay un archivo seleccionado"
18391839

18401840
# used on mobile
18411841
msgid "dlg.upload.pickfile"
1842-
msgstr "Escoger Archivo"
1842+
msgstr "Escoger Archivo…"
18431843

18441844
msgid "heading.addfolder"
18451845
msgstr "Agregar Carpeta"
@@ -2112,7 +2112,7 @@ msgid "menu.page.upload.edit"
21122112
msgstr "Editar Página con Titan…"
21132113

21142114
msgid "heading.upload.id"
2115-
msgstr "Autorización"
2115+
msgstr "Credenciales"
21162116

21172117
msgid "menu.upload.export"
21182118
msgstr "Exportar Texto"
@@ -2798,7 +2798,7 @@ msgid "heading.upload.edit.error"
27982798
msgstr "Falló la Edición"
27992799

28002800
msgid "dlg.upload.edit"
2801-
msgstr "Editar"
2801+
msgstr "Enviar"
28022802

28032803
# Only shown in a message box when CCing self fails.
28042804
msgid "misfin.cc"
@@ -2867,3 +2867,6 @@ msgstr "Advertencias de seguridad TLS:"
28672867

28682868
msgid "misfin.self.copy"
28692869
msgstr "Enviarme una copia"
2870+
2871+
msgid "upload.type"
2872+
msgstr "Contenido"

‎po/eu.po

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
msgid ""
22
msgstr ""
33
"Report-Msgid-Bugs-To: [email protected]\n"
4-
"PO-Revision-Date: 2024-09-08 03:33+0000\n"
4+
"PO-Revision-Date: 2024-10-06 10:28+0000\n"
55
"Last-Translator: xabi <[email protected]>\n"
66
"Language-Team: Basque <http://weblate.skyjake.fi/projects/lagrange/ui/eu/>\n"
77
"Language: eu\n"
@@ -2887,3 +2887,6 @@ msgstr "Hartzailea:"
28872887

28882888
msgid "misfin.self.copy"
28892889
msgstr "Bidali kopia bat nire buruari"
2890+
2891+
msgid "upload.type"
2892+
msgstr "Edukia"

‎po/fi.po

+9-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
55
"POT-Creation-Date: 2023-03-09 05:32+0000\n"
6-
"PO-Revision-Date: 2024-09-17 13:52+0000\n"
6+
"PO-Revision-Date: 2024-10-12 17:27+0000\n"
77
"Last-Translator: Weblate Admin <[email protected]>\n"
88
"Language-Team: Finnish <http://weblate.skyjake.fi/projects/lagrange/ui/fi/>\n"
99
"Language: fi\n"
@@ -1718,7 +1718,7 @@ msgstr[1] "Sinulla on %d kirjanmerkkiä."
17181718

17191719
# used on mobile
17201720
msgid "dlg.upload.text"
1721-
msgstr "Lähetä tekstiä"
1721+
msgstr "Syötä lähetettävä teksti"
17221722

17231723
# used on mobile
17241724
msgid "heading.settings"
@@ -1774,11 +1774,12 @@ msgstr "Oletusidentiteetti"
17741774

17751775
# used on mobile
17761776
msgid "dlg.upload.file"
1777-
msgstr "Lähetä tiedosto"
1777+
msgstr "Ei valittua tiedostoa"
17781778

17791779
# used on mobile
1780+
#, fuzzy
17801781
msgid "dlg.upload.pickfile"
1781-
msgstr "Valitse tiedosto"
1782+
msgstr "Valitse tiedosto…"
17821783

17831784
msgid "heading.bookmark.tags"
17841785
msgstr "Ominaisuudet"
@@ -2710,7 +2711,7 @@ msgid "heading.upload.edit.error"
27102711
msgstr "Muokkaus epäonnistui"
27112712

27122713
msgid "dlg.upload.edit"
2713-
msgstr "Muokkaa"
2714+
msgstr "Hyväksy muutokset"
27142715

27152716
# Keyboard shortcut for the terminal. Should be very short or abbreviated.
27162717
msgid "term.linkkeys"
@@ -2821,3 +2822,6 @@ msgstr "kirjoita viesti"
28212822

28222823
msgid "dlg.upload.sendmsg"
28232824
msgstr "Lähetä viesti"
2825+
2826+
msgid "upload.type"
2827+
msgstr "Sisältö"

‎po/gl.po

+9-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
55
"POT-Creation-Date: 2023-01-25 09:20+0000\n"
6-
"PO-Revision-Date: 2024-09-13 05:07+0000\n"
6+
"PO-Revision-Date: 2024-10-06 10:28+0000\n"
77
"Last-Translator: Xosé M. <[email protected]>\n"
88
"Language-Team: Galician <http://weblate.skyjake.fi/projects/lagrange/ui/gl/>"
99
"\n"
@@ -1832,15 +1832,15 @@ msgstr "Identidade por defecto"
18321832

18331833
# used on mobile
18341834
msgid "dlg.upload.text"
1835-
msgstr "Subir texto plano"
1835+
msgstr "Escribe o texto a subir"
18361836

18371837
# used on mobile
18381838
msgid "dlg.upload.file"
1839-
msgstr "Subir un ficheiro"
1839+
msgstr "Sen ficheiro seleccionado"
18401840

18411841
# used on mobile
18421842
msgid "dlg.upload.pickfile"
1843-
msgstr "Elexir ficheiro"
1843+
msgstr "Escoller Ficheiro…"
18441844

18451845
msgid "heading.addfolder"
18461846
msgstr "Engadir Cartafol"
@@ -2111,7 +2111,7 @@ msgid "menu.page.upload.edit"
21112111
msgstr "Editar páxina con Titan…"
21122112

21132113
msgid "heading.upload.id"
2114-
msgstr "Autorización"
2114+
msgstr "Credenciais"
21152115

21162116
msgid "menu.upload.export"
21172117
msgstr "Exportar texto"
@@ -2781,7 +2781,7 @@ msgid "heading.upload.edit.error"
27812781
msgstr "Fallou a edición"
27822782

27832783
msgid "dlg.upload.edit"
2784-
msgstr "Editar"
2784+
msgstr "Enviar"
27852785

27862786
msgid "ident.sendmsg"
27872787
msgstr "Enviar mensaxe como…"
@@ -2856,3 +2856,6 @@ msgstr "Avisos de seguridade TLS:"
28562856

28572857
msgid "misfin.self.copy"
28582858
msgstr "Envíame unha copia"
2859+
2860+
msgid "upload.type"
2861+
msgstr "Contido"

‎po/ie.po

+9-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
55
"POT-Creation-Date: 2023-01-29 07:54+0000\n"
6-
"PO-Revision-Date: 2024-09-08 03:33+0000\n"
6+
"PO-Revision-Date: 2024-10-06 10:28+0000\n"
77
"Last-Translator: Olga Smirnova <[email protected]>\n"
88
"Language-Team: Occidental <http://weblate.skyjake.fi/projects/lagrange/ui/ie/"
99
">\n"
@@ -1724,15 +1724,15 @@ msgstr "Garda ti-ci págine por exportar les, o copia les in li Paperiere."
17241724

17251725
# used on mobile
17261726
msgid "dlg.upload.text"
1727-
msgstr "Cargar textu"
1727+
msgstr "Textu por cargar"
17281728

17291729
# used on mobile
17301730
msgid "dlg.upload.file"
1731-
msgstr "Cargar un file"
1731+
msgstr "Null file selectet"
17321732

17331733
# used on mobile
17341734
msgid "dlg.upload.pickfile"
1735-
msgstr "Selecter un file"
1735+
msgstr "Selecter un file…"
17361736

17371737
msgid "bookmark.export.format.tags"
17381738
msgstr "Etiquettes es format per rubricas de nivelle 2."
@@ -2058,7 +2058,7 @@ msgid "menu.share"
20582058
msgstr "Partir"
20592059

20602060
msgid "heading.upload.id"
2061-
msgstr "Autorisation"
2061+
msgstr "Legitimation"
20622062

20632063
msgid "menu.upload.export"
20642064
msgstr "Exportar li textu"
@@ -2824,10 +2824,13 @@ msgid "misfin.unknown"
28242824
msgstr "Ne successat communicar con li servitor."
28252825

28262826
msgid "dlg.upload.edit"
2827-
msgstr "Redacter"
2827+
msgstr "Inviar"
28282828

28292829
msgid "ident.sendmsg"
28302830
msgstr "Inviar quam…"
28312831

28322832
msgid "misfin.self.copy"
28332833
msgstr "Inviar un copie a me"
2834+
2835+
msgid "upload.type"
2836+
msgstr "Contenete"

‎po/ru.po

+10-7
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
55
"POT-Creation-Date: 2023-01-22 13:09+0000\n"
6-
"PO-Revision-Date: 2024-09-06 05:00+0000\n"
7-
"Last-Translator: Nikolay Korotkiy <sikmir@gmail.com>\n"
6+
"PO-Revision-Date: 2024-10-06 10:28+0000\n"
7+
"Last-Translator: Olga Smirnova <mistresssilvara@hotmail.com>\n"
88
"Language-Team: Russian <http://weblate.skyjake.fi/projects/lagrange/ui/ru/>\n"
99
"Language: ru\n"
1010
"MIME-Version: 1.0\n"
@@ -1837,15 +1837,15 @@ msgstr "Клиентский сертификат по умолчанию"
18371837

18381838
# used on mobile
18391839
msgid "dlg.upload.text"
1840-
msgstr "Загрузить простой текст"
1840+
msgstr "Введите загружаемый текст"
18411841

18421842
# used on mobile
18431843
msgid "dlg.upload.file"
1844-
msgstr "Загрузить файл"
1844+
msgstr "Файл не выбран"
18451845

18461846
# used on mobile
18471847
msgid "dlg.upload.pickfile"
1848-
msgstr "Выбрать файл"
1848+
msgstr "Выбрать файл…"
18491849

18501850
msgid "upload.id"
18511851
msgstr "Клиентский сертификат:"
@@ -2106,7 +2106,7 @@ msgid "menu.share"
21062106
msgstr "Поделиться"
21072107

21082108
msgid "heading.upload.id"
2109-
msgstr "Авторизация"
2109+
msgstr "Учетные данные"
21102110

21112111
msgid "menu.upload.delete"
21122112
msgstr "Удалить всё"
@@ -2833,7 +2833,7 @@ msgid "upload.to"
28332833
msgstr "Кому:"
28342834

28352835
msgid "dlg.upload.edit"
2836-
msgstr "Редактировать"
2836+
msgstr "Отправить"
28372837

28382838
msgid "heading.upload.error.file"
28392839
msgstr "Неверный файл"
@@ -2846,3 +2846,6 @@ msgstr "Путь к файлу:"
28462846

28472847
msgid "misfin.self.copy"
28482848
msgstr "Отправить мне копию"
2849+
2850+
msgid "upload.type"
2851+
msgstr "Содержимое"

0 commit comments

Comments
 (0)