From f5751ee9cff2791f8f34fffb1b508eb0666283b3 Mon Sep 17 00:00:00 2001 From: Tobias Bernard Date: Tue, 26 Mar 2024 17:26:15 +0100 Subject: [PATCH 01/13] metainfo: add brand colors (#1057) --- crates/rnote-ui/data/app.metainfo.xml.in.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/rnote-ui/data/app.metainfo.xml.in.in b/crates/rnote-ui/data/app.metainfo.xml.in.in index 1fab655f36..d91d07fdaf 100644 --- a/crates/rnote-ui/data/app.metainfo.xml.in.in +++ b/crates/rnote-ui/data/app.metainfo.xml.in.in @@ -745,5 +745,8 @@ Breakages in the file format will be explicitly announced (but we'll work as har - - \ No newline at end of file + + #ffbe6f + #613583 + + From 942f6007a629cfe71cdaa03db931e3e9232806a5 Mon Sep 17 00:00:00 2001 From: Felix Zwettler Date: Sat, 30 Mar 2024 14:24:46 +0100 Subject: [PATCH 02/13] build: move update-translations in script --- ...ranslation.yml => update-translations.yml} | 15 +++--------- MAINTAINING.md | 4 +++- build-aux/update-translations.sh | 24 +++++++++++++++++++ crates/rnote-ui/po/LINGUAS | 2 +- crates/rnote-ui/po/zh_Hant.po | 6 ++--- 5 files changed, 34 insertions(+), 17 deletions(-) rename .github/workflows/{update-translation.yml => update-translations.yml} (75%) create mode 100755 build-aux/update-translations.sh diff --git a/.github/workflows/update-translation.yml b/.github/workflows/update-translations.yml similarity index 75% rename from .github/workflows/update-translation.yml rename to .github/workflows/update-translations.yml index 374ed0d682..dfbed52d45 100644 --- a/.github/workflows/update-translation.yml +++ b/.github/workflows/update-translations.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: workflow_call: -name: Update Translation +name: Update Translations concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -35,18 +35,9 @@ jobs: git config --local user.email "github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" - - name: Generate zh_Hant from zh_Hans + - name: Update translations run: | - cat ./crates/rnote-ui/po/LINGUAS \ - | sed -e 's|zh_Hans|zh_Hans\nzh_CN\nzh_SG|' \ - -e 's|zh_Hant|zh_Hant\nzh_HK\nzh_TW|' \ - | sort -uo ./crates/rnote-ui/po/LINGUAS - - cat ./crates/rnote-ui/po/zh_Hans.po \ - | sed -e 's|Language: zh_Hans|Language: zh_Hant|' \ - -e 's|Last-Translator:|Last-Translator: openCC converted|' \ - | opencc -c /usr/share/opencc/s2twp.json \ - -o ./crates/rnote-ui/po/zh_Hant.po + bash ./build-aux/update-translations.sh - name: Commit changes id: commit-changes diff --git a/MAINTAINING.md b/MAINTAINING.md index 387301a487..1815cfeae3 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -96,10 +96,12 @@ unlock the weblate repo to resynchronize with upstream. ## Update the "Chinese Traditional" Translation (zh_Hant.po) Manually +The package providing the `opencc` tool (`opencc-tools` on Fedora) needs to be installed to regenerate the translation. + To autogenerate chinese traditional translation (`zh_Hant`) from chinese simplified (`zh_Hans`), use opencc: ```bash -opencc -i crates/rnote-ui/po/zh_Hans.po -o crates/rnote-ui/po/zh_Hant.po -c /usr/share/opencc/s2twp.json +./build-aux/update-translations.sh ``` discussed in [issue 220](https://github.com/flxzt/rnote/issues/220) diff --git a/build-aux/update-translations.sh b/build-aux/update-translations.sh new file mode 100755 index 0000000000..f2332e842c --- /dev/null +++ b/build-aux/update-translations.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +script_dir=$(dirname "$0") + +if ! command -v opencc &> /dev/null +then + echo "The 'opencc' tool needs to be installed and present in PATH" + exit 1 +fi + + +# Regenerate 'zh_Hant' translation from 'zh_Hans' +sed \ + -e 's|zh_Hans|zh_Hans\nzh_CN\nzh_SG|' \ + -e 's|zh_Hant|zh_Hant\nzh_HK\nzh_TW|' \ + "${script_dir}/../crates/rnote-ui/po/LINGUAS" \ + | sort -uo "${script_dir}/../crates/rnote-ui/po/LINGUAS" + +sed \ + -e 's|Language: zh_Hans|Language: zh_Hant|' \ + -e 's|Last-Translator:|Last-Translator: openCC converted|' \ + "${script_dir}/../crates/rnote-ui/po/zh_Hans.po" \ + | opencc -c /usr/share/opencc/s2twp.json \ + -o "${script_dir}/../crates/rnote-ui/po/zh_Hant.po" diff --git a/crates/rnote-ui/po/LINGUAS b/crates/rnote-ui/po/LINGUAS index 00ecaee0bb..d63e37cf56 100644 --- a/crates/rnote-ui/po/LINGUAS +++ b/crates/rnote-ui/po/LINGUAS @@ -30,8 +30,8 @@ tr uk vi zh_CN -zh_HK zh_Hans zh_Hant +zh_HK zh_SG zh_TW diff --git a/crates/rnote-ui/po/zh_Hant.po b/crates/rnote-ui/po/zh_Hant.po index 72630f818f..86925f00a4 100644 --- a/crates/rnote-ui/po/zh_Hant.po +++ b/crates/rnote-ui/po/zh_Hant.po @@ -842,7 +842,7 @@ msgid "" "when this switch is off/on" msgstr "" "按住Ctrl鍵可暫時\n" -"啟用/禁用約束條件\n" +"啟用/停用約束條件\n" "當此開關被關閉/開啟時" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:327 @@ -1088,7 +1088,7 @@ msgstr "使用觸控繪製 [_T]" #: crates/rnote-ui/data/ui/canvasmenu.ui:59 msgid "Block Pinch to _Zoom" -msgstr "禁用雙指縮放 [_Z]" +msgstr "停用雙指縮放 [_Z]" #: crates/rnote-ui/data/ui/canvasmenu.ui:90 #: crates/rnote-ui/data/ui/shortcuts.ui:132 @@ -1254,7 +1254,7 @@ msgid "" "gets disabled." msgstr "" "設定畫布上的觸控滾動是否為慣性滾動。\n" -"當這個選項被禁用時，\n" +"當這個選項被停用時，\n" "應用程式需要重新啟動。" #: crates/rnote-ui/data/ui/settingspanel.ui:72 From 0be778a00dbeebded188f36accb93d0115be80db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 30 Mar 2024 13:25:58 +0000 Subject: [PATCH 03/13] i18n: Update traditional Chinese translation referenced issue: #220 --- crates/rnote-ui/po/LINGUAS | 2 +- crates/rnote-ui/po/zh_Hant.po | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/rnote-ui/po/LINGUAS b/crates/rnote-ui/po/LINGUAS index d63e37cf56..00ecaee0bb 100644 --- a/crates/rnote-ui/po/LINGUAS +++ b/crates/rnote-ui/po/LINGUAS @@ -30,8 +30,8 @@ tr uk vi zh_CN +zh_HK zh_Hans zh_Hant -zh_HK zh_SG zh_TW diff --git a/crates/rnote-ui/po/zh_Hant.po b/crates/rnote-ui/po/zh_Hant.po index 86925f00a4..72630f818f 100644 --- a/crates/rnote-ui/po/zh_Hant.po +++ b/crates/rnote-ui/po/zh_Hant.po @@ -842,7 +842,7 @@ msgid "" "when this switch is off/on" msgstr "" "按住Ctrl鍵可暫時\n" -"啟用/停用約束條件\n" +"啟用/禁用約束條件\n" "當此開關被關閉/開啟時" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:327 @@ -1088,7 +1088,7 @@ msgstr "使用觸控繪製 [_T]" #: crates/rnote-ui/data/ui/canvasmenu.ui:59 msgid "Block Pinch to _Zoom" -msgstr "停用雙指縮放 [_Z]" +msgstr "禁用雙指縮放 [_Z]" #: crates/rnote-ui/data/ui/canvasmenu.ui:90 #: crates/rnote-ui/data/ui/shortcuts.ui:132 @@ -1254,7 +1254,7 @@ msgid "" "gets disabled." msgstr "" "設定畫布上的觸控滾動是否為慣性滾動。\n" -"當這個選項被停用時，\n" +"當這個選項被禁用時，\n" "應用程式需要重新啟動。" #: crates/rnote-ui/data/ui/settingspanel.ui:72 From b46fc411fa3aff7ca059507272521a87716c57ca Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Sat, 6 Apr 2024 12:50:02 +0200 Subject: [PATCH 04/13] i18n: Translations update from Hosted Weblate (#1058) * Update translation files Updated by "Update LINGUAS file" hook in Weblate. Translation: rnote/repo Translate-URL: https://hosted.weblate.org/projects/rnote/repo/ * Translated using Weblate (Hindi) Currently translated at 100.0% (519 of 519 strings) Translation: rnote/repo Translate-URL: https://hosted.weblate.org/projects/rnote/repo/hi/ * Translated using Weblate (Portuguese) Currently translated at 40.0% (208 of 519 strings) Translation: rnote/repo Translate-URL: https://hosted.weblate.org/projects/rnote/repo/pt/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 99.8% (518 of 519 strings) Translation: rnote/repo Translate-URL: https://hosted.weblate.org/projects/rnote/repo/zh_Hans/ * Translated using Weblate (Japanese) Currently translated at 73.2% (380 of 519 strings) Translation: rnote/repo Translate-URL: https://hosted.weblate.org/projects/rnote/repo/ja/ --------- Co-authored-by: Scrambled777 Co-authored-by: tserv2331 Co-authored-by: Integral Co-authored-by: Ryo Nakano --- crates/rnote-ui/po/LINGUAS | 4 - crates/rnote-ui/po/hi.po | 1029 +++++++++++++++++---------------- crates/rnote-ui/po/ja.po | 10 +- crates/rnote-ui/po/pt.po | 22 +- crates/rnote-ui/po/zh_Hans.po | 24 +- 5 files changed, 549 insertions(+), 540 deletions(-) diff --git a/crates/rnote-ui/po/LINGUAS b/crates/rnote-ui/po/LINGUAS index 00ecaee0bb..18e6c6dc47 100644 --- a/crates/rnote-ui/po/LINGUAS +++ b/crates/rnote-ui/po/LINGUAS @@ -29,9 +29,5 @@ th tr uk vi -zh_CN -zh_HK zh_Hans zh_Hant -zh_SG -zh_TW diff --git a/crates/rnote-ui/po/hi.po b/crates/rnote-ui/po/hi.po index 4802b2b277..6d6e0af2a3 100644 --- a/crates/rnote-ui/po/hi.po +++ b/crates/rnote-ui/po/hi.po @@ -8,27 +8,26 @@ msgstr "" "Project-Id-Version: rnote\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-22 15:14+0100\n" -"PO-Revision-Date: 2023-10-10 03:00+0000\n" -"Last-Translator: winpower21 \n" +"PO-Revision-Date: 2024-03-28 12:01+0000\n" +"Last-Translator: Scrambled777 \n" "Language-Team: Hindi \n" "Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 5.1-dev\n" +"X-Generator: Weblate 5.5-dev\n" #: crates/rnote-ui/data/app.desktop.in.in:5 #: crates/rnote-ui/data/app.metainfo.xml.in.in:9 #: crates/rnote-ui/src/dialogs/mod.rs:35 msgid "Sketch and take handwritten notes" -msgstr "स्केच बनाएं और हस्तलिखित नोट्स लें" +msgstr "रेखाचित्र बनाएं और हस्तलिखित नोट्स लें" #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! #: crates/rnote-ui/data/app.desktop.in.in:15 -#, fuzzy msgid "Gnome;GTK;Office;Graphics;Notes;" -msgstr "जिनोम;जिटिके;कार्यालय;गरापहिकस;नोटस" +msgstr "Gnome;GTK;Office;Graphics;Notes;गनोम;कार्यालय;ग्राफिक्स;नोट्स;" #: crates/rnote-ui/data/app.desktop.in.in:20 #: crates/rnote-ui/data/ui/shortcuts.ui:20 @@ -40,51 +39,47 @@ msgid "" "Rnote is a vector-based drawing app for sketching, handwritten notes and to " "annotate documents and pictures." msgstr "" -"आरनोट स्केचिंग , हस्तलिखित नोट्स, दस्तावेजों और चित्रों का एनोटेशन करने के लिए एक वेक्टर-" -"आधारित ड्राइंग ऐप है।" +"Rnote स्केचिंग, हस्तलिखित नोट्स और दस्तावेज़ों और चित्रों को एनोटेट करने के " +"लिए एक वेक्टर-आधारित ड्राइंग ऐप है।" #: crates/rnote-ui/data/app.metainfo.xml.in.in:25 -#, fuzzy msgid "" "Disclaimer: The file format is still unstable. It might change and break " "compatibility between versions." msgstr "" -"अस्वीकरण: फ़ाइल स्वरूप अभी भी अस्थिर है. यह संस्करणों के बीच संगतता को बदल और/या तोड़ " -"सकता है।" +"अस्वीकरण: फाइल स्वरूप अभी भी अस्थिर है. यह संस्करणों के बीच संगतता को बदल और " +"तोड़ सकता है।" #: crates/rnote-ui/data/app.metainfo.xml.in.in:35 -#, fuzzy -#| msgid "An Overview" msgid "An overview" msgstr "एक अवलोकन" #: crates/rnote-ui/data/app.metainfo.xml.in.in:40 msgid "A selection" -msgstr "" +msgstr "एक चयन" #: crates/rnote-ui/data/app.metainfo.xml.in.in:45 msgid "Write text with the typewriter" -msgstr "" +msgstr "टाइपराइटर से टेक्स्ट लिखें" #: crates/rnote-ui/data/app.metainfo.xml.in.in:50 msgid "Hide toolbars with the focus mode" -msgstr "" +msgstr "फोकस मोड से टूलबार छिपाएँ" #: crates/rnote-ui/data/app.metainfo.xml.in.in:55 msgid "Quickly access files through workspace" -msgstr "" +msgstr "कार्यस्थान के माध्यम से फाइलों तक शीघ्रता से पहुँचें" #: crates/rnote-ui/data/app.metainfo.xml.in.in:60 msgid "Adjust document settings" -msgstr "" +msgstr "दस्तावेज़ सेटिंग्स समायोजित करें" #: crates/rnote-ui/data/app.metainfo.xml.in.in:65 msgid "Configure action shortcuts" -msgstr "" +msgstr "क्रिया शॉर्टकट कॉन्फ़िगर करें" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:5 #: crates/rnote-ui/data/ui/shortcuts.ui:185 -#, fuzzy msgid "Clear Document" msgstr "दस्तावेज़ साफ़ करें" @@ -103,9 +98,8 @@ msgstr "इससे संपूर्ण दस्तावेज़ साफ #: crates/rnote-ui/data/ui/dialogs/import.ui:10 #: crates/rnote-ui/data/ui/dialogs/import.ui:205 #: crates/rnote-ui/src/workspacebrowser/widgethelper.rs:31 -#, fuzzy msgid "Cancel" -msgstr "रद्द करे" +msgstr "रद्द" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:11 msgid "Clear" @@ -128,7 +122,7 @@ msgstr "" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:23 #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:41 msgid "Discard" -msgstr "खारिज करना" +msgstr "खारिज करें" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:24 #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:42 @@ -158,7 +152,7 @@ msgid "" "Some opened files contain unsaved changes.\n" "Changes which are not saved will be permanently lost." msgstr "" -"कुछ खुली हुई फ़ाइलों में सहेजे न गए परिवर्तन हैं।\n" +"कुछ खुली हुई फाइलों में सहेजे न गए परिवर्तन हैं।\n" "जो परिवर्तन सहेजे नहीं गए वे स्थायी रूप से नष्ट हो जाएंगे।" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:54 @@ -171,7 +165,7 @@ msgstr "सभी को त्यागें" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:67 msgid "Edit Workspace" -msgstr "कार्यक्षेत्र संपादित करें" +msgstr "कार्यस्थान संपादन" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:75 #: crates/rnote-ui/data/ui/settingspanel.ui:234 @@ -181,34 +175,32 @@ msgstr "आवेदन करे" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:117 msgid "Workspace Name" -msgstr "कार्यस्थल का नाम" +msgstr "कार्यस्थान का नाम" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:122 msgid "Icon" -msgstr "आइकोन" +msgstr "आइकन" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:123 msgid "Change the workspace icon" -msgstr "कार्यक्षेत्र आइकोन बदलें" +msgstr "कार्यस्थान आइकन बदलें" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:143 #: crates/rnote-ui/data/ui/settingspanel.ui:286 msgid "Color" -msgstr "रिंग" +msgstr "रंग" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:144 msgid "Change the workspace color" -msgstr "कार्यस्थान का रंग बदलॆ" +msgstr "कार्यस्थान का रंग बदलें" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:158 -#, fuzzy msgid "Directory" -msgstr "निदॆशिका" +msgstr "निर्देशिका" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:159 -#, fuzzy msgid "Change the workspace directory" -msgstr "कार्यस्थान निदॆशिका बदलॆ" +msgstr "कार्यस्थान निर्देशिका बदलें" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:168 #: crates/rnote-ui/data/ui/dialogs/export.ui:284 @@ -226,7 +218,7 @@ msgstr "निदॆशिका बदलॆ" #: crates/rnote-ui/data/ui/dialogs/export.ui:7 #: crates/rnote-ui/src/dialogs/export.rs:268 msgid "Export Document" -msgstr "" +msgstr "दस्तावेज़ निर्यात करें" #: crates/rnote-ui/data/ui/dialogs/export.ui:15 #: crates/rnote-ui/data/ui/dialogs/export.ui:180 @@ -234,17 +226,17 @@ msgstr "" #: crates/rnote-ui/src/dialogs/export.rs:907 #: crates/rnote-ui/src/dialogs/export.rs:955 msgid "Export" -msgstr "" +msgstr "निर्यात" #: crates/rnote-ui/data/ui/dialogs/export.ui:72 #: crates/rnote-ui/data/ui/dialogs/export.ui:473 msgid "Export File" -msgstr "" +msgstr "फाइल निर्यात करें" #: crates/rnote-ui/data/ui/dialogs/export.ui:73 #: crates/rnote-ui/data/ui/dialogs/export.ui:474 msgid "Select the export file" -msgstr "" +msgstr "निर्यात फाइल का चयन करें" #. force the user to pick another file #: crates/rnote-ui/data/ui/dialogs/export.ui:82 @@ -258,60 +250,61 @@ msgstr "" #: crates/rnote-ui/src/dialogs/export.rs:697 #: crates/rnote-ui/src/dialogs/export.rs:748 msgid "- no file selected -" -msgstr "" +msgstr "- कोई फाइल चयनित नहीं -" #: crates/rnote-ui/data/ui/dialogs/export.ui:106 #: crates/rnote-ui/data/ui/dialogs/export.ui:313 #: crates/rnote-ui/data/ui/dialogs/export.ui:507 msgid "Export Preferences" -msgstr "" +msgstr "निर्यात प्राथमिकताएँ" #: crates/rnote-ui/data/ui/dialogs/export.ui:110 #: crates/rnote-ui/data/ui/dialogs/export.ui:317 #: crates/rnote-ui/data/ui/dialogs/export.ui:511 msgid "With Background" -msgstr "" +msgstr "पृष्ठभूमि के साथ" #: crates/rnote-ui/data/ui/dialogs/export.ui:111 #: crates/rnote-ui/data/ui/dialogs/export.ui:318 #: crates/rnote-ui/data/ui/dialogs/export.ui:512 msgid "Set whether the background should be exported" -msgstr "" +msgstr "निर्धारित करें कि क्या पृष्ठभूमि निर्यात की जानी चाहिए" #: crates/rnote-ui/data/ui/dialogs/export.ui:116 #: crates/rnote-ui/data/ui/dialogs/export.ui:323 #: crates/rnote-ui/data/ui/dialogs/export.ui:517 msgid "With Pattern" -msgstr "" +msgstr "पैटर्न सहित" #: crates/rnote-ui/data/ui/dialogs/export.ui:117 #: crates/rnote-ui/data/ui/dialogs/export.ui:324 #: crates/rnote-ui/data/ui/dialogs/export.ui:518 msgid "Set whether the background pattern should be exported" -msgstr "" +msgstr "निर्धारित करें कि क्या पृष्ठभूमि पैटर्न निर्यात किया जाना चाहिए" #: crates/rnote-ui/data/ui/dialogs/export.ui:122 #: crates/rnote-ui/data/ui/dialogs/export.ui:329 #: crates/rnote-ui/data/ui/dialogs/export.ui:523 msgid "Optimize for Printing" -msgstr "" +msgstr "मुद्रण के लिए अनुकूलित करें" #: crates/rnote-ui/data/ui/dialogs/export.ui:123 #: crates/rnote-ui/data/ui/dialogs/export.ui:330 #: crates/rnote-ui/data/ui/dialogs/export.ui:524 msgid "Set whether the content should be optimized for printing" msgstr "" +"निर्धारित करें कि क्या सामग्री को मुद्रण के लिए अनुकूलित किया जाना चाहिए" #: crates/rnote-ui/data/ui/dialogs/export.ui:128 #: crates/rnote-ui/data/ui/dialogs/export.ui:335 #: crates/rnote-ui/data/ui/dialogs/export.ui:529 msgid "Export Format" -msgstr "" +msgstr "निर्यात प्रारूप" #: crates/rnote-ui/data/ui/dialogs/export.ui:129 #: crates/rnote-ui/data/ui/dialogs/export.ui:336 msgid "The export format" -msgstr "" +msgstr "निर्यात प्रारूप" #: crates/rnote-ui/data/ui/dialogs/export.ui:133 #: crates/rnote-ui/data/ui/dialogs/export.ui:340 @@ -320,22 +313,22 @@ msgstr "" #: crates/rnote-ui/src/dialogs/export.rs:579 #: crates/rnote-ui/src/dialogs/export.rs:866 msgid "Svg" -msgstr "" +msgstr "SVG" #: crates/rnote-ui/data/ui/dialogs/export.ui:134 #: crates/rnote-ui/src/dialogs/export.rs:283 msgid "Pdf" -msgstr "" +msgstr "PDF" #: crates/rnote-ui/data/ui/dialogs/export.ui:135 #: crates/rnote-ui/src/dialogs/export.rs:288 msgid "Xopp" -msgstr "" +msgstr "XOPP" #: crates/rnote-ui/data/ui/dialogs/export.ui:143 #: crates/rnote-ui/data/ui/dialogs/export.ui:350 msgid "Page Order" -msgstr "" +msgstr "पृष्ठ क्रम" #: crates/rnote-ui/data/ui/dialogs/export.ui:144 #: crates/rnote-ui/data/ui/dialogs/export.ui:351 @@ -344,59 +337,62 @@ msgid "" "that expand in horizontal and vertical directions\n" "are cut into pages" msgstr "" +"लेआउट वाले दस्तावेज़ों में पृष्ठ क्रम\n" +"जो क्षैतिज और ऊर्ध्वाधर दिशाओं में विस्तारित होते हैं\n" +"पन्नों में काट दिया जाता है" #: crates/rnote-ui/data/ui/dialogs/export.ui:150 #: crates/rnote-ui/data/ui/dialogs/export.ui:357 msgid "Horizontal First" -msgstr "" +msgstr "क्षैतिज प्रथम" #: crates/rnote-ui/data/ui/dialogs/export.ui:151 #: crates/rnote-ui/data/ui/dialogs/export.ui:358 msgid "Vertical First" -msgstr "" +msgstr "लंबवत प्रथम" #: crates/rnote-ui/data/ui/dialogs/export.ui:172 #: crates/rnote-ui/src/dialogs/export.rs:565 msgid "Export Document Pages" -msgstr "" +msgstr "दस्तावेज़ पृष्ठ निर्यात करें" #: crates/rnote-ui/data/ui/dialogs/export.ui:254 msgid "Page Files Naming:" -msgstr "" +msgstr "पृष्ठ फाइलों का नामकरण:" #: crates/rnote-ui/data/ui/dialogs/export.ui:274 msgid "Export Directory" -msgstr "" +msgstr "निर्यात निर्देशिका" #: crates/rnote-ui/data/ui/dialogs/export.ui:275 msgid "Select the export directory" -msgstr "" +msgstr "निर्यात निर्देशिका का चयन करें" #: crates/rnote-ui/data/ui/dialogs/export.ui:306 msgctxt "" "When pages are exported this is the base name, followed by: - Page 0,1,.." msgid "Export Files Stem Name" -msgstr "" +msgstr "निर्यात फाइलें स्टेम नाम" #: crates/rnote-ui/data/ui/dialogs/export.ui:341 #: crates/rnote-ui/data/ui/dialogs/export.ui:535 #: crates/rnote-ui/src/dialogs/export.rs:584 #: crates/rnote-ui/src/dialogs/export.rs:871 msgid "Png" -msgstr "" +msgstr "PNG" #: crates/rnote-ui/data/ui/dialogs/export.ui:342 #: crates/rnote-ui/data/ui/dialogs/export.ui:536 #: crates/rnote-ui/src/dialogs/export.rs:590 #: crates/rnote-ui/src/dialogs/export.rs:877 msgid "Jpeg" -msgstr "" +msgstr "JPEG" #: crates/rnote-ui/data/ui/dialogs/export.ui:366 #: crates/rnote-ui/data/ui/dialogs/export.ui:544 #: crates/rnote-ui/data/ui/dialogs/import.ui:158 msgid "Bitmap Scale-Factor" -msgstr "" +msgstr "बिटमैप स्केल-फैक्टर" #: crates/rnote-ui/data/ui/dialogs/export.ui:367 #: crates/rnote-ui/data/ui/dialogs/export.ui:545 @@ -405,33 +401,35 @@ msgid "" "Set the bitmap scale factor in relation\n" "to the actual size on the document" msgstr "" +"संबंध में बिटमैप स्केल कारक निर्धारित करें\n" +"दस्तावेज़ पर वास्तविक आकार के अनुसार" #: crates/rnote-ui/data/ui/dialogs/export.ui:375 #: crates/rnote-ui/data/ui/dialogs/export.ui:553 msgid "Jpeg Quality" -msgstr "" +msgstr "JPEG गुणवत्ता" #: crates/rnote-ui/data/ui/dialogs/export.ui:376 #: crates/rnote-ui/data/ui/dialogs/export.ui:554 msgid "Set the quality of the Jpeg image (1 - 100)" -msgstr "" +msgstr "JPEG छवि की गुणवत्ता निर्धारित करें (1 - 100)" #: crates/rnote-ui/data/ui/dialogs/export.ui:408 #: crates/rnote-ui/src/dialogs/export.rs:854 msgid "Export Selection" -msgstr "" +msgstr "निर्यात चयन" #: crates/rnote-ui/data/ui/dialogs/export.ui:530 msgid "The export image format" -msgstr "" +msgstr "निर्यात छवि प्रारूप" #: crates/rnote-ui/data/ui/dialogs/export.ui:561 msgid "Margin" -msgstr "" +msgstr "मार्जिन" #: crates/rnote-ui/data/ui/dialogs/export.ui:562 msgid "Set the margin around the selected area" -msgstr "" +msgstr "चयनित क्षेत्र के आसपास मार्जिन सेट करें" #: crates/rnote-ui/data/ui/dialogs/import.ui:7 msgid "Import Pdf" @@ -448,396 +446,397 @@ msgid "Info" msgstr "जानकारि" #: crates/rnote-ui/data/ui/dialogs/import.ui:79 -#, fuzzy msgid "Pdf Import Preferences" -msgstr "पीदीएफ आयात पसन्द" +msgstr "PDF आयात प्राथमिकताएँ" #: crates/rnote-ui/data/ui/dialogs/import.ui:83 msgid "Start Page" -msgstr "" +msgstr "आरंभ पृष्ठ" #: crates/rnote-ui/data/ui/dialogs/import.ui:92 msgid "End Page" -msgstr "" +msgstr "अंतिम पृष्ठ" #: crates/rnote-ui/data/ui/dialogs/import.ui:101 -#, fuzzy -#| msgid "New Document" msgid "Adjust Document" -msgstr "नया दस्तावेज़" +msgstr "दस्तावेज़ समायोजित करें" #: crates/rnote-ui/data/ui/dialogs/import.ui:102 msgid "Whether the document layout should be adjusted to the Pdf" -msgstr "" +msgstr "क्या दस्तावेज़ लेआउट को PDF में समायोजित किया जाना चाहिए" #: crates/rnote-ui/data/ui/dialogs/import.ui:107 msgid "Page Width (%)" -msgstr "" +msgstr "पृष्ठ की चौड़ाई (%)" #: crates/rnote-ui/data/ui/dialogs/import.ui:108 msgid "Set the width of imported Pdf's in percentage to the format width" -msgstr "" +msgstr "आयातित PDF की चौड़ाई को प्रारूप की चौड़ाई के प्रतिशत में निर्धारित करें" #: crates/rnote-ui/data/ui/dialogs/import.ui:115 msgid "Page Spacing" -msgstr "" +msgstr "पृष्ठ रिक्ति" #: crates/rnote-ui/data/ui/dialogs/import.ui:116 msgid "How Pdf pages are spaced" -msgstr "" +msgstr "PDF पेजों में अंतर कैसे रखा जाता है" #: crates/rnote-ui/data/ui/dialogs/import.ui:120 msgid "Continuous" -msgstr "" +msgstr "निरंतर" #: crates/rnote-ui/data/ui/dialogs/import.ui:121 msgid "One per Document Page" -msgstr "" +msgstr "प्रति दस्तावेज़ पृष्ठ एक" #: crates/rnote-ui/data/ui/dialogs/import.ui:129 msgid "Pages Type" -msgstr "" +msgstr "पेज प्रकार" #: crates/rnote-ui/data/ui/dialogs/import.ui:130 msgid "Set whether Pdf's should be imported as vector or bitmap images" msgstr "" +"निर्धारित करें कि क्या PDF को वेक्टर या बिटमैप छवियों के रूप में आयात किया " +"जाना चाहिए" #: crates/rnote-ui/data/ui/dialogs/import.ui:142 msgid "Vector" -msgstr "" +msgstr "वेक्टर" #: crates/rnote-ui/data/ui/dialogs/import.ui:149 msgid "Bitmap" -msgstr "" +msgstr "बिटमैप" #: crates/rnote-ui/data/ui/dialogs/import.ui:167 msgid "Page Borders" -msgstr "" +msgstr "पृष्ठ बोर्डर" #: crates/rnote-ui/data/ui/dialogs/import.ui:168 msgid "Whether the pages have drawn borders" -msgstr "" +msgstr "क्या पेज पर बॉर्डर बना हुआ है" #: crates/rnote-ui/data/ui/dialogs/import.ui:202 msgid "Import Xournal++ File" -msgstr "" +msgstr "Xournal++ फाइल आयात करें" #: crates/rnote-ui/data/ui/dialogs/import.ui:241 msgid "Xournal++ File Import Preferences" -msgstr "" +msgstr "Xournal++ फाइल आयात प्राथमिकताएँ" #: crates/rnote-ui/data/ui/dialogs/import.ui:245 msgid "DPI" -msgstr "" +msgstr "DPI" #: crates/rnote-ui/data/ui/dialogs/import.ui:246 msgid "Set the preferred DPI for the Xournal++ file" -msgstr "" +msgstr "Xournal++ फाइल के लिए पसंदीदा DPI निर्धारित करें" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:18 msgid "Brush Style" -msgstr "" +msgstr "ब्रश शैली" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:33 #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:149 msgid "Brush Configuration" -msgstr "" +msgstr "ब्रश विन्यास" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:66 msgid "Brush Styles" -msgstr "" +msgstr "ब्रश शैलियाँ" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:95 msgid "Marker" -msgstr "" +msgstr "मार्कर" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:96 msgid "Mark underneath other strokes" -msgstr "" +msgstr "अन्य स्ट्रोक्स के नीचे निशान लगाएं" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:107 #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:201 msgid "Solid" -msgstr "" +msgstr "ठोस" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:108 msgid "Draw solid color strokes" -msgstr "" +msgstr "ठोस रंग के स्ट्रोक बनाएं" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:119 msgid "Textured" -msgstr "" +msgstr "बनावट" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:120 msgid "Draw textured strokes" -msgstr "" +msgstr "बनावट वाले स्ट्रोक बनाएं" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:170 msgid "Path Modelling" -msgstr "" +msgstr "पथ मॉडलिंग" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:187 msgid "Simple" -msgstr "" +msgstr "सरल" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:188 msgid "Produces line segments from the raw input.\n" -msgstr "" +msgstr "कच्चे इनपुट से लाइन सेगमेंट तैयार करता है।\n" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:194 msgid "Curved" -msgstr "" +msgstr "वक्र" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:195 msgid "Produces smooth, curved segments.\n" -msgstr "" +msgstr "चिकने, घुमावदार खंड उत्पन्न करता है।\n" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:201 msgid "Modeled" -msgstr "" +msgstr "मॉडलिंग" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:202 msgid "" "Produces a modeled path with physics based algorithms.\n" "Results in the best looking handwriting." msgstr "" +"भौतिकी आधारित एल्गोरिदम के साथ एक मॉडल पथ तैयार करता है।\n" +"सबसे अच्छी दिखने वाली लिखावट में परिणाम।" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:211 msgid "Solid Style" -msgstr "" +msgstr "ठोस शैली" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:214 msgid "Pressure Curve" -msgstr "" +msgstr "दबाव वक्र" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:215 msgid "Choose a pressure curve" -msgstr "" +msgstr "एक दबाव वक्र चुनें" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:219 msgid "Constant" -msgstr "" +msgstr "स्थिरांक" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:220 msgid "Linear" -msgstr "" +msgstr "रेखीय" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:221 msgid "Square root" -msgstr "" +msgstr "वर्गमूल" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:222 msgid "Cubic root" -msgstr "" +msgstr "घन मूल" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:223 msgid "Quadratic Parabola" -msgstr "" +msgstr "द्विघात परवलय" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:224 msgid "Cubic Parabola" -msgstr "" +msgstr "घन परवलय" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:235 msgid "Textured Style" -msgstr "" +msgstr "बनावट शैली" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:238 msgid "Density" -msgstr "" +msgstr "घनत्व" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:239 msgid "The density is the amount of dots per 10x10 area" -msgstr "" +msgstr "घनत्व प्रति 10x10 क्षेत्र में बिंदुओं की संख्या है" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:248 msgctxt "" "Drawing with a textured pen, how the dots of the texture are distributed" msgid "Stroke Dots Position Distribution" -msgstr "" +msgstr "स्ट्रोक बिंदु स्थिति वितरण" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:249 msgid "Choose a dots position probability distribution" -msgstr "" +msgstr "एक बिंदु स्थिति संभाव्यता वितरण चुनें" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:253 msgctxt "A variant of the textured pen texture distribution" msgid "Uniform" -msgstr "" +msgstr "समान्तर" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:254 msgctxt "A variant of the textured pen texture distribution" msgid "Normal" -msgstr "" +msgstr "सामान्य" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:255 msgctxt "A variant of the textured pen texture distribution" msgid "Exponential" -msgstr "" +msgstr "घातीय" #: crates/rnote-ui/data/ui/penssidebar/brushpage.ui:256 msgctxt "A variant of the textured pen texture distribution" msgid "Reverse Exponential" -msgstr "" +msgstr "उलटा घातीय" #: crates/rnote-ui/data/ui/penssidebar/eraserpage.ui:21 msgid "Trash Strokes" -msgstr "" +msgstr "ट्रैश स्ट्रोक्स" #: crates/rnote-ui/data/ui/penssidebar/eraserpage.ui:31 msgid "Split Strokes" -msgstr "" +msgstr "विभाजित स्ट्रोक" #: crates/rnote-ui/data/ui/penssidebar/penssidebar.ui:17 #: crates/rnote-ui/src/settingspanel/penshortcutmodels.rs:81 msgid "Brush" -msgstr "" +msgstr "ब्रश" #: crates/rnote-ui/data/ui/penssidebar/penssidebar.ui:33 #: crates/rnote-ui/src/settingspanel/penshortcutmodels.rs:82 msgid "Shaper" -msgstr "" +msgstr "शेपर" #: crates/rnote-ui/data/ui/penssidebar/penssidebar.ui:49 #: crates/rnote-ui/src/settingspanel/penshortcutmodels.rs:83 msgid "Typewriter" -msgstr "" +msgstr "टाइपराइटर" #: crates/rnote-ui/data/ui/penssidebar/penssidebar.ui:65 #: crates/rnote-ui/src/settingspanel/penshortcutmodels.rs:84 msgid "Eraser" -msgstr "" +msgstr "इरेज़र" #: crates/rnote-ui/data/ui/penssidebar/penssidebar.ui:81 #: crates/rnote-ui/src/settingspanel/penshortcutmodels.rs:85 msgid "Selector" -msgstr "" +msgstr "चयनकर्ता" #: crates/rnote-ui/data/ui/penssidebar/penssidebar.ui:97 #: crates/rnote-ui/src/settingspanel/penshortcutmodels.rs:86 msgid "Tools" -msgstr "" +msgstr "टूल्स" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:22 msgid "Select With a Polygon" -msgstr "" +msgstr "बहुभुज के साथ चयन करें" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:32 msgid "Select With a Rectangle" -msgstr "" +msgstr "एक आयत के साथ चयन करें" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:42 msgid "Select One by One" -msgstr "" +msgstr "एक-एक करके चुनें" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:52 msgid "Select Intersecting Path" -msgstr "" +msgstr "प्रतिच्छेदी पथ का चयन करें" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:73 msgid "Lock Aspectratio While Resizing the Selection" -msgstr "" +msgstr "चयन का आकार बदलते समय पहलू अनुपात को लॉक करें" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:83 msgid "Select All Strokes" -msgstr "" +msgstr "सभी स्ट्रोक्स का चयन करें" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:94 msgid "Deselect All Strokes" -msgstr "" +msgstr "सभी स्ट्रोक्स को अचयनित करें" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:105 msgid "Invert Color Brightness of All Selected Strokes" -msgstr "" +msgstr "सभी चयनित स्ट्रोक्स की रंग चमक को उलटा करें" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:116 #: crates/rnote-ui/data/ui/shortcuts.ui:236 msgid "Duplicate Selection" -msgstr "" +msgstr "डुप्लिकेट चयन" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:127 msgid "Delete Selection" -msgstr "" +msgstr "चयन हटाएँ" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:19 #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:248 msgid "Shape Builders" -msgstr "" +msgstr "आकार निर्माता" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:35 #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:290 msgid "Constraints" -msgstr "" +msgstr "प्रतिबंध" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:64 msgid "Shaper Style" -msgstr "" +msgstr "शेपर स्टाइल" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:77 #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:170 msgid "Shape Configuration" -msgstr "" +msgstr "आकार विन्यास" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:101 msgid "Shaper Styles" -msgstr "" +msgstr "शेपर शैलियाँ" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:130 msgid "Smooth" -msgstr "" +msgstr "चिकना" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:141 msgid "Rough" -msgstr "" +msgstr "असभ्य" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:192 msgid "Rough style" -msgstr "" +msgstr "असभ्य शैली" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:196 msgid "Fill Style" -msgstr "" +msgstr "भरण शैली" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:197 msgid "Choose a fill style" -msgstr "" +msgstr "भरण शैली चुनें" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:202 msgid "Hachure" -msgstr "" +msgstr "छाया" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:203 msgid "Zig-Zag" -msgstr "" +msgstr "टेढ़ा-मेढ़ा" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:204 msgid "Zig-Zag Line" -msgstr "" +msgstr "टेढ़ी-मेढ़ी रेखा" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:205 msgid "Crosshatch" -msgstr "" +msgstr "क्रॉसहैच" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:206 #: crates/rnote-ui/data/ui/settingspanel.ui:315 msgid "Dots" -msgstr "" +msgstr "बिंदु" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:207 msgid "Dashed" -msgstr "" +msgstr "बिंदुयुक्त रेखा" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:215 msgid "Hachure Angle" -msgstr "" +msgstr "कोणीय छाया" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:216 msgid "Set the angle of hachure fills" -msgstr "" +msgstr "छाया रेखा का कोण निर्धारित करें" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:319 msgid "Enabled" -msgstr "" +msgstr "सक्षम" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:320 msgid "" @@ -845,404 +844,411 @@ msgid "" "enable/disable constraints\n" "when this switch is off/on" msgstr "" +"Ctrl को अस्थायी रूप से दबाए रखें\n" +"बाधाओं को सक्षम/अक्षम करें\n" +"जब यह स्विच बंद/चालू होता है" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:327 msgid "1:1" -msgstr "" +msgstr "1:1" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:332 msgid "3:2" -msgstr "" +msgstr "3:2" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:337 msgid "Golden Ratio (1:1.618)" -msgstr "" +msgstr "स्वर्णिम अनुपात (1:1.618)" #: crates/rnote-ui/data/ui/penssidebar/toolspage.ui:19 msgid "Insert Vertical Space" -msgstr "" +msgstr "लंबवत स्थान सम्मिलित करें" #: crates/rnote-ui/data/ui/penssidebar/toolspage.ui:29 #: crates/rnote-ui/data/ui/shortcuts.ui:108 msgid "Move View" -msgstr "" +msgstr "दृश्य को स्थानांतरित करें" #: crates/rnote-ui/data/ui/penssidebar/toolspage.ui:40 msgid "Zoom In/Out" -msgstr "" +msgstr "ज़ूम इन/आउट" #: crates/rnote-ui/data/ui/penssidebar/typewriterpage.ui:43 msgid "Pick And Insert Emoji" -msgstr "" +msgstr "इमोजी चुनें और डालें" #: crates/rnote-ui/data/ui/penssidebar/typewriterpage.ui:68 msgid "Reset Text Attributes" -msgstr "" +msgstr "टेक्स्ट विशेषताएँ रीसेट करें" #: crates/rnote-ui/data/ui/penssidebar/typewriterpage.ui:77 msgid "Bold" -msgstr "" +msgstr "बोल्ड" #: crates/rnote-ui/data/ui/penssidebar/typewriterpage.ui:86 msgid "Italic" -msgstr "" +msgstr "तिरछा" #: crates/rnote-ui/data/ui/penssidebar/typewriterpage.ui:95 msgid "Underline" -msgstr "" +msgstr "रेखांकित" #: crates/rnote-ui/data/ui/penssidebar/typewriterpage.ui:104 msgid "Strikethrough" -msgstr "" +msgstr "स्ट्राइकथ्रू" #: crates/rnote-ui/data/ui/penssidebar/typewriterpage.ui:126 msgid "Align Left" -msgstr "" +msgstr "बाएँ संरेखित करें" #: crates/rnote-ui/data/ui/penssidebar/typewriterpage.ui:133 msgid "Align Center" -msgstr "" +msgstr "मध्य में संरेखित करें" #: crates/rnote-ui/data/ui/penssidebar/typewriterpage.ui:140 msgid "Align Right" -msgstr "" +msgstr "दाएँ संरेखित करें" #: crates/rnote-ui/data/ui/penssidebar/typewriterpage.ui:147 msgid "Fill" -msgstr "" +msgstr "भरण" #: crates/rnote-ui/data/ui/workspacesbar/workspacesbar.ui:60 msgid "Move Selected Workspace Up" -msgstr "" +msgstr "चयनित कार्यस्थान को ऊपर ले जाएँ" #: crates/rnote-ui/data/ui/workspacesbar/workspacesbar.ui:69 msgid "Move Selected Workspace Down" -msgstr "" +msgstr "चयनित कार्यस्थान को नीचे ले जाएँ" #: crates/rnote-ui/data/ui/workspacesbar/workspacesbar.ui:80 msgid "Add Workspace" -msgstr "" +msgstr "कार्यस्थान जोड़ें" #: crates/rnote-ui/data/ui/workspacesbar/workspacesbar.ui:89 msgid "Remove Selected Workspace" -msgstr "" +msgstr "चयनित कार्यस्थान हटाएँ" #: crates/rnote-ui/data/ui/workspacesbar/workspacesbar.ui:99 msgid "Edit Selected Workspace" -msgstr "" +msgstr "चयनित कार्यस्थान संपादन" #: crates/rnote-ui/data/ui/appmenu.ui:24 msgid "Co_lor Scheme" -msgstr "" +msgstr "रंग योजना (_l)" #: crates/rnote-ui/data/ui/appmenu.ui:26 msgid "Use _System Colors" -msgstr "" +msgstr "सिस्टम रंगों का प्रयोग करें (_S)" #: crates/rnote-ui/data/ui/appmenu.ui:31 msgid "Use _Light Colors" -msgstr "" +msgstr "हल्के रंगों का प्रयोग करें (_L)" #: crates/rnote-ui/data/ui/appmenu.ui:36 msgid "Use _Dark Colors" -msgstr "" +msgstr "गहरे रंग का प्रयोग करें (_D)" #: crates/rnote-ui/data/ui/appmenu.ui:42 msgid "Developer _Menu" -msgstr "" +msgstr "डेवलपर मेनू (_M)" #: crates/rnote-ui/data/ui/appmenu.ui:47 msgid "Visual _Debugging" -msgstr "" +msgstr "विज़ुअल डीबगिंग (_D)" #: crates/rnote-ui/data/ui/appmenu.ui:51 msgid "Export Engine _State" -msgstr "" +msgstr "निर्यात इंजन अवस्था (_S)" #: crates/rnote-ui/data/ui/appmenu.ui:55 msgid "Export Engine _Config" -msgstr "" +msgstr "निर्यात इंजन _कॉन्फिग" #: crates/rnote-ui/data/ui/appmenu.ui:61 msgid "De_veloper Mode" -msgstr "" +msgstr "डेवलपर मोड (_v)" #: crates/rnote-ui/data/ui/appmenu.ui:66 -#, fuzzy -#| msgid "New Window" msgid "New _Window" -msgstr "नई विंडो" +msgstr "नई विंडो (_W)" #: crates/rnote-ui/data/ui/appmenu.ui:72 msgid "_New" -msgstr "" +msgstr "नया (_N)" #: crates/rnote-ui/data/ui/appmenu.ui:76 msgid "_Open" -msgstr "" +msgstr "खोलें (_O)" #: crates/rnote-ui/data/ui/appmenu.ui:80 msgid "_Save" -msgstr "" +msgstr "सहेजें (_S)" #: crates/rnote-ui/data/ui/appmenu.ui:84 msgid "Save _As" -msgstr "" +msgstr "ऐसे सहेजें (_A)" #: crates/rnote-ui/data/ui/appmenu.ui:90 msgid "_Print" -msgstr "" +msgstr "प्रिंट (_P)" #: crates/rnote-ui/data/ui/appmenu.ui:94 msgid "_Import File" -msgstr "" +msgstr "फाइल आयात (_I)" #: crates/rnote-ui/data/ui/appmenu.ui:98 msgid "_Clipboard" -msgstr "" +msgstr "क्लिपबोर्ड (_C)" #: crates/rnote-ui/data/ui/appmenu.ui:100 #: crates/rnote-ui/data/ui/contextmenu.ui:10 msgid "_Copy" -msgstr "" +msgstr "कॉपी (_C)" #: crates/rnote-ui/data/ui/appmenu.ui:104 #: crates/rnote-ui/data/ui/contextmenu.ui:14 msgid "C_ut" -msgstr "" +msgstr "काटें (_u)" #: crates/rnote-ui/data/ui/appmenu.ui:108 #: crates/rnote-ui/data/ui/contextmenu.ui:18 msgid "_Paste" -msgstr "" +msgstr "पेस्ट (_P)" #: crates/rnote-ui/data/ui/appmenu.ui:113 msgid "_Export…" -msgstr "" +msgstr "निर्यात… (_E)" #: crates/rnote-ui/data/ui/appmenu.ui:115 msgid "Export _Document" -msgstr "" +msgstr "दस्तावेज़ निर्यात (_D)" #: crates/rnote-ui/data/ui/appmenu.ui:119 msgid "Export Document _Pages" -msgstr "" +msgstr "दस्तावेज़ पेज निर्यात (_P)" #: crates/rnote-ui/data/ui/appmenu.ui:123 msgid "Export _Selection" -msgstr "" +msgstr "निर्यात चयनित (_S)" #: crates/rnote-ui/data/ui/appmenu.ui:130 msgid "Se_ttings" -msgstr "" +msgstr "सेटिंग्स (_t)" #: crates/rnote-ui/data/ui/appmenu.ui:134 msgid "_Keyboard Shortcuts" -msgstr "" +msgstr "कीबोर्ड शॉर्टकट (_K)" #: crates/rnote-ui/data/ui/appmenu.ui:138 msgid "_Donate 💝" -msgstr "" +msgstr "दान करें 💝 (_D)" #: crates/rnote-ui/data/ui/appmenu.ui:142 msgid "A_bout Rnote" -msgstr "" +msgstr "Rnote के बारे में (_b)" #: crates/rnote-ui/data/ui/appmenu.ui:173 msgid "Sidebar on the Left Side" -msgstr "" +msgstr "बाईं ओर साइडबार" #: crates/rnote-ui/data/ui/appmenu.ui:182 msgid "Sidebar on the Right Side" -msgstr "" +msgstr "दाईं ओर साइडबार" #: crates/rnote-ui/data/ui/appmenu.ui:192 #: crates/rnote-ui/data/ui/shortcuts.ui:56 msgid "Toggle Fullscreen" -msgstr "" +msgstr "पूर्णस्क्रीन टॉगल करें" #: crates/rnote-ui/data/ui/canvasmenu.ui:24 msgid "_Snap Positions" -msgstr "" +msgstr "स्नैप स्थिति (_S)" #: crates/rnote-ui/data/ui/canvasmenu.ui:29 msgid "_Pen Sounds" -msgstr "" +msgstr "पेन ध्वनियाँ (_P)" #: crates/rnote-ui/data/ui/canvasmenu.ui:34 msgid "_Return to Origin Page" -msgstr "" +msgstr "मूल पृष्ठ पर लौटें (_R)" #: crates/rnote-ui/data/ui/canvasmenu.ui:38 msgid "C_lear Document" -msgstr "" +msgstr "दस्तावेज़ साफ़ करें (_l)" #: crates/rnote-ui/data/ui/canvasmenu.ui:44 msgid "Show _Format Borders" -msgstr "" +msgstr "प्रारूप सीमाएँ दिखाएँ (_F)" #: crates/rnote-ui/data/ui/canvasmenu.ui:49 msgid "Show _Origin Indicator" -msgstr "" +msgstr "उत्पत्ति संकेतक दिखाएँ (_O)" #: crates/rnote-ui/data/ui/canvasmenu.ui:54 msgid "Draw With _Touch Input" -msgstr "" +msgstr "टच इनपुट से ड्रा करें (_T)" #: crates/rnote-ui/data/ui/canvasmenu.ui:59 msgid "Block Pinch to _Zoom" -msgstr "" +msgstr "पिंच से ज़ूम को ब्लॉक करें (_Z)" #: crates/rnote-ui/data/ui/canvasmenu.ui:90 #: crates/rnote-ui/data/ui/shortcuts.ui:132 #: crates/rnote-ui/data/ui/shortcuts.ui:138 #: crates/rnote-ui/data/ui/shortcuts.ui:144 msgid "Zoom out" -msgstr "" +msgstr "ज़ूम आउट" #: crates/rnote-ui/data/ui/canvasmenu.ui:99 msgid "Reset Zoom" -msgstr "" +msgstr "ज़ूम रीसेट" #: crates/rnote-ui/data/ui/canvasmenu.ui:106 #: crates/rnote-ui/data/ui/shortcuts.ui:114 #: crates/rnote-ui/data/ui/shortcuts.ui:120 #: crates/rnote-ui/data/ui/shortcuts.ui:126 msgid "Zoom in" -msgstr "" +msgstr "ज़ूम इन" #: crates/rnote-ui/data/ui/canvasmenu.ui:118 msgid "Zoom to Page Width" -msgstr "" +msgstr "पृष्ठ की चौड़ाई पर ज़ूम" #: crates/rnote-ui/data/ui/canvasmenu.ui:133 msgid "" "Remove Page.\n" "Available in Fixed-Size Document Layout." msgstr "" +"पृष्ठ हटाएँ.\n" +"निश्चित आकार के दस्तावेज़ लेआउट में उपलब्ध है।" #: crates/rnote-ui/data/ui/canvasmenu.ui:142 msgid "" "Add Page.\n" "Available in Fixed-Size Document Layout." msgstr "" +"पृष्ठ जोड़ें।\n" +"निश्चित आकार के दस्तावेज़ लेआउट में उपलब्ध है।" #: crates/rnote-ui/data/ui/canvasmenu.ui:151 msgid "" "Resize Document to Fit Content.\n" "Available in Fixed-Size Document Layout." msgstr "" +"सामग्री को फ़िट करने के लिए दस्तावेज़ का आकार बदलें।\n" +"निश्चित आकार के दस्तावेज़ लेआउट में उपलब्ध है।" #: crates/rnote-ui/data/ui/colorpicker.ui:19 msgid "Stroke Color" -msgstr "" +msgstr "स्ट्रोक का रंग" #: crates/rnote-ui/data/ui/colorpicker.ui:26 msgid "Fill Color" -msgstr "" +msgstr "भरण रंग" #: crates/rnote-ui/data/ui/filerow.ui:61 #: crates/rnote-ui/src/dialogs/import.rs:26 msgid "Open" -msgstr "" +msgstr "खोलें" #: crates/rnote-ui/data/ui/filerow.ui:65 msgid "Open in Default App" -msgstr "" +msgstr "डिफ़ॉल्ट ऐप में खोलें" #: crates/rnote-ui/data/ui/filerow.ui:69 #: crates/rnote-ui/src/workspacebrowser/filerow/actions/rename.rs:91 msgid "Rename" -msgstr "" +msgstr "नाम बदलें" #: crates/rnote-ui/data/ui/filerow.ui:73 msgid "Move to Trash" -msgstr "" +msgstr "ट्रैश में ले जाएं" #: crates/rnote-ui/data/ui/filerow.ui:77 msgid "Duplicate" -msgstr "" +msgstr "डुप्लिकेट" #: crates/rnote-ui/data/ui/mainheader.ui:23 #: crates/rnote-ui/src/canvas/mod.rs:584 msgid "Draft" -msgstr "" +msgstr "ड्राफ्ट" #: crates/rnote-ui/data/ui/mainheader.ui:40 #: crates/rnote-ui/data/ui/mainheader.ui:74 msgid "Show/Hide Sidebar" -msgstr "" +msgstr "साइडबार दिखाएँ/छिपाएँ" #: crates/rnote-ui/data/ui/mainheader.ui:47 #: crates/rnote-ui/data/ui/shortcuts.ui:26 msgid "New Tab" -msgstr "" +msgstr "नया टैब" #: crates/rnote-ui/data/ui/mainheader.ui:54 msgid "Focus Mode" -msgstr "" +msgstr "फोकस मोड" #: crates/rnote-ui/data/ui/mainheader.ui:66 #: crates/rnote-ui/data/ui/shortcuts.ui:167 msgid "Save Document" -msgstr "" +msgstr "दस्तावेज़ सहेजें" #: crates/rnote-ui/data/ui/overlays.ui:99 msgid "Move _Left" -msgstr "" +msgstr "बाएँ ले जाएँ (_L)" #: crates/rnote-ui/data/ui/overlays.ui:103 msgid "Move _Right" -msgstr "" +msgstr "दाएँ ले जाएँ (_R)" #: crates/rnote-ui/data/ui/overlays.ui:109 msgid "_Close" -msgstr "" +msgstr "बंद करे (_C)" #: crates/rnote-ui/data/ui/penshortcutrow.ui:11 msgid "Temporary" -msgstr "" +msgstr "अस्थायी" #: crates/rnote-ui/data/ui/penshortcutrow.ui:12 msgid "Permanent" -msgstr "" +msgstr "स्थायी" #: crates/rnote-ui/data/ui/penshortcutrow.ui:13 msgid "Toggle" -msgstr "" +msgstr "टॉगल" #: crates/rnote-ui/data/ui/settingspanel.ui:41 #: crates/rnote-ui/data/ui/shortcuts.ui:11 msgid "General" -msgstr "" +msgstr "सामान्य" #: crates/rnote-ui/data/ui/settingspanel.ui:44 msgid "Autosave" -msgstr "" +msgstr "स्वत: सहेजें" #: crates/rnote-ui/data/ui/settingspanel.ui:45 msgid "Enable or disable autosave" -msgstr "" +msgstr "स्वतः सहेजना सक्षम या अक्षम करें" #: crates/rnote-ui/data/ui/settingspanel.ui:50 msgid "Autosave Interval (secs)" -msgstr "" +msgstr "स्वतः सहेजें अंतराल (सेकंड)" #: crates/rnote-ui/data/ui/settingspanel.ui:51 msgid "Set the autosave interval in seconds" -msgstr "" +msgstr "स्वतः सहेजें का अंतराल को सेकंड में निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:58 msgid "Show Scrollbars" -msgstr "" +msgstr "स्क्रॉलबार दिखाएँ" #: crates/rnote-ui/data/ui/settingspanel.ui:59 msgid "Set whether the scrollbars on the canvas are shown" -msgstr "" +msgstr "निर्धारित करें कि कैनवास पर स्क्रॉलबार दिखाए गए हैं या नहीं" #: crates/rnote-ui/data/ui/settingspanel.ui:64 msgid "Inertial Touch Scrolling" -msgstr "" +msgstr "जड़त्वीय टच स्क्रॉलिंग" #: crates/rnote-ui/data/ui/settingspanel.ui:65 msgid "" @@ -1250,459 +1256,478 @@ msgid "" "An application restart is required when this option\n" "gets disabled." msgstr "" +"निर्धारित करें कि कैनवास पर स्पर्श स्क्रॉलिंग जड़त्वीय है या नहीं।\n" +"यह विकल्प होने पर एप्लिकेशन पुनरारंभ की आवश्यकता होती है\n" +"अक्षम हो जाता है।" #: crates/rnote-ui/data/ui/settingspanel.ui:72 msgid "Regular Cursor" -msgstr "" +msgstr "नियमित कर्सर" #: crates/rnote-ui/data/ui/settingspanel.ui:73 msgid "Set the regular cursor" -msgstr "" +msgstr "नियमित कर्सर निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:95 msgid "Show Drawing Cursor" -msgstr "" +msgstr "ड्राइंग कर्सर दिखाएँ" #: crates/rnote-ui/data/ui/settingspanel.ui:96 msgid "Set whether the drawing cursor is visible" -msgstr "" +msgstr "निर्धारित करें कि ड्राइंग कर्सर दृश्यमान है या नहीं" #: crates/rnote-ui/data/ui/settingspanel.ui:102 msgid "Drawing Cursor" -msgstr "" +msgstr "ड्राइंग कर्सर" #: crates/rnote-ui/data/ui/settingspanel.ui:103 msgid "Set the drawing cursor" -msgstr "" +msgstr "ड्राइंग कर्सर निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:128 msgid "Page Format" -msgstr "" +msgstr "पृष्ठ प्रारूप" #: crates/rnote-ui/data/ui/settingspanel.ui:131 msgid "Format" -msgstr "" +msgstr "प्रारूप" #: crates/rnote-ui/data/ui/settingspanel.ui:132 msgid "Choose a format" -msgstr "" +msgstr "एक प्रारूप चुनें" #: crates/rnote-ui/data/ui/settingspanel.ui:136 msgid "A6" -msgstr "" +msgstr "A6" #: crates/rnote-ui/data/ui/settingspanel.ui:137 msgid "A5" -msgstr "" +msgstr "A5" #: crates/rnote-ui/data/ui/settingspanel.ui:138 msgid "A4" -msgstr "" +msgstr "A4" #: crates/rnote-ui/data/ui/settingspanel.ui:139 msgid "A3" -msgstr "" +msgstr "A3" #: crates/rnote-ui/data/ui/settingspanel.ui:140 msgid "A2" -msgstr "" +msgstr "A2" #: crates/rnote-ui/data/ui/settingspanel.ui:141 msgid "US letter" -msgstr "" +msgstr "US पत्र" #: crates/rnote-ui/data/ui/settingspanel.ui:142 msgid "US legal" -msgstr "" +msgstr "US कानूनी" #: crates/rnote-ui/data/ui/settingspanel.ui:143 msgid "Custom" -msgstr "" +msgstr "कस्टम" #: crates/rnote-ui/data/ui/settingspanel.ui:151 msgid "Orientation" -msgstr "" +msgstr "अभिविन्यास" #: crates/rnote-ui/data/ui/settingspanel.ui:152 msgid "Set the format orientation" -msgstr "" +msgstr "प्रारूप अभिविन्यास निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:164 msgid "Portrait" -msgstr "" +msgstr "पोर्ट्रेट" #: crates/rnote-ui/data/ui/settingspanel.ui:170 msgid "Landscape" -msgstr "" +msgstr "परिदृश्य" #: crates/rnote-ui/data/ui/settingspanel.ui:180 msgid "Width" -msgstr "" +msgstr "चौड़ाई" #: crates/rnote-ui/data/ui/settingspanel.ui:181 msgid "Set the format width" -msgstr "" +msgstr "प्रारूप की चौड़ाई निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:197 msgid "Height" -msgstr "" +msgstr "ऊंचाई" #: crates/rnote-ui/data/ui/settingspanel.ui:198 msgid "Set the format height" -msgstr "" +msgstr "प्रारूप ऊंचाई निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:214 msgid "Dpi" -msgstr "" +msgstr "DPI" #: crates/rnote-ui/data/ui/settingspanel.ui:215 msgid "Set the Dpi (dots per inch). Defaults to 96." -msgstr "" +msgstr "DPI (बिंदु प्रति इंच) निर्धारित करें। 96 पर डिफ़ॉल्ट।" #: crates/rnote-ui/data/ui/settingspanel.ui:225 msgid "Revert" -msgstr "" +msgstr "पूर्ववत करें" #: crates/rnote-ui/data/ui/settingspanel.ui:247 #: crates/rnote-ui/data/ui/shortcuts.ui:158 #: crates/rnote-ui/src/dialogs/mod.rs:631 msgid "Document" -msgstr "" +msgstr "दस्तावेज़" #: crates/rnote-ui/data/ui/settingspanel.ui:250 msgid "Document Layout" -msgstr "" +msgstr "दस्तावेज़ लेआउट" #: crates/rnote-ui/data/ui/settingspanel.ui:254 msgid "Fixed Size" -msgstr "" +msgstr "निर्धारित माप" #: crates/rnote-ui/data/ui/settingspanel.ui:255 msgid "Continuous Vertical" -msgstr "" +msgstr "सतत् लंबवत" #: crates/rnote-ui/data/ui/settingspanel.ui:256 msgid "Semi Infinite" -msgstr "" +msgstr "अर्ध अनंत" #: crates/rnote-ui/data/ui/settingspanel.ui:257 msgid "Infinite" -msgstr "" +msgstr "अनंत" #: crates/rnote-ui/data/ui/settingspanel.ui:265 msgid "Format Border Color" -msgstr "" +msgstr "प्रारूप सीमा रंग" #: crates/rnote-ui/data/ui/settingspanel.ui:266 msgid "Set the format border color" -msgstr "" +msgstr "फ़ॉर्मेट बॉर्डर रंग निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:287 msgid "Set the background color" -msgstr "" +msgstr "पृष्ठभूमि का रंग निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:307 msgid "Pattern" -msgstr "" +msgstr "पैटर्न" #: crates/rnote-ui/data/ui/settingspanel.ui:308 msgid "Choose a background pattern" -msgstr "" +msgstr "एक पृष्ठभूमि पैटर्न चुनें" #: crates/rnote-ui/data/ui/settingspanel.ui:312 msgid "None" -msgstr "" +msgstr "कोई नहीं" #: crates/rnote-ui/data/ui/settingspanel.ui:313 msgid "Lines" -msgstr "" +msgstr "पंक्तियां" #: crates/rnote-ui/data/ui/settingspanel.ui:314 #: crates/rnote-ui/src/penssidebar/shaperpage.rs:429 msgid "Grid" -msgstr "" +msgstr "ग्रिड" #: crates/rnote-ui/data/ui/settingspanel.ui:316 msgid "Isometric Grid" -msgstr "" +msgstr "सममितीय ग्रिड" #: crates/rnote-ui/data/ui/settingspanel.ui:317 msgid "Isometric Dots" -msgstr "" +msgstr "सममितीय बिंदु" #: crates/rnote-ui/data/ui/settingspanel.ui:325 msgid "Pattern Color" -msgstr "" +msgstr "पैटर्न रंग" #: crates/rnote-ui/data/ui/settingspanel.ui:326 msgid "Set the background pattern color" -msgstr "" +msgstr "पृष्ठभूमि पैटर्न का रंग निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:346 msgid "Pattern Width" -msgstr "" +msgstr "पैटर्न की चौड़ाई" #: crates/rnote-ui/data/ui/settingspanel.ui:347 msgid "Set the background pattern width" -msgstr "" +msgstr "पृष्ठभूमि पैटर्न की चौड़ाई निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:363 msgid "Pattern Height" -msgstr "" +msgstr "पैटर्न की ऊंचाई" #: crates/rnote-ui/data/ui/settingspanel.ui:364 msgid "Set the background pattern height" -msgstr "" +msgstr "पृष्ठभूमि पैटर्न ऊंचाई निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:380 msgid "Invert Color Brightness" -msgstr "" +msgstr "रंग की चमक को उलटा करें" #: crates/rnote-ui/data/ui/settingspanel.ui:381 msgid "Invert the brightness of all background pattern colors" -msgstr "" +msgstr "सभी पृष्ठभूमि पैटर्न रंगों की चमक को उल्टा करें" #: crates/rnote-ui/data/ui/settingspanel.ui:385 msgid "Invert" -msgstr "" +msgstr "उलटें" #: crates/rnote-ui/data/ui/settingspanel.ui:395 msgid "Button Shortcuts" -msgstr "" +msgstr "बटन शॉर्टकट" #: crates/rnote-ui/data/ui/settingspanel.ui:398 msgid "Stylus Primary Button Action" -msgstr "" +msgstr "स्टाइलस प्राथमिक बटन क्रिया" #: crates/rnote-ui/data/ui/settingspanel.ui:399 msgid "" "Set the action for the\n" "primary stylus button" msgstr "" +"प्राथमिक स्टाइलस बटन\n" +"के लिए कार्रवाई निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:411 msgid "Stylus Secondary Button Action" -msgstr "" +msgstr "स्टाइलस सेकेंडरी बटन एक्शन" #: crates/rnote-ui/data/ui/settingspanel.ui:412 msgid "" "Set the action for the\n" "secondary stylus button" msgstr "" +"सेकेंडरी स्टाइलस बटन\n" +"के लिए कार्रवाई निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:424 msgid "Mouse Secondary Button Action" -msgstr "" +msgstr "माउस सेकेंडरी बटन एक्शन" #: crates/rnote-ui/data/ui/settingspanel.ui:425 msgid "" "Set the action for the\n" "secondary mouse button" msgstr "" +"द्वितीयक माउस बटन\n" +"के लिए कार्रवाई निर्धारित करें" #: crates/rnote-ui/data/ui/settingspanel.ui:437 msgid "Touch Two-Finger Long-Press Action" -msgstr "" +msgstr "दो-उंगली लंबी-प्रेस टच कार्रवाई" #: crates/rnote-ui/data/ui/settingspanel.ui:438 msgid "" "Set the action for the touch\n" "two-finger long-press gesture" msgstr "" +"स्पर्श के लिए क्रिया निर्धारित करें\n" +"दो अंगुलियों से लंबे समय तक दबाने का इशारा" #: crates/rnote-ui/data/ui/settingspanel.ui:450 msgid "Keyboard Ctrl-Space Action" -msgstr "" +msgstr "कीबोर्ड Ctrl-Space क्रिया" #: crates/rnote-ui/data/ui/settingspanel.ui:451 msgid "" "Set the action for the keyboard\n" "Ctrl plus Space shortcut" msgstr "" +"कीबोर्ड के लिए क्रिया निर्धारित करें\n" +"Ctrl + Space शॉर्टकट" #: crates/rnote-ui/data/ui/settingspanel.ui:463 msgid "Drawing Pad Button 1 Action" -msgstr "" +msgstr "ड्राइंग पैड बटन 1 कार्रवाई" #: crates/rnote-ui/data/ui/settingspanel.ui:464 msgid "" "Set the action for button 1\n" "on a drawing pad" msgstr "" +"बटन 1 के लिए कार्रवाई निर्धारित करें\n" +"ड्राइंग पैड पर" #: crates/rnote-ui/data/ui/settingspanel.ui:476 msgid "Drawing Pad Button 2 Action" -msgstr "" +msgstr "ड्रॉइंग पैड बटन 2 कार्रवाई" #: crates/rnote-ui/data/ui/settingspanel.ui:477 msgid "" "Set the action for button 2\n" "on a drawing pad" msgstr "" +"बटन 2 के लिए कार्रवाई निर्धारित करें\n" +"ड्राइंग पैड पर" #: crates/rnote-ui/data/ui/settingspanel.ui:489 msgid "Drawing Pad Button 3 Action" -msgstr "" +msgstr "ड्राइंग पैड बटन 3 कार्रवाई" #: crates/rnote-ui/data/ui/settingspanel.ui:490 msgid "" "Set the action for button 3\n" "on a drawing pad" msgstr "" +"बटन 3 के लिए कार्रवाई निर्धारित करें\n" +"ड्राइंग पैड पर" #: crates/rnote-ui/data/ui/settingspanel.ui:502 msgid "Drawing Pad Button 4 Action" -msgstr "" +msgstr "ड्राइंग पैड बटन 4 कार्रवाई" #: crates/rnote-ui/data/ui/settingspanel.ui:503 msgid "" "Set the action for button 4\n" "on a drawing pad" msgstr "" +"बटन 4 के लिए कार्रवाई निर्धारित करें\n" +"ड्राइंग पैड पर" #: crates/rnote-ui/data/ui/shortcuts.ui:14 msgid "Show Keyboard Shortcuts" -msgstr "" +msgstr "कीबोर्ड शॉर्टकट दिखाएं" #: crates/rnote-ui/data/ui/shortcuts.ui:32 msgid "Close the Active Tab" -msgstr "" +msgstr "सक्रिय टैब बंद करें" #: crates/rnote-ui/data/ui/shortcuts.ui:38 msgid "Quit the Application" -msgstr "" +msgstr "एप्लिकेशन छोड़ें" #: crates/rnote-ui/data/ui/shortcuts.ui:44 msgid "Open the Canvas-Menu" -msgstr "" +msgstr "कैनवास-मेनू खोलें" #: crates/rnote-ui/data/ui/shortcuts.ui:50 msgid "Open the App-Menu" -msgstr "" +msgstr "ऐप-मेनू खोलें" #: crates/rnote-ui/data/ui/shortcuts.ui:64 msgid "Navigation" -msgstr "" +msgstr "नेविगेशन" #: crates/rnote-ui/data/ui/shortcuts.ui:67 msgid "Switch to the 'Brush'" -msgstr "" +msgstr "'ब्रश' पर जाएँ" #: crates/rnote-ui/data/ui/shortcuts.ui:73 msgid "Switch to the 'Shaper'" -msgstr "" +msgstr "'शेपर' पर जाएँ" #: crates/rnote-ui/data/ui/shortcuts.ui:79 msgid "Switch to the 'Typewriter'" -msgstr "" +msgstr "'टाइपराइटर' पर जाएँ" #: crates/rnote-ui/data/ui/shortcuts.ui:85 msgid "Switch to the 'Eraser'" -msgstr "" +msgstr "'इरेज़र' पर जाएँ" #: crates/rnote-ui/data/ui/shortcuts.ui:91 msgid "Switch to the 'Selector'" -msgstr "" +msgstr "'चयनकर्ता' पर जाएँ" #: crates/rnote-ui/data/ui/shortcuts.ui:97 msgid "Switch to the 'Tools'" -msgstr "" +msgstr "'टूल्स' पर जाएँ" #: crates/rnote-ui/data/ui/shortcuts.ui:105 msgid "View" -msgstr "" +msgstr "देखें" #: crates/rnote-ui/data/ui/shortcuts.ui:109 msgid "Alt + Drag" -msgstr "" +msgstr "Alt + खींचें" #: crates/rnote-ui/data/ui/shortcuts.ui:150 msgid "Zoom in/out" -msgstr "" +msgstr "ज़ूम इन/आउट" #: crates/rnote-ui/data/ui/shortcuts.ui:151 msgid "Alt + Shift + Drag" -msgstr "" +msgstr "Alt + Shift + खींचें" #: crates/rnote-ui/data/ui/shortcuts.ui:161 msgid "Open Document" -msgstr "" +msgstr "दस्तावेज़ खोलें" #: crates/rnote-ui/data/ui/shortcuts.ui:173 #: crates/rnote-ui/src/dialogs/export.rs:30 msgid "Save Document As" -msgstr "" +msgstr "दस्तावेज़ को इस रूप में सहेजें" #: crates/rnote-ui/data/ui/shortcuts.ui:179 msgid "Snap Positions" -msgstr "" +msgstr "स्नैप स्थिति" #: crates/rnote-ui/data/ui/shortcuts.ui:191 msgid "Add Page (When in Fixed-Size Layout)" -msgstr "" +msgstr "पृष्ठ जोड़ें (जब निश्चित-आकार लेआउट में हो)" #: crates/rnote-ui/data/ui/shortcuts.ui:197 msgid "Remove Last Page (When in Fixed-Size Layout)" -msgstr "" +msgstr "अंतिम पृष्ठ हटाएँ (जब निश्चित आकार के लेआउट में हों)" #: crates/rnote-ui/data/ui/shortcuts.ui:203 msgid "Print Document" -msgstr "" +msgstr "दस्तावेज़ प्रिंट करें" #: crates/rnote-ui/data/ui/shortcuts.ui:209 #: crates/rnote-ui/src/dialogs/import.rs:66 msgid "Import File" -msgstr "" +msgstr "फाइल आयात करें" #: crates/rnote-ui/data/ui/shortcuts.ui:215 msgid "Drawing" -msgstr "" +msgstr "रेखांकन" #: crates/rnote-ui/data/ui/shortcuts.ui:218 msgid "Copy to Clipboard" -msgstr "" +msgstr "क्लिपबोर्ड पर कॉपी करें" #: crates/rnote-ui/data/ui/shortcuts.ui:224 msgid "Cut to Clipboard" -msgstr "" +msgstr "क्लिपबोर्ड पर काटें" #: crates/rnote-ui/data/ui/shortcuts.ui:230 msgid "Paste Clipboard" -msgstr "" +msgstr "क्लिपबोर्ड पेस्ट करें" #: crates/rnote-ui/data/ui/shortcuts.ui:242 msgid "Undo" -msgstr "" +msgstr "पूर्ववत" #: crates/rnote-ui/data/ui/shortcuts.ui:248 msgid "Redo" -msgstr "" +msgstr "पुनः करें" #: crates/rnote-ui/data/ui/sidebar.ui:50 -#, fuzzy -#| msgid "Edit Workspace" msgid "Workspace" -msgstr "कार्यक्षेत्र संपादित करें" +msgstr "कार्यस्थान" #: crates/rnote-ui/data/ui/sidebar.ui:61 msgid "Settings" -msgstr "" +msgstr "सेटिंग्स" #: crates/rnote-ui/data/ui/strokecontentpreview.ui:79 msgid "Page" -msgstr "" +msgstr "पृष्ठ" #: crates/rnote-ui/data/ui/workspacebrowser.ui:64 msgid "Move Directory up" -msgstr "" +msgstr "निर्देशिका को ऊपर ले जाएँ" #: crates/rnote-ui/data/ui/workspacebrowser.ui:81 msgid "Workspace Directory Actions" -msgstr "" +msgstr "कार्यस्थान निर्देशिका क्रियाएँ" #: crates/rnote-ui/data/ui/workspacebrowser.ui:163 msgid "Create new Folder" -msgstr "" +msgstr "नया फोल्डर बनाएं" #: crates/rnote-ui/src/appwindow/actions.rs:569 #: crates/rnote-ui/src/appwindow/imp.rs:258 @@ -1711,641 +1736,641 @@ msgstr "" #: crates/rnote-ui/src/dialogs/mod.rs:258 #: crates/rnote-ui/src/dialogs/mod.rs:412 msgid "Saving document failed" -msgstr "" +msgstr "दस्तावेज़ सहेजना विफल रहा" #: crates/rnote-ui/src/appwindow/actions.rs:632 msgid "Printing document failed" -msgstr "" +msgstr "दस्तावेज़ का मुद्रण विफल रही" #: crates/rnote-ui/src/appwindow/actions.rs:668 msgid "Exporting selection failed, nothing selected" -msgstr "" +msgstr "निर्यात चयन विफल, कुछ भी चयनित नहीं" #: crates/rnote-ui/src/appwindow/imp.rs:281 msgid "Button 1" -msgstr "" +msgstr "बटन 1" #: crates/rnote-ui/src/appwindow/imp.rs:288 msgid "Button 2" -msgstr "" +msgstr "बटन 2" #: crates/rnote-ui/src/appwindow/imp.rs:295 msgid "Button 3" -msgstr "" +msgstr "बटन 3" #: crates/rnote-ui/src/appwindow/imp.rs:302 msgid "Button 4" -msgstr "" +msgstr "बटन 4" #: crates/rnote-ui/src/appwindow/mod.rs:126 msgid "" "Settings schema is not installed. App settings could not be loaded and won't " "be saved." msgstr "" +"सेटिंग्स स्कीमा स्थापित नहीं है. ऐप सेटिंग लोड नहीं की जा सकीं और सहेजी नहीं " +"जाएंगी।" #: crates/rnote-ui/src/appwindow/mod.rs:488 msgid "Opening file failed" -msgstr "" +msgstr "फाइल खोलना विफल रहा" #: crates/rnote-ui/src/canvas/mod.rs:846 crates/rnote-ui/src/dialogs/mod.rs:205 #: crates/rnote-ui/src/dialogs/mod.rs:342 msgid "- invalid file name -" -msgstr "" +msgstr "- अमान्य फाइल नाम -" #: crates/rnote-ui/src/canvas/mod.rs:859 msgid "- invalid folder path -" -msgstr "" +msgstr "- अमान्य फोल्डर पथ -" #: crates/rnote-ui/src/canvas/mod.rs:883 msgid "Opened file was modified on disk" -msgstr "" +msgstr "खोली गई फाइल को डिस्क पर संशोधित किया गया था" #: crates/rnote-ui/src/canvas/mod.rs:884 msgid "Reload" -msgstr "" +msgstr "पुनः लोड करें" #: crates/rnote-ui/src/canvas/mod.rs:891 msgid "Reloading .rnote file from disk failed" -msgstr "" +msgstr "डिस्क से .rnote फाइल पुनः लोड करना विफल रहा" #: crates/rnote-ui/src/canvas/mod.rs:957 msgid "Opened file was renamed or moved." -msgstr "" +msgstr "खोली गई फाइल का नाम बदल दिया गया या स्थानांतरित कर दिया गया।" #: crates/rnote-ui/src/canvas/mod.rs:971 msgid "Opened file was removed." -msgstr "" +msgstr "खोली गई फाइल हटा दी गई।" #: crates/rnote-ui/src/canvas/mod.rs:1145 msgid "Inserting file failed" -msgstr "" +msgstr "फाइल सम्मिलित करना विफल रहा" #: crates/rnote-ui/src/canvas/mod.rs:1155 msgid "Inserting text failed" -msgstr "" +msgstr "टेक्स्ट सम्मिलित करना विफल रहा" #: crates/rnote-ui/src/dialogs/export.rs:27 #: crates/rnote-ui/src/dialogs/import.rs:21 msgid ".rnote" -msgstr "" +msgstr ".rnote" #: crates/rnote-ui/src/dialogs/export.rs:55 msgid "Saved document successfully" -msgstr "" +msgstr "दस्तावेज़ सफलतापूर्वक सहेजा गया" #: crates/rnote-ui/src/dialogs/export.rs:226 #: crates/rnote-ui/src/dialogs/export.rs:239 #: crates/rnote-ui/src/dialogs/export.rs:536 #: crates/rnote-ui/src/dialogs/export.rs:804 msgid "Exporting document failed" -msgstr "" +msgstr "दस्तावेज़ निर्यात करना विफल रहा" #: crates/rnote-ui/src/dialogs/export.rs:230 msgid "Exported document successfully" -msgstr "" +msgstr "दस्तावेज़ सफलतापूर्वक निर्यात किया गया" #: crates/rnote-ui/src/dialogs/export.rs:231 #: crates/rnote-ui/src/dialogs/export.rs:532 #: crates/rnote-ui/src/dialogs/export.rs:796 msgid "View in file manager" -msgstr "" +msgstr "फाइल प्रबंधक में देखें" #: crates/rnote-ui/src/dialogs/export.rs:245 #: crates/rnote-ui/src/dialogs/export.rs:542 #: crates/rnote-ui/src/dialogs/export.rs:810 msgid "Failed to open the file in the file manager" -msgstr "" +msgstr "फाइल प्रबंधक में फाइल खोलने में विफल" #: crates/rnote-ui/src/dialogs/export.rs:255 msgid "Exporting document failed, no file selected" -msgstr "" +msgstr "दस्तावेज़ निर्यात करना विफल रहा, कोई फाइल चयनित नहीं हुई" #: crates/rnote-ui/src/dialogs/export.rs:270 #: crates/rnote-ui/src/dialogs/export.rs:567 #: crates/rnote-ui/src/dialogs/export.rs:856 #: crates/rnote-ui/src/dialogs/mod.rs:510 msgid "Select" -msgstr "" +msgstr "चुनें" #: crates/rnote-ui/src/dialogs/export.rs:527 msgid "Exporting document pages failed" -msgstr "" +msgstr "दस्तावेज़ पृष्ठ निर्यात करना विफल रहा" #: crates/rnote-ui/src/dialogs/export.rs:531 msgid "Exported document pages successfully" -msgstr "" +msgstr "दस्तावेज़ पृष्ठ सफलतापूर्वक निर्यात किए गए" #: crates/rnote-ui/src/dialogs/export.rs:551 msgid "Exporting document pages failed, no directory selected" -msgstr "" +msgstr "दस्तावेज़ पृष्ठों का निर्यात विफल रहा, कोई निर्देशिका चयनित नहीं हुई" #: crates/rnote-ui/src/dialogs/export.rs:781 msgid "Exporting selection failed, no file selected" -msgstr "" +msgstr "निर्यात चयन विफल, कोई फ़ाइल चयनित नहीं" #: crates/rnote-ui/src/dialogs/export.rs:791 msgid "Exporting selection failed" -msgstr "" +msgstr "निर्यात चयन विफल रहा" #: crates/rnote-ui/src/dialogs/export.rs:795 msgid "Exported selection successfully" -msgstr "" +msgstr "चयन सफलतापूर्वक निर्यात किया गया" #: crates/rnote-ui/src/dialogs/export.rs:897 #: crates/rnote-ui/src/dialogs/export.rs:945 msgid "Json" -msgstr "" +msgstr "Json" #: crates/rnote-ui/src/dialogs/export.rs:905 msgid "Export Engine State" -msgstr "" +msgstr "निर्यात इंजन अवस्था" #: crates/rnote-ui/src/dialogs/export.rs:923 msgid "Exporting engine state failed" -msgstr "" +msgstr "इंजन अवस्था निर्यात करने में विफल" #: crates/rnote-ui/src/dialogs/export.rs:927 msgid "Exported engine state successfully" -msgstr "" +msgstr "इंजन अवस्था सफलतापूर्वक निर्यात की गई" #: crates/rnote-ui/src/dialogs/export.rs:953 msgid "Export Engine Config" -msgstr "" +msgstr "निर्यात इंजन कॉन्फिग" #: crates/rnote-ui/src/dialogs/export.rs:971 msgid "Exporting engine config failed" -msgstr "" +msgstr "इंजन कॉन्फ़िगरेशन निर्यात करना विफल रहा" #: crates/rnote-ui/src/dialogs/export.rs:975 msgid "Exported engine config successfully" -msgstr "" +msgstr "इंजन कॉन्फ़िगरेशन सफलतापूर्वक निर्यात किया गया" #: crates/rnote-ui/src/dialogs/import.rs:24 msgid "Open File" -msgstr "" +msgstr "फाइल खोलें" #: crates/rnote-ui/src/dialogs/import.rs:63 msgid "Jpg, Pdf, Png, Svg, Xopp, Txt" -msgstr "" +msgstr "Jpg, Pdf, Png, Svg, Xopp, Txt" #: crates/rnote-ui/src/dialogs/import.rs:212 msgid "- no file name -" -msgstr "" +msgstr "- कोई फाइल नाम नहीं -" #: crates/rnote-ui/src/dialogs/import.rs:217 msgid "- no title -" -msgstr "" +msgstr "- कोई शीर्षक नहीं -" #: crates/rnote-ui/src/dialogs/import.rs:220 msgid "- no author -" -msgstr "" +msgstr "- कोई लेखक नहीं -" #: crates/rnote-ui/src/dialogs/import.rs:224 msgid "- no date -" -msgstr "" +msgstr "- कोई तिथि नहीं -" #: crates/rnote-ui/src/dialogs/import.rs:231 msgid "File name:" -msgstr "" +msgstr "फाइल का नाम:" #: crates/rnote-ui/src/dialogs/import.rs:235 msgid "Title:" -msgstr "" +msgstr "शीर्षक:" #: crates/rnote-ui/src/dialogs/import.rs:239 msgid "Author:" -msgstr "" +msgstr "लेखक:" #: crates/rnote-ui/src/dialogs/import.rs:243 msgid "Modification date:" -msgstr "" +msgstr "संशोधन तिथि:" #: crates/rnote-ui/src/dialogs/import.rs:247 msgid "Pages:" -msgstr "" +msgstr "पन्ने:" #. TRANSLATORS: 'Name ' or 'Name https://website.example' #: crates/rnote-ui/src/dialogs/mod.rs:47 msgid "translator-credits" -msgstr "" +msgstr "Scrambled777 " #: crates/rnote-ui/src/dialogs/mod.rs:212 #: crates/rnote-ui/src/dialogs/mod.rs:349 msgid "- invalid save folder name -" -msgstr "" +msgstr "- सहेजने के लिए अमान्य फोल्डर नाम -" #: crates/rnote-ui/src/dialogs/mod.rs:228 #: crates/rnote-ui/src/dialogs/mod.rs:364 msgid "The changes will be saved" -msgstr "" +msgstr "परिवर्तन सहेजे जाएंगे" #: crates/rnote-ui/src/dialogs/mod.rs:233 #: crates/rnote-ui/src/dialogs/mod.rs:369 msgid "A new file will be created" -msgstr "" +msgstr "एक नई फाइल बनाई जाएगी" #: crates/rnote-ui/src/dialogs/mod.rs:508 msgid "Change Workspace Directory" -msgstr "" +msgstr "कार्यस्थान निर्देशिका बदलें" #: crates/rnote-ui/src/dialogs/mod.rs:618 msgid "Band-Aid" -msgstr "" +msgstr "बैंड-एड" #: crates/rnote-ui/src/dialogs/mod.rs:619 msgid "Bank" -msgstr "" +msgstr "बैंक" #: crates/rnote-ui/src/dialogs/mod.rs:620 msgid "Bookmark" -msgstr "" +msgstr "बुकमार्क" #: crates/rnote-ui/src/dialogs/mod.rs:621 msgid "Book" -msgstr "" +msgstr "किताब" #: crates/rnote-ui/src/dialogs/mod.rs:622 msgid "Bread" -msgstr "" +msgstr "ब्रेड" #: crates/rnote-ui/src/dialogs/mod.rs:623 msgid "Calendar" -msgstr "" +msgstr "पंचांग" #: crates/rnote-ui/src/dialogs/mod.rs:624 msgid "Camera" -msgstr "" +msgstr "कैमरा" #: crates/rnote-ui/src/dialogs/mod.rs:625 msgctxt "as in computer chip" msgid "Chip" -msgstr "" +msgstr "चिप" #: crates/rnote-ui/src/dialogs/mod.rs:626 msgid "Clock" -msgstr "" +msgstr "घड़ी" #: crates/rnote-ui/src/dialogs/mod.rs:627 msgid "Code" -msgstr "" +msgstr "कोड" #: crates/rnote-ui/src/dialogs/mod.rs:628 msgid "Compose" -msgstr "" +msgstr "लिखें" #: crates/rnote-ui/src/dialogs/mod.rs:629 msgctxt "as in plant" msgid "Crop" -msgstr "" +msgstr "फसल" #: crates/rnote-ui/src/dialogs/mod.rs:630 msgid "Dictionary" -msgstr "" +msgstr "शब्दकोष" #: crates/rnote-ui/src/dialogs/mod.rs:632 msgid "Drinks" -msgstr "" +msgstr "पेय" #: crates/rnote-ui/src/dialogs/mod.rs:633 msgid "Flag" -msgstr "" +msgstr "झंडा" #: crates/rnote-ui/src/dialogs/mod.rs:634 msgid "Folder" -msgstr "" +msgstr "फोल्डर" #: crates/rnote-ui/src/dialogs/mod.rs:635 msgid "Footprints" -msgstr "" +msgstr "पदचिन्ह" #: crates/rnote-ui/src/dialogs/mod.rs:636 msgid "Gamepad" -msgstr "" +msgstr "गेमपैड" #: crates/rnote-ui/src/dialogs/mod.rs:637 msgid "Gear" -msgstr "" +msgstr "गियर" #: crates/rnote-ui/src/dialogs/mod.rs:638 msgid "Globe" -msgstr "" +msgstr "ग्लोब" #: crates/rnote-ui/src/dialogs/mod.rs:639 msgid "Hammer" -msgstr "" +msgstr "हथौड़ा" #: crates/rnote-ui/src/dialogs/mod.rs:640 msgid "Heart" -msgstr "" +msgstr "दिल" #: crates/rnote-ui/src/dialogs/mod.rs:641 msgid "Hourglass" -msgstr "" +msgstr "रेतघड़ी" #: crates/rnote-ui/src/dialogs/mod.rs:642 msgid "Key" -msgstr "" +msgstr "कुंजी" #: crates/rnote-ui/src/dialogs/mod.rs:643 msgid "Language" -msgstr "" +msgstr "भाषा" #: crates/rnote-ui/src/dialogs/mod.rs:644 msgid "Library" -msgstr "" +msgstr "पुस्तकालय" #: crates/rnote-ui/src/dialogs/mod.rs:645 msgid "Lightbulb" -msgstr "" +msgstr "लाइटबल्ब" #: crates/rnote-ui/src/dialogs/mod.rs:646 msgid "Mathematics" -msgstr "" +msgstr "गणित" #: crates/rnote-ui/src/dialogs/mod.rs:647 msgid "Meeting" -msgstr "" +msgstr "बैठक" #: crates/rnote-ui/src/dialogs/mod.rs:648 msgid "Money" -msgstr "" +msgstr "पैसा" #: crates/rnote-ui/src/dialogs/mod.rs:649 msgid "Musical Note" -msgstr "" +msgstr "संगीत नोट" #: crates/rnote-ui/src/dialogs/mod.rs:650 msgid "Nature" -msgstr "" +msgstr "प्रकृति" #: crates/rnote-ui/src/dialogs/mod.rs:651 msgid "Open Book" -msgstr "" +msgstr "किताब खोलें" #: crates/rnote-ui/src/dialogs/mod.rs:652 msgid "Paintbrush" -msgstr "" +msgstr "तूलिका" #: crates/rnote-ui/src/dialogs/mod.rs:653 msgid "Pencil and Paper" -msgstr "" +msgstr "पेंसिल और कागज" #: crates/rnote-ui/src/dialogs/mod.rs:654 msgid "People" -msgstr "" +msgstr "लोग" #: crates/rnote-ui/src/dialogs/mod.rs:655 msgid "Person" -msgstr "" +msgstr "व्यक्ति" #: crates/rnote-ui/src/dialogs/mod.rs:656 msgid "Projector" -msgstr "" +msgstr "प्रोजेक्टर" #: crates/rnote-ui/src/dialogs/mod.rs:657 msgid "Science" -msgstr "" +msgstr "विज्ञान" #: crates/rnote-ui/src/dialogs/mod.rs:658 msgid "Scratchpad" -msgstr "" +msgstr "स्क्रैचपैड" #: crates/rnote-ui/src/dialogs/mod.rs:659 msgid "Shapes" -msgstr "" +msgstr "आकार" #: crates/rnote-ui/src/dialogs/mod.rs:660 msgid "Shopping" -msgstr "" +msgstr "खरीदारी" #: crates/rnote-ui/src/dialogs/mod.rs:661 msgid "Speech Bubble" -msgstr "" +msgstr "संवाद बुलबुला" #: crates/rnote-ui/src/dialogs/mod.rs:662 msgid "Speedometer" -msgstr "" +msgstr "गतिमापी" #: crates/rnote-ui/src/dialogs/mod.rs:663 msgid "Star" -msgstr "" +msgstr "तारा" #: crates/rnote-ui/src/dialogs/mod.rs:665 msgctxt "as in terminal software" msgid "Terminal" -msgstr "" +msgstr "टर्मिनल" #: crates/rnote-ui/src/dialogs/mod.rs:667 msgid "Text" -msgstr "" +msgstr "टेक्स्ट" #: crates/rnote-ui/src/dialogs/mod.rs:668 msgid "Travel" -msgstr "" +msgstr "यात्रा" #: crates/rnote-ui/src/dialogs/mod.rs:669 msgid "Weather" -msgstr "" +msgstr "मौसम" #: crates/rnote-ui/src/dialogs/mod.rs:670 msgid "Weight" -msgstr "" +msgstr "वज़न" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:387 msgid "Miscellaneous" -msgstr "" +msgstr "मिश्रित" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:396 msgid "Coordinate Systems" -msgstr "" +msgstr "समन्वय प्रणाली" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:404 msgid "Ellipses" -msgstr "" +msgstr "दीर्घवृत्त" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:411 msgid "Curves & Paths" -msgstr "" +msgstr "वक्र एवं पथ" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:426 msgid "Arrow" -msgstr "" +msgstr "तीर" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:427 msgid "Line" -msgstr "" +msgstr "रेखा" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:428 msgid "Rectangle" -msgstr "" +msgstr "आयत" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:430 msgid "2D coordinate system" -msgstr "" +msgstr "2D समन्वय प्रणाली" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:431 msgid "3D coordinate system" -msgstr "" +msgstr "3D समन्वय प्रणाली" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:432 msgid "2D single quadrant coordinate system" -msgstr "" +msgstr "2D एकल चतुर्भुज समन्वय प्रणाली" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:433 msgid "Ellipse" -msgstr "" +msgstr "दीर्घवृत्त" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:434 msgid "Ellipse with foci" -msgstr "" +msgstr "केंद्र के साथ दीर्घवृत्त" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:435 msgid "Quadratic bezier curve" -msgstr "" +msgstr "द्विघात बेज़ियर वक्र" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:436 msgid "Cubic bezier curve" -msgstr "" +msgstr "घन बेज़ियर वक्र" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:437 msgid "Polyline" -msgstr "" +msgstr "बहुरेखा" #: crates/rnote-ui/src/penssidebar/shaperpage.rs:438 msgid "Polygon" -msgstr "" +msgstr "बहुभुज" #: crates/rnote-ui/src/settingspanel/mod.rs:551 msgid "Application restart is required" -msgstr "" +msgstr "एप्लिकेशन पुनरारंभ आवश्यक है" #: crates/rnote-ui/src/settingspanel/mod.rs:867 msgctxt "a cursor type" msgid "Crosshair (Small)" -msgstr "" +msgstr "क्रॉसहेयर (छोटा)" #: crates/rnote-ui/src/settingspanel/mod.rs:868 msgctxt "a cursor type" msgid "Crosshair (Medium)" -msgstr "" +msgstr "क्रॉसहेयर (मध्यम)" #: crates/rnote-ui/src/settingspanel/mod.rs:869 msgctxt "a cursor type" msgid "Crosshair (Large)" -msgstr "" +msgstr "क्रॉसहेयर (बड़ा)" #: crates/rnote-ui/src/settingspanel/mod.rs:870 msgctxt "a cursor type" msgid "Dot (Small)" -msgstr "" +msgstr "बिंदु (छोटा)" #: crates/rnote-ui/src/settingspanel/mod.rs:871 msgctxt "a cursor type" msgid "Dot (Medium)" -msgstr "" +msgstr "बिंदु (मध्यम)" #: crates/rnote-ui/src/settingspanel/mod.rs:872 msgctxt "a cursor type" msgid "Dot (Large)" -msgstr "" +msgstr "बिंदु (बड़ा)" #: crates/rnote-ui/src/settingspanel/mod.rs:873 msgctxt "a cursor type" msgid "Teardrop North-West (Small)" -msgstr "" +msgstr "अश्रु उत्तर-पश्चिम (छोटा)" #: crates/rnote-ui/src/settingspanel/mod.rs:874 msgctxt "a cursor type" msgid "Teardrop North-West (Medium)" -msgstr "" +msgstr "अश्रु उत्तर-पश्चिम (मध्यम)" #: crates/rnote-ui/src/settingspanel/mod.rs:875 msgctxt "a cursor type" msgid "Teardrop North-West (Large)" -msgstr "" +msgstr "अश्रु उत्तर-पश्चिम (बड़ा)" #: crates/rnote-ui/src/settingspanel/mod.rs:876 msgctxt "a cursor type" msgid "Teardrop North-East (Small)" -msgstr "" +msgstr "अश्रु-उत्तर-पूर्व (छोटा)" #: crates/rnote-ui/src/settingspanel/mod.rs:877 msgctxt "a cursor type" msgid "Teardrop North-East (Medium)" -msgstr "" +msgstr "अश्रु-उत्तर-पूर्व (मध्यम)" #: crates/rnote-ui/src/settingspanel/mod.rs:878 msgctxt "a cursor type" msgid "Teardrop North-East (Large)" -msgstr "" +msgstr "अश्रु उत्तर-पूर्व (बड़ा)" #: crates/rnote-ui/src/settingspanel/mod.rs:879 msgctxt "a cursor type" msgid "Teardrop North (Small)" -msgstr "" +msgstr "अश्रु उत्तर (छोटा)" #: crates/rnote-ui/src/settingspanel/mod.rs:880 msgctxt "a cursor type" msgid "Teardrop North (Medium)" -msgstr "" +msgstr "अश्रु उत्तर (मध्यम)" #: crates/rnote-ui/src/settingspanel/mod.rs:881 msgctxt "a cursor type" msgid "Teardrop North (Large)" -msgstr "" +msgstr "अश्रु उत्तर (बड़ा)" #: crates/rnote-ui/src/settingspanel/mod.rs:882 msgctxt "a cursor type" msgid "Beam (Small)" -msgstr "" +msgstr "बीम (छोटा)" #: crates/rnote-ui/src/settingspanel/mod.rs:883 msgctxt "a cursor type" msgid "Beam (Medium)" -msgstr "" +msgstr "बीम (मध्यम)" #: crates/rnote-ui/src/settingspanel/mod.rs:884 msgctxt "a cursor type" msgid "Beam (Large)" -msgstr "" +msgstr "बीम (बड़ा)" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/duplicate.rs:35 msgid "Can't duplicate an unsaved document" -msgstr "" +msgstr "बिना सहेजे गए दस्तावेज़ की नकल नहीं बनाई जा सकती" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/duplicate.rs:45 msgid "Duplicating the file failed" -msgstr "" +msgstr "फाइल की प्रतिलिपि बनाना विफल रहा" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/duplicate.rs:51 -#, fuzzy -#| msgid "Change the directory" msgid "Duplicating the directory failed" -msgstr "निदॆशिका बदलॆ" +msgstr "निर्देशिका की प्रतिलिपि बनाना विफल रहा" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/open_in_default_app.rs:18 msgid "Open the file in the default app failed" -msgstr "" +msgstr "फाइल को डिफ़ॉल्ट ऐप में खोलना विफल रहा" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/rename.rs:39 msgid "Renaming file failed, target file already exists" -msgstr "" +msgstr "फाइल नाम बदलना विफल रहा, लक्ष्य फाइल पहले से मौजूद है" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/rename.rs:46 msgid "Renaming file failed" -msgstr "" +msgstr "फाइल का नाम बदलना विफल रहा" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/trash.rs:20 msgid "Trashing file failed" -msgstr "" +msgstr "फाइल ट्रैशिंग विफल रही" #: crates/rnote-ui/src/workspacebrowser/workspaceactions/createfolder.rs:67 msgid "Folder Name" -msgstr "" +msgstr "फोल्डर का नाम" #: crates/rnote-ui/src/workspacebrowser/workspaceactions/createfolder.rs:75 msgid "New Folder" -msgstr "" +msgstr "नया फोल्डर" #~ msgid "Lecture Note 1" #~ msgstr "लेकचर नोट १" diff --git a/crates/rnote-ui/po/ja.po b/crates/rnote-ui/po/ja.po index 030a5f2848..bbdeb09e8f 100644 --- a/crates/rnote-ui/po/ja.po +++ b/crates/rnote-ui/po/ja.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: rnote\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-22 15:14+0100\n" -"PO-Revision-Date: 2024-02-17 14:42+0000\n" +"PO-Revision-Date: 2024-04-06 10:48+0000\n" "Last-Translator: Ryo Nakano \n" -"Language-Team: Japanese \n" +"Language-Team: Japanese " +"\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.4\n" +"X-Generator: Weblate 5.5-dev\n" #: crates/rnote-ui/data/app.desktop.in.in:5 #: crates/rnote-ui/data/app.metainfo.xml.in.in:9 @@ -1049,7 +1049,7 @@ msgstr "寄付(_D) 💝" #: crates/rnote-ui/data/ui/appmenu.ui:142 msgid "A_bout Rnote" -msgstr "Rnoteについて(_B)" +msgstr "Rnote について(_B)" #: crates/rnote-ui/data/ui/appmenu.ui:173 msgid "Sidebar on the Left Side" diff --git a/crates/rnote-ui/po/pt.po b/crates/rnote-ui/po/pt.po index 671094a795..2903f35188 100644 --- a/crates/rnote-ui/po/pt.po +++ b/crates/rnote-ui/po/pt.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: rnote\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-22 15:14+0100\n" -"PO-Revision-Date: 2023-04-16 08:50+0000\n" -"Last-Translator: Felipe Nogueira \n" +"PO-Revision-Date: 2024-03-30 01:01+0000\n" +"Last-Translator: tserv2331 \n" "Language-Team: Portuguese \n" "Language: pt\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.17-dev\n" +"X-Generator: Weblate 5.5-dev\n" #: crates/rnote-ui/data/app.desktop.in.in:5 #: crates/rnote-ui/data/app.metainfo.xml.in.in:9 @@ -69,7 +69,7 @@ msgstr "" #: crates/rnote-ui/data/app.metainfo.xml.in.in:50 msgid "Hide toolbars with the focus mode" -msgstr "" +msgstr "Ocultar barras de ferramentas com o modo foco" #: crates/rnote-ui/data/app.metainfo.xml.in.in:55 msgid "Quickly access files through workspace" @@ -77,11 +77,11 @@ msgstr "" #: crates/rnote-ui/data/app.metainfo.xml.in.in:60 msgid "Adjust document settings" -msgstr "" +msgstr "Ajustar as configurações do documento" #: crates/rnote-ui/data/app.metainfo.xml.in.in:65 msgid "Configure action shortcuts" -msgstr "" +msgstr "Configurar atalhos de ação" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:5 #: crates/rnote-ui/data/ui/shortcuts.ui:185 @@ -157,10 +157,6 @@ msgid "Close Window" msgstr "Fechar Janela" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:48 -#, fuzzy -#| msgid "" -#| "Some opened files contain unsaved changes. Changes which are not saved " -#| "will be permanently lost." msgid "" "Some opened files contain unsaved changes.\n" "Changes which are not saved will be permanently lost." @@ -299,7 +295,7 @@ msgstr "Definir se padrão de fundo deve ser exportado" #: crates/rnote-ui/data/ui/dialogs/export.ui:329 #: crates/rnote-ui/data/ui/dialogs/export.ui:523 msgid "Optimize for Printing" -msgstr "" +msgstr "Otimizar para Impressão" #: crates/rnote-ui/data/ui/dialogs/export.ui:123 #: crates/rnote-ui/data/ui/dialogs/export.ui:330 @@ -790,7 +786,7 @@ msgstr "Desmarcar Todos os Traços" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:105 msgid "Invert Color Brightness of All Selected Strokes" -msgstr "" +msgstr "Inverter o brilho da cor de todos os traços selecionados" #: crates/rnote-ui/data/ui/penssidebar/selectorpage.ui:116 #: crates/rnote-ui/data/ui/shortcuts.ui:236 @@ -960,7 +956,7 @@ msgstr "Preencher" #: crates/rnote-ui/data/ui/workspacesbar/workspacesbar.ui:60 msgid "Move Selected Workspace Up" -msgstr "" +msgstr "Mover Área de trabalho Selecionada para cima" #: crates/rnote-ui/data/ui/workspacesbar/workspacesbar.ui:69 msgid "Move Selected Workspace Down" diff --git a/crates/rnote-ui/po/zh_Hans.po b/crates/rnote-ui/po/zh_Hans.po index b1e32b7352..23d1dc0423 100644 --- a/crates/rnote-ui/po/zh_Hans.po +++ b/crates/rnote-ui/po/zh_Hans.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: rnote\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-22 15:14+0100\n" -"PO-Revision-Date: 2024-03-15 11:02+0000\n" -"Last-Translator: detiam \n" +"PO-Revision-Date: 2024-04-02 00:01+0000\n" +"Last-Translator: Integral \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -2335,19 +2335,15 @@ msgstr "横（大）" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/duplicate.rs:35 msgid "Can't duplicate an unsaved document" -msgstr "" +msgstr "无法复制未保存的文档" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/duplicate.rs:45 -#, fuzzy -#| msgid "Opening .rnote file failed" msgid "Duplicating the file failed" -msgstr ".rnote 文件打开失败" +msgstr ".rnote 文件复制失败" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/duplicate.rs:51 -#, fuzzy -#| msgid "Change the directory" msgid "Duplicating the directory failed" -msgstr "更改目录" +msgstr "复制目录失败" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/open_in_default_app.rs:18 #, fuzzy @@ -2357,19 +2353,15 @@ msgstr "无法打开在文件管理器中选择的文件" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/rename.rs:39 msgid "Renaming file failed, target file already exists" -msgstr "" +msgstr "重命名文件失败，目标文件已存在" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/rename.rs:46 -#, fuzzy -#| msgid "Opening file failed" msgid "Renaming file failed" -msgstr "文件打开失败" +msgstr "文件重命名失败" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/trash.rs:20 -#, fuzzy -#| msgid "Inserting file failed" msgid "Trashing file failed" -msgstr "插入文件失败" +msgstr "删除文件失败" #: crates/rnote-ui/src/workspacebrowser/workspaceactions/createfolder.rs:67 msgid "Folder Name" From dfe255b59efef4555a988d07f368fc871b5ce135 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 6 Apr 2024 10:50:57 +0000 Subject: [PATCH 05/13] i18n: Update traditional Chinese translation referenced issue: #220 --- crates/rnote-ui/po/LINGUAS | 4 ++++ crates/rnote-ui/po/zh_Hant.po | 24 ++++++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/crates/rnote-ui/po/LINGUAS b/crates/rnote-ui/po/LINGUAS index 18e6c6dc47..00ecaee0bb 100644 --- a/crates/rnote-ui/po/LINGUAS +++ b/crates/rnote-ui/po/LINGUAS @@ -29,5 +29,9 @@ th tr uk vi +zh_CN +zh_HK zh_Hans zh_Hant +zh_SG +zh_TW diff --git a/crates/rnote-ui/po/zh_Hant.po b/crates/rnote-ui/po/zh_Hant.po index 72630f818f..789faeb17d 100644 --- a/crates/rnote-ui/po/zh_Hant.po +++ b/crates/rnote-ui/po/zh_Hant.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: rnote\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-22 15:14+0100\n" -"PO-Revision-Date: 2024-03-15 11:02+0000\n" -"Last-Translator: openCC converted detiam \n" +"PO-Revision-Date: 2024-04-02 00:01+0000\n" +"Last-Translator: openCC converted Integral \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hant\n" @@ -2335,19 +2335,15 @@ msgstr "橫（大）" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/duplicate.rs:35 msgid "Can't duplicate an unsaved document" -msgstr "" +msgstr "無法複製未儲存的文件" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/duplicate.rs:45 -#, fuzzy -#| msgid "Opening .rnote file failed" msgid "Duplicating the file failed" -msgstr ".rnote 檔案開啟失敗" +msgstr ".rnote 檔案複製失敗" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/duplicate.rs:51 -#, fuzzy -#| msgid "Change the directory" msgid "Duplicating the directory failed" -msgstr "更改目錄" +msgstr "複製目錄失敗" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/open_in_default_app.rs:18 #, fuzzy @@ -2357,19 +2353,15 @@ msgstr "無法開啟在檔案管理器中選擇的檔案" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/rename.rs:39 msgid "Renaming file failed, target file already exists" -msgstr "" +msgstr "重新命名檔案失敗，目標檔案已存在" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/rename.rs:46 -#, fuzzy -#| msgid "Opening file failed" msgid "Renaming file failed" -msgstr "檔案開啟失敗" +msgstr "檔案重新命名失敗" #: crates/rnote-ui/src/workspacebrowser/filerow/actions/trash.rs:20 -#, fuzzy -#| msgid "Inserting file failed" msgid "Trashing file failed" -msgstr "插入檔案失敗" +msgstr "刪除檔案失敗" #: crates/rnote-ui/src/workspacebrowser/workspaceactions/createfolder.rs:67 msgid "Folder Name" From 1e24581918f08872467ecc5f6f6ec6bc56170b47 Mon Sep 17 00:00:00 2001 From: Felix Zwettler Date: Sat, 6 Apr 2024 13:33:16 +0200 Subject: [PATCH 06/13] chore: update deps, devel flatpak --- BUILDING.md | 4 +- Cargo.lock | 387 ++++++++++---------- Cargo.toml | 4 +- build-aux/com.github.flxzt.rnote.Devel.json | 12 +- build-aux/com.github.flxzt.rnote.Devel.yaml | 12 +- 5 files changed, 213 insertions(+), 206 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 87c4a1a714..cfe79c88ba 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -40,8 +40,8 @@ flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.f The flatpak Gnome Runtime, SDK and some extensions are needed: ```bash -flatpak install org.gnome.Platform//45 org.gnome.Sdk//45 org.freedesktop.Sdk.Extension.rust-stable//23.08 \ -org.freedesktop.Sdk.Extension.llvm16//23.08 +flatpak install org.gnome.Platform//46 org.gnome.Sdk//46 org.freedesktop.Sdk.Extension.rust-stable//23.08 \ +org.freedesktop.Sdk.Extension.llvm17//23.08 ``` Use Gnome Builder or VSCode with the diff --git a/Cargo.lock b/Cargo.lock index 07c7748de2..967bb9300a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -51,7 +51,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" dependencies = [ "alsa-sys", - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", ] @@ -130,9 +130,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "approx" @@ -178,17 +178,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" dependencies = [ "async-lock 3.3.0", "async-task", @@ -211,9 +211,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock 3.3.0", "cfg-if", @@ -261,19 +261,21 @@ dependencies = [ [[package]] name = "async-process" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" +checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" dependencies = [ "async-channel", "async-io", "async-lock 3.3.0", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 5.2.0", + "event-listener 5.3.0", "futures-lite", "rustix", + "tracing", "windows-sys 0.52.0", ] @@ -320,9 +322,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "autocxx" @@ -356,7 +358,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.52", + "syn 2.0.58", "which", ] @@ -369,7 +371,7 @@ dependencies = [ "autocxx-engine", "env_logger", "indexmap 1.9.3", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -396,7 +398,7 @@ dependencies = [ "rustversion", "serde_json", "strum_macros", - "syn 2.0.52", + "syn 2.0.58", "tempfile", "thiserror", "version_check", @@ -412,7 +414,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -429,15 +431,15 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.52", + "syn 2.0.58", "thiserror", ] [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -459,9 +461,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.7" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "bindgen" @@ -469,7 +471,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -480,7 +482,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -497,9 +499,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block" @@ -531,9 +533,9 @@ checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -543,9 +545,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cairo-rs" @@ -553,7 +555,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", @@ -620,9 +622,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -645,9 +647,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.2" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -662,19 +664,19 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -864,14 +866,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] name = "cxx" -version = "1.0.119" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "635179be18797d7e10edb9cd06c859580237750c7351f39ed9b298bfc17544ad" +checksum = "ff4dc7287237dd438b926a81a1a5605dad33d286870e5eee2db17bf2bcd9e92a" dependencies = [ "cc", "cxxbridge-flags", @@ -881,31 +883,31 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.119" +version = "0.7.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5797d553b95704a6a49394acfdb93e2332b8aaa146713a1e8ebe362e86d9fa68" +checksum = "cf9e305d914e15a8eefd7972a3b658d876d91a22681d555219feda30a9f5ea2b" dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] name = "cxxbridge-flags" -version = "1.0.119" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a87ff7342ffaa54b7c61618e0ce2bbcf827eba6d55b923b83d82551acbbecfe5" +checksum = "701a1ac7a697e249cdd8dc026d7a7dafbfd0dbcd8bd24ec55889f2bc13dd6287" [[package]] name = "cxxbridge-macro" -version = "1.0.119" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b5b86cf65fa0626d85720619d80b288013477a91a0389fa8bc716bf4903ad1" +checksum = "b404f596046b0bb2d903a9c786b875a126261b52b7c3a64bbb66382c41c771df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1129,9 +1131,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -1150,11 +1152,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ - "event-listener 5.2.0", + "event-listener 5.3.0", "pin-project-lite", ] @@ -1188,9 +1190,9 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" @@ -1379,9 +1381,9 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "fastrand", "futures-core", @@ -1398,7 +1400,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1537,9 +1539,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" dependencies = [ "cfg-if", "libc", @@ -1584,9 +1586,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" +checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" dependencies = [ "futures-channel", "futures-core", @@ -1615,11 +1617,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" +checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -1646,15 +1648,15 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" +checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1843,6 +1845,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1961,9 +1969,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2105,9 +2113,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -2180,18 +2188,19 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ "arrayvec", + "smallvec", ] [[package]] name = "kurbo" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" +checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" dependencies = [ "arrayvec", "smallvec", @@ -2277,9 +2286,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "librsvg" -version = "2.58.0-beta.1" +version = "2.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d441368ddd551d54ef8ebcf515cf8a22604856a66da21828fa1d57651a9f71" +checksum = "de005d9589235493d0e2b62d055c0d8e368db4fb33e746dafc9400fb67b9c817" dependencies = [ "cairo-rs", "cast", @@ -2420,9 +2429,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -2435,9 +2444,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2471,7 +2480,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -2513,9 +2522,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.4" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4541eb06dce09c0241ebbaab7102f0a01a0c8994afed2e5d0d66775016e25ac2" +checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef" dependencies = [ "approx", "matrixmultiply", @@ -2545,7 +2554,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "jni-sys", "log", "ndk-sys", @@ -2570,15 +2579,9 @@ dependencies = [ [[package]] name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "no-std-compat" -version = "0.4.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nom" @@ -2596,7 +2599,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -2651,7 +2654,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -2712,7 +2715,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -2723,12 +2726,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "numeric-sort" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f2c4adf593c928171160e2632096353bb0306d3c8447143861374d5e678e37" -dependencies = [ - "no-std-compat", -] +checksum = "5180ed575d2ae6100dc63813e3810aba273c291608cf019aa58f76784ecc331b" [[package]] name = "objc" @@ -2840,14 +2840,14 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] name = "pango" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" +checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" dependencies = [ "gio", "glib", @@ -2924,9 +2924,9 @@ dependencies = [ [[package]] name = "parry2d-f64" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542444b3ef557470c352ca13ba34a3d5e558b34265339320b8fb560bc82c427e" +checksum = "5565e2f28bad470868b5e5c146fd0e2716345b67d8b9f27e0fc147a1dd4790b5" dependencies = [ "approx", "arrayvec", @@ -3051,7 +3051,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3060,7 +3060,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -3069,7 +3069,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -3102,9 +3102,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3154,12 +3154,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.3.9", "pin-project-lite", "rustix", "tracing", @@ -3213,12 +3214,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3256,9 +3257,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -3338,9 +3339,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3373,14 +3374,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -3400,7 +3401,7 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -3411,9 +3412,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rgb" @@ -3659,11 +3660,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -3678,11 +3679,11 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +checksum = "88117946aa1bfb53c2ae0643ceac6506337f44887f8c9fbfb43587b1cc52ba49" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "bytemuck", "smallvec", "ttf-parser", @@ -3728,7 +3729,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cssparser", "derive_more", "fxhash", @@ -3767,14 +3768,14 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -3863,6 +3864,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.9" @@ -3884,9 +3891,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -3981,9 +3988,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum_macros" @@ -3991,7 +3998,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -4047,17 +4054,17 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] name = "svgtypes" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d7618f12b51be8171a7cfdda1e7a93f79cbc57c4e7adf89a749cf671125241" +checksum = "d97ca9a891c9c70da8139ac9d8e8ea36a210fa21bb50eccd75d4a9561c83e87f" dependencies = [ - "kurbo 0.10.4", - "siphasher", + "kurbo 0.11.0", + "siphasher 1.0.1", ] [[package]] @@ -4144,9 +4151,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -4155,14 +4162,14 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck", + "heck 0.5.0", "pkg-config", - "toml 0.8.10", + "toml 0.8.12", "version-compare", ] @@ -4174,9 +4181,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" @@ -4233,22 +4240,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -4312,14 +4319,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.9", ] [[package]] @@ -4337,7 +4344,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -4350,18 +4357,18 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -4387,7 +4394,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -4500,15 +4507,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" [[package]] name = "unicode-ccc" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" [[package]] name = "unicode-ident" @@ -4574,24 +4581,24 @@ dependencies = [ [[package]] name = "usvg" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c04150a94f0bfc3b2c15d4e151524d14cd06765fc6641d8b1c59a248360d4474" +checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d" dependencies = [ "base64", "data-url", "flate2", "fontdb", "imagesize", - "kurbo 0.9.5", + "kurbo 0.11.0", "log", "pico-args", "roxmltree", "rustybuzz", "simplecss", - "siphasher", + "siphasher 1.0.1", "strict-num", - "svgtypes 0.14.0", + "svgtypes 0.15.0", "tiny-skia-path", "unicode-bidi", "unicode-script", @@ -4619,9 +4626,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -4666,7 +4673,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -4700,7 +4707,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5084,7 +5091,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7e6aefd0d7..4689cff46a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ anyhow = "1.0" approx = "0.5.1" async-fs = "2.1" atty = "0.2.14" -base64 = "0.21.7" +base64 = "0.22.0" cairo-rs = { version = "0.19.2", features = ["v1_18", "png", "svg", "pdf"] } chrono = "0.4.34" clap = { version = "4.4", features = ["derive"] } @@ -81,7 +81,7 @@ tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } unicode-segmentation = "1.11" url = "2.5" -usvg = "0.40.0" +usvg = "0.41.0" winresource = "0.1.17" xmlwriter = "0.1.0" # Enabling feature > v20_9 causes linker errors on mingw diff --git a/build-aux/com.github.flxzt.rnote.Devel.json b/build-aux/com.github.flxzt.rnote.Devel.json index 4c5046b0a1..4d32bc5c35 100644 --- a/build-aux/com.github.flxzt.rnote.Devel.json +++ b/build-aux/com.github.flxzt.rnote.Devel.json @@ -4,11 +4,11 @@ "development" ], "runtime": "org.gnome.Platform", - "runtime-version": "45", + "runtime-version": "46", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm16" + "org.freedesktop.Sdk.Extension.llvm17" ], "command": "rnote", "finish-args": [ @@ -29,7 +29,7 @@ "--env=GST_DEBUG=3" ], "build-options": { - "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin", + "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm17/bin", "env": { "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang", "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold", @@ -43,7 +43,7 @@ "--socket=x11", "--share=network" ], - "prepend-ld-library-path": "/usr/lib/sdk/llvm16/lib" + "prepend-ld-library-path": "/usr/lib/sdk/llvm17/lib" }, "modules": [ { @@ -63,8 +63,8 @@ "sources": [ { "type": "archive", - "url": "https://poppler.freedesktop.org/poppler-24.02.0.tar.xz", - "sha256": "19187a3fdd05f33e7d604c4799c183de5ca0118640c88b370ddcf3136343222e" + "url": "https://poppler.freedesktop.org/poppler-24.04.0.tar.xz", + "sha256": "1e804ec565acf7126eb2e9bb3b56422ab2039f7e05863a5dfabdd1ffd1bb77a7" } ] }, diff --git a/build-aux/com.github.flxzt.rnote.Devel.yaml b/build-aux/com.github.flxzt.rnote.Devel.yaml index d7bd2484a8..9eea4ea720 100644 --- a/build-aux/com.github.flxzt.rnote.Devel.yaml +++ b/build-aux/com.github.flxzt.rnote.Devel.yaml @@ -2,11 +2,11 @@ id: com.github.flxzt.rnote.Devel tags: - development runtime: org.gnome.Platform -runtime-version: "45" +runtime-version: "46" sdk: org.gnome.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.rust-stable - - org.freedesktop.Sdk.Extension.llvm16 + - org.freedesktop.Sdk.Extension.llvm17 command: rnote finish-args: - "--socket=wayland" @@ -25,7 +25,7 @@ finish-args: - "--env=GTK_PATH=/app/lib/gtk-4.0" - "--env=GST_DEBUG=3" build-options: - append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin" + append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm17/bin" env: CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER: clang CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold" @@ -36,7 +36,7 @@ build-options: test-args: - "--socket=x11" - "--share=network" - prepend-ld-library-path: /usr/lib/sdk/llvm16/lib + prepend-ld-library-path: /usr/lib/sdk/llvm17/lib modules: - name: poppler buildsystem: cmake-ninja @@ -52,8 +52,8 @@ modules: - "-DENABLE_UTILS=OFF" sources: - type: archive - url: "https://poppler.freedesktop.org/poppler-24.02.0.tar.xz" - sha256: 19187a3fdd05f33e7d604c4799c183de5ca0118640c88b370ddcf3136343222e + url: "https://poppler.freedesktop.org/poppler-24.04.0.tar.xz" + sha256: 1e804ec565acf7126eb2e9bb3b56422ab2039f7e05863a5dfabdd1ffd1bb77a7 - name: poppler-data buildsystem: cmake-ninja config-opts: From 0f8adb5480adc165377b90654181395753366d21 Mon Sep 17 00:00:00 2001 From: Felix Zwettler Date: Sat, 6 Apr 2024 13:55:31 +0200 Subject: [PATCH 07/13] fix: origin indicator cross size on hi-dpi screens --- crates/rnote-engine/src/engine/rendering.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/rnote-engine/src/engine/rendering.rs b/crates/rnote-engine/src/engine/rendering.rs index 17e7dba297..eb708bf174 100644 --- a/crates/rnote-engine/src/engine/rendering.rs +++ b/crates/rnote-engine/src/engine/rendering.rs @@ -56,7 +56,7 @@ impl Engine { use crate::ext::GrapheneRectExt; use gtk4::{graphene, gsk, prelude::*}; - let image_scale = self.camera.image_scale(); + let total_zoom = self.camera.total_zoom(); if let Some(image) = &self.origin_indicator_image { // Only create the texture once, it is expensive @@ -75,7 +75,7 @@ impl Engine { &new_texture, &graphene::Rect::from_p2d_aabb( origin_indicator_bounds() - .scaled(&na::Vector2::repeat(1.0 / image_scale)), + .scaled(&na::Vector2::repeat(1.0 / total_zoom)), ), ) .upcast(), From dc3b2d513ad8c57f5d70b552bc82a5c3a555a66f Mon Sep 17 00:00:00 2001 From: Felix Zwettler Date: Sat, 6 Apr 2024 14:13:58 +0200 Subject: [PATCH 08/13] chore: bump app version --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- Cargo.lock | 8 ++++---- Cargo.toml | 6 +++--- .../src/fileformats/rnoteformat/mod.rs | 2 +- crates/rnote-ui/data/app.metainfo.xml.in.in | 14 ++++++++++++++ crates/rnote-ui/src/appwindow/appsettings.rs | 2 +- meson.build | 2 +- 7 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 5d4125c51f..0b8b4031eb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,7 +28,7 @@ If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** - OS: [e.g. Fedora 39, Windows 11 23H2, ...] - - App Version: [e.g. Rnote v0.10.1] + - App Version: [e.g. Rnote v0.10.2] - Installation Source: [e.g. Flatpak, Archlinux Community Repo, ...] - Desktop Environment: [e.g. Gnome 45.2] - Display Server: [e.g. Wayland or X11] diff --git a/Cargo.lock b/Cargo.lock index 967bb9300a..0cbd1de820 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3427,7 +3427,7 @@ dependencies = [ [[package]] name = "rnote" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "async-fs", @@ -3477,7 +3477,7 @@ dependencies = [ [[package]] name = "rnote-cli" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "atty", @@ -3496,7 +3496,7 @@ dependencies = [ [[package]] name = "rnote-compose" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "approx", @@ -3525,7 +3525,7 @@ dependencies = [ [[package]] name = "rnote-engine" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "approx", diff --git a/Cargo.toml b/Cargo.toml index 4689cff46a..841845cdac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,11 +14,11 @@ homepage = "https://rnote.flxzt.net" license = "GPL-3.0-or-later" repository = "https://github.com/flxzt/rnote" rust-version = "1.74" -version = "0.10.1" +version = "0.10.2" [workspace.dependencies] -rnote-compose = { version = "0.10.1", path = "crates/rnote-compose" } -rnote-engine = { version = "0.10.1", path = "crates/rnote-engine" } +rnote-compose = { version = "0.10.2", path = "crates/rnote-compose" } +rnote-engine = { version = "0.10.2", path = "crates/rnote-engine" } adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] } anyhow = "1.0" diff --git a/crates/rnote-engine/src/fileformats/rnoteformat/mod.rs b/crates/rnote-engine/src/fileformats/rnoteformat/mod.rs index 4db420bfd8..da94f823fa 100644 --- a/crates/rnote-engine/src/fileformats/rnoteformat/mod.rs +++ b/crates/rnote-engine/src/fileformats/rnoteformat/mod.rs @@ -56,7 +56,7 @@ struct RnotefileWrapper { pub type RnoteFile = RnoteFileMaj0Min9; impl RnoteFile { - pub const SEMVER: &'static str = "0.10.1"; + pub const SEMVER: &'static str = "0.10.2"; } impl FileFormatLoader for RnoteFile { diff --git a/crates/rnote-ui/data/app.metainfo.xml.in.in b/crates/rnote-ui/data/app.metainfo.xml.in.in index d91d07fdaf..ac9c333acd 100644 --- a/crates/rnote-ui/data/app.metainfo.xml.in.in +++ b/crates/rnote-ui/data/app.metainfo.xml.in.in @@ -87,6 +87,20 @@ + + +

this release changes:

+
    +
  • improv: put handles outside of selection borders, enable resizing to smaller sizes (thanks to @Doublonmousse)
    • +
  • improv: error notification when file operations fail in workspace browser
    • +
  • metainfo: add brand colors (thanks to @bertob)
    • +
  • fix: origin indicator cross size on hi-dpi screens
    • +
  • fix: rendering got out of sync when resizing long-to-render content
    • +
  • fix: selection stroke widths got larger when resizing non-uniformly
    • +
  • fix: regression which caused excessive rerendering of selection during resizing
    • +
+ +

this release changes:

diff --git a/crates/rnote-ui/src/appwindow/appsettings.rs b/crates/rnote-ui/src/appwindow/appsettings.rs index 2dc990075a..65530a33e7 100644 --- a/crates/rnote-ui/src/appwindow/appsettings.rs +++ b/crates/rnote-ui/src/appwindow/appsettings.rs @@ -406,7 +406,7 @@ impl RnAppWindow { let is_maximized = app_settings.boolean("is-maximized"); if is_maximized { - // don't restore maximized window state on macos, avoids issues disussed in + // don't restore maximized window state on macos, avoids issues discussed in // issue 823 - https://github.com/flxzt/rnote/issues/823 #[cfg(not(target_os = "macos"))] self.maximize(); diff --git a/meson.build b/meson.build index 9afcddb26e..0bc60118cd 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'rnote', ['rust', 'cpp'], - version: '0.10.1', + version: '0.10.2', meson_version: '>= 1.0', ) # add a patch suffix for alpha or beta versions in format '-.'. From ba0c40ef25a8bf88d1f09bd46858017baf4fa88f Mon Sep 17 00:00:00 2001 From: Doublonmousse <115779707+Doublonmousse@users.noreply.github.com> Date: Fri, 12 Apr 2024 16:31:10 +0200 Subject: [PATCH 09/13] improv: disable option for all shortcuts (#1067) --- crates/rnote-engine/src/pens/penholder.rs | 1 + crates/rnote-engine/src/pens/shortcuts.rs | 2 ++ crates/rnote-ui/data/ui/penshortcutrow.ui | 1 + 3 files changed, 4 insertions(+) diff --git a/crates/rnote-engine/src/pens/penholder.rs b/crates/rnote-engine/src/pens/penholder.rs index 5bace7187f..66952fbe25 100644 --- a/crates/rnote-engine/src/pens/penholder.rs +++ b/crates/rnote-engine/src/pens/penholder.rs @@ -299,6 +299,7 @@ impl PenHolder { widget_flags |= self.change_style_int(style, engine_view); } } + ShortcutMode::Disabled => {} }, } diff --git a/crates/rnote-engine/src/pens/shortcuts.rs b/crates/rnote-engine/src/pens/shortcuts.rs index d6e5a9e19c..ab17304439 100644 --- a/crates/rnote-engine/src/pens/shortcuts.rs +++ b/crates/rnote-engine/src/pens/shortcuts.rs @@ -25,6 +25,8 @@ pub enum ShortcutMode { Permanent, #[serde(rename = "toggle")] Toggle, + #[serde(rename = "disabled")] + Disabled, } impl TryFrom for ShortcutMode { diff --git a/crates/rnote-ui/data/ui/penshortcutrow.ui b/crates/rnote-ui/data/ui/penshortcutrow.ui index dd22166bc0..a1401b85f1 100644 --- a/crates/rnote-ui/data/ui/penshortcutrow.ui +++ b/crates/rnote-ui/data/ui/penshortcutrow.ui @@ -11,6 +11,7 @@ Temporary Permanent Toggle + Disabled From 5f83e74932a8e1c23b9f81fef440322316c9935a Mon Sep 17 00:00:00 2001 From: Jonathan Niklasson Godar <75271757+JonathanGodar@users.noreply.github.com> Date: Sat, 13 Apr 2024 10:42:59 +0200 Subject: [PATCH 10/13] improv: zoom tool zoom towards initial pointer location (#1080) * Made the zoom tool zoom towards the initially selected location Autoexpand document when zooming using zoom tool Remove commented code Clean code of zoom tool * Fixed clippy warning --------- Co-authored-by: JonathanGodar --- crates/rnote-engine/src/pens/tools.rs | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/crates/rnote-engine/src/pens/tools.rs b/crates/rnote-engine/src/pens/tools.rs index ea57adda86..ea1dd58de6 100644 --- a/crates/rnote-engine/src/pens/tools.rs +++ b/crates/rnote-engine/src/pens/tools.rs @@ -399,27 +399,40 @@ impl PenBehaviour for Tools { .resize_autoexpand(engine_view.store, engine_view.camera); } ToolStyle::Zoom => { - let total_zoom = engine_view.camera.total_zoom(); - let viewport_center = engine_view.camera.viewport_center(); + let total_zoom_old = engine_view.camera.total_zoom(); + let camera_offset = engine_view.camera.offset(); + let new_surface_coord = engine_view .camera .transform() .transform_point(&element.pos.into()) .coords; + let offset = new_surface_coord - self.zoom_tool.current_surface_coord; // Drag down zooms out, drag up zooms in let new_zoom = - total_zoom * (1.0 - offset[1] * Camera::DRAG_ZOOM_MAGN_ZOOM_FACTOR); + total_zoom_old * (1.0 - offset[1] * Camera::DRAG_ZOOM_MAGN_ZOOM_FACTOR); if (Camera::ZOOM_MIN..=Camera::ZOOM_MAX).contains(&new_zoom) { widget_flags |= engine_view .camera .zoom_w_timeout(new_zoom, engine_view.tasks_tx.clone()); - widget_flags |= engine_view.camera.set_viewport_center(viewport_center) - | engine_view - .document - .expand_autoexpand(engine_view.camera, engine_view.store); + + // Translate the camera view so that the start_surface_coord has the same surface position + // as before the zoom occured + let new_camera_offset = (((camera_offset + + self.zoom_tool.start_surface_coord) + / total_zoom_old) + * new_zoom) + - self.zoom_tool.start_surface_coord; + widget_flags |= engine_view + .camera + .set_offset(new_camera_offset, engine_view.document); + + widget_flags |= engine_view + .document + .expand_autoexpand(engine_view.camera, engine_view.store); } self.zoom_tool.current_surface_coord = new_surface_coord; } From 309b67d8d7445b1c409feebc0f2cd298fa1af37c Mon Sep 17 00:00:00 2001 From: Doublonmousse <115779707+Doublonmousse@users.noreply.github.com> Date: Sun, 21 Apr 2024 09:38:07 +0200 Subject: [PATCH 11/13] fix: filters not working in file dialogs (#1075) * fix: `filters` not working for the save dialog * add `filters` to all exports windows * filters set for importing files * use one filter for the import file dialog --- crates/rnote-ui/src/dialogs/export.rs | 27 +++++++++++++++++++++++++++ crates/rnote-ui/src/dialogs/import.rs | 8 ++++++++ 2 files changed, 35 insertions(+) diff --git a/crates/rnote-ui/src/dialogs/export.rs b/crates/rnote-ui/src/dialogs/export.rs index 830bcfb0f5..80f4270b9c 100644 --- a/crates/rnote-ui/src/dialogs/export.rs +++ b/crates/rnote-ui/src/dialogs/export.rs @@ -26,10 +26,15 @@ pub(crate) async fn dialog_save_doc_as(appwindow: &RnAppWindow, canvas: &RnCanva filter.add_suffix("rnote"); filter.set_name(Some(&gettext(".rnote"))); + // create the list of filters + let filter_list = gio::ListStore::new::(); + filter_list.append(&filter); + let filedialog = FileDialog::builder() .title(gettext("Save Document As")) .modal(true) .accept_label(gettext("Save")) + .filters(&filter_list) .default_filter(&filter) .build(); @@ -295,6 +300,10 @@ fn create_filedialog_export_doc( Some(&(String::from(".") + &file_ext)), ); + let filter_list = gio::ListStore::new::(); + filter_list.append(&filter); + filedialog.set_filters(Some(&filter_list)); + filedialog.set_default_filter(Some(&filter)); filedialog.set_initial_name(Some(&file_name)); filedialog.set_initial_folder(get_initial_folder_for_export(appwindow, canvas).as_ref()); @@ -591,6 +600,10 @@ fn create_filedialog_export_doc_pages( } } + let filter_list = gio::ListStore::new::(); + filter_list.append(&filter); + filedialog.set_filters(Some(&filter_list)); + filedialog.set_default_filter(Some(&filter)); filedialog @@ -884,6 +897,10 @@ fn create_filedialog_export_selection( Some(&(String::from(" - Selection") + "." + &file_ext)), ); + let filter_list = gio::ListStore::new::(); + filter_list.append(&filter); + filedialog.set_filters(Some(&filter_list)); + filedialog.set_default_filter(Some(&filter)); filedialog.set_initial_name(Some(&file_name)); @@ -895,6 +912,10 @@ pub(crate) async fn filechooser_export_engine_state(appwindow: &RnAppWindow, can filter.add_mime_type("application/json"); filter.add_suffix("json"); filter.set_name(Some(&gettext("Json"))); + + let filter_list = gio::ListStore::new::(); + filter_list.append(&filter); + let initial_name = crate::utils::default_file_title_for_export( canvas.output_file(), Some(&canvas::OUTPUT_FILE_NEW_TITLE), @@ -905,6 +926,7 @@ pub(crate) async fn filechooser_export_engine_state(appwindow: &RnAppWindow, can .title(gettext("Export Engine State")) .modal(true) .accept_label(gettext("Export")) + .filters(&filter_list) .default_filter(&filter) .initial_name(&initial_name) .build(); @@ -943,6 +965,10 @@ pub(crate) async fn filechooser_export_engine_config(appwindow: &RnAppWindow, ca filter.add_mime_type("application/json"); filter.add_suffix("json"); filter.set_name(Some(&gettext("Json"))); + + let filter_list = gio::ListStore::new::(); + filter_list.append(&filter); + let initial_name = crate::utils::default_file_title_for_export( canvas.output_file(), Some(&canvas::OUTPUT_FILE_NEW_TITLE), @@ -953,6 +979,7 @@ pub(crate) async fn filechooser_export_engine_config(appwindow: &RnAppWindow, ca .title(gettext("Export Engine Config")) .modal(true) .accept_label(gettext("Export")) + .filters(&filter_list) .default_filter(&filter) .initial_name(&initial_name) .build(); diff --git a/crates/rnote-ui/src/dialogs/import.rs b/crates/rnote-ui/src/dialogs/import.rs index 971061cbd6..bd2f5c2e50 100644 --- a/crates/rnote-ui/src/dialogs/import.rs +++ b/crates/rnote-ui/src/dialogs/import.rs @@ -20,10 +20,14 @@ pub(crate) async fn filedialog_open_doc(appwindow: &RnAppWindow) { filter.add_suffix("rnote"); filter.set_name(Some(&gettext(".rnote"))); + let filter_list = gio::ListStore::new::(); + filter_list.append(&filter); + let filedialog = FileDialog::builder() .title(gettext("Open File")) .modal(true) .accept_label(gettext("Open")) + .filters(&filter_list) .default_filter(&filter) .build(); @@ -62,10 +66,14 @@ pub(crate) async fn filedialog_import_file(appwindow: &RnAppWindow) { filter.add_suffix("txt"); filter.set_name(Some(&gettext("Jpg, Pdf, Png, Svg, Xopp, Txt"))); + let filter_list = gio::ListStore::new::(); + filter_list.append(&filter); + let dialog = FileDialog::builder() .title(gettext("Import File")) .modal(true) .accept_label(gettext("Import")) + .filters(&filter_list) .default_filter(&filter) .build(); From 23c11812f7e63f9122ed6800b3b5a9dcd7aa0e94 Mon Sep 17 00:00:00 2001 From: Felix Zwettler Date: Sun, 21 Apr 2024 09:39:35 +0200 Subject: [PATCH 12/13] feat: add improve-for-epd option, add active-color label (#1081) * impl color label * improv: cache origin indicator rendering, reducing constant repaints when moving view which improves the experience on EPD. addresses #658 * check if resize actually happened, reducing full repaints * fix: initial color label string * feat: add optimize for epd setting * fix: always use 'desaturated' if value is below 0.333 * fix: deal with possible negative alpha val * chore: remove unused getter * chore: move color-translate function, translate it * fix: use only `&str` literal in pgettext, fixing regenerated pot file not picking it up * add alpha str representation * color str representation improvements * tweak hue ranges by hand * update po template * more consistent string for alpha * fix typos --- Cargo.lock | 2 + crates/rnote-engine/src/engine/export.rs | 1 + crates/rnote-engine/src/engine/import.rs | 4 + crates/rnote-engine/src/engine/mod.rs | 13 + crates/rnote-engine/src/pens/tools.rs | 2 +- crates/rnote-ui/Cargo.toml | 2 + crates/rnote-ui/data/ui/colorpicker.ui | 128 +++++---- crates/rnote-ui/data/ui/overlays.ui | 1 - crates/rnote-ui/data/ui/settingspanel.ui | 7 + crates/rnote-ui/po/POTFILES | 1 + crates/rnote-ui/po/rnote.pot | 341 ++++++++++++++++------- crates/rnote-ui/src/appwindow/mod.rs | 6 +- crates/rnote-ui/src/colorpicker/mod.rs | 110 +++----- crates/rnote-ui/src/settingspanel/mod.rs | 20 ++ crates/rnote-ui/src/utils.rs | 115 ++++++++ 15 files changed, 518 insertions(+), 235 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0cbd1de820..dd69d35352 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3430,6 +3430,7 @@ name = "rnote" version = "0.10.2" dependencies = [ "anyhow", + "approx", "async-fs", "base64", "cairo-rs", @@ -3450,6 +3451,7 @@ dependencies = [ "numeric-sort", "once_cell", "open", + "palette", "parry2d-f64", "path-absolutize", "piet", diff --git a/crates/rnote-engine/src/engine/export.rs b/crates/rnote-engine/src/engine/export.rs index ac4c5912be..b2a1a84d34 100644 --- a/crates/rnote-engine/src/engine/export.rs +++ b/crates/rnote-engine/src/engine/export.rs @@ -353,6 +353,7 @@ impl Engine { import_prefs: self.import_prefs.clone_config(), export_prefs: self.export_prefs.clone_config(), pen_sounds: self.pen_sounds(), + optimize_epd: self.optimize_epd(), } } diff --git a/crates/rnote-engine/src/engine/import.rs b/crates/rnote-engine/src/engine/import.rs index 7d7c2f7b4f..7ab071a6af 100644 --- a/crates/rnote-engine/src/engine/import.rs +++ b/crates/rnote-engine/src/engine/import.rs @@ -163,6 +163,8 @@ impl Engine { // Set the pen sounds to update the audioplayer self.set_pen_sounds(engine_config.pen_sounds, data_dir); + self.set_optimize_epd(engine_config.optimize_epd); + widget_flags |= self .penholder .reinstall_pen_current_style(&mut EngineViewMut { @@ -195,6 +197,8 @@ impl Engine { // Set the pen sounds to update the audioplayer self.set_pen_sounds(engine_config.pen_sounds, data_dir); + self.set_optimize_epd(engine_config.optimize_epd); + widget_flags |= self .penholder .reinstall_pen_current_style(&mut EngineViewMut { diff --git a/crates/rnote-engine/src/engine/mod.rs b/crates/rnote-engine/src/engine/mod.rs index 221491194f..0d4e4ff653 100644 --- a/crates/rnote-engine/src/engine/mod.rs +++ b/crates/rnote-engine/src/engine/mod.rs @@ -120,6 +120,8 @@ pub struct EngineConfig { export_prefs: ExportPrefs, #[serde(rename = "pen_sounds")] pen_sounds: bool, + #[serde(rename = "optimize_epd")] + optimize_epd: bool, } #[derive(Debug, Clone)] @@ -166,6 +168,8 @@ pub struct Engine { pub export_prefs: ExportPrefs, #[serde(rename = "pen_sounds")] pen_sounds: bool, + #[serde(rename = "optimize_epd")] + optimize_epd: bool, #[serde(skip)] audioplayer: Option, @@ -203,6 +207,7 @@ impl Default for Engine { import_prefs: ImportPrefs::default(), export_prefs: ExportPrefs::default(), pen_sounds: false, + optimize_epd: false, audioplayer: None, visual_debug: false, @@ -282,6 +287,14 @@ impl Engine { } } + pub fn optimize_epd(&self) -> bool { + self.optimize_epd + } + + pub fn set_optimize_epd(&mut self, optimize_epd: bool) { + self.optimize_epd = optimize_epd + } + pub fn visual_debug(&self) -> bool { self.visual_debug } diff --git a/crates/rnote-engine/src/pens/tools.rs b/crates/rnote-engine/src/pens/tools.rs index ea1dd58de6..cbe68e883a 100644 --- a/crates/rnote-engine/src/pens/tools.rs +++ b/crates/rnote-engine/src/pens/tools.rs @@ -420,7 +420,7 @@ impl PenBehaviour for Tools { .zoom_w_timeout(new_zoom, engine_view.tasks_tx.clone()); // Translate the camera view so that the start_surface_coord has the same surface position - // as before the zoom occured + // as before the zoom occurred let new_camera_offset = (((camera_offset + self.zoom_tool.start_surface_coord) / total_zoom_old) diff --git a/crates/rnote-ui/Cargo.toml b/crates/rnote-ui/Cargo.toml index f189921911..04d3e8e8ff 100644 --- a/crates/rnote-ui/Cargo.toml +++ b/crates/rnote-ui/Cargo.toml @@ -14,6 +14,7 @@ rnote-compose = { workspace = true } rnote-engine = { workspace = true, features = ["ui"] } adw = { workspace = true } +approx = { workspace = true } anyhow = { workspace = true } async-fs = { workspace = true } base64 = { workspace = true } @@ -33,6 +34,7 @@ num-traits = { workspace = true } numeric-sort = { workspace = true } once_cell = { workspace = true } open = { workspace = true } +palette = { workspace = true } parry2d-f64 = { workspace = true } path-absolutize = { workspace = true } piet = { workspace = true } diff --git a/crates/rnote-ui/data/ui/colorpicker.ui b/crates/rnote-ui/data/ui/colorpicker.ui index 2c6735fc7a..80828b0f42 100644 --- a/crates/rnote-ui/data/ui/colorpicker.ui +++ b/crates/rnote-ui/data/ui/colorpicker.ui @@ -11,78 +11,94 @@ - - 3 - - - stroke-color-symbolic - Stroke Color - true - - - - - fill-color-symbolic - Fill Color - stroke_color_pad - - - - - - - - - - vertical - true + + horizontal 6 - - - - - - - - - - - - - - + + 3 + + + stroke-color-symbolic + Stroke Color + true + + + + + fill-color-symbolic + Fill Color + stroke_color_pad + + - - - - - - - - - - + - + + horizontal + true + 6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + preferences-color-symbolic + - - preferences-color-symbolic + + true + center + ... diff --git a/crates/rnote-ui/data/ui/overlays.ui b/crates/rnote-ui/data/ui/overlays.ui index 679df1f276..350aca2341 100644 --- a/crates/rnote-ui/data/ui/overlays.ui +++ b/crates/rnote-ui/data/ui/overlays.ui @@ -46,7 +46,6 @@ 6 18 18 - top diff --git a/crates/rnote-ui/data/ui/settingspanel.ui b/crates/rnote-ui/data/ui/settingspanel.ui index 9e6163dc1d..e1c205a8e7 100644 --- a/crates/rnote-ui/data/ui/settingspanel.ui +++ b/crates/rnote-ui/data/ui/settingspanel.ui @@ -59,6 +59,13 @@ Set whether the scrollbars on the canvas are shown + + + Optimize for E-Paper Displays + Changes certain UI elements and modifies behaviour +of tools for optimized usage on E-Paper displays + + Inertial Touch Scrolling diff --git a/crates/rnote-ui/po/POTFILES b/crates/rnote-ui/po/POTFILES index 78ad069c4e..28cdbfc83f 100644 --- a/crates/rnote-ui/po/POTFILES +++ b/crates/rnote-ui/po/POTFILES @@ -56,3 +56,4 @@ crates/rnote-ui/src/workspacebrowser/workspaceactions/createfolder.rs crates/rnote-ui/src/workspacebrowser/mod.rs crates/rnote-ui/src/workspacebrowser/widgethelper.rs crates/rnote-ui/src/overlays.rs +crates/rnote-ui/src/utils.rs diff --git a/crates/rnote-ui/po/rnote.pot b/crates/rnote-ui/po/rnote.pot index f6f6a30c80..b78ce7ae48 100644 --- a/crates/rnote-ui/po/rnote.pot +++ b/crates/rnote-ui/po/rnote.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rnote\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-22 15:14+0100\n" +"POT-Creation-Date: 2024-04-20 11:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -157,7 +157,7 @@ msgid "Edit Workspace" msgstr "" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:75 -#: crates/rnote-ui/data/ui/settingspanel.ui:234 +#: crates/rnote-ui/data/ui/settingspanel.ui:241 #: crates/rnote-ui/src/workspacebrowser/widgethelper.rs:36 msgid "Apply" msgstr "" @@ -175,7 +175,7 @@ msgid "Change the workspace icon" msgstr "" #: crates/rnote-ui/data/ui/dialogs/dialogs.ui:143 -#: crates/rnote-ui/data/ui/settingspanel.ui:286 +#: crates/rnote-ui/data/ui/settingspanel.ui:293 msgid "Color" msgstr "" @@ -797,7 +797,7 @@ msgid "Crosshatch" msgstr "" #: crates/rnote-ui/data/ui/penssidebar/shaperpage.ui:206 -#: crates/rnote-ui/data/ui/settingspanel.ui:315 +#: crates/rnote-ui/data/ui/settingspanel.ui:322 msgid "Dots" msgstr "" @@ -1109,11 +1109,11 @@ msgid "" "Available in Fixed-Size Document Layout." msgstr "" -#: crates/rnote-ui/data/ui/colorpicker.ui:19 +#: crates/rnote-ui/data/ui/colorpicker.ui:23 msgid "Stroke Color" msgstr "" -#: crates/rnote-ui/data/ui/colorpicker.ui:26 +#: crates/rnote-ui/data/ui/colorpicker.ui:30 msgid "Fill Color" msgstr "" @@ -1163,15 +1163,15 @@ msgstr "" msgid "Save Document" msgstr "" -#: crates/rnote-ui/data/ui/overlays.ui:99 +#: crates/rnote-ui/data/ui/overlays.ui:98 msgid "Move _Left" msgstr "" -#: crates/rnote-ui/data/ui/overlays.ui:103 +#: crates/rnote-ui/data/ui/overlays.ui:102 msgid "Move _Right" msgstr "" -#: crates/rnote-ui/data/ui/overlays.ui:109 +#: crates/rnote-ui/data/ui/overlays.ui:108 msgid "_Close" msgstr "" @@ -1187,6 +1187,10 @@ msgstr "" msgid "Toggle" msgstr "" +#: crates/rnote-ui/data/ui/penshortcutrow.ui:14 +msgid "Disabled" +msgstr "" + #: crates/rnote-ui/data/ui/settingspanel.ui:41 #: crates/rnote-ui/data/ui/shortcuts.ui:11 msgid "General" @@ -1217,320 +1221,330 @@ msgid "Set whether the scrollbars on the canvas are shown" msgstr "" #: crates/rnote-ui/data/ui/settingspanel.ui:64 -msgid "Inertial Touch Scrolling" +msgid "Optimize for E-Paper Displays" msgstr "" #: crates/rnote-ui/data/ui/settingspanel.ui:65 msgid "" +"Changes certain UI elements and modifies behaviour\n" +"of tools for optimized usage on E-Paper displays" +msgstr "" + +#: crates/rnote-ui/data/ui/settingspanel.ui:71 +msgid "Inertial Touch Scrolling" +msgstr "" + +#: crates/rnote-ui/data/ui/settingspanel.ui:72 +msgid "" "Set whether touch scrolling on the canvas is inertial.\n" "An application restart is required when this option\n" "gets disabled." msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:72 +#: crates/rnote-ui/data/ui/settingspanel.ui:79 msgid "Regular Cursor" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:73 +#: crates/rnote-ui/data/ui/settingspanel.ui:80 msgid "Set the regular cursor" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:95 +#: crates/rnote-ui/data/ui/settingspanel.ui:102 msgid "Show Drawing Cursor" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:96 +#: crates/rnote-ui/data/ui/settingspanel.ui:103 msgid "Set whether the drawing cursor is visible" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:102 +#: crates/rnote-ui/data/ui/settingspanel.ui:109 msgid "Drawing Cursor" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:103 +#: crates/rnote-ui/data/ui/settingspanel.ui:110 msgid "Set the drawing cursor" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:128 +#: crates/rnote-ui/data/ui/settingspanel.ui:135 msgid "Page Format" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:131 +#: crates/rnote-ui/data/ui/settingspanel.ui:138 msgid "Format" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:132 +#: crates/rnote-ui/data/ui/settingspanel.ui:139 msgid "Choose a format" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:136 +#: crates/rnote-ui/data/ui/settingspanel.ui:143 msgid "A6" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:137 +#: crates/rnote-ui/data/ui/settingspanel.ui:144 msgid "A5" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:138 +#: crates/rnote-ui/data/ui/settingspanel.ui:145 msgid "A4" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:139 +#: crates/rnote-ui/data/ui/settingspanel.ui:146 msgid "A3" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:140 +#: crates/rnote-ui/data/ui/settingspanel.ui:147 msgid "A2" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:141 +#: crates/rnote-ui/data/ui/settingspanel.ui:148 msgid "US letter" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:142 +#: crates/rnote-ui/data/ui/settingspanel.ui:149 msgid "US legal" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:143 +#: crates/rnote-ui/data/ui/settingspanel.ui:150 msgid "Custom" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:151 +#: crates/rnote-ui/data/ui/settingspanel.ui:158 msgid "Orientation" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:152 +#: crates/rnote-ui/data/ui/settingspanel.ui:159 msgid "Set the format orientation" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:164 +#: crates/rnote-ui/data/ui/settingspanel.ui:171 msgid "Portrait" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:170 +#: crates/rnote-ui/data/ui/settingspanel.ui:177 msgid "Landscape" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:180 +#: crates/rnote-ui/data/ui/settingspanel.ui:187 msgid "Width" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:181 +#: crates/rnote-ui/data/ui/settingspanel.ui:188 msgid "Set the format width" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:197 +#: crates/rnote-ui/data/ui/settingspanel.ui:204 msgid "Height" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:198 +#: crates/rnote-ui/data/ui/settingspanel.ui:205 msgid "Set the format height" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:214 +#: crates/rnote-ui/data/ui/settingspanel.ui:221 msgid "Dpi" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:215 +#: crates/rnote-ui/data/ui/settingspanel.ui:222 msgid "Set the Dpi (dots per inch). Defaults to 96." msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:225 +#: crates/rnote-ui/data/ui/settingspanel.ui:232 msgid "Revert" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:247 +#: crates/rnote-ui/data/ui/settingspanel.ui:254 #: crates/rnote-ui/data/ui/shortcuts.ui:158 #: crates/rnote-ui/src/dialogs/mod.rs:631 msgid "Document" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:250 +#: crates/rnote-ui/data/ui/settingspanel.ui:257 msgid "Document Layout" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:254 +#: crates/rnote-ui/data/ui/settingspanel.ui:261 msgid "Fixed Size" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:255 +#: crates/rnote-ui/data/ui/settingspanel.ui:262 msgid "Continuous Vertical" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:256 +#: crates/rnote-ui/data/ui/settingspanel.ui:263 msgid "Semi Infinite" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:257 +#: crates/rnote-ui/data/ui/settingspanel.ui:264 msgid "Infinite" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:265 +#: crates/rnote-ui/data/ui/settingspanel.ui:272 msgid "Format Border Color" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:266 +#: crates/rnote-ui/data/ui/settingspanel.ui:273 msgid "Set the format border color" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:287 +#: crates/rnote-ui/data/ui/settingspanel.ui:294 msgid "Set the background color" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:307 +#: crates/rnote-ui/data/ui/settingspanel.ui:314 msgid "Pattern" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:308 +#: crates/rnote-ui/data/ui/settingspanel.ui:315 msgid "Choose a background pattern" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:312 +#: crates/rnote-ui/data/ui/settingspanel.ui:319 msgid "None" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:313 +#: crates/rnote-ui/data/ui/settingspanel.ui:320 msgid "Lines" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:314 +#: crates/rnote-ui/data/ui/settingspanel.ui:321 #: crates/rnote-ui/src/penssidebar/shaperpage.rs:429 msgid "Grid" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:316 +#: crates/rnote-ui/data/ui/settingspanel.ui:323 msgid "Isometric Grid" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:317 +#: crates/rnote-ui/data/ui/settingspanel.ui:324 msgid "Isometric Dots" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:325 +#: crates/rnote-ui/data/ui/settingspanel.ui:332 msgid "Pattern Color" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:326 +#: crates/rnote-ui/data/ui/settingspanel.ui:333 msgid "Set the background pattern color" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:346 +#: crates/rnote-ui/data/ui/settingspanel.ui:353 msgid "Pattern Width" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:347 +#: crates/rnote-ui/data/ui/settingspanel.ui:354 msgid "Set the background pattern width" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:363 +#: crates/rnote-ui/data/ui/settingspanel.ui:370 msgid "Pattern Height" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:364 +#: crates/rnote-ui/data/ui/settingspanel.ui:371 msgid "Set the background pattern height" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:380 +#: crates/rnote-ui/data/ui/settingspanel.ui:387 msgid "Invert Color Brightness" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:381 +#: crates/rnote-ui/data/ui/settingspanel.ui:388 msgid "Invert the brightness of all background pattern colors" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:385 +#: crates/rnote-ui/data/ui/settingspanel.ui:392 msgid "Invert" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:395 +#: crates/rnote-ui/data/ui/settingspanel.ui:402 msgid "Button Shortcuts" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:398 +#: crates/rnote-ui/data/ui/settingspanel.ui:405 msgid "Stylus Primary Button Action" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:399 +#: crates/rnote-ui/data/ui/settingspanel.ui:406 msgid "" "Set the action for the\n" "primary stylus button" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:411 +#: crates/rnote-ui/data/ui/settingspanel.ui:418 msgid "Stylus Secondary Button Action" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:412 +#: crates/rnote-ui/data/ui/settingspanel.ui:419 msgid "" "Set the action for the\n" "secondary stylus button" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:424 +#: crates/rnote-ui/data/ui/settingspanel.ui:431 msgid "Mouse Secondary Button Action" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:425 +#: crates/rnote-ui/data/ui/settingspanel.ui:432 msgid "" "Set the action for the\n" "secondary mouse button" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:437 +#: crates/rnote-ui/data/ui/settingspanel.ui:444 msgid "Touch Two-Finger Long-Press Action" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:438 +#: crates/rnote-ui/data/ui/settingspanel.ui:445 msgid "" "Set the action for the touch\n" "two-finger long-press gesture" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:450 +#: crates/rnote-ui/data/ui/settingspanel.ui:457 msgid "Keyboard Ctrl-Space Action" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:451 +#: crates/rnote-ui/data/ui/settingspanel.ui:458 msgid "" "Set the action for the keyboard\n" "Ctrl plus Space shortcut" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:463 +#: crates/rnote-ui/data/ui/settingspanel.ui:470 msgid "Drawing Pad Button 1 Action" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:464 +#: crates/rnote-ui/data/ui/settingspanel.ui:471 msgid "" "Set the action for button 1\n" "on a drawing pad" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:476 +#: crates/rnote-ui/data/ui/settingspanel.ui:483 msgid "Drawing Pad Button 2 Action" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:477 +#: crates/rnote-ui/data/ui/settingspanel.ui:484 msgid "" "Set the action for button 2\n" "on a drawing pad" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:489 +#: crates/rnote-ui/data/ui/settingspanel.ui:496 msgid "Drawing Pad Button 3 Action" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:490 +#: crates/rnote-ui/data/ui/settingspanel.ui:497 msgid "" "Set the action for button 3\n" "on a drawing pad" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:502 +#: crates/rnote-ui/data/ui/settingspanel.ui:509 msgid "Drawing Pad Button 4 Action" msgstr "" -#: crates/rnote-ui/data/ui/settingspanel.ui:503 +#: crates/rnote-ui/data/ui/settingspanel.ui:510 msgid "" "Set the action for button 4\n" "on a drawing pad" @@ -2189,96 +2203,96 @@ msgstr "" msgid "Polygon" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:551 +#: crates/rnote-ui/src/settingspanel/mod.rs:571 msgid "Application restart is required" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:867 +#: crates/rnote-ui/src/settingspanel/mod.rs:887 msgctxt "a cursor type" msgid "Crosshair (Small)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:868 +#: crates/rnote-ui/src/settingspanel/mod.rs:888 msgctxt "a cursor type" msgid "Crosshair (Medium)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:869 +#: crates/rnote-ui/src/settingspanel/mod.rs:889 msgctxt "a cursor type" msgid "Crosshair (Large)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:870 +#: crates/rnote-ui/src/settingspanel/mod.rs:890 msgctxt "a cursor type" msgid "Dot (Small)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:871 +#: crates/rnote-ui/src/settingspanel/mod.rs:891 msgctxt "a cursor type" msgid "Dot (Medium)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:872 +#: crates/rnote-ui/src/settingspanel/mod.rs:892 msgctxt "a cursor type" msgid "Dot (Large)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:873 +#: crates/rnote-ui/src/settingspanel/mod.rs:893 msgctxt "a cursor type" msgid "Teardrop North-West (Small)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:874 +#: crates/rnote-ui/src/settingspanel/mod.rs:894 msgctxt "a cursor type" msgid "Teardrop North-West (Medium)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:875 +#: crates/rnote-ui/src/settingspanel/mod.rs:895 msgctxt "a cursor type" msgid "Teardrop North-West (Large)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:876 +#: crates/rnote-ui/src/settingspanel/mod.rs:896 msgctxt "a cursor type" msgid "Teardrop North-East (Small)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:877 +#: crates/rnote-ui/src/settingspanel/mod.rs:897 msgctxt "a cursor type" msgid "Teardrop North-East (Medium)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:878 +#: crates/rnote-ui/src/settingspanel/mod.rs:898 msgctxt "a cursor type" msgid "Teardrop North-East (Large)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:879 +#: crates/rnote-ui/src/settingspanel/mod.rs:899 msgctxt "a cursor type" msgid "Teardrop North (Small)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:880 +#: crates/rnote-ui/src/settingspanel/mod.rs:900 msgctxt "a cursor type" msgid "Teardrop North (Medium)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:881 +#: crates/rnote-ui/src/settingspanel/mod.rs:901 msgctxt "a cursor type" msgid "Teardrop North (Large)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:882 +#: crates/rnote-ui/src/settingspanel/mod.rs:902 msgctxt "a cursor type" msgid "Beam (Small)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:883 +#: crates/rnote-ui/src/settingspanel/mod.rs:903 msgctxt "a cursor type" msgid "Beam (Medium)" msgstr "" -#: crates/rnote-ui/src/settingspanel/mod.rs:884 +#: crates/rnote-ui/src/settingspanel/mod.rs:904 msgctxt "a cursor type" msgid "Beam (Large)" msgstr "" @@ -2318,3 +2332,128 @@ msgstr "" #: crates/rnote-ui/src/workspacebrowser/workspaceactions/createfolder.rs:75 msgid "New Folder" msgstr "" + +#: crates/rnote-ui/src/utils.rs:161 +msgctxt "used in string representation of the current selected color" +msgid "grey" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:163 crates/rnote-ui/src/utils.rs:198 +msgctxt "part of string representation of a color" +msgid "rose" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:165 +msgctxt "part of string representation of a color" +msgid "red" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:168 +msgctxt "part of string representation of a color" +msgid "orange" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:171 +msgctxt "part of string representation of a color" +msgid "yellow" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:175 +msgctxt "part of string representation of a color" +msgid "chartreuse-green" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:178 +msgctxt "part of string representation of a color" +msgid "green" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:181 +msgctxt "part of string representation of a color" +msgid "spring-green" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:184 +msgctxt "part of string representation of a color" +msgid "cyan" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:187 +msgctxt "part of string representation of a color" +msgid "azure" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:190 +msgctxt "part of string representation of a color" +msgid "blue" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:193 +msgctxt "part of string representation of a color" +msgid "violet" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:196 +msgctxt "part of string representation of a color" +msgid "magenta" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:203 +msgctxt "part of string representation of a color" +msgid "greyish" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:206 +msgctxt "part of string representation of a color" +msgid "vivid" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:210 +msgctxt "part of string representation of a color" +msgid "very-dark" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:212 +msgctxt "part of string representation of a color" +msgid "dark" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:215 +msgctxt "part of string representation of a color" +msgid "mid" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:217 +msgctxt "part of string representation of a color" +msgid "bright" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:221 +msgctxt "part of string representation of a color" +msgid "transparent" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:223 +msgctxt "part of string representation of a color" +msgid "translucent" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:227 +msgctxt "part of string representation of a color" +msgid "slightly-translucent" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:236 +msgctxt "part of string representation of a color" +msgid "fully transparent" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:239 +msgctxt "part of string representation of a color" +msgid "black" +msgstr "" + +#: crates/rnote-ui/src/utils.rs:241 +msgctxt "part of string representation of a color" +msgid "white" +msgstr "" diff --git a/crates/rnote-ui/src/appwindow/mod.rs b/crates/rnote-ui/src/appwindow/mod.rs index 84967181a1..7c6327274e 100644 --- a/crates/rnote-ui/src/appwindow/mod.rs +++ b/crates/rnote-ui/src/appwindow/mod.rs @@ -127,13 +127,13 @@ impl RnAppWindow { )); } else { if let Err(e) = self.setup_settings_binds() { - tracing::error!("Failed to setup settings binds, Err: {e:}"); + tracing::error!("Failed to setup settings binds, Err: {e:?}"); } if let Err(e) = self.setup_periodic_save() { - tracing::error!("Failed to setup periodic save, Err: {e:}"); + tracing::error!("Failed to setup periodic save, Err: {e:?}"); } if let Err(e) = self.load_settings() { - tracing::error!("Failed to load initial settings, Err: {e:}"); + tracing::error!("Failed to load initial settings, Err: {e:?}"); } } diff --git a/crates/rnote-ui/src/colorpicker/mod.rs b/crates/rnote-ui/src/colorpicker/mod.rs index a86158252a..1552fa00a8 100644 --- a/crates/rnote-ui/src/colorpicker/mod.rs +++ b/crates/rnote-ui/src/colorpicker/mod.rs @@ -9,13 +9,13 @@ pub(crate) use colorsetter::RnColorSetter; // Imports use crate::RnAppWindow; use gtk4::{ - gdk, glib, glib::clone, prelude::*, subclass::prelude::*, BoxLayout, Button, ColorDialog, - CompositeTemplate, Orientation, PositionType, Widget, + gdk, glib, glib::clone, prelude::*, subclass::prelude::*, Button, ColorDialog, + CompositeTemplate, Label, Widget, }; use once_cell::sync::Lazy; use rnote_compose::{color, Color}; use rnote_engine::ext::GdkRGBAExt; -use std::cell::{Cell, RefCell}; +use std::cell::RefCell; mod imp { use super::*; @@ -25,7 +25,6 @@ mod imp { pub(crate) struct RnColorPicker { pub(crate) stroke_color: RefCell, pub(crate) fill_color: RefCell, - pub(crate) position: Cell, pub(crate) color_dialog: glib::WeakRef, #[template_child] @@ -56,6 +55,8 @@ mod imp { pub(crate) setter_9: TemplateChild, #[template_child] pub(crate) colordialog_button: TemplateChild