From 06c344a036627babb563b8fb911def4d5176d841 Mon Sep 17 00:00:00 2001 From: teamcons Date: Sun, 15 Feb 2026 23:06:11 +0100 Subject: [PATCH 1/5] use legacy rdnn --- .github/workflows/CI.yml | 2 +- README.md | 10 +++---- data/cherrypick.desktop.in | 6 ++--- data/cherrypick.gresource.xml | 2 +- data/cherrypick.gschema.xml | 6 ++--- data/cherrypick.metainfo.xml.in | 26 +++++++++---------- ...ithub.ellie_commons.cherrypick.flathub.yml | 6 ++--- ... => io.github.ellie_commons.cherrypick.yml | 4 +-- meson.build | 2 +- po/README.md | 2 +- po/de.po | 2 +- po/es.po | 2 +- po/extra/de.po | 6 ++--- po/extra/es.po | 6 ++--- po/extra/extra.pot | 2 +- po/extra/fr.po | 6 ++--- po/extra/it.po | 4 +-- po/extra/ru.po | 6 ++--- po/fr.po | 2 +- ...=> io.github.ellie_commons.cherrypick.pot} | 4 +-- po/it.po | 4 +-- po/ru.po | 2 +- po/sv.po | 4 +-- src/Application.vala | 4 +-- src/Services/Settings.vala | 2 +- 25 files changed, 61 insertions(+), 61 deletions(-) rename io.github.elly_code.cherrypick.flathub.yml => io.github.ellie_commons.cherrypick.flathub.yml (83%) rename io.github.elly_code.cherrypick.yml => io.github.ellie_commons.cherrypick.yml (87%) rename po/{io.github.elly_code.cherrypick.pot => io.github.ellie_commons.cherrypick.pot} (94%) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0149fae..6023ec3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,7 +27,7 @@ jobs: uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: bundle: cherrypick.flatpak - manifest-path: io.github.elly_code.cherrypick.yml + manifest-path: io.github.ellie_commons.cherrypick.yml run-tests: true repository-name: appcenter repository-url: https://flatpak.elementary.io/repo.flatpakrepo diff --git a/README.md b/README.md index 5255d74..163e5c1 100644 --- a/README.md +++ b/README.md @@ -3,20 +3,20 @@ An icon of an eyedropper with a rainbow circle in the background

Cherrypick

Cherry-pick colors on your screen

