Merge branch 'master' into fix-percent

elementary · Nov 30, 2023 · b084d3d · b084d3d
2 parents 6c09010 + dd28a8a
commit b084d3d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/data/calculator.metainfo.xml.in b/data/calculator.metainfo.xml.in
@@ -15,10 +15,10 @@
 
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/calculator/2.0.2/data/screenshot@2x.png</image>
+      <image>https://raw.githubusercontent.com/elementary/calculator/2.0.3/data/screenshot@2x.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/calculator/2.0.2/data/screenshot-extended@2x.png</image>
+      <image>https://raw.githubusercontent.com/elementary/calculator/2.0.3/data/screenshot-extended@2x.png</image>
     </screenshot>
   </screenshots>
 
@@ -55,6 +55,19 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
+    <release version="2.0.3" date="2023-11-29" urgency="medium">
+      <description>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Branding color changed to Mint 500</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/calculator/issues/259">Fix crash when pasting into division or multiplication expression</issue>
+      </issues>
+    </release>
+
     <release version="2.0.2" date="2023-05-30" urgency="medium">
       <description>
         <p>Minor updates:</p>

diff --git a/data/io.elementary.calculator.gschema.xml b/data/io.elementary.calculator.gschema.xml
@@ -16,10 +16,5 @@
             <summary>Saves the decimal places for displayed values.</summary>
             <description>Saves the decimal places for displayed values.</description>
         </key>
-        <key name="window-position" type="(ii)">
-            <default>(-1, -1)</default>
-            <summary>Window position.</summary>
-            <description>Saved position of main calculator window.</description>
-        </key>
     </schema>
 </schemalist>
diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
     'io.elementary.calculator', 'vala', 'c',
     meson_version : '>= 0.58.0',
-    version: '2.0.2'
+    version: '2.0.3'
 )
 
 gnome = import('gnome')

diff --git a/po/extra/sk.po b/po/extra/sk.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: pantheon-calculator\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-30 18:04+0000\n"
-"PO-Revision-Date: 2022-12-26 20:25+0000\n"
+"PO-Revision-Date: 2023-10-27 10:10+0000\n"
 "Last-Translator: JohnDumpling <john_dumpling@protonmail.com>\n"
 "Language-Team: Slovak <https://l10n.elementary.io/projects/calculator/extra/"
 "sk/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.14.2\n"
+"X-Generator: Weblate 5.0.2\n"
 "X-Launchpad-Export-Date: 2016-12-31 04:44+0000\n"
 
 #: data/calculator.metainfo.xml.in:10
@@ -50,11 +50,11 @@ msgstr "Drobné aktualizácie:"
 
 #: data/calculator.metainfo.xml.in:55
 msgid "Always use elementary styles and icons, even on other platforms"
-msgstr ""
+msgstr "Vždy použiť štýly a ikonky elementary, aj na iných platformách"
 
 #: data/calculator.metainfo.xml.in:56
 msgid "Always paste text with the keyboard shortcut \"Ctrl + V\""
-msgstr ""
+msgstr "Vždy prilepiť text klávesovou skratkou „Ctrl + V“"
 
 #: data/calculator.metainfo.xml.in:57 data/calculator.metainfo.xml.in:72
 #: data/calculator.metainfo.xml.in:82 data/calculator.metainfo.xml.in:92