Merge branch 'develop' into feature/password-notes

CHANGELOG.md

@@ -1,6 +1,27 @@
 # Changelog
 
-<!--ENTER CHANGELOG HERE-->
+<!--ENTER CHANGELOG HERE-->
+
+## 2.2.3 (2024-12-24)
+
+Merry Christmas! 🎄
+
+This is a stable release, it includes all the changes from the 2.2.3 nightly releases.
+Read more here: https://linwood.dev/butterfly/2.2.3
+
+## 2.2.3-rc.2 (2024-12-20)
+
+* Add area options to context menu in area navigator page
+* Add error icon to asset card
+* Move create button to the top right of the template dialog
+* Improve mobile color picker
+* Align no elements text to the center
+* Fix thumbnail in files view
+* Fix spacing in home page
+* Fix baking not working correctly when zooming in
+* Fix docker image ([#769](https://github.com/LinwoodDev/Butterfly/pull/769))
+
+Read more here: https://linwood.dev/butterfly/2.2.3-rc.2
 
 ## 2.2.3-rc.1 (2024-12-16)
 

SECURITY.md

@@ -4,8 +4,8 @@
 
 | Version   | Supported          |                                                                                                                                  |
 | --------- | ------------------ | -------------------------------------------------------------------------------------------------------------------------------- |
-| 2.2.3-dev | :warning:          | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.3-rc.2) |
-| 2.2.2     | :white_check_mark: | [Docs](https://butterfly.linwood.dev/docs/2.2/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.2)      |
+| 2.2.3-dev | :warning:          | [Docs](https://butterfly.linwood.dev/docs/2.2/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.3-rc.2) |
+| 2.2.3     | :white_check_mark: | [Docs](https://butterfly.linwood.dev/docs/2.2/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.3)      |
 | 2.1.1     | :x:                | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.1.1)      |
 | 2.0.3     | :x:                | [Docs](https://butterfly.linwood.dev/docs/2.0/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.0.3)      |
 | 1.6.1     | :x:                | [Docs](https://butterfly.linwood.dev/docs/1.6/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.6.1)      |

api/pubspec.yaml

@@ -1,6 +1,6 @@
 name: butterfly_api
 description: The Linwood Butterfly API
-version: 2.2.3-rc.2
+version: 2.3.0-beta.0
 publish_to: none
 
 environment:

app/AppImageBuilder.yml

@@ -14,7 +14,7 @@ AppDir:
     id: dev.linwood.butterfly
     name: Linwood Butterfly
     icon: dev.linwood.butterfly
-    version: 2.2.3-rc.2
+    version: 2.3.0-beta.0
     exec: butterfly
     exec_args: $@
   apt:

app/lib/l10n/app_hu.arb

@@ -50,7 +50,7 @@
   "systemLocale": "Helyi rendszer",
   "information": "Információ",
   "license": "Licensz",
-  "imprint": "Imprint",
+  "imprint": "Impresszum",
   "privacypolicy": "Adatvédelmi nyilatkozat",
   "source": "Forráskód",
   "documentation": "Dokumentáció",
@@ -59,7 +59,7 @@
   "color": "Szín",
   "description": "Leírás",
   "fill": "Kitöltés",
-  "defaultPalette": "Default palette",
+  "defaultPalette": "Alapértelmezett paletta",
   "highlighter": "Kiemelés",
   "add": "Hozzáadás",
   "remove": "Törlés",
@@ -73,7 +73,7 @@
   "strikethrough": "Áthúzás",
   "thickness": "Vastagság",
   "style": "Stílus",
-  "solid": "Solid",
+  "solid": "Szilárd",
   "double": "Dupla",
   "dotted": "Pontozott",
   "dashed": "Szaggatott",
@@ -161,35 +161,35 @@
   "selectElements": "Elemek kiválasztása",
   "deleteElements": "Elemek törlése",
   "deleteElementsConfirm": "Valóban törölni kívánja a kiválasztott elemeket?",
-  "selectCustomCollection": "Select a custom collection",
+  "selectCustomCollection": "Egyedi kollekció kiválasztása",
   "svg": "SVG",
   "sensitivity": "Érzékenység",
   "sensitivityHint": "Minél nagyobb az érték, annál érzékenyebb a bemenet",
   "horizontal": "Vízszintes",
   "vertical": "Függőleges",
   "plain": "Sima",
   "light": "Világos",
-  "ruled": "Ruled",
+  "ruled": "Szabályzott",
   "quad": "Quad",
   "music": "Zene",
   "dark": "Sötét",
   "plainDark": "Sötét",
   "ruledDark": "Ruled dark",
   "quadDark": "Quad dark",
-  "musicDark": "Music dark",
+  "musicDark": "Zene sötét",
   "templates": "Sablonok",
   "untitled": "Névtelen",
-  "createTemplate": "Create template",
-  "createTemplateContent": "Do you really want to create a template from this document? The original document will get deleted.",
-  "replace": "Replace",
-  "reallyReplace": "Do you really want to replace the template? This operation can be not undone!",
-  "defaultTemplate": "Default template",
-  "insert": "Insert",
-  "document": "Document",
-  "camera": "Camera",
+  "createTemplate": "Sablon létrehozása",
+  "createTemplateContent": "Tényleg szeretne sablont létrehozni ebből a dokumentumból? Az eredeti dokumentum törölve lesz.",
+  "replace": "Kicserélés",
+  "reallyReplace": "Tényleg ki akarja cserélni a sablont? ez a művelet visszavonhatatlan!",
+  "defaultTemplate": "Alapértelmezett sablon",
+  "insert": "Beillesztés",
+  "document": "Dokumentum",
+  "camera": "Kamera",
   "printout": "Printout",
-  "selectCamera": "Select a camera",
-  "changeDocumentPath": "Change document path",
+  "selectCamera": "Kamera kiválasztása",
+  "changeDocumentPath": "Dokumentum útvonal megváltoztatása",
   "deleteWholeStroke": "Delete whole stroke",
   "alpha": "Alpha",
   "area": "Area",

app/linux/debian/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: linwood-butterfly
-Version: 2.2.3-rc.2
+Version: 2.3.0-beta.0
 Section: base
 Priority: optional
 Homepage: https://github.com/LinwoodDev/butterfly

app/linux/debian/usr/share/metainfo/dev.linwood.butterfly.appdata.xml

@@ -38,6 +38,7 @@
 	</screenshots>
 	<launchable type="desktop-id">dev.linwood.butterfly.desktop</launchable>
 	<releases>
+		<release version="2.2.3" date="2024-12-24" />
 		<release version="2.2.2" date="2024-11-11" />
 		<release version="2.2.1" date="2024-10-17" />
 		<release version="2.2.0" date="2024-09-28" />

app/pubspec.lock

@@ -164,7 +164,7 @@ packages:
       path: "../api"
       relative: true
     source: path
-    version: "2.2.3-rc.2"
+    version: "2.3.0-beta.0"
   camera:
     dependency: "direct main"
     description:

app/pubspec.yaml

@@ -13,7 +13,7 @@ publish_to: none
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.2.3-rc.2+125
+version: 2.3.0-beta.0+127
 
 environment:
   sdk: ">=3.4.0 <4.0.0"

docs/src/content/docs/hu/docs/v2/utilities.md

@@ -23,6 +23,6 @@ The grid allows you to exactly position elements. You can use it to move element
 
 The ruler allows you to measure the distance between two points. Additionally you can use it to create a line with the pen tool.
 
-## Camera
+## Kamera
 
 To jump to a specific position or zoom to a specific level you can use this tab.

metadata/en-US/changelogs/126.txt

@@ -0,0 +1,4 @@
+Merry Christmas! 🎄
+
+This is a stable release, it includes all the changes from the 2.2.3 nightly releases.
+Read more here: https://linwood.dev/butterfly/2.2.3