- A screenshot of a window with a side displaying options and the other a single solid color + A screenshot of a window with a side displaying options and the other a single solid color - Made for elementary OS + Made for elementary OS ## Installation Cherrypick is designed and developed primarily for [elementary OS]. The latest stable release is available via AppCenter. -[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg?new)](https://appcenter.elementary.io/io.github.elly_code.cherrypick) +[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg?new)](https://appcenter.elementary.io/io.github.ellie_commons.cherrypick) -[Download on Flathub](https://flathub.org/apps/io.github.elly_code.cherrypick) +[Download on Flathub](https://flathub.org/apps/io.github.ellie_commons.cherrypick) @@ -35,7 +35,7 @@ and run the following command: ### On elementary OS or with its appcenter remote installed ```bash -flatpak-builder --force-clean --user --install-deps-from=appcenter --install builddir ./io.github.elly_code.cherrypick.yml +flatpak-builder --force-clean --user --install-deps-from=appcenter --install builddir ./io.github.ellie_commons.cherrypick.yml ``` ### On other systems: diff --git a/data/cherrypick.desktop.in b/data/cherrypick.desktop.in index 5585354..f03e3e6 100644 --- a/data/cherrypick.desktop.in +++ b/data/cherrypick.desktop.in @@ -6,8 +6,8 @@ GenericName=Color Picker Comment=Pick colors on your screen Categories=Graphics;Utility; -Icon=io.github.elly_code.cherrypick -Exec=io.github.elly_code.cherrypick +Icon=io.github.ellie_commons.cherrypick +Exec=io.github.ellie_commons.cherrypick SingleMainWindow=true Terminal=false Keywords=Color;Pick;Eyedropper;Picker; @@ -16,4 +16,4 @@ Actions=ImmediatelyPick; [Desktop Action ImmediatelyPick] Name=Pick a color Icon=color-picker -Exec=io.github.elly_code.cherrypick --immediately-pick +Exec=io.github.ellie_commons.cherrypick --immediately-pick diff --git a/data/cherrypick.gresource.xml b/data/cherrypick.gresource.xml index 14ab6a2..a9fa1b9 100644 --- a/data/cherrypick.gresource.xml +++ b/data/cherrypick.gresource.xml @@ -1,6 +1,6 @@ - + Application.css diff --git a/data/cherrypick.gschema.xml b/data/cherrypick.gschema.xml index 84806e8..ee74f64 100644 --- a/data/cherrypick.gschema.xml +++ b/data/cherrypick.gschema.xml @@ -1,6 +1,6 @@ - + @@ -9,7 +9,7 @@ - + ["rgba(237, 83, 83, 1)", "rgba(243, 115, 41, 1)", "rgba(249, 196, 64, 1)", "rgba(155, 219, 77, 1)", "rgba(165, 109, 226, 1)"] @@ -22,7 +22,7 @@ Color history The rgba values for saved snapshot - + "rgba" Color format Last selected color format diff --git a/data/cherrypick.metainfo.xml.in b/data/cherrypick.metainfo.xml.in index e0760bd..c49a7d0 100644 --- a/data/cherrypick.metainfo.xml.in +++ b/data/cherrypick.metainfo.xml.in @@ -1,9 +1,9 @@ - io.github.elly_code.cherrypick + io.github.ellie_commons.cherrypick Cherrypick Pick colors on your screen - io.github.elly_code.cherrypick.desktop + io.github.ellie_commons.cherrypick.desktop CC-BY-4.0 GPL-3.0-or-later @@ -28,33 +28,33 @@ - io.github.elly_code.cherrypick + io.github.ellie_commons.cherrypick pointing touch - + PhoneyBadger + Stella and Charlie - elly-code - https://github.com/elly-code/cherrypick - https://github.com/elly-code/cherrypick/issues - https://github.com/elly-code/cherrypick/issues + ellie-commons + https://github.com/ellie-commons/cherrypick + https://github.com/ellie-commons/cherrypick/issues + https://github.com/ellie-commons/cherrypick/issues https://ko-fi.com/teamcons - https://github.com/elly-code/cherrypick + https://github.com/ellie-commons/cherrypick Cherrypick's main window - https://github.com/elly-code/cherrypick/blob/main/data/screenshots/window-light.png?raw=true + https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-light.png?raw=true Main window with dark theme - https://github.com/elly-code/cherrypick/blob/main/data/screenshots/window-dark.png?raw=true + https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-dark.png?raw=true @@ -89,7 +89,7 @@ - Fix alpha not being restored properly + Fix alpha not being restored properly @@ -114,7 +114,7 @@
  • App now works on ARM thanks to @ryonakano!
  • Add the ability to immediately pick and copy to clipboard
  • You can right-click on app icon and choose "Immediately pick"
    • -
  • Or set a keybind to "flatpak run io.elly_code.cherrypick --immediately-pick"
    • +
  • Or set a keybind to "flatpak run io.ellie_commons.cherrypick --immediately-pick"
  • Updated deprecated widgets
  • Minute tweaks by @ryonakano thanks again!
    • diff --git a/io.github.elly_code.cherrypick.flathub.yml b/io.github.ellie_commons.cherrypick.flathub.yml similarity index 83% rename from io.github.elly_code.cherrypick.flathub.yml rename to io.github.ellie_commons.cherrypick.flathub.yml index 0c4ce16..611ec63 100644 --- a/io.github.elly_code.cherrypick.flathub.yml +++ b/io.github.ellie_commons.cherrypick.flathub.yml @@ -1,11 +1,11 @@ -id: io.github.elly_code.cherrypick +id: io.github.ellie_commons.cherrypick # elementary SDK is not available on Flathub, so use the elementary BaseApp instead base: io.elementary.BaseApp base-version: 'circe-25.08' runtime: org.gnome.Platform runtime-version: '49' sdk: org.gnome.Sdk -command: io.github.elly_code.cherrypick +command: io.github.ellie_commons.cherrypick finish-args: - '--share=ipc' @@ -30,7 +30,7 @@ modules: buildsystem: meson sources: - type: git - url: https://github.com/elly-code/cherrypick.git + url: https://github.com/ellie-commons/cherrypick.git tag: 2.3.0 commit: ed215bda8d53d2475597317fb44844a3c35ed325 x-checker-data: diff --git a/io.github.elly_code.cherrypick.yml b/io.github.ellie_commons.cherrypick.yml similarity index 87% rename from io.github.elly_code.cherrypick.yml rename to io.github.ellie_commons.cherrypick.yml index c163fc8..5fc53df 100644 --- a/io.github.elly_code.cherrypick.yml +++ b/io.github.ellie_commons.cherrypick.yml @@ -1,9 +1,9 @@ -id: io.github.elly_code.cherrypick +id: io.github.ellie_commons.cherrypick runtime: io.elementary.Platform # Currently this crashes for 8.2 (which flathub has) bc https://github.com/elementary/granite/pull/893 runtime-version: '8' sdk: io.elementary.Sdk -command: io.github.elly_code.cherrypick +command: io.github.ellie_commons.cherrypick finish-args: - '--share=ipc' diff --git a/meson.build b/meson.build index 3989f71..11205ff 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('io.github.elly_code.cherrypick', +project('io.github.ellie_commons.cherrypick', 'c', 'vala', version: '2.3.0') diff --git a/po/README.md b/po/README.md index bc47966..e99e4da 100644 --- a/po/README.md +++ b/po/README.md @@ -2,7 +2,7 @@ ## First Things First -* Clone this repository by opening the terminal in a folder of your choice and typing ```git clone https://github.com/elly_code/cherrypick``` +* Clone this repository by opening the terminal in a folder of your choice and typing ```git clone https://github.com/ellie_commons/cherrypick``` ## Basics diff --git a/po/de.po b/po/de.po index e4113c2..598671e 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #. /TRANSLATORS: Do not translate app name diff --git a/po/es.po b/po/es.po index 58a4d44..8277761 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #. /TRANSLATORS: Do not translate app name diff --git a/po/extra/de.po b/po/extra/de.po index c84d563..12ce1fb 100644 --- a/po/extra/de.po +++ b/po/extra/de.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #: data/cherrypick.desktop.in:5 @@ -111,8 +111,8 @@ msgid "You can right-click on app icon and choose \"Immediately pick\"" msgstr "Sie können mit der rechten Maustaste auf das App-Symbol klicken und \"Sofort auswählen\" wählen." #: data/cherrypick.metainfo.xml.in:92 -msgid "Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-pick\"" -msgstr "Oder setzen Sie eine Schlüsselbindung auf \"flatpak run io.elly_code.cherrypick --immediately-pick\"" +msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" +msgstr "Oder setzen Sie eine Schlüsselbindung auf \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" #: data/cherrypick.metainfo.xml.in:93 msgid "Updated deprecated widgets" diff --git a/po/extra/es.po b/po/extra/es.po index 7563d0b..d3e7e73 100644 --- a/po/extra/es.po +++ b/po/extra/es.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #: data/cherrypick.desktop.in:5 @@ -113,8 +113,8 @@ msgid "You can right-click on app icon and choose \"Immediately pick\"" msgstr "Puedes hacer clic con el botón derecho en el icono de la aplicación y elegir \"Elegir inmediatamente\"." #: data/cherrypick.metainfo.xml.in:92 -msgid "Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-pick\"" -msgstr "O establece un keybind a \"flatpak run io.elly_code.cherrypick --immediately-pick\"" +msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" +msgstr "O establece un keybind a \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" #: data/cherrypick.metainfo.xml.in:93 msgid "Updated deprecated widgets" diff --git a/po/extra/extra.pot b/po/extra/extra.pot index 96f5a00..3a708aa 100644 --- a/po/extra/extra.pot +++ b/po/extra/extra.pot @@ -117,7 +117,7 @@ msgstr "" #: data/cherrypick.metainfo.xml.in:92 msgid "" -"Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-" +"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" "pick\"" msgstr "" diff --git a/po/extra/fr.po b/po/extra/fr.po index 80898a8..d82ade2 100644 --- a/po/extra/fr.po +++ b/po/extra/fr.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #: data/cherrypick.desktop.in:5 @@ -111,8 +111,8 @@ msgid "You can right-click on app icon and choose \"Immediately pick\"" msgstr "Vous pouvez cliquer avec le bouton droit de la souris sur l'icône de l'application et choisir \"Récupérer immédiatement\"" #: data/cherrypick.metainfo.xml.in:92 -msgid "Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-pick\"" -msgstr "Ou mettre un keybind à \"flatpak run io.elly_code.cherrypick --immediately-pick\"" +msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" +msgstr "Ou mettre un keybind à \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" #: data/cherrypick.metainfo.xml.in:93 msgid "Updated deprecated widgets" diff --git a/po/extra/it.po b/po/extra/it.po index 163b0ac..18b6cd7 100644 --- a/po/extra/it.po +++ b/po/extra/it.po @@ -118,10 +118,10 @@ msgstr "Puoi fare clic con il tasto destro sull'icona dell'app e scegliere \"Sel #: data/cherrypick.metainfo.xml.in:92 msgid "" -"Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-" +"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" "pick\"" msgstr "" -"Oppure imposta un tasto di scelta rapida a \"flatpak run io.elly_code.cherrypick --immediately-pick\"" +"Oppure imposta un tasto di scelta rapida a \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" #: data/cherrypick.metainfo.xml.in:93 msgid "Updated deprecated widgets" diff --git a/po/extra/ru.po b/po/extra/ru.po index 2092e13..b36bfe8 100644 --- a/po/extra/ru.po +++ b/po/extra/ru.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "PO-Revision-Date: 2022-09-27 20:44+0900\n" @@ -126,10 +126,10 @@ msgstr "" #: data/cherrypick.metainfo.xml.in:92 msgid "" -"Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-" +"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" "pick\"" msgstr "" -"Или установите привязку клавиш на \"flatpak run io.elly_code.cherrypick " +"Или установите привязку клавиш на \"flatpak run io.ellie_commons.cherrypick " "--immediately-pick\"." #: data/cherrypick.metainfo.xml.in:93 diff --git a/po/fr.po b/po/fr.po index a572c5a..c3bc3a4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #. /TRANSLATORS: Do not translate app name diff --git a/po/io.github.elly_code.cherrypick.pot b/po/io.github.ellie_commons.cherrypick.pot similarity index 94% rename from po/io.github.elly_code.cherrypick.pot rename to po/io.github.ellie_commons.cherrypick.pot index b43205c..64f052c 100644 --- a/po/io.github.elly_code.cherrypick.pot +++ b/po/io.github.ellie_commons.cherrypick.pot @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.cherrypick package. +# This file is distributed under the same license as the io.github.ellie_commons.cherrypick package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/it.po b/po/it.po index c12ecef..9d77220 100644 --- a/po/it.po +++ b/po/it.po @@ -1,12 +1,12 @@ # ITALIAN TRANSLATION. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.cherrypick package. +# This file is distributed under the same license as the io.github.ellie_commons.cherrypick package. # ALBANO BATTISTELLA , 2025. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "PO-Revision-Date: 2025-12-27 16:41+0100\n" diff --git a/po/ru.po b/po/ru.po index 4390391..9caba2f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "PO-Revision-Date: 2022-09-27 20:44+0900\n" diff --git a/po/sv.po b/po/sv.po index 5aadd76..893e3f2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.cherrypick package. +# This file is distributed under the same license as the io.github.ellie_commons.cherrypick package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "PO-Revision-Date: 2026-01-14 15:57+0100\n" diff --git a/src/Application.vala b/src/Application.vala index f4aaa0d..745185f 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -25,7 +25,7 @@ public class Cherrypick.Application : Gtk.Application { public Application () { Object ( - application_id: "io.github.elly_code.cherrypick", + application_id: "io.github.ellie_commons.cherrypick", flags: ApplicationFlags.HANDLES_COMMAND_LINE ); } @@ -76,7 +76,7 @@ public class Cherrypick.Application : Gtk.Application { }); var provider = new Gtk.CssProvider (); - provider.load_from_resource ("/io/github/elly_code/cherrypick/Application.css"); + provider.load_from_resource ("/io/github/ellie_commons/cherrypick/Application.css"); Gtk.StyleContext.add_provider_for_display ( Gdk.Display.get_default (), provider, diff --git a/src/Services/Settings.vala b/src/Services/Settings.vala index e2b5989..6363e99 100644 --- a/src/Services/Settings.vala +++ b/src/Services/Settings.vala @@ -20,7 +20,7 @@ public class Cherrypick.Settings: GLib.Settings { private Settings () { Object ( - schema_id: "io.github.elly_code.cherrypick" + schema_id: "io.github.ellie_commons.cherrypick" ); } } From 5d974dfa47644b8d6e8d3976355391c70f63806e Mon Sep 17 00:00:00 2001 From: teamcons Date: Sun, 15 Feb 2026 23:07:46 +0100 Subject: [PATCH 2/5] manifest --- ...ithub.ellie_commons.cherrypick.flathub.yml | 38 ------------------- io.github.ellie_commons.cherrypick.yml | 21 ++++++---- 2 files changed, 14 insertions(+), 45 deletions(-) delete mode 100644 io.github.ellie_commons.cherrypick.flathub.yml diff --git a/io.github.ellie_commons.cherrypick.flathub.yml b/io.github.ellie_commons.cherrypick.flathub.yml deleted file mode 100644 index 611ec63..0000000 --- a/io.github.ellie_commons.cherrypick.flathub.yml +++ /dev/null @@ -1,38 +0,0 @@ -id: io.github.ellie_commons.cherrypick -# elementary SDK is not available on Flathub, so use the elementary BaseApp instead -base: io.elementary.BaseApp -base-version: 'circe-25.08' -runtime: org.gnome.Platform -runtime-version: '49' -sdk: org.gnome.Sdk -command: io.github.ellie_commons.cherrypick - -finish-args: - - '--share=ipc' - - '--device=dri' - - '--socket=fallback-x11' - - '--socket=wayland' - -cleanup: - - '/include' - - '/lib/pkgconfig' - - '/man' - - '/share/doc' - - '/share/gtk-doc' - - '/share/man' - - '/share/pkgconfig' - - '/share/installed-tests' - - '*.la' - - '*.a' - -modules: - - name: cherrypick - buildsystem: meson - sources: - - type: git - url: https://github.com/ellie-commons/cherrypick.git - tag: 2.3.0 - commit: ed215bda8d53d2475597317fb44844a3c35ed325 - x-checker-data: - type: git - tag-pattern: '^([\d.]+)$' \ No newline at end of file diff --git a/io.github.ellie_commons.cherrypick.yml b/io.github.ellie_commons.cherrypick.yml index 5fc53df..611ec63 100644 --- a/io.github.ellie_commons.cherrypick.yml +++ b/io.github.ellie_commons.cherrypick.yml @@ -1,15 +1,17 @@ id: io.github.ellie_commons.cherrypick -runtime: io.elementary.Platform -# Currently this crashes for 8.2 (which flathub has) bc https://github.com/elementary/granite/pull/893 -runtime-version: '8' -sdk: io.elementary.Sdk +# elementary SDK is not available on Flathub, so use the elementary BaseApp instead +base: io.elementary.BaseApp +base-version: 'circe-25.08' +runtime: org.gnome.Platform +runtime-version: '49' +sdk: org.gnome.Sdk command: io.github.ellie_commons.cherrypick finish-args: - '--share=ipc' + - '--device=dri' - '--socket=fallback-x11' - '--socket=wayland' - - '--device=dri' cleanup: - '/include' @@ -27,5 +29,10 @@ modules: - name: cherrypick buildsystem: meson sources: - - type: dir - path: . + - type: git + url: https://github.com/ellie-commons/cherrypick.git + tag: 2.3.0 + commit: ed215bda8d53d2475597317fb44844a3c35ed325 + x-checker-data: + type: git + tag-pattern: '^([\d.]+)$' \ No newline at end of file From b58b2fd469bdae35f7d915dc4e06acfe42d2ed50 Mon Sep 17 00:00:00 2001 From: teamcons Date: Sun, 15 Feb 2026 23:18:39 +0100 Subject: [PATCH 3/5] remove circular ref --- data/cherrypick.metainfo.xml.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/cherrypick.metainfo.xml.in b/data/cherrypick.metainfo.xml.in index c49a7d0..a021312 100644 --- a/data/cherrypick.metainfo.xml.in +++ b/data/cherrypick.metainfo.xml.in @@ -20,11 +20,11 @@ - io.github.ellie_commons.cherrypick - io.github.ellie_commons.cherrypick + io.github.elly_code.cherrypick + io.github.elly_code.cherrypick - io.github.ellie_commons.cherrypick + io.github.elly_code.cherrypick From e4d3c7cf3214b518b878c53c2ea379a444a8b353 Mon Sep 17 00:00:00 2001 From: teamcons Date: Mon, 13 Apr 2026 15:06:17 +0200 Subject: [PATCH 4/5] Overhaul the buildsystem to be more flexible with app_id and gettext --- data/Application.css | 25 + ...ck.desktop.in => cherrypick.desktop.in.in} | 6 +- ...source.xml => cherrypick.gresource.xml.in} | 2 +- ....gschema.xml => cherrypick.gschema.xml.in} | 6 +- ...o.xml.in => cherrypick.metainfo.xml.in.in} | 78 +--- data/meson.build | 116 +++-- io.github.ellie_commons.cherrypick.yml | 2 +- io.github.elly_code.cherrypick.devel.yml | 40 ++ io.github.elly_code.cherrypick.yml | 29 ++ meson.build | 60 ++- meson_options.txt | 2 + po/POTFILES | 1 + ..._commons.cherrypick.pot => cherrypick.pot} | 34 +- po/de.po | 51 ++- po/es.po | 46 +- po/extra/POTFILES | 4 +- po/extra/de.po | 208 +++++---- po/extra/es.po | 211 +++++---- po/extra/extra.pot | 114 +++-- po/extra/fr.po | 221 +++++---- po/extra/it.po | 430 ++++++++++-------- po/extra/ru.po | 116 +++-- po/fr.po | 49 +- po/it.po | 33 +- po/meson.build | 2 +- po/ru.po | 39 +- po/sv.po | 33 +- src/Application.vala | 8 +- src/Config.vala.in | 6 +- src/Services/Settings.vala | 2 +- 30 files changed, 1246 insertions(+), 728 deletions(-) rename data/{cherrypick.desktop.in => cherrypick.desktop.in.in} (69%) rename data/{cherrypick.gresource.xml => cherrypick.gresource.xml.in} (70%) rename data/{cherrypick.gschema.xml => cherrypick.gschema.xml.in} (84%) rename data/{cherrypick.metainfo.xml.in => cherrypick.metainfo.xml.in.in} (66%) create mode 100644 io.github.elly_code.cherrypick.devel.yml create mode 100644 io.github.elly_code.cherrypick.yml create mode 100644 meson_options.txt rename po/{io.github.ellie_commons.cherrypick.pot => cherrypick.pot} (63%) diff --git a/data/Application.css b/data/Application.css index b4e5731..47420c4 100644 --- a/data/Application.css +++ b/data/Application.css @@ -1,6 +1,31 @@ +/* +* Copyright (c) 2025-2026 Stella (teamcons on GitHub) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License as published by the Free Software Foundation; either +* version 3 of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301 USA +*/ .color-preview { /* preview_color defined in code */ background-color: @preview_color; box-shadow: inset 1px 0 0 0 shade(@preview_color, 1.07); } + +/* Devel builds get these. Libadwaita has that too, but we do not use it. */ +window.devel { + border-style: solid; + border-width: 3px; + border-color: @warning_color; +} \ No newline at end of file diff --git a/data/cherrypick.desktop.in b/data/cherrypick.desktop.in.in similarity index 69% rename from data/cherrypick.desktop.in rename to data/cherrypick.desktop.in.in index f03e3e6..b447d09 100644 --- a/data/cherrypick.desktop.in +++ b/data/cherrypick.desktop.in.in @@ -6,8 +6,8 @@ GenericName=Color Picker Comment=Pick colors on your screen Categories=Graphics;Utility; -Icon=io.github.ellie_commons.cherrypick -Exec=io.github.ellie_commons.cherrypick +Icon=@APP_ID@ +Exec=@APP_ID@ SingleMainWindow=true Terminal=false Keywords=Color;Pick;Eyedropper;Picker; @@ -16,4 +16,4 @@ Actions=ImmediatelyPick; [Desktop Action ImmediatelyPick] Name=Pick a color Icon=color-picker -Exec=io.github.ellie_commons.cherrypick --immediately-pick +Exec=@APP_ID@ --immediately-pick diff --git a/data/cherrypick.gresource.xml b/data/cherrypick.gresource.xml.in similarity index 70% rename from data/cherrypick.gresource.xml rename to data/cherrypick.gresource.xml.in index a9fa1b9..8512128 100644 --- a/data/cherrypick.gresource.xml +++ b/data/cherrypick.gresource.xml.in @@ -1,6 +1,6 @@ - + Application.css diff --git a/data/cherrypick.gschema.xml b/data/cherrypick.gschema.xml.in similarity index 84% rename from data/cherrypick.gschema.xml rename to data/cherrypick.gschema.xml.in index ee74f64..a4125d4 100644 --- a/data/cherrypick.gschema.xml +++ b/data/cherrypick.gschema.xml.in @@ -1,6 +1,6 @@ - + @@ -9,7 +9,7 @@ - + ["rgba(237, 83, 83, 1)", "rgba(243, 115, 41, 1)", "rgba(249, 196, 64, 1)", "rgba(155, 219, 77, 1)", "rgba(165, 109, 226, 1)"] @@ -22,7 +22,7 @@ Color history The rgba values for saved snapshot - + "rgba" Color format Last selected color format diff --git a/data/cherrypick.metainfo.xml.in b/data/cherrypick.metainfo.xml.in.in similarity index 66% rename from data/cherrypick.metainfo.xml.in rename to data/cherrypick.metainfo.xml.in.in index a021312..c61c5dc 100644 --- a/data/cherrypick.metainfo.xml.in +++ b/data/cherrypick.metainfo.xml.in.in @@ -1,9 +1,9 @@ - io.github.ellie_commons.cherrypick - Cherrypick + @APP_ID@ + @APP_NAME@ Pick colors on your screen - io.github.ellie_commons.cherrypick.desktop + @APP_ID@.desktop CC-BY-4.0 GPL-3.0-or-later @@ -20,41 +20,41 @@ - io.github.elly_code.cherrypick - io.github.elly_code.cherrypick + @ALTERNATE_ID@ + @ALTERNATE_ID@ - io.github.elly_code.cherrypick + @ALTERNATE_ID@ - io.github.ellie_commons.cherrypick + @GETTEXT_PACKAGE@ pointing touch - + PhoneyBadger + Stella and Charlie ellie-commons - https://github.com/ellie-commons/cherrypick - https://github.com/ellie-commons/cherrypick/issues - https://github.com/ellie-commons/cherrypick/issues - https://ko-fi.com/teamcons - https://github.com/ellie-commons/cherrypick + https://github.com/elly-code/cherrypick + https://github.com/elly-code/cherrypick/issues + https://github.com/elly-code/cherrypick/issues + https://ko-fi.com/teamcons/tip + https://github.com/elly-code/cherrypick Cherrypick's main window - https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-light.png?raw=true + https://raw.githubusercontent.com/elly-code/cherrypick/@APP_VERSION@/data/screenshots/window-light.png Main window with dark theme - https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-dark.png?raw=true + https://raw.githubusercontent.com/elly-code/cherrypick/@APP_VERSION@/data/screenshots/window-dark.png @@ -65,6 +65,14 @@ + + +
      +
    • Fixed broken translations
      • +
    • Update for german and french
      • +
    +     +
      @@ -89,7 +97,7 @@
    - Fix alpha not being restored properly + Fix alpha not being restored properly     @@ -139,43 +147,5 @@ - - -

    Add command line flag to open directly in color picking mode

    -     -     - - -
      -
    • Fix layout bug when opening multiple instances
      • -
    • Make pick color button the default focused widget
      • -
    • Remove payment option from appcenter
      • -
    -     -     - - -
      -
    • Update to elementary platform 7
      • -
    • Minor change to app description
      • -
    -     -     - - -

    Fix inaccuracies in metadata

    -     -     - - -

    Add stripe key

    -     -     - - -

    Initial release

    -     -     -     diff --git a/data/meson.build b/data/meson.build index 6ef9510..baeb209 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,37 +1,40 @@ -# Install GSettings schema -install_data ( - 'cherrypick.gschema.xml', - install_dir: get_option('datadir') / 'glib-2.0' / 'schemas', - rename: meson.project_name() + '.gschema.xml' + + +gresource_conf = configuration_data() +gresource_conf.set('APP_PATH', app_path) +gresource_file = configure_file( + input: 'cherrypick.gresource.xml.in', + output: 'cherrypick.gresource.xml', + configuration: gresource_conf, ) -# Include the translations module -i18n = import('i18n') +gresource = gnome.compile_resources( + 'gresource', + gresource_file, + source_dir: 'data' +) -# Set our translation domain -add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name()), language:'c') -#Translate and install our .desktop file -i18n.merge_file( - input: 'cherrypick.desktop.in', - output: meson.project_name() + '.desktop', - po_dir: meson.project_source_root() / 'po', - type: 'desktop', - install: true, - install_dir: get_option('datadir') / 'applications' +gschema_conf = configuration_data() +gschema_conf.set('APP_ID', app_id) +gschema_conf.set('APP_PATH', app_path) +gschema_file = configure_file( + input: 'cherrypick.gschema.xml.in', + output: app_id + '.gschema.xml', + configuration: gschema_conf, ) -#Translate and install our .metainfo file -i18n.merge_file( - input: 'cherrypick.metainfo.xml.in', - output: meson.project_name() + '.metainfo.xml', - po_dir: meson.project_source_root() / 'po', - install: true, - install_dir: get_option('datadir') / 'metainfo' +install_data( + gschema_file, + install_dir: get_option('datadir') / 'glib-2.0' / 'schemas', +) + +compile_schemas = find_program('glib-compile-schemas', required: false, disabler: true) + test('Validate schema file', + compile_schemas, + args: ['--strict', '--dry-run', meson.current_source_dir()], ) -# Compile and install custom css file -gnome = import('gnome') #picker_resources = gnome.compile_resources( # 'picker-resources', @@ -47,12 +50,69 @@ foreach i : icon_sizes install_data( 'icons' / 'png' / i + '.png', install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps', - rename: meson.project_name() + '.png' + rename: app_id + '.png' ) # HiDPI install_data( 'icons' / 'png' / i + '@2x' + '.png', install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i + '@2' / 'apps', - rename: meson.project_name() + '.png' + rename: app_id + '.png' ) endforeach + + +# Inject some variables into the desktop file before merging in the translations +desktop_conf = configuration_data() +desktop_conf.set('APP_NAME', app_name) +desktop_conf.set('APP_ID', app_id) +desktop_file_in = configure_file( +input: 'cherrypick.desktop.in.in', +output: app_id + '.desktop.in', +configuration: desktop_conf, +) + +desktop_file = i18n.merge_file( +input: desktop_file_in, +output: app_id + '.desktop', +po_dir: meson.project_source_root() / 'po' / 'extra', +type: 'desktop', +install: true, +install_dir: get_option('datadir') / 'applications', +) + + +# Inject some variables into the metainfo file before merging in the translations +appstream_conf = configuration_data() +appstream_conf.set('APP_NAME', app_name) +appstream_conf.set('APP_ID', app_id) +appstream_conf.set('APP_VERSION', app_version) +appstream_conf.set('GETTEXT_PACKAGE', gettext_name) +appstream_conf.set('ALTERNATE_APP_ID', alternate_app_id) +appstream_file_in = configure_file( + input: 'cherrypick.metainfo.xml.in.in', + output: app_id + '.metainfo.xml.in', + configuration: appstream_conf, +) + +appstream_file = i18n.merge_file( + input: appstream_file_in, + output: app_id + '.metainfo.xml', + po_dir: meson.project_source_root() / 'po' / 'extra', + type: 'xml', + install: true, + install_dir: get_option('datadir') / 'metainfo', +) + + + +# Test definitions +desktop_utils = find_program('desktop-file-validate', required: false) +if desktop_utils.found() + test('Validate desktop file', desktop_utils, args: [desktop_file]) +endif + +appstreamcli = find_program('appstreamcli', required: false, disabler: true) + test('Validate appstream file', +appstreamcli, +args: ['validate', '--no-net', '--explain', appstream_file], +) \ No newline at end of file diff --git a/io.github.ellie_commons.cherrypick.yml b/io.github.ellie_commons.cherrypick.yml index 611ec63..eb111f4 100644 --- a/io.github.ellie_commons.cherrypick.yml +++ b/io.github.ellie_commons.cherrypick.yml @@ -3,7 +3,7 @@ id: io.github.ellie_commons.cherrypick base: io.elementary.BaseApp base-version: 'circe-25.08' runtime: org.gnome.Platform -runtime-version: '49' +runtime-version: '50' sdk: org.gnome.Sdk command: io.github.ellie_commons.cherrypick diff --git a/io.github.elly_code.cherrypick.devel.yml b/io.github.elly_code.cherrypick.devel.yml new file mode 100644 index 0000000..5835414 --- /dev/null +++ b/io.github.elly_code.cherrypick.devel.yml @@ -0,0 +1,40 @@ +# +# This is danger +# +id: io.github.elly_code.cherrypick.devel +# elementary SDK is not available on Flathub, so use the elementary BaseApp instead +base: io.elementary.BaseApp +base-version: 'circe-25.08' +runtime: org.gnome.Platform +runtime-version: '50' +sdk: org.gnome.Sdk +command: io.github.elly_code.cherrypick.devel + +tags: ['devel'] +desktop-file-name-suffix: ' (Development)' + +finish-args: + - '--share=ipc' + - '--device=dri' + - '--socket=fallback-x11' + - '--socket=wayland' + +cleanup: + - '/include' + - '/lib/pkgconfig' + - '/man' + - '/share/gtk-doc' + - '/share/man' + - '/share/pkgconfig' + - '/share/installed-tests' + - '*.la' + - '*.a' + +modules: + - name: cherrypick + buildsystem: meson + config-opts: + - -Ddevelopment=true + sources: + - type: dir + path: . \ No newline at end of file diff --git a/io.github.elly_code.cherrypick.yml b/io.github.elly_code.cherrypick.yml new file mode 100644 index 0000000..c2b5b1d --- /dev/null +++ b/io.github.elly_code.cherrypick.yml @@ -0,0 +1,29 @@ +id: io.github.elly_code.cherrypick +runtime: io.elementary.Platform +runtime-version: '8.2' +sdk: io.elementary.Sdk +command: io.github.elly_code.cherrypick + +finish-args: + - '--share=ipc' + - '--device=dri' + - '--socket=fallback-x11' + - '--socket=wayland' + +cleanup: + - '/include' + - '/lib/pkgconfig' + - '/man' + - '/share/gtk-doc' + - '/share/man' + - '/share/pkgconfig' + - '/share/installed-tests' + - '*.la' + - '*.a' + +modules: + - name: cherrypick + buildsystem: meson + sources: + - type: dir + path: . \ No newline at end of file diff --git a/meson.build b/meson.build index 11205ff..161d9e0 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,50 @@ -project('io.github.ellie_commons.cherrypick', +project('cherrypick', 'c', 'vala', version: '2.3.0') +app_name = 'Cherrypick' +correct_app_id = 'io.github.elly_code.' + meson.project_name() +legacy_app_id = 'io.github.ellie_commons.' + meson.project_name() + +if get_option('legacy-rdnn') + app_id = legacy_app_id + alternate_app_id = correct_app_id + app_path = '/io/github/ellie_commons/cherrypick/' +else + app_id = correct_app_id + alternate_app_id = legacy_app_id + app_path = '/io/github/elly_code/cherrypick/' + +endif + +app_version = meson.project_version() +gettext_name = meson.project_name() + +vala_flags = [] +if get_option('development') + app_id += '.devel' + name_prefix = '(devel) ' + vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip() + version_suffix = '-@0@'.format (vcs_tag) + vala_flags += ['--define', 'DEVEL'] + +else + name_prefix = '' + version_suffix = '' +endif + +# Include the translations module +i18n = import('i18n') + +# Set our translation domain +add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (gettext_name), language:'c') + +# Compile and install custom css file +gnome = import('gnome') + + + + subdir('src') subdir('data') subdir('po') @@ -14,23 +57,22 @@ portal_dep = dependency('libportal') picker_dependencies = [glib_dep, gtk_dep, granite_dep, portal_dep, meson.get_compiler('c').find_library('m', required: true)] config_data = configuration_data() -config_data.set('version', meson.project_version()) config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir')) -config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +config_data.set_quoted('GETTEXT_PACKAGE', gettext_name) +config_data.set_quoted('APP_NAME', app_name) +config_data.set_quoted('APP_ID', app_id) +config_data.set_quoted('APP_PATH', app_path) +config_data.set_quoted('APP_VERSION', app_version) config_file = configure_file( input: 'src/Config.vala.in', output: '@BASENAME@', configuration: config_data ) -gresource = gnome.compile_resources( - 'gresource', - 'data' / 'cherrypick.gresource.xml', - source_dir: 'data' -) + executable( - meson.project_name(), + app_id, gresource, config_file, sources: [picker_source_files], diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..e582eb5 --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,2 @@ +option('development', type: 'boolean', value: false, description: 'If this is a development build') +option('legacy-rdnn', type: 'boolean', value: false, description: 'If this uses the legacy RDNN') \ No newline at end of file diff --git a/po/POTFILES b/po/POTFILES index b93e853..6e15ef8 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,4 +1,5 @@ src/Windows/Window.vala +src/Views/MainView.vala src/Widgets/FormatArea.vala src/Widgets/HistoryHeader.vala src/Application.vala \ No newline at end of file diff --git a/po/io.github.ellie_commons.cherrypick.pot b/po/cherrypick.pot similarity index 63% rename from po/io.github.ellie_commons.cherrypick.pot rename to po/cherrypick.pot index 64f052c..c237599 100644 --- a/po/io.github.ellie_commons.cherrypick.pot +++ b/po/cherrypick.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.ellie_commons.cherrypick package. +# This file is distributed under the same license as the cherrypick package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" +"Project-Id-Version: cherrypick\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"POT-Creation-Date: 2026-04-13 14:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,27 +19,41 @@ msgstr "" #. /TRANSLATORS: Do not translate app name #. We need to hide the title area for the split headerbar -#: src/Windows/Window.vala:31 src/Windows/Window.vala:48 +#: src/Windows/Window.vala:35 src/Windows/Window.vala:52 msgid "Cherrypick" msgstr "" -#: src/Widgets/FormatArea.vala:66 +#. ---------------- FORMAT ---------------- +#: src/Views/MainView.vala:36 +msgid "Format" +msgstr "" + +#. ---------------- BIG BUTTON ---------------- +#: src/Views/MainView.vala:53 +msgid "Pick Color" +msgstr "" + +#: src/Views/MainView.vala:57 +msgid "Click to pick a color on the screen" +msgstr "" + +#: src/Widgets/FormatArea.vala:68 msgid "Click to paste a colour if you have one saved up" msgstr "" -#: src/Widgets/FormatArea.vala:69 +#: src/Widgets/FormatArea.vala:73 msgid "Click to copy this colour to your clipboard" msgstr "" -#: src/Widgets/FormatArea.vala:75 +#: src/Widgets/FormatArea.vala:78 msgid "Choose your preferred format to display picked colours" msgstr "" -#: src/Widgets/FormatArea.vala:109 +#: src/Widgets/FormatArea.vala:112 msgid "Copied to clipboard!" msgstr "" -#: src/Widgets/FormatArea.vala:138 +#: src/Widgets/FormatArea.vala:141 msgid "Cannot detect colour!" msgstr "" @@ -59,6 +73,6 @@ msgstr "" msgid "History saved" msgstr "" -#: src/Application.vala:129 +#: src/Application.vala:114 msgid "Pick a colour and copy it to clipboard" msgstr "" diff --git a/po/de.po b/po/de.po index 598671e..ae1457d 100644 --- a/po/de.po +++ b/po/de.po @@ -1,41 +1,54 @@ msgid "" msgstr "" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Language: de\n" -"Language-Team: none\n" +"Project-Id-Version: cherrypick\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2026-04-13 14:58+0200\n" +"PO-Revision-Date: 2022-05-29 02:15+0530\n" "Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: de\n" "MIME-Version: 1.0\n" -"PO-Revision-Date: 2022-05-29 02:15+0530\n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" -"Report-Msgid-Bugs-To: \n" #. /TRANSLATORS: Do not translate app name #. We need to hide the title area for the split headerbar -#: src/Windows/Window.vala:31 -#: src/Windows/Window.vala:48 +#: src/Windows/Window.vala:35 src/Windows/Window.vala:52 msgid "Cherrypick" msgstr "Cherrypick" -#: src/Widgets/FormatArea.vala:66 +#. ---------------- FORMAT ---------------- +#: src/Views/MainView.vala:36 +msgid "Format" +msgstr "Format" + +#. ---------------- BIG BUTTON ---------------- +#: src/Views/MainView.vala:53 +msgid "Pick Color" +msgstr "Farbe auswählen" + +#: src/Views/MainView.vala:57 +msgid "Click to pick a color on the screen" +msgstr "Auf den Bildschirm klicken, um eine Farbe auszuwählen" + +#: src/Widgets/FormatArea.vala:68 msgid "Click to paste a colour if you have one saved up" -msgstr "Klicken Sie hier, um eine Farbe einzufügen, wenn Sie eine gespeichert haben" +msgstr "Klicken, um eine Farbe einzufügen, wenn Sie eine gespeichert haben" -#: src/Widgets/FormatArea.vala:69 +#: src/Widgets/FormatArea.vala:73 msgid "Click to copy this colour to your clipboard" -msgstr "Klicken Sie, um diese Farbe in Ihre Zwischenablage zu kopieren" +msgstr "Klicken, um diese Farbe in Ihre Zwischenablage zu kopieren" -#: src/Widgets/FormatArea.vala:75 +#: src/Widgets/FormatArea.vala:78 msgid "Choose your preferred format to display picked colours" -msgstr "Wählen Sie Ihr bevorzugtes Format für die Anzeige von Farben" +msgstr "Ihr bevorzugtes Format wählen für die Anzeige von Farben" -#: src/Widgets/FormatArea.vala:109 +#: src/Widgets/FormatArea.vala:112 msgid "Copied to clipboard!" msgstr "In die Zwischenablage kopiert!" -#: src/Widgets/FormatArea.vala:138 +#: src/Widgets/FormatArea.vala:141 msgid "Cannot detect colour!" msgstr "Kann keine Farbe erkennen!" @@ -55,6 +68,6 @@ msgstr "Schnappschuss der Historie wiederherstellen" msgid "History saved" msgstr "Verlauf gespeichert" -#: src/Application.vala:129 +#: src/Application.vala:114 msgid "Pick a colour and copy it to clipboard" msgstr "Eine Farbe auswählen und in die Zwischenablage kopieren" diff --git a/po/es.po b/po/es.po index 8277761..84cd2ed 100644 --- a/po/es.po +++ b/po/es.po @@ -1,41 +1,55 @@ msgid "" msgstr "" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Language: es\n" -"Language-Team: none\n" +"Project-Id-Version: cherrypick\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2026-04-13 14:58+0200\n" +"PO-Revision-Date: 2022-05-29 02:15+0530\n" "Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es\n" "MIME-Version: 1.0\n" -"PO-Revision-Date: 2022-05-29 02:15+0530\n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" -"Report-Msgid-Bugs-To: \n" #. /TRANSLATORS: Do not translate app name #. We need to hide the title area for the split headerbar -#: src/Windows/Window.vala:31 -#: src/Windows/Window.vala:48 +#: src/Windows/Window.vala:35 src/Windows/Window.vala:52 msgid "Cherrypick" msgstr "Cherrypick" -#: src/Widgets/FormatArea.vala:66 +#. ---------------- FORMAT ---------------- +#: src/Views/MainView.vala:36 +msgid "Format" +msgstr "" + +#. ---------------- BIG BUTTON ---------------- +#: src/Views/MainView.vala:53 +msgid "Pick Color" +msgstr "" + +#: src/Views/MainView.vala:57 +#, fuzzy +msgid "Click to pick a color on the screen" +msgstr "Haz clic para pegar un color si tienes uno guardado" + +#: src/Widgets/FormatArea.vala:68 msgid "Click to paste a colour if you have one saved up" msgstr "Haz clic para pegar un color si tienes uno guardado" -#: src/Widgets/FormatArea.vala:69 +#: src/Widgets/FormatArea.vala:73 msgid "Click to copy this colour to your clipboard" msgstr "Haga clic para copiar este color en el portapapeles" -#: src/Widgets/FormatArea.vala:75 +#: src/Widgets/FormatArea.vala:78 msgid "Choose your preferred format to display picked colours" msgstr "Elige el formato que prefieras para mostrar los colores elegidos" -#: src/Widgets/FormatArea.vala:109 +#: src/Widgets/FormatArea.vala:112 msgid "Copied to clipboard!" msgstr "Copiado al portapapeles." -#: src/Widgets/FormatArea.vala:138 +#: src/Widgets/FormatArea.vala:141 msgid "Cannot detect colour!" msgstr "No detecta el color." @@ -55,6 +69,6 @@ msgstr "Restaurar instantánea del historial" msgid "History saved" msgstr "Historia guardada" -#: src/Application.vala:129 +#: src/Application.vala:114 msgid "Pick a colour and copy it to clipboard" msgstr "Elige un color y cópialo en el portapapeles" diff --git a/po/extra/POTFILES b/po/extra/POTFILES index 2b5aecf..11e1896 100644 --- a/po/extra/POTFILES +++ b/po/extra/POTFILES @@ -1,2 +1,2 @@ -data/cherrypick.desktop.in -data/cherrypick.metainfo.xml.in +data/cherrypick.desktop.in.in +data/cherrypick.metainfo.xml.in.in diff --git a/po/extra/de.po b/po/extra/de.po index 12ce1fb..270bebb 100644 --- a/po/extra/de.po +++ b/po/extra/de.po @@ -1,196 +1,250 @@ msgid "" msgstr "" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Language: de\n" -"Language-Team: none\n" +"Project-Id-Version: cherrypick\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2026-04-13 14:55+0200\n" +"PO-Revision-Date: 2022-05-29 02:15+0530\n" "Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: de\n" "MIME-Version: 1.0\n" -"PO-Revision-Date: 2022-05-29 02:15+0530\n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" -"Report-Msgid-Bugs-To: \n" -#: data/cherrypick.desktop.in:5 -#: data/cherrypick.metainfo.xml.in:4 +#: data/cherrypick.desktop.in.in:5 msgid "Cherrypick" msgstr "Cherrypick" -#: data/cherrypick.desktop.in:6 +#: data/cherrypick.desktop.in.in:6 msgid "Color Picker" msgstr "Farbwähler" -#: data/cherrypick.desktop.in:7 -#: data/cherrypick.metainfo.xml.in:5 +#: data/cherrypick.desktop.in.in:7 data/cherrypick.metainfo.xml.in.in:5 msgid "Pick colors on your screen" msgstr "Farben auf Ihrem Bildschirm auswählen" -#: data/cherrypick.desktop.in:14 +#: data/cherrypick.desktop.in.in:14 msgid "Color;Pick;Eyedropper;Picker;" msgstr "Farbe;Pick;Pipette;Picker;" -#: data/cherrypick.desktop.in:18 +#: data/cherrypick.desktop.in.in:18 msgid "Pick a color" msgstr "Eine farbe wählen" -#: data/cherrypick.metainfo.xml.in:11 +#: data/cherrypick.metainfo.xml.in.in:4 +msgid "@APP_NAME@" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:11 msgid "A modern and trusty color picker" msgstr "Ein moderner und zuverlässiger Farbwähler" -#: data/cherrypick.metainfo.xml.in:12 +#: data/cherrypick.metainfo.xml.in.in:12 msgid "Features:" msgstr "Merkmale:" -#: data/cherrypick.metainfo.xml.in:14 +#: data/cherrypick.metainfo.xml.in.in:14 msgid "Choose different output formats (RGB, RGBA, HEX, CMYK, HSL, HSLA)" -msgstr "Wählen Sie verschiedene Ausgabeformate (RGB, RGBA, HEX, CMYK, HSL, HSLA)" +msgstr "" +"Wählen Sie verschiedene Ausgabeformate (RGB, RGBA, HEX, CMYK, HSL, HSLA)" -#: data/cherrypick.metainfo.xml.in:15 +#: data/cherrypick.metainfo.xml.in.in:15 msgid "Remembers your preferred format" msgstr "Erinnert sich an Ihr bevorzugtes Format" -#: data/cherrypick.metainfo.xml.in:16 -msgid "Color history remembers your last picked colors (hover to check their code)" -msgstr "Der Farbverlauf speichert Ihre zuletzt gewählten Farben (bewegen Sie den Mauszeiger, um ihren Code zu überprüfen)" +#: data/cherrypick.metainfo.xml.in.in:16 +msgid "" +"Color history remembers your last picked colors (hover to check their code)" +msgstr "" +"Der Farbverlauf speichert Ihre zuletzt gewählten Farben (bewegen Sie den " +"Mauszeiger, um ihren Code zu überprüfen)" -#: data/cherrypick.metainfo.xml.in:17 +#: data/cherrypick.metainfo.xml.in.in:17 msgid "Curious about a color? Copy paste it from your clipboard to preview it" -msgstr "Neugierig auf eine Farbe? Kopieren und Einfügen aus der Zwischenablage für eine Vorschau" +msgstr "" +"Neugierig auf eine Farbe? Kopieren und Einfügen aus der Zwischenablage für " +"eine Vorschau" -#: data/cherrypick.metainfo.xml.in:18 +#: data/cherrypick.metainfo.xml.in.in:18 msgid "You can set a keybind to immediately pick and copy to clipboard!" -msgstr "Sie können eine Tastenkombination festlegen, um sofort zu wählen und in die Zwischenablage zu kopieren!" +msgstr "" +"Sie können eine Tastenkombination festlegen, um sofort zu wählen und in die " +"Zwischenablage zu kopieren!" -#: data/cherrypick.metainfo.xml.in:30 -msgid "PhoneyBadger + Stella" -msgstr "PhoneyBadger + Stella" +#: data/cherrypick.metainfo.xml.in.in:38 +msgid "PhoneyBadger + Stella and Charlie" +msgstr "PhoneyBadger + Stella and Charlie" -#: data/cherrypick.metainfo.xml.in:40 +#: data/cherrypick.metainfo.xml.in.in:49 msgid "Cherrypick's main window" msgstr "Das Hauptfenster von Cherrypick" -#: data/cherrypick.metainfo.xml.in:46 +#: data/cherrypick.metainfo.xml.in.in:55 msgid "Main window with dark theme" msgstr "Hauptfenster mit dunklem Thema" -#: data/cherrypick.metainfo.xml.in:62 +#: data/cherrypick.metainfo.xml.in.in:71 +msgid "Organization change" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:72 +msgid "Show a pasted color has alpha by displaying a checkerboard" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:73 +msgid "Italian translation thanks to @albanobattistella!" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:80 +msgid "Prevent Cherrypick from lingering in the background" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:87 msgid "Change branding colors to a nice cherry" msgstr "Ändern Sie die Branding-Farben in eine schöne Kirsche" -#: data/cherrypick.metainfo.xml.in:63 +#: data/cherrypick.metainfo.xml.in.in:88 msgid "All a glance: Preview tooltip shows all formats" msgstr "Alles auf einen Blick: Vorschau-Tooltip zeigt alle Formate" -#: data/cherrypick.metainfo.xml.in:73 -msgid "Fix regression: Allow --immediately-pick when the window is already open" -msgstr "Regression beheben: --immediately-pick zulassen, wenn das Fenster bereits geöffnet ist" +#: data/cherrypick.metainfo.xml.in.in:98 +msgid "" +"Fix regression: Allow --immediately-pick when the window is already open" +msgstr "" +"Regression beheben: --immediately-pick zulassen, wenn das Fenster bereits " +"geöffnet ist" -#: data/cherrypick.metainfo.xml.in:74 +#: data/cherrypick.metainfo.xml.in.in:99 msgid "Not sure how to fix yet: the crosshair doesnt show..." -msgstr "Bin mir noch nicht sicher, wie man das beheben kann: Das Fadenkreuz wird nicht angezeigt..." +msgstr "" +"Bin mir noch nicht sicher, wie man das beheben kann: Das Fadenkreuz wird " +"nicht angezeigt..." -#: data/cherrypick.metainfo.xml.in:81 +#: data/cherrypick.metainfo.xml.in.in:106 msgid "Clean appdata for flathub release" msgstr "Bereinigung der Anwendungsdaten für die Flathub-Veröffentlichung" -#: data/cherrypick.metainfo.xml.in:82 +#: data/cherrypick.metainfo.xml.in.in:107 msgid "Make sure the app doesnt crash at startup for flathub builds" -msgstr "Stellen Sie sicher, dass die Anwendung beim Start von Flathub-Builds nicht abstürzt" +msgstr "" +"Stellen Sie sicher, dass die Anwendung beim Start von Flathub-Builds nicht " +"abstürzt" -#: data/cherrypick.metainfo.xml.in:89 +#: data/cherrypick.metainfo.xml.in.in:114 msgid "App now works on ARM thanks to @ryonakano!" msgstr "App funktioniert jetzt auf ARM dank @ryonakano!" -#: data/cherrypick.metainfo.xml.in:90 +#: data/cherrypick.metainfo.xml.in.in:115 msgid "Add the ability to immediately pick and copy to clipboard" -msgstr "Hinzufügen der Möglichkeit zum sofortigen Auswählen und Kopieren in die Zwischenablage" +msgstr "" +"Hinzufügen der Möglichkeit zum sofortigen Auswählen und Kopieren in die " +"Zwischenablage" -#: data/cherrypick.metainfo.xml.in:91 +#: data/cherrypick.metainfo.xml.in.in:116 msgid "You can right-click on app icon and choose \"Immediately pick\"" -msgstr "Sie können mit der rechten Maustaste auf das App-Symbol klicken und \"Sofort auswählen\" wählen." +msgstr "" +"Sie können mit der rechten Maustaste auf das App-Symbol klicken und \"Sofort " +"auswählen\" wählen." -#: data/cherrypick.metainfo.xml.in:92 -msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" -msgstr "Oder setzen Sie eine Schlüsselbindung auf \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" +#: data/cherrypick.metainfo.xml.in.in:117 +msgid "" +"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" +"pick\"" +msgstr "" +"Oder setzen Sie eine Schlüsselbindung auf \"flatpak run io.ellie_commons." +"cherrypick --immediately-pick\"" -#: data/cherrypick.metainfo.xml.in:93 +#: data/cherrypick.metainfo.xml.in.in:118 msgid "Updated deprecated widgets" msgstr "Aktualisierte, veraltete Widgets" -#: data/cherrypick.metainfo.xml.in:94 +#: data/cherrypick.metainfo.xml.in.in:119 msgid "Minute tweaks by @ryonakano thanks again!" msgstr "Minutiöse Verbesserungen durch @ryonakano, danke nochmals!" -#: data/cherrypick.metainfo.xml.in:100 +#: data/cherrypick.metainfo.xml.in.in:125 msgid "Remove minor artifacts" msgstr "Entfernen kleinerer Artefakte" -#: data/cherrypick.metainfo.xml.in:105 +#: data/cherrypick.metainfo.xml.in.in:130 msgid "2.0.0: The revival!" msgstr "2.0.0: Die Wiederbelebung!" -#: data/cherrypick.metainfo.xml.in:107 -msgid "A new name, Cherrypick! Blessed by @adithyankv, the OG author. Thank you!" -msgstr "Ein neuer Name, Cherrypick! Gesegnet von @adithyankv, dem OG-Autor. Dankeschön!" +#: data/cherrypick.metainfo.xml.in.in:132 +msgid "" +"A new name, Cherrypick! Blessed by @adithyankv, the OG author. Thank you!" +msgstr "" +"Ein neuer Name, Cherrypick! Gesegnet von @adithyankv, dem OG-Autor. " +"Dankeschön!" -#: data/cherrypick.metainfo.xml.in:108 -msgid "Port to modern tech (GTK4, Wayland, portals, elementary 8). Not broken anymore!" -msgstr "Portierung auf moderne Technik (GTK4, Wayland, Portale, Elementar 8). Nicht mehr gebrochen!" +#: data/cherrypick.metainfo.xml.in.in:133 +msgid "" +"Port to modern tech (GTK4, Wayland, portals, elementary 8). Not broken " +"anymore!" +msgstr "" +"Portierung auf moderne Technik (GTK4, Wayland, Portale, Elementar 8). Nicht " +"mehr gebrochen!" -#: data/cherrypick.metainfo.xml.in:109 +#: data/cherrypick.metainfo.xml.in.in:134 msgid "CMYK model available thanks to @DSLitvinov" msgstr "CMYK-Modell verfügbar dank @DSLitvinov" -#: data/cherrypick.metainfo.xml.in:110 +#: data/cherrypick.metainfo.xml.in.in:135 msgid "HSL model available thanks to @ckruse's work on ColorMate" msgstr "HSL-Modell verfügbar dank der Arbeit von @ckruse an ColorMate" -#: data/cherrypick.metainfo.xml.in:111 +#: data/cherrypick.metainfo.xml.in.in:136 msgid "Also apparently HSLA is a thing so i added it" msgstr "Anscheinend ist HSLA auch eine Sache, also habe ich es hinzugefügt" -#: data/cherrypick.metainfo.xml.in:112 +#: data/cherrypick.metainfo.xml.in.in:137 msgid "New feature: You can now paste a color from clipboard to preview it" -msgstr "Neue Funktion: Sie können jetzt eine Farbe aus der Zwischenablage einfügen, um sie in der Vorschau anzuzeigen" +msgstr "" +"Neue Funktion: Sie können jetzt eine Farbe aus der Zwischenablage einfügen, " +"um sie in der Vorschau anzuzeigen" -#: data/cherrypick.metainfo.xml.in:113 -msgid "New feature: Hover over history buttons to see their code in your preferred format" -msgstr "Neue Funktion: Bewegen Sie den Mauszeiger über die Verlaufsschaltflächen, um deren Code in Ihrem bevorzugten Format anzuzeigen" +#: data/cherrypick.metainfo.xml.in.in:138 +msgid "" +"New feature: Hover over history buttons to see their code in your preferred " +"format" +msgstr "" +"Neue Funktion: Bewegen Sie den Mauszeiger über die Verlaufsschaltflächen, um " +"deren Code in Ihrem bevorzugten Format anzuzeigen" -#: data/cherrypick.metainfo.xml.in:119 +#: data/cherrypick.metainfo.xml.in.in:144 msgid "Add command line flag to open directly in color picking mode" msgstr "Befehlszeilenflag hinzufügen, um direkt im Farbauswahlmodus zu öffnen" -#: data/cherrypick.metainfo.xml.in:125 +#: data/cherrypick.metainfo.xml.in.in:150 msgid "Fix layout bug when opening multiple instances" msgstr "Layout-Fehler beim Öffnen mehrerer Instanzen behoben" -#: data/cherrypick.metainfo.xml.in:126 +#: data/cherrypick.metainfo.xml.in.in:151 msgid "Make pick color button the default focused widget" msgstr "Farbauswahl-Schaltfläche zum standardmäßig fokussierten Widget machen" -#: data/cherrypick.metainfo.xml.in:127 +#: data/cherrypick.metainfo.xml.in.in:152 msgid "Remove payment option from appcenter" msgstr "Zahlungsoption aus dem Appcenter entfernen" -#: data/cherrypick.metainfo.xml.in:134 +#: data/cherrypick.metainfo.xml.in.in:159 msgid "Update to elementary platform 7" msgstr "Aktualisierung auf die elementare Plattform 7" -#: data/cherrypick.metainfo.xml.in:135 +#: data/cherrypick.metainfo.xml.in.in:160 msgid "Minor change to app description" msgstr "Geringfügige Änderung der App-Beschreibung" -#: data/cherrypick.metainfo.xml.in:141 +#: data/cherrypick.metainfo.xml.in.in:166 msgid "Fix inaccuracies in metadata" msgstr "Behebung von Ungenauigkeiten in Metadaten" -#: data/cherrypick.metainfo.xml.in:146 +#: data/cherrypick.metainfo.xml.in.in:171 msgid "Add stripe key" msgstr "Strip-Schlüssel hinzufügen" -#: data/cherrypick.metainfo.xml.in:151 +#: data/cherrypick.metainfo.xml.in.in:176 msgid "Initial release" msgstr "Erste Veröffentlichung" diff --git a/po/extra/es.po b/po/extra/es.po index d3e7e73..db580fd 100644 --- a/po/extra/es.po +++ b/po/extra/es.po @@ -1,198 +1,255 @@ msgid "" msgstr "" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Language: es\n" -"Language-Team: none\n" +"Project-Id-Version: cherrypick\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2026-04-13 14:55+0200\n" +"PO-Revision-Date: 2022-05-29 02:15+0530\n" "Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es\n" "MIME-Version: 1.0\n" -"PO-Revision-Date: 2022-05-29 02:15+0530\n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" -"Report-Msgid-Bugs-To: \n" -#: data/cherrypick.desktop.in:5 -#: data/cherrypick.metainfo.xml.in:4 +#: data/cherrypick.desktop.in.in:5 msgid "Cherrypick" msgstr "Cherrypick" -#: data/cherrypick.desktop.in:6 +#: data/cherrypick.desktop.in.in:6 msgid "Color Picker" msgstr "Selector de color" -#: data/cherrypick.desktop.in:7 -#: data/cherrypick.metainfo.xml.in:5 +#: data/cherrypick.desktop.in.in:7 data/cherrypick.metainfo.xml.in.in:5 #, fuzzy msgid "Pick colors on your screen" msgstr "Elige los colores de los píxeles de tu pantalla" -#: data/cherrypick.desktop.in:14 +#: data/cherrypick.desktop.in.in:14 msgid "Color;Pick;Eyedropper;Picker;" msgstr "Color;Pick;Cuentagotas;Picker;" -#: data/cherrypick.desktop.in:18 +#: data/cherrypick.desktop.in.in:18 #, fuzzy msgid "Pick a color" msgstr "Elige cualquier color" -#: data/cherrypick.metainfo.xml.in:11 +#: data/cherrypick.metainfo.xml.in.in:4 +msgid "@APP_NAME@" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:11 msgid "A modern and trusty color picker" msgstr "Un selector de color moderno y fiable" -#: data/cherrypick.metainfo.xml.in:12 +#: data/cherrypick.metainfo.xml.in.in:12 msgid "Features:" msgstr "Características:" -#: data/cherrypick.metainfo.xml.in:14 +#: data/cherrypick.metainfo.xml.in.in:14 msgid "Choose different output formats (RGB, RGBA, HEX, CMYK, HSL, HSLA)" msgstr "Elija diferentes formatos de salida (RGB, RGBA, HEX, CMYK, HSL, HSLA)" -#: data/cherrypick.metainfo.xml.in:15 +#: data/cherrypick.metainfo.xml.in.in:15 msgid "Remembers your preferred format" msgstr "Recuerda tu formato preferido" -#: data/cherrypick.metainfo.xml.in:16 -msgid "Color history remembers your last picked colors (hover to check their code)" -msgstr "El historial de colores recuerda los últimos colores elegidos (pasa el ratón por encima para comprobar su código)" +#: data/cherrypick.metainfo.xml.in.in:16 +msgid "" +"Color history remembers your last picked colors (hover to check their code)" +msgstr "" +"El historial de colores recuerda los últimos colores elegidos (pasa el ratón " +"por encima para comprobar su código)" -#: data/cherrypick.metainfo.xml.in:17 +#: data/cherrypick.metainfo.xml.in.in:17 msgid "Curious about a color? Copy paste it from your clipboard to preview it" -msgstr "¿Tienes curiosidad por un color? Cópielo y péguelo desde el portapapeles para obtener una vista previa." +msgstr "" +"¿Tienes curiosidad por un color? Cópielo y péguelo desde el portapapeles " +"para obtener una vista previa." -#: data/cherrypick.metainfo.xml.in:18 +#: data/cherrypick.metainfo.xml.in.in:18 msgid "You can set a keybind to immediately pick and copy to clipboard!" -msgstr "Puedes establecer una combinación de teclas para seleccionar y copiar inmediatamente en el portapapeles." +msgstr "" +"Puedes establecer una combinación de teclas para seleccionar y copiar " +"inmediatamente en el portapapeles." -#: data/cherrypick.metainfo.xml.in:30 -msgid "PhoneyBadger + Stella" +#: data/cherrypick.metainfo.xml.in.in:38 +#, fuzzy +msgid "PhoneyBadger + Stella and Charlie" msgstr "PhoneyBadger + Stella" -#: data/cherrypick.metainfo.xml.in:40 +#: data/cherrypick.metainfo.xml.in.in:49 msgid "Cherrypick's main window" msgstr "Ventana principal de Cherrypick" -#: data/cherrypick.metainfo.xml.in:46 +#: data/cherrypick.metainfo.xml.in.in:55 msgid "Main window with dark theme" msgstr "Ventana principal con tema oscuro" -#: data/cherrypick.metainfo.xml.in:62 +#: data/cherrypick.metainfo.xml.in.in:71 +msgid "Organization change" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:72 +msgid "Show a pasted color has alpha by displaying a checkerboard" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:73 +msgid "Italian translation thanks to @albanobattistella!" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:80 +msgid "Prevent Cherrypick from lingering in the background" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:87 msgid "Change branding colors to a nice cherry" msgstr "Cambia los colores de la marca a un bonito cereza" -#: data/cherrypick.metainfo.xml.in:63 +#: data/cherrypick.metainfo.xml.in.in:88 msgid "All a glance: Preview tooltip shows all formats" -msgstr "Todo de un vistazo: La información sobre herramientas de previsualización muestra todos los formatos" +msgstr "" +"Todo de un vistazo: La información sobre herramientas de previsualización " +"muestra todos los formatos" -#: data/cherrypick.metainfo.xml.in:73 -msgid "Fix regression: Allow --immediately-pick when the window is already open" -msgstr "Corregir regresión: Permitir --immediately-pick cuando la ventana ya está abierta" +#: data/cherrypick.metainfo.xml.in.in:98 +msgid "" +"Fix regression: Allow --immediately-pick when the window is already open" +msgstr "" +"Corregir regresión: Permitir --immediately-pick cuando la ventana ya está " +"abierta" -#: data/cherrypick.metainfo.xml.in:74 +#: data/cherrypick.metainfo.xml.in.in:99 msgid "Not sure how to fix yet: the crosshair doesnt show..." msgstr "Aún no sé cómo solucionarlo: la retícula no aparece..." -#: data/cherrypick.metainfo.xml.in:81 +#: data/cherrypick.metainfo.xml.in.in:106 msgid "Clean appdata for flathub release" msgstr "Limpiar appdata para la liberación de flathub" -#: data/cherrypick.metainfo.xml.in:82 +#: data/cherrypick.metainfo.xml.in.in:107 msgid "Make sure the app doesnt crash at startup for flathub builds" -msgstr "Asegúrese de que la aplicación no se bloquee en el inicio de flathub construye" +msgstr "" +"Asegúrese de que la aplicación no se bloquee en el inicio de flathub " +"construye" -#: data/cherrypick.metainfo.xml.in:89 +#: data/cherrypick.metainfo.xml.in.in:114 msgid "App now works on ARM thanks to @ryonakano!" msgstr "¡La aplicación ya funciona en ARM gracias a @ryonakano!" -#: data/cherrypick.metainfo.xml.in:90 +#: data/cherrypick.metainfo.xml.in.in:115 msgid "Add the ability to immediately pick and copy to clipboard" -msgstr "Añade la posibilidad de seleccionar y copiar inmediatamente en el portapapeles" +msgstr "" +"Añade la posibilidad de seleccionar y copiar inmediatamente en el " +"portapapeles" -#: data/cherrypick.metainfo.xml.in:91 +#: data/cherrypick.metainfo.xml.in.in:116 msgid "You can right-click on app icon and choose \"Immediately pick\"" -msgstr "Puedes hacer clic con el botón derecho en el icono de la aplicación y elegir \"Elegir inmediatamente\"." +msgstr "" +"Puedes hacer clic con el botón derecho en el icono de la aplicación y elegir " +"\"Elegir inmediatamente\"." -#: data/cherrypick.metainfo.xml.in:92 -msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" -msgstr "O establece un keybind a \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" +#: data/cherrypick.metainfo.xml.in.in:117 +msgid "" +"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" +"pick\"" +msgstr "" +"O establece un keybind a \"flatpak run io.ellie_commons.cherrypick --" +"immediately-pick\"" -#: data/cherrypick.metainfo.xml.in:93 +#: data/cherrypick.metainfo.xml.in.in:118 msgid "Updated deprecated widgets" msgstr "Widgets obsoletos actualizados" -#: data/cherrypick.metainfo.xml.in:94 +#: data/cherrypick.metainfo.xml.in.in:119 msgid "Minute tweaks by @ryonakano thanks again!" msgstr "Pequeños retoques de @ryonakano ¡Gracias de nuevo!" -#: data/cherrypick.metainfo.xml.in:100 +#: data/cherrypick.metainfo.xml.in.in:125 msgid "Remove minor artifacts" msgstr "Eliminar artefactos menores" -#: data/cherrypick.metainfo.xml.in:105 +#: data/cherrypick.metainfo.xml.in.in:130 msgid "2.0.0: The revival!" msgstr "2.0.0: ¡El renacimiento!" -#: data/cherrypick.metainfo.xml.in:107 -msgid "A new name, Cherrypick! Blessed by @adithyankv, the OG author. Thank you!" -msgstr "Un nuevo nombre, ¡Cherrypick! Bendecido por @adithyankv, el autor OG. Gracias." +#: data/cherrypick.metainfo.xml.in.in:132 +msgid "" +"A new name, Cherrypick! Blessed by @adithyankv, the OG author. Thank you!" +msgstr "" +"Un nuevo nombre, ¡Cherrypick! Bendecido por @adithyankv, el autor OG. " +"Gracias." -#: data/cherrypick.metainfo.xml.in:108 -msgid "Port to modern tech (GTK4, Wayland, portals, elementary 8). Not broken anymore!" -msgstr "Adaptación a la tecnología moderna (GTK4, Wayland, portales, elementary 8). ¡Ya no está roto!" +#: data/cherrypick.metainfo.xml.in.in:133 +msgid "" +"Port to modern tech (GTK4, Wayland, portals, elementary 8). Not broken " +"anymore!" +msgstr "" +"Adaptación a la tecnología moderna (GTK4, Wayland, portales, elementary 8). " +"¡Ya no está roto!" -#: data/cherrypick.metainfo.xml.in:109 +#: data/cherrypick.metainfo.xml.in.in:134 msgid "CMYK model available thanks to @DSLitvinov" msgstr "Modelo CMYK disponible gracias a @DSLitvinov" -#: data/cherrypick.metainfo.xml.in:110 +#: data/cherrypick.metainfo.xml.in.in:135 msgid "HSL model available thanks to @ckruse's work on ColorMate" msgstr "Modelo HSL disponible gracias al trabajo de @ckruse en ColorMate" -#: data/cherrypick.metainfo.xml.in:111 +#: data/cherrypick.metainfo.xml.in.in:136 msgid "Also apparently HSLA is a thing so i added it" msgstr "También al parecer HSLA es una cosa así que lo añadí" -#: data/cherrypick.metainfo.xml.in:112 +#: data/cherrypick.metainfo.xml.in.in:137 msgid "New feature: You can now paste a color from clipboard to preview it" -msgstr "Nueva función: Ahora puedes pegar un color desde el portapapeles para previsualizarlo" +msgstr "" +"Nueva función: Ahora puedes pegar un color desde el portapapeles para " +"previsualizarlo" -#: data/cherrypick.metainfo.xml.in:113 -msgid "New feature: Hover over history buttons to see their code in your preferred format" -msgstr "Nueva función: Pasa el ratón por encima de los botones del historial para ver su código en el formato que prefieras." +#: data/cherrypick.metainfo.xml.in.in:138 +msgid "" +"New feature: Hover over history buttons to see their code in your preferred " +"format" +msgstr "" +"Nueva función: Pasa el ratón por encima de los botones del historial para " +"ver su código en el formato que prefieras." -#: data/cherrypick.metainfo.xml.in:119 +#: data/cherrypick.metainfo.xml.in.in:144 msgid "Add command line flag to open directly in color picking mode" -msgstr "Añadir indicador de línea de comandos para abrir directamente en modo de selección de color" +msgstr "" +"Añadir indicador de línea de comandos para abrir directamente en modo de " +"selección de color" -#: data/cherrypick.metainfo.xml.in:125 +#: data/cherrypick.metainfo.xml.in.in:150 msgid "Fix layout bug when opening multiple instances" msgstr "Corrección de un error de diseño al abrir varias instancias" -#: data/cherrypick.metainfo.xml.in:126 +#: data/cherrypick.metainfo.xml.in.in:151 msgid "Make pick color button the default focused widget" -msgstr "Hacer que el botón de selección de color sea el widget enfocado por defecto" +msgstr "" +"Hacer que el botón de selección de color sea el widget enfocado por defecto" -#: data/cherrypick.metainfo.xml.in:127 +#: data/cherrypick.metainfo.xml.in.in:152 msgid "Remove payment option from appcenter" msgstr "Eliminar la opción de pago de appcenter" -#: data/cherrypick.metainfo.xml.in:134 +#: data/cherrypick.metainfo.xml.in.in:159 msgid "Update to elementary platform 7" msgstr "Actualización a la plataforma elemental 7" -#: data/cherrypick.metainfo.xml.in:135 +#: data/cherrypick.metainfo.xml.in.in:160 msgid "Minor change to app description" msgstr "Cambio menor en la descripción de la aplicación" -#: data/cherrypick.metainfo.xml.in:141 +#: data/cherrypick.metainfo.xml.in.in:166 msgid "Fix inaccuracies in metadata" msgstr "Corrección de imprecisiones en los metadatos" -#: data/cherrypick.metainfo.xml.in:146 +#: data/cherrypick.metainfo.xml.in.in:171 msgid "Add stripe key" msgstr "Añadir clave de banda" -#: data/cherrypick.metainfo.xml.in:151 +#: data/cherrypick.metainfo.xml.in.in:176 msgid "Initial release" msgstr "Lanzamiento inicial" diff --git a/po/extra/extra.pot b/po/extra/extra.pot index 3a708aa..3b43f19 100644 --- a/po/extra/extra.pot +++ b/po/extra/extra.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: extra\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"POT-Creation-Date: 2026-04-13 14:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,191 +17,211 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: data/cherrypick.desktop.in:5 data/cherrypick.metainfo.xml.in:4 +#: data/cherrypick.desktop.in.in:5 msgid "Cherrypick" msgstr "" -#: data/cherrypick.desktop.in:6 +#: data/cherrypick.desktop.in.in:6 msgid "Color Picker" msgstr "" -#: data/cherrypick.desktop.in:7 data/cherrypick.metainfo.xml.in:5 +#: data/cherrypick.desktop.in.in:7 data/cherrypick.metainfo.xml.in.in:5 msgid "Pick colors on your screen" msgstr "" -#: data/cherrypick.desktop.in:14 +#: data/cherrypick.desktop.in.in:14 msgid "Color;Pick;Eyedropper;Picker;" msgstr "" -#: data/cherrypick.desktop.in:18 +#: data/cherrypick.desktop.in.in:18 msgid "Pick a color" msgstr "" -#: data/cherrypick.metainfo.xml.in:11 +#: data/cherrypick.metainfo.xml.in.in:4 +msgid "@APP_NAME@" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:11 msgid "A modern and trusty color picker" msgstr "" -#: data/cherrypick.metainfo.xml.in:12 +#: data/cherrypick.metainfo.xml.in.in:12 msgid "Features:" msgstr "" -#: data/cherrypick.metainfo.xml.in:14 +#: data/cherrypick.metainfo.xml.in.in:14 msgid "Choose different output formats (RGB, RGBA, HEX, CMYK, HSL, HSLA)" msgstr "" -#: data/cherrypick.metainfo.xml.in:15 +#: data/cherrypick.metainfo.xml.in.in:15 msgid "Remembers your preferred format" msgstr "" -#: data/cherrypick.metainfo.xml.in:16 +#: data/cherrypick.metainfo.xml.in.in:16 msgid "" "Color history remembers your last picked colors (hover to check their code)" msgstr "" -#: data/cherrypick.metainfo.xml.in:17 +#: data/cherrypick.metainfo.xml.in.in:17 msgid "Curious about a color? Copy paste it from your clipboard to preview it" msgstr "" -#: data/cherrypick.metainfo.xml.in:18 +#: data/cherrypick.metainfo.xml.in.in:18 msgid "You can set a keybind to immediately pick and copy to clipboard!" msgstr "" -#: data/cherrypick.metainfo.xml.in:30 -msgid "PhoneyBadger + Stella" +#: data/cherrypick.metainfo.xml.in.in:38 +msgid "PhoneyBadger + Stella and Charlie" msgstr "" -#: data/cherrypick.metainfo.xml.in:40 +#: data/cherrypick.metainfo.xml.in.in:49 msgid "Cherrypick's main window" msgstr "" -#: data/cherrypick.metainfo.xml.in:46 +#: data/cherrypick.metainfo.xml.in.in:55 msgid "Main window with dark theme" msgstr "" -#: data/cherrypick.metainfo.xml.in:62 +#: data/cherrypick.metainfo.xml.in.in:71 +msgid "Organization change" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:72 +msgid "Show a pasted color has alpha by displaying a checkerboard" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:73 +msgid "Italian translation thanks to @albanobattistella!" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:80 +msgid "Prevent Cherrypick from lingering in the background" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:87 msgid "Change branding colors to a nice cherry" msgstr "" -#: data/cherrypick.metainfo.xml.in:63 +#: data/cherrypick.metainfo.xml.in.in:88 msgid "All a glance: Preview tooltip shows all formats" msgstr "" -#: data/cherrypick.metainfo.xml.in:73 +#: data/cherrypick.metainfo.xml.in.in:98 msgid "" "Fix regression: Allow --immediately-pick when the window is already open" msgstr "" -#: data/cherrypick.metainfo.xml.in:74 +#: data/cherrypick.metainfo.xml.in.in:99 msgid "Not sure how to fix yet: the crosshair doesnt show..." msgstr "" -#: data/cherrypick.metainfo.xml.in:81 +#: data/cherrypick.metainfo.xml.in.in:106 msgid "Clean appdata for flathub release" msgstr "" -#: data/cherrypick.metainfo.xml.in:82 +#: data/cherrypick.metainfo.xml.in.in:107 msgid "Make sure the app doesnt crash at startup for flathub builds" msgstr "" -#: data/cherrypick.metainfo.xml.in:89 +#: data/cherrypick.metainfo.xml.in.in:114 msgid "App now works on ARM thanks to @ryonakano!" msgstr "" -#: data/cherrypick.metainfo.xml.in:90 +#: data/cherrypick.metainfo.xml.in.in:115 msgid "Add the ability to immediately pick and copy to clipboard" msgstr "" -#: data/cherrypick.metainfo.xml.in:91 +#: data/cherrypick.metainfo.xml.in.in:116 msgid "You can right-click on app icon and choose \"Immediately pick\"" msgstr "" -#: data/cherrypick.metainfo.xml.in:92 +#: data/cherrypick.metainfo.xml.in.in:117 msgid "" "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" "pick\"" msgstr "" -#: data/cherrypick.metainfo.xml.in:93 +#: data/cherrypick.metainfo.xml.in.in:118 msgid "Updated deprecated widgets" msgstr "" -#: data/cherrypick.metainfo.xml.in:94 +#: data/cherrypick.metainfo.xml.in.in:119 msgid "Minute tweaks by @ryonakano thanks again!" msgstr "" -#: data/cherrypick.metainfo.xml.in:100 +#: data/cherrypick.metainfo.xml.in.in:125 msgid "Remove minor artifacts" msgstr "" -#: data/cherrypick.metainfo.xml.in:105 +#: data/cherrypick.metainfo.xml.in.in:130 msgid "2.0.0: The revival!" msgstr "" -#: data/cherrypick.metainfo.xml.in:107 +#: data/cherrypick.metainfo.xml.in.in:132 msgid "" "A new name, Cherrypick! Blessed by @adithyankv, the OG author. Thank you!" msgstr "" -#: data/cherrypick.metainfo.xml.in:108 +#: data/cherrypick.metainfo.xml.in.in:133 msgid "" "Port to modern tech (GTK4, Wayland, portals, elementary 8). Not broken " "anymore!" msgstr "" -#: data/cherrypick.metainfo.xml.in:109 +#: data/cherrypick.metainfo.xml.in.in:134 msgid "CMYK model available thanks to @DSLitvinov" msgstr "" -#: data/cherrypick.metainfo.xml.in:110 +#: data/cherrypick.metainfo.xml.in.in:135 msgid "HSL model available thanks to @ckruse's work on ColorMate" msgstr "" -#: data/cherrypick.metainfo.xml.in:111 +#: data/cherrypick.metainfo.xml.in.in:136 msgid "Also apparently HSLA is a thing so i added it" msgstr "" -#: data/cherrypick.metainfo.xml.in:112 +#: data/cherrypick.metainfo.xml.in.in:137 msgid "New feature: You can now paste a color from clipboard to preview it" msgstr "" -#: data/cherrypick.metainfo.xml.in:113 +#: data/cherrypick.metainfo.xml.in.in:138 msgid "" "New feature: Hover over history buttons to see their code in your preferred " "format" msgstr "" -#: data/cherrypick.metainfo.xml.in:119 +#: data/cherrypick.metainfo.xml.in.in:144 msgid "Add command line flag to open directly in color picking mode" msgstr "" -#: data/cherrypick.metainfo.xml.in:125 +#: data/cherrypick.metainfo.xml.in.in:150 msgid "Fix layout bug when opening multiple instances" msgstr "" -#: data/cherrypick.metainfo.xml.in:126 +#: data/cherrypick.metainfo.xml.in.in:151 msgid "Make pick color button the default focused widget" msgstr "" -#: data/cherrypick.metainfo.xml.in:127 +#: data/cherrypick.metainfo.xml.in.in:152 msgid "Remove payment option from appcenter" msgstr "" -#: data/cherrypick.metainfo.xml.in:134 +#: data/cherrypick.metainfo.xml.in.in:159 msgid "Update to elementary platform 7" msgstr "" -#: data/cherrypick.metainfo.xml.in:135 +#: data/cherrypick.metainfo.xml.in.in:160 msgid "Minor change to app description" msgstr "" -#: data/cherrypick.metainfo.xml.in:141 +#: data/cherrypick.metainfo.xml.in.in:166 msgid "Fix inaccuracies in metadata" msgstr "" -#: data/cherrypick.metainfo.xml.in:146 +#: data/cherrypick.metainfo.xml.in.in:171 msgid "Add stripe key" msgstr "" -#: data/cherrypick.metainfo.xml.in:151 +#: data/cherrypick.metainfo.xml.in.in:176 msgid "Initial release" msgstr "" diff --git a/po/extra/fr.po b/po/extra/fr.po index d82ade2..0b3c481 100644 --- a/po/extra/fr.po +++ b/po/extra/fr.po @@ -1,196 +1,257 @@ msgid "" msgstr "" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Language: fr\n" -"Language-Team: none\n" +"Project-Id-Version: cherrypick\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2026-04-13 14:55+0200\n" +"PO-Revision-Date: 2022-05-29 02:15+0530\n" "Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: fr\n" "MIME-Version: 1.0\n" -"PO-Revision-Date: 2022-05-29 02:15+0530\n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" -"Report-Msgid-Bugs-To: \n" -#: data/cherrypick.desktop.in:5 -#: data/cherrypick.metainfo.xml.in:4 +#: data/cherrypick.desktop.in.in:5 msgid "Cherrypick" msgstr "Cherrypick" -#: data/cherrypick.desktop.in:6 +#: data/cherrypick.desktop.in.in:6 msgid "Color Picker" msgstr "Sélecteur de couleurs" -#: data/cherrypick.desktop.in:7 -#: data/cherrypick.metainfo.xml.in:5 +#: data/cherrypick.desktop.in.in:7 data/cherrypick.metainfo.xml.in.in:5 msgid "Pick colors on your screen" msgstr "Sélectionnez des couleurs sur votre écran" -#: data/cherrypick.desktop.in:14 +#: data/cherrypick.desktop.in.in:14 msgid "Color;Pick;Eyedropper;Picker;" msgstr "Couleur;Pick;Eyedropper;Picker ;" -#: data/cherrypick.desktop.in:18 +#: data/cherrypick.desktop.in.in:18 msgid "Pick a color" msgstr "Choisissez une couleur" -#: data/cherrypick.metainfo.xml.in:11 +#: data/cherrypick.metainfo.xml.in.in:4 +msgid "@APP_NAME@" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:11 msgid "A modern and trusty color picker" msgstr "Un sélecteur de couleurs moderne et fiable" -#: data/cherrypick.metainfo.xml.in:12 +#: data/cherrypick.metainfo.xml.in.in:12 msgid "Features:" msgstr "Caractéristiques :" -#: data/cherrypick.metainfo.xml.in:14 +#: data/cherrypick.metainfo.xml.in.in:14 msgid "Choose different output formats (RGB, RGBA, HEX, CMYK, HSL, HSLA)" -msgstr "Choisissez différents formats de sortie (RGB, RGBA, HEX, CMYK, HSL, HSLA)" +msgstr "" +"Choisissez différents formats de sortie (RGB, RGBA, HEX, CMYK, HSL, HSLA)" -#: data/cherrypick.metainfo.xml.in:15 +#: data/cherrypick.metainfo.xml.in.in:15 msgid "Remembers your preferred format" msgstr "Se souvient de votre format préféré" -#: data/cherrypick.metainfo.xml.in:16 -msgid "Color history remembers your last picked colors (hover to check their code)" -msgstr "L'historique des couleurs se souvient des dernières couleurs choisies (survoler pour vérifier leur code)" +#: data/cherrypick.metainfo.xml.in.in:16 +msgid "" +"Color history remembers your last picked colors (hover to check their code)" +msgstr "" +"L'historique des couleurs se souvient des dernières couleurs choisies " +"(survoler pour vérifier leur code)" -#: data/cherrypick.metainfo.xml.in:17 +#: data/cherrypick.metainfo.xml.in.in:17 msgid "Curious about a color? Copy paste it from your clipboard to preview it" -msgstr "Curieux d'une couleur ? Copiez-collez-la depuis votre presse-papiers pour en avoir un aperçu." +msgstr "" +"Curieux d'une couleur ? Copiez-collez-la depuis votre presse-papiers pour en " +"avoir un aperçu." -#: data/cherrypick.metainfo.xml.in:18 +#: data/cherrypick.metainfo.xml.in.in:18 msgid "You can set a keybind to immediately pick and copy to clipboard!" -msgstr "Vous pouvez définir un raccourci clavier pour sélectionner et copier immédiatement dans le presse-papiers !" +msgstr "" +"Vous pouvez définir un raccourci clavier pour sélectionner et copier " +"immédiatement dans le presse-papiers !" -#: data/cherrypick.metainfo.xml.in:30 -msgid "PhoneyBadger + Stella" +#: data/cherrypick.metainfo.xml.in.in:38 +#, fuzzy +msgid "PhoneyBadger + Stella and Charlie" msgstr "PhoneyBadger + Stella" -#: data/cherrypick.metainfo.xml.in:40 +#: data/cherrypick.metainfo.xml.in.in:49 msgid "Cherrypick's main window" msgstr "Fenêtre principale de Cherrypick" -#: data/cherrypick.metainfo.xml.in:46 +#: data/cherrypick.metainfo.xml.in.in:55 msgid "Main window with dark theme" msgstr "Fenêtre principale avec thème sombre" -#: data/cherrypick.metainfo.xml.in:62 +#: data/cherrypick.metainfo.xml.in.in:71 +msgid "Organization change" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:72 +msgid "Show a pasted color has alpha by displaying a checkerboard" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:73 +msgid "Italian translation thanks to @albanobattistella!" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:80 +msgid "Prevent Cherrypick from lingering in the background" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:87 msgid "Change branding colors to a nice cherry" msgstr "Changer les couleurs de la marque pour une belle cerise" -#: data/cherrypick.metainfo.xml.in:63 +#: data/cherrypick.metainfo.xml.in.in:88 msgid "All a glance: Preview tooltip shows all formats" -msgstr "Tout en un coup d'œil : L'info-bulle de l'aperçu montre tous les formats" +msgstr "" +"Tout en un coup d'œil : L'info-bulle de l'aperçu montre tous les formats" -#: data/cherrypick.metainfo.xml.in:73 -msgid "Fix regression: Allow --immediately-pick when the window is already open" -msgstr "Correction d'une régression : Autoriser --immediately-pick lorsque la fenêtre est déjà ouverte" +#: data/cherrypick.metainfo.xml.in.in:98 +msgid "" +"Fix regression: Allow --immediately-pick when the window is already open" +msgstr "" +"Correction d'une régression : Autoriser --immediately-pick lorsque la " +"fenêtre est déjà ouverte" -#: data/cherrypick.metainfo.xml.in:74 +#: data/cherrypick.metainfo.xml.in.in:99 msgid "Not sure how to fix yet: the crosshair doesnt show..." -msgstr "Je ne sais pas encore comment résoudre le problème : le réticule ne s'affiche pas..." +msgstr "" +"Je ne sais pas encore comment résoudre le problème : le réticule ne " +"s'affiche pas..." -#: data/cherrypick.metainfo.xml.in:81 +#: data/cherrypick.metainfo.xml.in.in:106 msgid "Clean appdata for flathub release" msgstr "Nettoyer les données d'application pour la version flathub" -#: data/cherrypick.metainfo.xml.in:82 +#: data/cherrypick.metainfo.xml.in.in:107 msgid "Make sure the app doesnt crash at startup for flathub builds" -msgstr "S'assurer que l'application ne plante pas au démarrage pour les constructions flathub" +msgstr "" +"S'assurer que l'application ne plante pas au démarrage pour les " +"constructions flathub" -#: data/cherrypick.metainfo.xml.in:89 +#: data/cherrypick.metainfo.xml.in.in:114 msgid "App now works on ARM thanks to @ryonakano!" msgstr "L'application fonctionne maintenant sur ARM grâce à @ryonakano !" -#: data/cherrypick.metainfo.xml.in:90 +#: data/cherrypick.metainfo.xml.in.in:115 msgid "Add the ability to immediately pick and copy to clipboard" -msgstr "Ajouter la possibilité de sélectionner et de copier immédiatement dans le presse-papiers" +msgstr "" +"Ajouter la possibilité de sélectionner et de copier immédiatement dans le " +"presse-papiers" -#: data/cherrypick.metainfo.xml.in:91 +#: data/cherrypick.metainfo.xml.in.in:116 msgid "You can right-click on app icon and choose \"Immediately pick\"" -msgstr "Vous pouvez cliquer avec le bouton droit de la souris sur l'icône de l'application et choisir \"Récupérer immédiatement\"" +msgstr "" +"Vous pouvez cliquer avec le bouton droit de la souris sur l'icône de " +"l'application et choisir \"Récupérer immédiatement\"" -#: data/cherrypick.metainfo.xml.in:92 -msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" -msgstr "Ou mettre un keybind à \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" +#: data/cherrypick.metainfo.xml.in.in:117 +msgid "" +"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" +"pick\"" +msgstr "" +"Ou mettre un keybind à \"flatpak run io.ellie_commons.cherrypick --" +"immediately-pick\"" -#: data/cherrypick.metainfo.xml.in:93 +#: data/cherrypick.metainfo.xml.in.in:118 msgid "Updated deprecated widgets" msgstr "Mise à jour des widgets obsolètes" -#: data/cherrypick.metainfo.xml.in:94 +#: data/cherrypick.metainfo.xml.in.in:119 msgid "Minute tweaks by @ryonakano thanks again!" msgstr "Ajustements minimes par @ryonakano, merci encore !" -#: data/cherrypick.metainfo.xml.in:100 +#: data/cherrypick.metainfo.xml.in.in:125 msgid "Remove minor artifacts" msgstr "Supprimer les artefacts mineurs" -#: data/cherrypick.metainfo.xml.in:105 +#: data/cherrypick.metainfo.xml.in.in:130 msgid "2.0.0: The revival!" msgstr "2.0.0 : Le renouveau !" -#: data/cherrypick.metainfo.xml.in:107 -msgid "A new name, Cherrypick! Blessed by @adithyankv, the OG author. Thank you!" -msgstr "Un nouveau nom, Cherrypick ! Béni par @adithyankv, l'auteur OG. Merci à vous !" +#: data/cherrypick.metainfo.xml.in.in:132 +msgid "" +"A new name, Cherrypick! Blessed by @adithyankv, the OG author. Thank you!" +msgstr "" +"Un nouveau nom, Cherrypick ! Béni par @adithyankv, l'auteur OG. Merci à " +"vous !" -#: data/cherrypick.metainfo.xml.in:108 -msgid "Port to modern tech (GTK4, Wayland, portals, elementary 8). Not broken anymore!" -msgstr "Portage vers les technologies modernes (GTK4, Wayland, portails, elementary 8). Il n'est plus cassé !" +#: data/cherrypick.metainfo.xml.in.in:133 +msgid "" +"Port to modern tech (GTK4, Wayland, portals, elementary 8). Not broken " +"anymore!" +msgstr "" +"Portage vers les technologies modernes (GTK4, Wayland, portails, elementary " +"8). Il n'est plus cassé !" -#: data/cherrypick.metainfo.xml.in:109 +#: data/cherrypick.metainfo.xml.in.in:134 msgid "CMYK model available thanks to @DSLitvinov" msgstr "Modèle CMYK disponible grâce à @DSLitvinov" -#: data/cherrypick.metainfo.xml.in:110 +#: data/cherrypick.metainfo.xml.in.in:135 msgid "HSL model available thanks to @ckruse's work on ColorMate" msgstr "Modèle HSL disponible grâce au travail de @ckruse sur ColorMate" -#: data/cherrypick.metainfo.xml.in:111 +#: data/cherrypick.metainfo.xml.in.in:136 msgid "Also apparently HSLA is a thing so i added it" msgstr "Apparemment, HSLA existe aussi, alors je l'ai ajouté." -#: data/cherrypick.metainfo.xml.in:112 +#: data/cherrypick.metainfo.xml.in.in:137 msgid "New feature: You can now paste a color from clipboard to preview it" -msgstr "Nouvelle fonctionnalité : Vous pouvez maintenant coller une couleur depuis le presse-papiers pour la prévisualiser." +msgstr "" +"Nouvelle fonctionnalité : Vous pouvez maintenant coller une couleur depuis " +"le presse-papiers pour la prévisualiser." -#: data/cherrypick.metainfo.xml.in:113 -msgid "New feature: Hover over history buttons to see their code in your preferred format" -msgstr "Nouvelle fonctionnalité : Survolez les boutons de l'historique pour voir leur code dans le format de votre choix." +#: data/cherrypick.metainfo.xml.in.in:138 +msgid "" +"New feature: Hover over history buttons to see their code in your preferred " +"format" +msgstr "" +"Nouvelle fonctionnalité : Survolez les boutons de l'historique pour voir " +"leur code dans le format de votre choix." -#: data/cherrypick.metainfo.xml.in:119 +#: data/cherrypick.metainfo.xml.in.in:144 msgid "Add command line flag to open directly in color picking mode" -msgstr "Ajout d'un drapeau de ligne de commande pour ouvrir directement en mode de sélection des couleurs" +msgstr "" +"Ajout d'un drapeau de ligne de commande pour ouvrir directement en mode de " +"sélection des couleurs" -#: data/cherrypick.metainfo.xml.in:125 +#: data/cherrypick.metainfo.xml.in.in:150 msgid "Fix layout bug when opening multiple instances" -msgstr "Correction d'un bug de mise en page lors de l'ouverture de plusieurs instances" +msgstr "" +"Correction d'un bug de mise en page lors de l'ouverture de plusieurs " +"instances" -#: data/cherrypick.metainfo.xml.in:126 +#: data/cherrypick.metainfo.xml.in.in:151 msgid "Make pick color button the default focused widget" -msgstr "Faire du bouton de sélection des couleurs le widget focalisé par défaut" +msgstr "" +"Faire du bouton de sélection des couleurs le widget focalisé par défaut" -#: data/cherrypick.metainfo.xml.in:127 +#: data/cherrypick.metainfo.xml.in.in:152 msgid "Remove payment option from appcenter" msgstr "Supprimer l'option de paiement de l'appcenter" -#: data/cherrypick.metainfo.xml.in:134 +#: data/cherrypick.metainfo.xml.in.in:159 msgid "Update to elementary platform 7" msgstr "Mise à jour vers la plateforme élémentaire 7" -#: data/cherrypick.metainfo.xml.in:135 +#: data/cherrypick.metainfo.xml.in.in:160 msgid "Minor change to app description" msgstr "Modification mineure de la description de l'application" -#: data/cherrypick.metainfo.xml.in:141 +#: data/cherrypick.metainfo.xml.in.in:166 msgid "Fix inaccuracies in metadata" msgstr "Corriger les inexactitudes dans les métadonnées" -#: data/cherrypick.metainfo.xml.in:146 +#: data/cherrypick.metainfo.xml.in.in:171 msgid "Add stripe key" msgstr "Ajouter une clé de stripe" -#: data/cherrypick.metainfo.xml.in:151 +#: data/cherrypick.metainfo.xml.in.in:176 msgid "Initial release" msgstr "Version initiale" diff --git a/po/extra/it.po b/po/extra/it.po index 18b6cd7..da4ae94 100644 --- a/po/extra/it.po +++ b/po/extra/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: extra\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"POT-Creation-Date: 2026-04-13 14:55+0200\n" "PO-Revision-Date: 2025-12-28 10:12+0100\n" "Last-Translator: Albano Battistella \n" "Language-Team: Italian \n" @@ -16,198 +16,236 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" - -#: data/cherrypick.desktop.in:5 data/cherrypick.metainfo.xml.in:4 -msgid "Cherrypick" -msgstr "Cherrypick" - -#: data/cherrypick.desktop.in:6 -msgid "Color Picker" -msgstr "Selettore Colore" - -#: data/cherrypick.desktop.in:7 data/cherrypick.metainfo.xml.in:5 -msgid "Pick colors on your screen" -msgstr "Seleziona colori sullo schermo" - -#: data/cherrypick.desktop.in:14 -msgid "Color;Pick;Eyedropper;Picker;" -msgstr "Colore;Seleziona;Contagocce;Selettore;" - -#: data/cherrypick.desktop.in:18 -msgid "Pick a color" -msgstr "Seleziona un colore" - -#: data/cherrypick.metainfo.xml.in:11 -msgid "A modern and trusty color picker" -msgstr "Un selettore colore moderno e affidabile" - -#: data/cherrypick.metainfo.xml.in:12 -msgid "Features:" -msgstr "Caratteristiche:" - -#: data/cherrypick.metainfo.xml.in:14 -msgid "Choose different output formats (RGB, RGBA, HEX, CMYK, HSL, HSLA)" -msgstr "Scegli diversi formati di output (RGB, RGBA, HEX, CMYK, HSL, HSLA)" - -#: data/cherrypick.metainfo.xml.in:15 -msgid "Remembers your preferred format" -msgstr "Ricorda il tuo formato preferito" - -#: data/cherrypick.metainfo.xml.in:16 -msgid "" -"Color history remembers your last picked colors (hover to check their code)" -msgstr "" -"La cronologia colori ricorda gli ultimi colori selezionati (passa sopra con il mouse per vedere il loro codice)" - -#: data/cherrypick.metainfo.xml.in:17 -msgid "Curious about a color? Copy paste it from your clipboard to preview it" -msgstr "Sei curioso di un colore? Copia e incollalo dalla clipboard per visualizzarlo in anteprima" - -#: data/cherrypick.metainfo.xml.in:18 -msgid "You can set a keybind to immediately pick and copy to clipboard!" -msgstr "Puoi impostare un tasto di scelta rapida per selezionare e copiare immediatamente negli appunti!" - -#: data/cherrypick.metainfo.xml.in:30 -msgid "PhoneyBadger + Stella" -msgstr "PhoneyBadger + Stella" - -#: data/cherrypick.metainfo.xml.in:40 -msgid "Cherrypick's main window" -msgstr "La finestra principale di Cherrypick" - -#: data/cherrypick.metainfo.xml.in:46 -msgid "Main window with dark theme" -msgstr "Finestra principale con tema scuro" - -#: data/cherrypick.metainfo.xml.in:62 -msgid "Change branding colors to a nice cherry" -msgstr "Cambia i colori del branding in un bel ciliegia" - -#: data/cherrypick.metainfo.xml.in:63 -msgid "All a glance: Preview tooltip shows all formats" -msgstr "Tutto a colpo d'occhio: il tooltip di anteprima mostra tutti i formati" - -#: data/cherrypick.metainfo.xml.in:73 -msgid "" -"Fix regression: Allow --immediately-pick when the window is already open" -msgstr "Correzione regressione: Permetti --immediately-pick quando la finestra è già aperta" - -#: data/cherrypick.metainfo.xml.in:74 -msgid "Not sure how to fix yet: the crosshair doesnt show..." -msgstr "Non sono ancora sicuro di come risolverlo: il mirino non si vede..." - -#: data/cherrypick.metainfo.xml.in:81 -msgid "Clean appdata for flathub release" -msgstr "Pulisci i dati dell'app per la release su Flathub" - -#: data/cherrypick.metainfo.xml.in:82 -msgid "Make sure the app doesnt crash at startup for flathub builds" -msgstr "Assicurati che l'app non si blocchi all'avvio per le build di Flathub" - -#: data/cherrypick.metainfo.xml.in:89 -msgid "App now works on ARM thanks to @ryonakano!" -msgstr "L'app ora funziona su ARM grazie a @ryonakano!" - -#: data/cherrypick.metainfo.xml.in:90 -msgid "Add the ability to immediately pick and copy to clipboard" -msgstr "Aggiungi la possibilità di selezionare e copiare immediatamente negli appunti" - -#: data/cherrypick.metainfo.xml.in:91 -msgid "You can right-click on app icon and choose \"Immediately pick\"" -msgstr "Puoi fare clic con il tasto destro sull'icona dell'app e scegliere \"Seleziona immediatamente\"" - -#: data/cherrypick.metainfo.xml.in:92 -msgid "" -"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" -"pick\"" -msgstr "" -"Oppure imposta un tasto di scelta rapida a \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" - -#: data/cherrypick.metainfo.xml.in:93 -msgid "Updated deprecated widgets" -msgstr "Widget obsoleti aggiornati" - -#: data/cherrypick.metainfo.xml.in:94 -msgid "Minute tweaks by @ryonakano thanks again!" -msgstr "Piccole modifiche di @ryonakano, grazie ancora!" - -#: data/cherrypick.metainfo.xml.in:100 -msgid "Remove minor artifacts" -msgstr "Rimuovi artefatti minori" - -#: data/cherrypick.metainfo.xml.in:105 -msgid "2.0.0: The revival!" -msgstr "2.0.0: Il ritorno!" - -#: data/cherrypick.metainfo.xml.in:107 -msgid "" -"A new name, Cherrypick! Blessed by @adithyankv, the OG author. Thank you!" -msgstr "" -"Un nuovo nome, Cherrypick! Benedetto da @adithyankv, l'autore originale. Grazie!" - -#: data/cherrypick.metainfo.xml.in:108 -msgid "" -"Port to modern tech (GTK4, Wayland, portals, elementary 8). Not broken " -"anymore!" -msgstr "" -"Porting a tecnologia moderna (GTK4, Wayland, portali, elementary 8). Non più rotto!" - -#: data/cherrypick.metainfo.xml.in:109 -msgid "CMYK model available thanks to @DSLitvinov" -msgstr "Modello CMYK disponibile grazie a @DSLitvinov" - -#: data/cherrypick.metainfo.xml.in:110 -msgid "HSL model available thanks to @ckruse's work on ColorMate" -msgstr "Modello HSL disponibile grazie al lavoro di @ckruse su ColorMate" - -#: data/cherrypick.metainfo.xml.in:111 -msgid "Also apparently HSLA is a thing so i added it" -msgstr "A quanto pare anche HSLA esiste, quindi l'ho aggiunto" - -#: data/cherrypick.metainfo.xml.in:112 -msgid "New feature: You can now paste a color from clipboard to preview it" -msgstr "Nuova funzionalità: ora puoi incollare un colore dalla clipboard per visualizzarlo in anteprima" - -#: data/cherrypick.metainfo.xml.in:113 -msgid "" -"New feature: Hover over history buttons to see their code in your preferred " -"format" -msgstr "" -"Nuova funzionalità: passa con il mouse sopra i pulsanti della cronologia per vedere il loro codice nel tuo " -"formato preferito" - -#: data/cherrypick.metainfo.xml.in:119 -msgid "Add command line flag to open directly in color picking mode" -msgstr "Aggiungi flag della riga di comando per aprire direttamente in modalità di selezione colore" - -#: data/cherrypick.metainfo.xml.in:125 -msgid "Fix layout bug when opening multiple instances" -msgstr "Correzione bug di layout all'apertura di più istanze" - -#: data/cherrypick.metainfo.xml.in:126 -msgid "Make pick color button the default focused widget" -msgstr "Rendi il pulsante di selezione colore il widget predefinito con focus" - -#: data/cherrypick.metainfo.xml.in:127 -msgid "Remove payment option from appcenter" -msgstr "Rimuovi l'opzione di pagamento da AppCenter" - -#: data/cherrypick.metainfo.xml.in:134 -msgid "Update to elementary platform 7" -msgstr "Aggiorna a elementary platform 7" - -#: data/cherrypick.metainfo.xml.in:135 -msgid "Minor change to app description" -msgstr "Modifica minore alla descrizione dell'app" - -#: data/cherrypick.metainfo.xml.in:141 -msgid "Fix inaccuracies in metadata" -msgstr "Correzione di imprecisioni nei metadata" - -#: data/cherrypick.metainfo.xml.in:146 -msgid "Add stripe key" -msgstr "Aggiungi chiave Stripe" - -#: data/cherrypick.metainfo.xml.in:151 -msgid "Initial release" -msgstr "Rilascio iniziale" + +#: data/cherrypick.desktop.in.in:5 +msgid "Cherrypick" +msgstr "Cherrypick" + +#: data/cherrypick.desktop.in.in:6 +msgid "Color Picker" +msgstr "Selettore Colore" + +#: data/cherrypick.desktop.in.in:7 data/cherrypick.metainfo.xml.in.in:5 +msgid "Pick colors on your screen" +msgstr "Seleziona colori sullo schermo" + +#: data/cherrypick.desktop.in.in:14 +msgid "Color;Pick;Eyedropper;Picker;" +msgstr "Colore;Seleziona;Contagocce;Selettore;" + +#: data/cherrypick.desktop.in.in:18 +msgid "Pick a color" +msgstr "Seleziona un colore" + +#: data/cherrypick.metainfo.xml.in.in:4 +msgid "@APP_NAME@" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:11 +msgid "A modern and trusty color picker" +msgstr "Un selettore colore moderno e affidabile" + +#: data/cherrypick.metainfo.xml.in.in:12 +msgid "Features:" +msgstr "Caratteristiche:" + +#: data/cherrypick.metainfo.xml.in.in:14 +msgid "Choose different output formats (RGB, RGBA, HEX, CMYK, HSL, HSLA)" +msgstr "Scegli diversi formati di output (RGB, RGBA, HEX, CMYK, HSL, HSLA)" + +#: data/cherrypick.metainfo.xml.in.in:15 +msgid "Remembers your preferred format" +msgstr "Ricorda il tuo formato preferito" + +#: data/cherrypick.metainfo.xml.in.in:16 +msgid "" +"Color history remembers your last picked colors (hover to check their code)" +msgstr "" +"La cronologia colori ricorda gli ultimi colori selezionati (passa sopra con " +"il mouse per vedere il loro codice)" + +#: data/cherrypick.metainfo.xml.in.in:17 +msgid "Curious about a color? Copy paste it from your clipboard to preview it" +msgstr "" +"Sei curioso di un colore? Copia e incollalo dalla clipboard per " +"visualizzarlo in anteprima" + +#: data/cherrypick.metainfo.xml.in.in:18 +msgid "You can set a keybind to immediately pick and copy to clipboard!" +msgstr "" +"Puoi impostare un tasto di scelta rapida per selezionare e copiare " +"immediatamente negli appunti!" + +#: data/cherrypick.metainfo.xml.in.in:38 +#, fuzzy +msgid "PhoneyBadger + Stella and Charlie" +msgstr "PhoneyBadger + Stella" + +#: data/cherrypick.metainfo.xml.in.in:49 +msgid "Cherrypick's main window" +msgstr "La finestra principale di Cherrypick" + +#: data/cherrypick.metainfo.xml.in.in:55 +msgid "Main window with dark theme" +msgstr "Finestra principale con tema scuro" + +#: data/cherrypick.metainfo.xml.in.in:71 +msgid "Organization change" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:72 +msgid "Show a pasted color has alpha by displaying a checkerboard" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:73 +msgid "Italian translation thanks to @albanobattistella!" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:80 +msgid "Prevent Cherrypick from lingering in the background" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:87 +msgid "Change branding colors to a nice cherry" +msgstr "Cambia i colori del branding in un bel ciliegia" + +#: data/cherrypick.metainfo.xml.in.in:88 +msgid "All a glance: Preview tooltip shows all formats" +msgstr "Tutto a colpo d'occhio: il tooltip di anteprima mostra tutti i formati" + +#: data/cherrypick.metainfo.xml.in.in:98 +msgid "" +"Fix regression: Allow --immediately-pick when the window is already open" +msgstr "" +"Correzione regressione: Permetti --immediately-pick quando la finestra è già " +"aperta" + +#: data/cherrypick.metainfo.xml.in.in:99 +msgid "Not sure how to fix yet: the crosshair doesnt show..." +msgstr "Non sono ancora sicuro di come risolverlo: il mirino non si vede..." + +#: data/cherrypick.metainfo.xml.in.in:106 +msgid "Clean appdata for flathub release" +msgstr "Pulisci i dati dell'app per la release su Flathub" + +#: data/cherrypick.metainfo.xml.in.in:107 +msgid "Make sure the app doesnt crash at startup for flathub builds" +msgstr "Assicurati che l'app non si blocchi all'avvio per le build di Flathub" + +#: data/cherrypick.metainfo.xml.in.in:114 +msgid "App now works on ARM thanks to @ryonakano!" +msgstr "L'app ora funziona su ARM grazie a @ryonakano!" + +#: data/cherrypick.metainfo.xml.in.in:115 +msgid "Add the ability to immediately pick and copy to clipboard" +msgstr "" +"Aggiungi la possibilità di selezionare e copiare immediatamente negli appunti" + +#: data/cherrypick.metainfo.xml.in.in:116 +msgid "You can right-click on app icon and choose \"Immediately pick\"" +msgstr "" +"Puoi fare clic con il tasto destro sull'icona dell'app e scegliere " +"\"Seleziona immediatamente\"" + +#: data/cherrypick.metainfo.xml.in.in:117 +msgid "" +"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" +"pick\"" +msgstr "" +"Oppure imposta un tasto di scelta rapida a \"flatpak run io.ellie_commons." +"cherrypick --immediately-pick\"" + +#: data/cherrypick.metainfo.xml.in.in:118 +msgid "Updated deprecated widgets" +msgstr "Widget obsoleti aggiornati" + +#: data/cherrypick.metainfo.xml.in.in:119 +msgid "Minute tweaks by @ryonakano thanks again!" +msgstr "Piccole modifiche di @ryonakano, grazie ancora!" + +#: data/cherrypick.metainfo.xml.in.in:125 +msgid "Remove minor artifacts" +msgstr "Rimuovi artefatti minori" + +#: data/cherrypick.metainfo.xml.in.in:130 +msgid "2.0.0: The revival!" +msgstr "2.0.0: Il ritorno!" + +#: data/cherrypick.metainfo.xml.in.in:132 +msgid "" +"A new name, Cherrypick! Blessed by @adithyankv, the OG author. Thank you!" +msgstr "" +"Un nuovo nome, Cherrypick! Benedetto da @adithyankv, l'autore originale. " +"Grazie!" + +#: data/cherrypick.metainfo.xml.in.in:133 +msgid "" +"Port to modern tech (GTK4, Wayland, portals, elementary 8). Not broken " +"anymore!" +msgstr "" +"Porting a tecnologia moderna (GTK4, Wayland, portali, elementary 8). Non più " +"rotto!" + +#: data/cherrypick.metainfo.xml.in.in:134 +msgid "CMYK model available thanks to @DSLitvinov" +msgstr "Modello CMYK disponibile grazie a @DSLitvinov" + +#: data/cherrypick.metainfo.xml.in.in:135 +msgid "HSL model available thanks to @ckruse's work on ColorMate" +msgstr "Modello HSL disponibile grazie al lavoro di @ckruse su ColorMate" + +#: data/cherrypick.metainfo.xml.in.in:136 +msgid "Also apparently HSLA is a thing so i added it" +msgstr "A quanto pare anche HSLA esiste, quindi l'ho aggiunto" + +#: data/cherrypick.metainfo.xml.in.in:137 +msgid "New feature: You can now paste a color from clipboard to preview it" +msgstr "" +"Nuova funzionalità: ora puoi incollare un colore dalla clipboard per " +"visualizzarlo in anteprima" + +#: data/cherrypick.metainfo.xml.in.in:138 +msgid "" +"New feature: Hover over history buttons to see their code in your preferred " +"format" +msgstr "" +"Nuova funzionalità: passa con il mouse sopra i pulsanti della cronologia per " +"vedere il loro codice nel tuo formato preferito" + +#: data/cherrypick.metainfo.xml.in.in:144 +msgid "Add command line flag to open directly in color picking mode" +msgstr "" +"Aggiungi flag della riga di comando per aprire direttamente in modalità di " +"selezione colore" + +#: data/cherrypick.metainfo.xml.in.in:150 +msgid "Fix layout bug when opening multiple instances" +msgstr "Correzione bug di layout all'apertura di più istanze" + +#: data/cherrypick.metainfo.xml.in.in:151 +msgid "Make pick color button the default focused widget" +msgstr "Rendi il pulsante di selezione colore il widget predefinito con focus" + +#: data/cherrypick.metainfo.xml.in.in:152 +msgid "Remove payment option from appcenter" +msgstr "Rimuovi l'opzione di pagamento da AppCenter" + +#: data/cherrypick.metainfo.xml.in.in:159 +msgid "Update to elementary platform 7" +msgstr "Aggiorna a elementary platform 7" + +#: data/cherrypick.metainfo.xml.in.in:160 +msgid "Minor change to app description" +msgstr "Modifica minore alla descrizione dell'app" + +#: data/cherrypick.metainfo.xml.in.in:166 +msgid "Fix inaccuracies in metadata" +msgstr "Correzione di imprecisioni nei metadata" + +#: data/cherrypick.metainfo.xml.in.in:171 +msgid "Add stripe key" +msgstr "Aggiungi chiave Stripe" + +#: data/cherrypick.metainfo.xml.in.in:176 +msgid "Initial release" +msgstr "Rilascio iniziale" diff --git a/po/extra/ru.po b/po/extra/ru.po index b36bfe8..536322b 100644 --- a/po/extra/ru.po +++ b/po/extra/ru.po @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" +"Project-Id-Version: cherrypick\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"POT-Creation-Date: 2026-04-13 14:55+0200\n" "PO-Revision-Date: 2022-09-27 20:44+0900\n" "Last-Translator: lenemter \n" "Language-Team: none\n" @@ -13,118 +13,138 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: data/cherrypick.desktop.in:5 data/cherrypick.metainfo.xml.in:4 +#: data/cherrypick.desktop.in.in:5 msgid "Cherrypick" msgstr "Cherrypick" -#: data/cherrypick.desktop.in:6 +#: data/cherrypick.desktop.in.in:6 msgid "Color Picker" msgstr "Подборщик цветов" -#: data/cherrypick.desktop.in:7 data/cherrypick.metainfo.xml.in:5 +#: data/cherrypick.desktop.in.in:7 data/cherrypick.metainfo.xml.in.in:5 #, fuzzy msgid "Pick colors on your screen" msgstr "Выбирайте цвета пикселей на экране" -#: data/cherrypick.desktop.in:14 +#: data/cherrypick.desktop.in.in:14 #, fuzzy msgid "Color;Pick;Eyedropper;Picker;" msgstr "Цвет;Выбрать;Пипетка;Выбор" -#: data/cherrypick.desktop.in:18 +#: data/cherrypick.desktop.in.in:18 #, fuzzy msgid "Pick a color" msgstr "Выбрать цвет" -#: data/cherrypick.metainfo.xml.in:11 +#: data/cherrypick.metainfo.xml.in.in:4 +msgid "@APP_NAME@" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:11 #, fuzzy msgid "A modern and trusty color picker" msgstr "Простая палитра цветов" -#: data/cherrypick.metainfo.xml.in:12 +#: data/cherrypick.metainfo.xml.in.in:12 msgid "Features:" msgstr "Функции:" -#: data/cherrypick.metainfo.xml.in:14 +#: data/cherrypick.metainfo.xml.in.in:14 msgid "Choose different output formats (RGB, RGBA, HEX, CMYK, HSL, HSLA)" msgstr "Выбор различные форматы цветов (RGB, RGBA, HEX, CMYK, HSL, HSLA)" -#: data/cherrypick.metainfo.xml.in:15 +#: data/cherrypick.metainfo.xml.in.in:15 msgid "Remembers your preferred format" msgstr "Запоминание вашего предпочитаемого формата" -#: data/cherrypick.metainfo.xml.in:16 +#: data/cherrypick.metainfo.xml.in.in:16 #, fuzzy msgid "" "Color history remembers your last picked colors (hover to check their code)" msgstr "История последних выбранных цветов" -#: data/cherrypick.metainfo.xml.in:17 +#: data/cherrypick.metainfo.xml.in.in:17 msgid "Curious about a color? Copy paste it from your clipboard to preview it" msgstr "" "Любопытно узнать о цвете? Скопируйте его из буфера обмена для " "предварительного просмотра" -#: data/cherrypick.metainfo.xml.in:18 +#: data/cherrypick.metainfo.xml.in.in:18 msgid "You can set a keybind to immediately pick and copy to clipboard!" msgstr "" "Вы можете установить привязку клавиш, чтобы немедленно выбрать и скопировать " "в буфер обмена!" -#: data/cherrypick.metainfo.xml.in:30 +#: data/cherrypick.metainfo.xml.in.in:38 #, fuzzy -msgid "PhoneyBadger + Stella" +msgid "PhoneyBadger + Stella and Charlie" msgstr "Phoney Badger" -#: data/cherrypick.metainfo.xml.in:40 +#: data/cherrypick.metainfo.xml.in.in:49 msgid "Cherrypick's main window" msgstr "Главное окно Cherrypick" -#: data/cherrypick.metainfo.xml.in:46 +#: data/cherrypick.metainfo.xml.in.in:55 msgid "Main window with dark theme" msgstr "Главное окно с темной темой" -#: data/cherrypick.metainfo.xml.in:62 +#: data/cherrypick.metainfo.xml.in.in:71 +msgid "Organization change" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:72 +msgid "Show a pasted color has alpha by displaying a checkerboard" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:73 +msgid "Italian translation thanks to @albanobattistella!" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:80 +msgid "Prevent Cherrypick from lingering in the background" +msgstr "" + +#: data/cherrypick.metainfo.xml.in.in:87 msgid "Change branding colors to a nice cherry" msgstr "" -#: data/cherrypick.metainfo.xml.in:63 +#: data/cherrypick.metainfo.xml.in.in:88 msgid "All a glance: Preview tooltip shows all formats" msgstr "" -#: data/cherrypick.metainfo.xml.in:73 +#: data/cherrypick.metainfo.xml.in.in:98 msgid "" "Fix regression: Allow --immediately-pick when the window is already open" msgstr "" "Исправление регрессии: Разрешить --immediately-pick, когда окно уже открыто" -#: data/cherrypick.metainfo.xml.in:74 +#: data/cherrypick.metainfo.xml.in.in:99 msgid "Not sure how to fix yet: the crosshair doesnt show..." msgstr "Пока не знаю, как исправить: перекрестие не отображается..." -#: data/cherrypick.metainfo.xml.in:81 +#: data/cherrypick.metainfo.xml.in.in:106 msgid "Clean appdata for flathub release" msgstr "Очистите данные appdata для выпуска flathub" -#: data/cherrypick.metainfo.xml.in:82 +#: data/cherrypick.metainfo.xml.in.in:107 msgid "Make sure the app doesnt crash at startup for flathub builds" msgstr "Убедитесь, что приложение не падает при запуске для сборок flathub" -#: data/cherrypick.metainfo.xml.in:89 +#: data/cherrypick.metainfo.xml.in.in:114 msgid "App now works on ARM thanks to @ryonakano!" msgstr "Приложение теперь работает на ARM благодаря @ryonakano!" -#: data/cherrypick.metainfo.xml.in:90 +#: data/cherrypick.metainfo.xml.in.in:115 msgid "Add the ability to immediately pick and copy to clipboard" msgstr "Добавьте возможность мгновенного выбора и копирования в буфер обмена" -#: data/cherrypick.metainfo.xml.in:91 +#: data/cherrypick.metainfo.xml.in.in:116 msgid "You can right-click on app icon and choose \"Immediately pick\"" msgstr "" "Вы можете щелкнуть правой кнопкой мыши на значке приложения и выбрать " "\"Немедленно выбрать\"." -#: data/cherrypick.metainfo.xml.in:92 +#: data/cherrypick.metainfo.xml.in.in:117 msgid "" "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" "pick\"" @@ -132,28 +152,28 @@ msgstr "" "Или установите привязку клавиш на \"flatpak run io.ellie_commons.cherrypick " "--immediately-pick\"." -#: data/cherrypick.metainfo.xml.in:93 +#: data/cherrypick.metainfo.xml.in.in:118 msgid "Updated deprecated widgets" msgstr "Обновление устаревших виджетов" -#: data/cherrypick.metainfo.xml.in:94 +#: data/cherrypick.metainfo.xml.in.in:119 msgid "Minute tweaks by @ryonakano thanks again!" msgstr "Минутные доработки от @ryonakano Спасибо еще раз!" -#: data/cherrypick.metainfo.xml.in:100 +#: data/cherrypick.metainfo.xml.in.in:125 msgid "Remove minor artifacts" msgstr "Удалите незначительные артефакты" -#: data/cherrypick.metainfo.xml.in:105 +#: data/cherrypick.metainfo.xml.in.in:130 msgid "2.0.0: The revival!" msgstr "2.0.0: Возрождение!" -#: data/cherrypick.metainfo.xml.in:107 +#: data/cherrypick.metainfo.xml.in.in:132 msgid "" "A new name, Cherrypick! Blessed by @adithyankv, the OG author. Thank you!" msgstr "Новое имя, Черрипик! Благословлено @adithyankv, автором OG. Спасибо!" -#: data/cherrypick.metainfo.xml.in:108 +#: data/cherrypick.metainfo.xml.in.in:133 msgid "" "Port to modern tech (GTK4, Wayland, portals, elementary 8). Not broken " "anymore!" @@ -161,25 +181,25 @@ msgstr "" "Переход на современные технологии (GTK4, Wayland, порталы, elementary 8). " "Больше не ломается!" -#: data/cherrypick.metainfo.xml.in:109 +#: data/cherrypick.metainfo.xml.in.in:134 msgid "CMYK model available thanks to @DSLitvinov" msgstr "Модель CMYK доступна благодаря @DSLitvinov" -#: data/cherrypick.metainfo.xml.in:110 +#: data/cherrypick.metainfo.xml.in.in:135 msgid "HSL model available thanks to @ckruse's work on ColorMate" msgstr "Модель HSL доступна благодаря работе @ckruse над ColorMate" -#: data/cherrypick.metainfo.xml.in:111 +#: data/cherrypick.metainfo.xml.in.in:136 msgid "Also apparently HSLA is a thing so i added it" msgstr "Также, очевидно, HSLA - это вещь, поэтому я добавил ее." -#: data/cherrypick.metainfo.xml.in:112 +#: data/cherrypick.metainfo.xml.in.in:137 msgid "New feature: You can now paste a color from clipboard to preview it" msgstr "" "Новая функция: Теперь вы можете вставить цвет из буфера обмена, чтобы " "предварительно просмотреть его" -#: data/cherrypick.metainfo.xml.in:113 +#: data/cherrypick.metainfo.xml.in.in:138 msgid "" "New feature: Hover over history buttons to see their code in your preferred " "format" @@ -187,40 +207,40 @@ msgstr "" "Новая функция: Наведите курсор на кнопки истории, чтобы увидеть их код в " "удобном для вас формате" -#: data/cherrypick.metainfo.xml.in:119 +#: data/cherrypick.metainfo.xml.in.in:144 msgid "Add command line flag to open directly in color picking mode" msgstr "" "Добавлен флаг командной строки для открытия сразу в режиме выбора цвета" -#: data/cherrypick.metainfo.xml.in:125 +#: data/cherrypick.metainfo.xml.in.in:150 msgid "Fix layout bug when opening multiple instances" msgstr "Исправлен баг интерфейса при открытии нескольких окон" -#: data/cherrypick.metainfo.xml.in:126 +#: data/cherrypick.metainfo.xml.in.in:151 msgid "Make pick color button the default focused widget" msgstr "Кнопка выбора цвета теперь сфокусирована по умолчанию" -#: data/cherrypick.metainfo.xml.in:127 +#: data/cherrypick.metainfo.xml.in.in:152 msgid "Remove payment option from appcenter" msgstr "Убрана опция покупки из AppCenter" -#: data/cherrypick.metainfo.xml.in:134 +#: data/cherrypick.metainfo.xml.in.in:159 msgid "Update to elementary platform 7" msgstr "Обновлено до elementary platform 7" -#: data/cherrypick.metainfo.xml.in:135 +#: data/cherrypick.metainfo.xml.in.in:160 msgid "Minor change to app description" msgstr "Небольшое изменение описания приложения" -#: data/cherrypick.metainfo.xml.in:141 +#: data/cherrypick.metainfo.xml.in.in:166 msgid "Fix inaccuracies in metadata" msgstr "Исправлены неаккуратности в метаданных" -#: data/cherrypick.metainfo.xml.in:146 +#: data/cherrypick.metainfo.xml.in.in:171 msgid "Add stripe key" msgstr "Добавлен ключ Stripe" -#: data/cherrypick.metainfo.xml.in:151 +#: data/cherrypick.metainfo.xml.in.in:176 msgid "Initial release" msgstr "Начальный релиз" diff --git a/po/fr.po b/po/fr.po index c3bc3a4..c571d43 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,41 +1,56 @@ msgid "" msgstr "" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Language: fr\n" -"Language-Team: none\n" +"Project-Id-Version: cherrypick\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2026-04-13 14:58+0200\n" +"PO-Revision-Date: 2022-05-29 02:15+0530\n" "Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: fr\n" "MIME-Version: 1.0\n" -"PO-Revision-Date: 2022-05-29 02:15+0530\n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" -"Report-Msgid-Bugs-To: \n" #. /TRANSLATORS: Do not translate app name #. We need to hide the title area for the split headerbar -#: src/Windows/Window.vala:31 -#: src/Windows/Window.vala:48 +#: src/Windows/Window.vala:35 src/Windows/Window.vala:52 msgid "Cherrypick" msgstr "Cherrypick" -#: src/Widgets/FormatArea.vala:66 +#. ---------------- FORMAT ---------------- +#: src/Views/MainView.vala:36 +msgid "Format" +msgstr "" + +#. ---------------- BIG BUTTON ---------------- +#: src/Views/MainView.vala:53 +msgid "Pick Color" +msgstr "" + +#: src/Views/MainView.vala:57 +#, fuzzy +msgid "Click to pick a color on the screen" +msgstr "Cliquez pour coller une couleur si vous en avez une de sauvegardée" + +#: src/Widgets/FormatArea.vala:68 msgid "Click to paste a colour if you have one saved up" msgstr "Cliquez pour coller une couleur si vous en avez une de sauvegardée" -#: src/Widgets/FormatArea.vala:69 +#: src/Widgets/FormatArea.vala:73 msgid "Click to copy this colour to your clipboard" msgstr "Cliquez pour copier cette couleur dans votre presse-papiers" -#: src/Widgets/FormatArea.vala:75 +#: src/Widgets/FormatArea.vala:78 msgid "Choose your preferred format to display picked colours" -msgstr "Choisissez votre format préféré pour afficher les couleurs sélectionnées" +msgstr "" +"Choisissez votre format préféré pour afficher les couleurs sélectionnées" -#: src/Widgets/FormatArea.vala:109 +#: src/Widgets/FormatArea.vala:112 msgid "Copied to clipboard!" msgstr "Copié dans le presse-papiers !" -#: src/Widgets/FormatArea.vala:138 +#: src/Widgets/FormatArea.vala:141 msgid "Cannot detect colour!" msgstr "Impossible de détecter la couleur !" @@ -55,6 +70,6 @@ msgstr "Restaurer l'instantané de l'historique" msgid "History saved" msgstr "Historique sauvé" -#: src/Application.vala:129 +#: src/Application.vala:114 msgid "Pick a colour and copy it to clipboard" msgstr "Choisissez une couleur et copiez-la dans le presse-papiers." diff --git a/po/it.po b/po/it.po index 9d77220..8a3fc60 100644 --- a/po/it.po +++ b/po/it.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" +"Project-Id-Version: cherrypick\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"POT-Creation-Date: 2026-04-13 14:58+0200\n" "PO-Revision-Date: 2025-12-27 16:41+0100\n" "Last-Translator: Albano Battistella \n" "Language-Team: Italian \n" @@ -19,27 +19,42 @@ msgstr "" #. /TRANSLATORS: Do not translate app name #. We need to hide the title area for the split headerbar -#: src/Windows/Window.vala:31 src/Windows/Window.vala:48 +#: src/Windows/Window.vala:35 src/Windows/Window.vala:52 msgid "Cherrypick" msgstr "Cherrypick" -#: src/Widgets/FormatArea.vala:66 +#. ---------------- FORMAT ---------------- +#: src/Views/MainView.vala:36 +msgid "Format" +msgstr "" + +#. ---------------- BIG BUTTON ---------------- +#: src/Views/MainView.vala:53 +msgid "Pick Color" +msgstr "" + +#: src/Views/MainView.vala:57 +#, fuzzy +msgid "Click to pick a color on the screen" +msgstr "Fai clic per incollare un colore se ne hai uno salvato" + +#: src/Widgets/FormatArea.vala:68 msgid "Click to paste a colour if you have one saved up" msgstr "Fai clic per incollare un colore se ne hai uno salvato" -#: src/Widgets/FormatArea.vala:69 +#: src/Widgets/FormatArea.vala:73 msgid "Click to copy this colour to your clipboard" msgstr "Fai clic per copiare questo colore negli appunti" -#: src/Widgets/FormatArea.vala:75 +#: src/Widgets/FormatArea.vala:78 msgid "Choose your preferred format to display picked colours" msgstr "Scegli il formato preferito per visualizzare i colori selezionati" -#: src/Widgets/FormatArea.vala:109 +#: src/Widgets/FormatArea.vala:112 msgid "Copied to clipboard!" msgstr "Copiato negli appunti!" -#: src/Widgets/FormatArea.vala:138 +#: src/Widgets/FormatArea.vala:141 msgid "Cannot detect colour!" msgstr "Impossibile rilevare il colore!" @@ -59,6 +74,6 @@ msgstr "Ripristina snapshot della cronologia" msgid "History saved" msgstr "Cronologia salvata" -#: src/Application.vala:129 +#: src/Application.vala:114 msgid "Pick a colour and copy it to clipboard" msgstr "Scegli un colore e copialo negli appunti" diff --git a/po/meson.build b/po/meson.build index 531ff8a..1e9f935 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,4 +1,4 @@ -i18n.gettext(meson.project_name(), +i18n.gettext(gettext_name, args: '--directory=' + meson.project_source_root(), preset: 'glib' ) diff --git a/po/ru.po b/po/ru.po index 9caba2f..6f77565 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" +"Project-Id-Version: cherrypick\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"POT-Creation-Date: 2026-04-13 14:58+0200\n" "PO-Revision-Date: 2022-09-27 20:44+0900\n" "Last-Translator: lenemter \n" "Language-Team: none\n" @@ -15,29 +15,44 @@ msgstr "" #. /TRANSLATORS: Do not translate app name #. We need to hide the title area for the split headerbar -#: src/Windows/Window.vala:31 src/Windows/Window.vala:48 +#: src/Windows/Window.vala:35 src/Windows/Window.vala:52 msgid "Cherrypick" msgstr "Cherrypick" -#: src/Widgets/FormatArea.vala:66 +#. ---------------- FORMAT ---------------- +#: src/Views/MainView.vala:36 +msgid "Format" +msgstr "Формат" + +#. ---------------- BIG BUTTON ---------------- +#: src/Views/MainView.vala:53 +msgid "Pick Color" +msgstr "Выбрать цвет" + +#: src/Views/MainView.vala:57 +#, fuzzy +msgid "Click to pick a color on the screen" +msgstr "Нажмите, чтобы вставить цвет, если он у вас сохранен." + +#: src/Widgets/FormatArea.vala:68 msgid "Click to paste a colour if you have one saved up" msgstr "Нажмите, чтобы вставить цвет, если он у вас сохранен." -#: src/Widgets/FormatArea.vala:69 +#: src/Widgets/FormatArea.vala:73 msgid "Click to copy this colour to your clipboard" msgstr "Нажмите, чтобы скопировать этот цвет в буфер обмена" -#: src/Widgets/FormatArea.vala:75 +#: src/Widgets/FormatArea.vala:78 #, fuzzy msgid "Choose your preferred format to display picked colours" msgstr "История последних выбранных цветов" -#: src/Widgets/FormatArea.vala:109 +#: src/Widgets/FormatArea.vala:112 #, fuzzy msgid "Copied to clipboard!" msgstr "Скопировано в буфер обмена" -#: src/Widgets/FormatArea.vala:138 +#: src/Widgets/FormatArea.vala:141 msgid "Cannot detect colour!" msgstr "Невозможно определить цвет!" @@ -58,17 +73,11 @@ msgstr "" msgid "History saved" msgstr "История" -#: src/Application.vala:129 +#: src/Application.vala:114 #, fuzzy msgid "Pick a colour and copy it to clipboard" msgstr "Сразу же выберите цвет и скопируйте его в буфер обмена" -#~ msgid "Format" -#~ msgstr "Формат" - -#~ msgid "Pick Color" -#~ msgstr "Выбрать цвет" - #~ msgid "" #~ "Allows you to click on a colour on the screen to get its code in the " #~ "preferred format" diff --git a/po/sv.po b/po/sv.po index 893e3f2..1c865aa 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.ellie_commons.cherrypick\n" +"Project-Id-Version: cherrypick\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-12-26 17:04+0100\n" +"POT-Creation-Date: 2026-04-13 14:58+0200\n" "PO-Revision-Date: 2026-01-14 15:57+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: \n" @@ -20,27 +20,42 @@ msgstr "" #. /TRANSLATORS: Do not translate app name #. We need to hide the title area for the split headerbar -#: src/Windows/Window.vala:31 src/Windows/Window.vala:48 +#: src/Windows/Window.vala:35 src/Windows/Window.vala:52 msgid "Cherrypick" msgstr "Cherrypick" -#: src/Widgets/FormatArea.vala:66 +#. ---------------- FORMAT ---------------- +#: src/Views/MainView.vala:36 +msgid "Format" +msgstr "" + +#. ---------------- BIG BUTTON ---------------- +#: src/Views/MainView.vala:53 +msgid "Pick Color" +msgstr "" + +#: src/Views/MainView.vala:57 +#, fuzzy +msgid "Click to pick a color on the screen" +msgstr "Klicka för att klistra in en färg om du har en sparad" + +#: src/Widgets/FormatArea.vala:68 msgid "Click to paste a colour if you have one saved up" msgstr "Klicka för att klistra in en färg om du har en sparad" -#: src/Widgets/FormatArea.vala:69 +#: src/Widgets/FormatArea.vala:73 msgid "Click to copy this colour to your clipboard" msgstr "Klicka för att kopiera denna färg till urklipp" -#: src/Widgets/FormatArea.vala:75 +#: src/Widgets/FormatArea.vala:78 msgid "Choose your preferred format to display picked colours" msgstr "Välj önskat format för att visa valda färger" -#: src/Widgets/FormatArea.vala:109 +#: src/Widgets/FormatArea.vala:112 msgid "Copied to clipboard!" msgstr "Kopierad till urklipp!" -#: src/Widgets/FormatArea.vala:138 +#: src/Widgets/FormatArea.vala:141 msgid "Cannot detect colour!" msgstr "Kan inte upptäcka färg!" @@ -60,6 +75,6 @@ msgstr "Återställ historikens ögonblicksbild" msgid "History saved" msgstr "Historik sparad" -#: src/Application.vala:129 +#: src/Application.vala:114 msgid "Pick a colour and copy it to clipboard" msgstr "Välj en färg och kopiera den till urklipp" diff --git a/src/Application.vala b/src/Application.vala index 745185f..98ca70b 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -25,7 +25,7 @@ public class Cherrypick.Application : Gtk.Application { public Application () { Object ( - application_id: "io.github.ellie_commons.cherrypick", + application_id: APP_ID, flags: ApplicationFlags.HANDLES_COMMAND_LINE ); } @@ -76,7 +76,7 @@ public class Cherrypick.Application : Gtk.Application { }); var provider = new Gtk.CssProvider (); - provider.load_from_resource ("/io/github/ellie_commons/cherrypick/Application.css"); + provider.load_from_resource (APP_PATH + "Application.css"); Gtk.StyleContext.add_provider_for_display ( Gdk.Display.get_default (), provider, @@ -110,7 +110,7 @@ public class Cherrypick.Application : Gtk.Application { public override int command_line (ApplicationCommandLine command_line) { debug ("Parsing commandline arguments"); - OptionEntry[] CMD_OPTION_ENTRIES = { + OptionEntry[] cmd_option_entries = { {"immediately-pick", 'p', OptionFlags.NONE, OptionArg.NONE, ref is_immediately_pick, _("Pick a colour and copy it to clipboard"), null} }; @@ -125,7 +125,7 @@ public class Cherrypick.Application : Gtk.Application { try { var ctx = new OptionContext (); ctx.set_help_enabled (true); - ctx.add_main_entries (CMD_OPTION_ENTRIES, null); + ctx.add_main_entries (cmd_option_entries, null); unowned string[] tmp = _args; ctx.parse (ref tmp); diff --git a/src/Config.vala.in b/src/Config.vala.in index a3c7bd4..8dfa1c1 100644 --- a/src/Config.vala.in +++ b/src/Config.vala.in @@ -1,2 +1,6 @@ public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@; -public const string LOCALEDIR = @LOCALEDIR@; \ No newline at end of file +public const string LOCALEDIR = @LOCALEDIR@; +public const string APP_NAME = @APP_NAME@; +public const string APP_ID = @APP_ID@; +public const string APP_PATH = @APP_PATH@; +public const string APP_VERSION = @APP_VERSION@; diff --git a/src/Services/Settings.vala b/src/Services/Settings.vala index 6363e99..d1d24e8 100644 --- a/src/Services/Settings.vala +++ b/src/Services/Settings.vala @@ -20,7 +20,7 @@ public class Cherrypick.Settings: GLib.Settings { private Settings () { Object ( - schema_id: "io.github.ellie_commons.cherrypick" + schema_id: APP_ID ); } } From 341be6512092850fd98fe4be19877a4ba8ada1ec Mon Sep 17 00:00:00 2001 From: teamcons Date: Mon, 13 Apr 2026 16:36:01 +0200 Subject: [PATCH 5/5] standardize everything a little bit --- io.github.ellie_commons.cherrypick.yml | 8 +-- meson.build | 33 ++++-------- src/Application.vala | 60 ++++++++++----------- src/Constants.vala | 20 +++++++ src/Controllers/ColorController.vala | 11 ++-- src/Main.vala | 13 ----- src/Models/Color.vala | 5 +- src/Models/ColorHistory.vala | 5 +- src/Models/Format.vala | 5 +- src/Services/ColorPicker.vala | 5 +- src/Services/Settings.vala | 5 +- src/Views/MainView.vala | 74 +++++++++++++++++++++----- src/Widgets/ColorButton.vala | 4 +- src/Widgets/ColorPreview.vala | 5 +- src/Widgets/FormatArea.vala | 13 +++-- src/Widgets/HistoryButtons.vala | 7 ++- src/Widgets/HistoryHeader.vala | 33 ++++++------ src/Windows/Window.vala | 61 ++++++--------------- src/meson.build | 14 ++++- 19 files changed, 198 insertions(+), 183 deletions(-) create mode 100644 src/Constants.vala delete mode 100644 src/Main.vala diff --git a/io.github.ellie_commons.cherrypick.yml b/io.github.ellie_commons.cherrypick.yml index eb111f4..bbd5566 100644 --- a/io.github.ellie_commons.cherrypick.yml +++ b/io.github.ellie_commons.cherrypick.yml @@ -28,11 +28,13 @@ cleanup: modules: - name: cherrypick buildsystem: meson + config-opts: + - -Dlegacy-rdnn=true sources: - type: git - url: https://github.com/ellie-commons/cherrypick.git - tag: 2.3.0 - commit: ed215bda8d53d2475597317fb44844a3c35ed325 + url: https://github.com/elly-code/cherrypick.git + tag: 2.4.0 + commit: x-checker-data: type: git tag-pattern: '^([\d.]+)$' \ No newline at end of file diff --git a/meson.build b/meson.build index 161d9e0..d38a5e4 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('cherrypick', 'c', 'vala', -version: '2.3.0') +version: '2.4.0') app_name = 'Cherrypick' correct_app_id = 'io.github.elly_code.' + meson.project_name() @@ -20,10 +20,13 @@ endif app_version = meson.project_version() gettext_name = meson.project_name() +i18n = import('i18n') +gnome = import('gnome') + + vala_flags = [] if get_option('development') app_id += '.devel' - name_prefix = '(devel) ' vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip() version_suffix = '-@0@'.format (vcs_tag) vala_flags += ['--define', 'DEVEL'] @@ -33,21 +36,14 @@ else version_suffix = '' endif -# Include the translations module -i18n = import('i18n') - -# Set our translation domain -add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (gettext_name), language:'c') -# Compile and install custom css file -gnome = import('gnome') +add_project_arguments(vala_flags, language: 'vala') +# Set our translation domain +add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (gettext_name), language:'c') -subdir('src') -subdir('data') -subdir('po') glib_dep = dependency('glib-2.0') gtk_dep = dependency('gtk4') @@ -69,16 +65,9 @@ config_file = configure_file( configuration: config_data ) - - -executable( - app_id, - gresource, - config_file, - sources: [picker_source_files], - dependencies: picker_dependencies, - install: true -) +subdir('data') +subdir('po') +subdir('src') gnome.post_install( glib_compile_schemas: true, diff --git a/src/Application.vala b/src/Application.vala index 98ca70b..9436de4 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -20,9 +20,17 @@ */ public class Cherrypick.Application : Gtk.Application { - private Window? window; + private static Window? window; private static bool is_immediately_pick = false; + public const string ACTION_PREFIX = "app."; + public const string ACTION_QUIT = "action_quit"; + public static Gee.MultiMap action_accelerators = new Gee.HashMultiMap (); + + private const GLib.ActionEntry[] ACTION_ENTRIES = { + { ACTION_QUIT, quit} + }; + public Application () { Object ( application_id: APP_ID, @@ -31,22 +39,10 @@ public class Cherrypick.Application : Gtk.Application { } construct { - var quit_action = new SimpleAction ("quit", null); - add_action (quit_action); - set_accels_for_action ("app.quit", {"q"}); - quit_action.activate.connect (quit); - - var pick_action = new SimpleAction ("pick", null); - add_action (pick_action); - set_accels_for_action ("app.pick", {"p"}); - - var copy_action = new SimpleAction ("copy", null); - add_action (copy_action); - set_accels_for_action ("app.copy", {"c"}); - - var paste_action = new SimpleAction ("paste", null); - add_action (paste_action); - set_accels_for_action ("app.paste", {"v"}); + Intl.setlocale (LocaleCategory.ALL, ""); + Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + Intl.textdomain (GETTEXT_PACKAGE); } public override void startup () { @@ -54,11 +50,8 @@ public class Cherrypick.Application : Gtk.Application { Gtk.init (); Granite.init (); - Intl.setlocale (LocaleCategory.ALL, ""); - Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); - Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - Intl.textdomain (GETTEXT_PACKAGE); - + add_action_entries (ACTION_ENTRIES, this); + set_accels_for_action ("app.action_quit", {"q"}); var granite_settings = Granite.Settings.get_default (); var gtk_settings = Gtk.Settings.get_default (); @@ -66,12 +59,12 @@ public class Cherrypick.Application : Gtk.Application { gtk_settings.gtk_theme_name = "io.elementary.stylesheet.strawberry"; gtk_settings.gtk_application_prefer_dark_theme = ( - granite_settings.prefers_color_scheme == DARK + granite_settings.prefers_color_scheme == DARK ); granite_settings.notify["prefers-color-scheme"].connect (() => { gtk_settings.gtk_application_prefer_dark_theme = ( - granite_settings.prefers_color_scheme == DARK + granite_settings.prefers_color_scheme == DARK ); }); @@ -87,14 +80,10 @@ public class Cherrypick.Application : Gtk.Application { public override void activate () { - /* Restricting to only one open instance of the application window. - It doesn't make much sense to have multiple instances as there - are no real valid use cases. And with the current architecture - the state is global and would be shared between multiple - instances anyway. */ - if (window == null) { - window = new Cherrypick.Window (this); + window = new Cherrypick.Window () { + application = this + }; window.show (); } else { @@ -104,7 +93,14 @@ public class Cherrypick.Application : Gtk.Application { /* Opens and immediately starts picking color if the --immediately-pick flag is passed when launching from the command line. This could be helpful for the user to set up keybindings and stuff */ - if (is_immediately_pick) { window.on_pick (); is_immediately_pick = false;}; + if (is_immediately_pick) { + window.activate_action (MainView.ACTION_PREFIX + MainView.ACTION_PICK, null); + is_immediately_pick = false; + }; + } + + public static int main (string[] args) { + return new Application ().run (args); } public override int command_line (ApplicationCommandLine command_line) { diff --git a/src/Constants.vala b/src/Constants.vala new file mode 100644 index 0000000..c2defdf --- /dev/null +++ b/src/Constants.vala @@ -0,0 +1,20 @@ +/* + * SPDX-License-Identifier: GPL-3.0-or-later + * SPDX-FileCopyrightText: 2022 Adithyan K V + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) + */ + +// vala-lint=skip-file + + namespace Cherrypick { + + const string DEVEL = "devel"; + const int SPACING_STANDARD = 5; + const int SPACING_DOUBLE = 10; + const int SPACING_TRIPLE = 15; + + const string KEY_HISTORY = "color-history"; + const string KEY_FORMAT = "color-format"; + const string KEY_SNAPSHOT = "color-snapshot"; + } \ No newline at end of file diff --git a/src/Controllers/ColorController.vala b/src/Controllers/ColorController.vala index f6b0af9..aecccfd 100644 --- a/src/Controllers/ColorController.vala +++ b/src/Controllers/ColorController.vala @@ -1,10 +1,9 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * Controlls the state of the color picker. * UI elements derive their state from the controller. @@ -30,8 +29,6 @@ public class Cherrypick.ColorController : Object { return instance; } - private ColorController () {} - construct { color_history = new Cherrypick.ColorHistory (HISTORY_SIZE); @@ -46,7 +43,7 @@ public class Cherrypick.ColorController : Object { public void load_history_from_gsettings () { var settings = Cherrypick.Settings.get_instance (); - var color_history_rgba_codes = settings.get_strv ("color-history"); + var color_history_rgba_codes = settings.get_strv (KEY_HISTORY); foreach (var rgba_code in color_history_rgba_codes) { var color = new Color (); color.parse (rgba_code); @@ -61,6 +58,6 @@ public class Cherrypick.ColorController : Object { for (int i = 0; i < color_history.size; i++) { rgba_codes[i] = color_history[i].to_rgba_string (); } - settings.set_strv ("color-history", rgba_codes); + settings.set_strv (KEY_HISTORY, rgba_codes); } } diff --git a/src/Main.vala b/src/Main.vala deleted file mode 100644 index 8dafc00..0000000 --- a/src/Main.vala +++ /dev/null @@ -1,13 +0,0 @@ -/* - * SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) - */ - -public int main (string[] args) { - var picker = new Cherrypick.Application (); - int status = picker.run (args); - - return status; -} diff --git a/src/Models/Color.vala b/src/Models/Color.vala index bf7cf73..aad8009 100644 --- a/src/Models/Color.vala +++ b/src/Models/Color.vala @@ -1,10 +1,9 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * Represent a color, and define the different supported formats * New formats get defined here, and conversion is done by methods to_ xxx_ string () diff --git a/src/Models/ColorHistory.vala b/src/Models/ColorHistory.vala index f785112..622bace 100644 --- a/src/Models/ColorHistory.vala +++ b/src/Models/ColorHistory.vala @@ -1,10 +1,9 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * A list of recently used colors */ diff --git a/src/Models/Format.vala b/src/Models/Format.vala index 0edb365..c367fb9 100644 --- a/src/Models/Format.vala +++ b/src/Models/Format.vala @@ -1,10 +1,9 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * An Enum representing the different supported formats */ diff --git a/src/Services/ColorPicker.vala b/src/Services/ColorPicker.vala index 8067835..7dc7c78 100644 --- a/src/Services/ColorPicker.vala +++ b/src/Services/ColorPicker.vala @@ -1,10 +1,9 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * Service responsible for interacting with portals * It will communicate via the signal picked () when it is done diff --git a/src/Services/Settings.vala b/src/Services/Settings.vala index d1d24e8..ff363e8 100644 --- a/src/Services/Settings.vala +++ b/src/Services/Settings.vala @@ -1,10 +1,9 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * Wrapper around GLib.Settings to retried it directly via get_instance () */ diff --git a/src/Views/MainView.vala b/src/Views/MainView.vala index c5ba3fa..2dc15d0 100644 --- a/src/Views/MainView.vala +++ b/src/Views/MainView.vala @@ -1,10 +1,9 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * Buttons for color operation all goes there */ @@ -13,29 +12,62 @@ class Cherrypick.MainView: Gtk.Box { private Granite.Toast toast; private ColorPicker color_picker; private Cherrypick.FormatArea format_area; + private HistoryHeader history_header; + private HistoryButtons history_buttons; public Gtk.Button pick_button; + public SimpleActionGroup actions { get; construct; } + public const string ACTION_PREFIX = "view."; + public const string ACTION_PICK = "pick"; + public const string ACTION_COPY = "copy"; + public const string ACTION_PASTE = "paste"; + public const string ACTION_RESET = "reset"; + public const string ACTION_SAVE = "save"; + public const string ACTION_RESTORE = "restore"; + + public static Gee.MultiMap action_accelerators = new Gee.HashMultiMap (); + + public const GLib.ActionEntry[] ACTION_ENTRIES = { + { ACTION_PICK, on_pick}, + { ACTION_COPY, copy}, + { ACTION_PASTE, paste}, + { ACTION_RESET, reset}, + { ACTION_SAVE, on_save}, + { ACTION_RESTORE, on_restore}, + }; + construct { // We use a lot of margin_top for each subelement // This way we avoid Le Blank Space caused by overlay eating up spacing orientation = Gtk.Orientation.VERTICAL; - spacing = 6; + spacing = SPACING_STANDARD; vexpand = true; valign = Gtk.Align.START; - margin_start = margin_bottom = margin_end = 12; + margin_start = margin_end = SPACING_DOUBLE; margin_top = 0; + margin_bottom = SPACING_STANDARD; - /* ---------------- TOASTS ---------------- */ + actions = new SimpleActionGroup (); + actions.add_action_entries (ACTION_ENTRIES, this); - toast = new Granite.Toast (""); + unowned var app = ((Gtk.Application) GLib.Application.get_default ()); + app.set_accels_for_action (ACTION_PREFIX + ACTION_PICK, {"P"}); + app.set_accels_for_action (ACTION_PREFIX + ACTION_COPY, {"C"}); + app.set_accels_for_action (ACTION_PREFIX + ACTION_PASTE, {"V"}); + app.set_accels_for_action (ACTION_PREFIX + ACTION_RESET, {"W"}); + app.set_accels_for_action (ACTION_PREFIX + ACTION_SAVE, {"S"}); + app.set_accels_for_action (ACTION_PREFIX + ACTION_RESTORE, {"R"}); + + /* ---------------- TOASTS ---------------- */ + toast = new Granite.Toast (""); var overlay = new Gtk.Overlay (); overlay.add_overlay (toast); /* ---------------- FORMAT ---------------- */ var format_label = new Gtk.Label (_("Format")) { xalign = 0f, - margin_top = 6 + margin_top = SPACING_STANDARD }; format_label.add_css_class (Granite.STYLE_CLASS_H4_LABEL); format_area = new Cherrypick.FormatArea (); @@ -43,15 +75,15 @@ class Cherrypick.MainView: Gtk.Box { /* ---------------- HISTORY ---------------- */ - var history_header = new HistoryHeader () { - margin_top = 12 + history_header = new HistoryHeader () { + margin_top = SPACING_DOUBLE }; - var history_buttons = new HistoryButtons (); + history_buttons = new HistoryButtons (); /* ---------------- BIG BUTTON ---------------- */ pick_button = new Gtk.Button.with_label (_("Pick Color")) { - margin_top = 12, + margin_top = SPACING_DOUBLE, tooltip_markup = Granite.markup_accel_tooltip ( {"P"}, _("Click to pick a color on the screen")) @@ -78,7 +110,7 @@ class Cherrypick.MainView: Gtk.Box { format_area.format_selector.notify ["selected"].connect_after (history_buttons.update_buttons); format_area.copied.connect (on_message); - history_header.saved.connect (on_message); + history_header.on_message.connect (on_message); color_picker.picked.connect (format_area.copy_to_clipboard); pick_button.clicked.connect (on_pick); @@ -100,4 +132,20 @@ class Cherrypick.MainView: Gtk.Box { public void paste () { format_area.paste_from_clipboard (); } + + public void reset () { + var settings = Cherrypick.Settings.get_instance (); + settings.reset (KEY_HISTORY); + ColorController.get_instance ().load_history_from_gsettings (); + history_buttons.update_buttons (); + on_message (_("Color palette reset")); + } + + public void on_save () { + history_header.on_save (); + } + + public void on_restore () { + history_header.on_restore (); + } } diff --git a/src/Widgets/ColorButton.vala b/src/Widgets/ColorButton.vala index a321389..4021119 100644 --- a/src/Widgets/ColorButton.vala +++ b/src/Widgets/ColorButton.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Widgets/ColorPreview.vala b/src/Widgets/ColorPreview.vala index 5fbb32e..a036cfd 100644 --- a/src/Widgets/ColorPreview.vala +++ b/src/Widgets/ColorPreview.vala @@ -1,10 +1,9 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * The right side, a flat preview surface previewing the last picked color. * If said color has alpha, it will be displayed with a checkerboard. diff --git a/src/Widgets/FormatArea.vala b/src/Widgets/FormatArea.vala index 9e85bab..1345266 100644 --- a/src/Widgets/FormatArea.vala +++ b/src/Widgets/FormatArea.vala @@ -1,10 +1,9 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * Horizontal box containing a formatted color into string, and a menu to choose preferred format */ @@ -22,7 +21,7 @@ public class Cherrypick.FormatArea : Gtk.Box { public FormatArea () { Object ( orientation: Gtk.Orientation.HORIZONTAL, - spacing: 10 + spacing: SPACING_DOUBLE ); } @@ -109,7 +108,7 @@ public class Cherrypick.FormatArea : Gtk.Box { public void copy_to_clipboard () { var clipboard = Gdk.Display.get_default ().get_clipboard (); clipboard.set_text (format_entry.text); - this.copied ( _("Copied to clipboard!")); + this.copied ( _("Copied to clipboard")); } public void paste_from_clipboard () { @@ -150,13 +149,13 @@ public class Cherrypick.FormatArea : Gtk.Box { public void load_format_from_gsettings () { var settings = Settings.get_instance (); - var format = settings.get_enum ("color-format"); + var format = settings.get_enum (KEY_FORMAT); color_format = (Format) format; format_selector.selected = color_format; } public void save_format_to_gsettings () { var settings = Settings.get_instance (); - settings.set_enum ("color-format", color_format); + settings.set_enum (KEY_FORMAT, color_format); } } diff --git a/src/Widgets/HistoryButtons.vala b/src/Widgets/HistoryButtons.vala index 4bd864a..24c56b7 100644 --- a/src/Widgets/HistoryButtons.vala +++ b/src/Widgets/HistoryButtons.vala @@ -1,10 +1,9 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * Horizontal list of ColorButtons representing the content of ColorHistory */ @@ -15,7 +14,7 @@ class Cherrypick.HistoryButtons: Gtk.Box { public HistoryButtons () { Object ( orientation: Gtk.Orientation.HORIZONTAL, - spacing: 8 + spacing: SPACING_DOUBLE ); } diff --git a/src/Widgets/HistoryHeader.vala b/src/Widgets/HistoryHeader.vala index c5a49f8..654110f 100644 --- a/src/Widgets/HistoryHeader.vala +++ b/src/Widgets/HistoryHeader.vala @@ -1,16 +1,15 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ - /** * A label announcing the HistoryButtons, with a couple buttons on the right operating it */ class Cherrypick.HistoryHeader: Granite.Bin { - public signal void saved (string message); + public signal void on_message (string message); construct { /* -------- START WIDGET -------- */ @@ -44,20 +43,22 @@ class Cherrypick.HistoryHeader: Granite.Bin { child = centerbox; + history_save.clicked.connect (on_save); + history_restore.clicked.connect (on_restore); + } + public void on_save () { var settings = Settings.get_instance (); - - history_save.clicked.connect (() => { - var snapshot = settings.get_strv ("color-history"); - settings.set_strv ("color-snapshot", snapshot); - saved (_("History saved")); - ;}); - - history_restore.clicked.connect (() => { - var snapshot = settings.get_strv ("color-snapshot"); - settings.set_strv ("color-history", snapshot); - ColorController.get_instance ().load_history_from_gsettings (); - }); + var snapshot = settings.get_strv (KEY_HISTORY); + settings.set_strv (KEY_SNAPSHOT, snapshot); + on_message (_("History saved")); } + public void on_restore () { + var settings = Settings.get_instance (); + var snapshot = settings.get_strv (KEY_SNAPSHOT); + settings.set_strv (KEY_HISTORY, snapshot); + ColorController.get_instance ().load_history_from_gsettings (); + on_message (_("Snapshot restored")); + } } diff --git a/src/Windows/Window.vala b/src/Windows/Window.vala index c2a9785..12f8dfd 100644 --- a/src/Windows/Window.vala +++ b/src/Windows/Window.vala @@ -1,36 +1,17 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Adithyan K V - * 2025 Stella & Charlie (teamcons.carrd.co) - * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025 Contributions from the ellie-Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ +public class Cherrypick.Window : Gtk.ApplicationWindow { -public class Cherrypick.Window : Gtk.Window { + private Cherrypick.MainView main_view; - private static GLib.Once _instance; - public static unowned Cherrypick.Window instance (Application application) { - return _instance.once (() => { return new Cherrypick.Window (application);}); - } - - private Cherrypick.MainView vbox; - - public SimpleActionGroup actions { get; construct; } - public const string ACTION_PREFIX = "app."; - public const string ACTION_PICK = "pick"; - public const string ACTION_COPY = "copy"; - public const string ACTION_PASTE = "paste"; - - public static Gee.MultiMap action_accelerators = new Gee.HashMultiMap (); - private const GLib.ActionEntry[] ACTION_ENTRIES = { - { ACTION_PICK, on_pick }, - { ACTION_COPY, copy }, - { ACTION_PASTE, paste } - }; - public Window (Gtk.Application app) { + public Window () { Object ( - application: app, ///TRANSLATORS: Do not translate app name title: _("Cherrypick"), default_width: 480, @@ -42,14 +23,14 @@ public class Cherrypick.Window : Gtk.Window { construct { Intl.setlocale (); - var actions = new SimpleActionGroup (); - actions.add_action_entries (ACTION_ENTRIES, this); - insert_action_group ("app", actions); +#if DEVEL + title = _("Cherrypick (Devel)"); + add_css_class (DEVEL); +#endif // We need to hide the title area for the split headerbar set_titlebar (new Gtk.Grid () {visible = false}); - - var titlelabel = new Gtk.Label (_("Cherrypick")); + var titlelabel = new Gtk.Label (title); titlelabel.add_css_class (Granite.STYLE_CLASS_TITLE_LABEL); var headerbar = new Gtk.HeaderBar () { @@ -59,7 +40,11 @@ public class Cherrypick.Window : Gtk.Window { //headerbar.show_title_buttons = false; //headerbar.pack_start (new Gtk.WindowControls (Gtk.PackType.START)); - vbox = new Cherrypick.MainView (); + main_view = new Cherrypick.MainView (); + + var actions = new SimpleActionGroup (); + actions.add_action_entries (MainView.ACTION_ENTRIES, this); + insert_action_group ("view", main_view.actions); /* We want the color preview area to span the entire height of the @@ -67,7 +52,7 @@ public class Cherrypick.Window : Gtk.Window { including the headerbar */ var window_grid = new Gtk.Grid (); window_grid.attach (headerbar, 0, 0); - window_grid.attach (vbox, 0, 1); + window_grid.attach (main_view, 0, 1); window_grid.attach (new Cherrypick.ColorPreview (), 1, 0, 1, 2); /* As the headerbar spans only half the window, it would be @@ -81,18 +66,6 @@ public class Cherrypick.Window : Gtk.Window { /* when the app is opened the user probably wants to pick the color straight away. So setting the pick button as focused default action so that pressing Return or Space starts the pick */ - set_focus (vbox.pick_button); - } - - public void on_pick () { - vbox.on_pick (); - } - - public void copy () { - vbox.copy (); - } - - public void paste () { - vbox.paste (); + set_focus (main_view.pick_button); } } diff --git a/src/meson.build b/src/meson.build index c69298a..b26c0f0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,6 @@ -picker_source_files = files( - 'Main.vala', + +sources = files( + 'Constants.vala', 'Application.vala', 'Models/Color.vala', 'Models/Format.vala', @@ -15,3 +16,12 @@ picker_source_files = files( 'Services/Settings.vala', 'Controllers/ColorController.vala' ) + +executable( + app_id, + gresource, + config_file, + sources, + dependencies: picker_dependencies, + install: true +) \ No newline at end of file