Merge branch 'develop' into dependabot/gradle/com.google.devtools.ksp…

…-2.1.10-1.0.29
TechbeeAT · Jan 29, 2025 · 33ec597 · 33ec597
2 parents ca91361 + e428167
commit 33ec597
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/app/src/main/java/at/techbee/jtx/database/ICalObject.kt b/app/src/main/java/at/techbee/jtx/database/ICalObject.kt
@@ -51,7 +51,6 @@ import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
 import java.text.ParseException
 import java.time.DayOfWeek
-import java.time.Instant
 import java.time.LocalDateTime
 import java.time.LocalTime
 import java.time.ZoneId

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -226,6 +226,24 @@
     <!-- Fuzzy -->
     <string name="collections_notes_num">"Notas: %1$s"</string>
     <string name="collections_tasks_num">"Tarefas: %1$s"</string>
+    <string name="attachments">"Anexos"</string>
+    <string name="recurrence">"Recorrência"</string>
+    <string name="recurrence_exceptions">"Exceções"</string>
+    <string name="description">"Descrição"</string>
+    <string name="search">"Pesquisar"</string>
+    <string name="search_journals">Pesquisar diários</string>
+    <string name="search_notes">Pesquisar notas</string>
+    <string name="search_todos">Pesquisar tarefas</string>
+    <string name="filter">"Filtrar"</string>
+    <string name="visibility">"Visibilidade"</string>
+    <string name="sync_now">"Sincronizar agora"</string>
+    <string name="add_time_switch">"Adicionar horário"</string>
+    <string name="progress">"Andamento"</string>
+    <string name="categories">"Categorias"</string>
+    <string name="subtasks">"Subtarefas"</string>
+    <string name="menu_collections_popup_move_entries">"Mover entradas"</string>
+    <string name="order_by_drag_and_drop">"Arrastar &amp; Soltar"</string>
+    <string name="filter_no_filter">"Sem filtro"</string>
     <!-- Buy Pro fragment -->
     <!-- alarms -->
     <!-- fragment_ical_list -->

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ compose-navigation = "2.8.5"
 glance = "1.1.1"
 #huawei = "1.8.1.300"
 #huawei-iap = "6.10.0.300"
-kotlin = "2.1.0"
+kotlin = "2.1.10"
 kotlinx-coroutines = "1.10.1"
 kotlinxSerializationJson = "1.8.0"
 # see https://github.com/google/ksp/releases for version numbers