From b76a07f76fdca729af47179244d33cbb3fbe9f90 Mon Sep 17 00:00:00 2001 From: bbhtt Date: Thu, 13 Mar 2025 09:53:14 +0530 Subject: [PATCH 1/2] tips-and-tricks: Document masking in more detail Closes https://github.com/flatpak/flatpak-docs/issues/576 --- docs/tips-and-tricks.rst | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/docs/tips-and-tricks.rst b/docs/tips-and-tricks.rst index bacb2422..cae3e3e0 100644 --- a/docs/tips-and-tricks.rst +++ b/docs/tips-and-tricks.rst @@ -44,12 +44,44 @@ Then you deploy the commit:: .. note:: The example here uses ``sudo`` for system installations because, unlike normal updates, downgrades are considered a privileged action. If the application is installed per-user you would run it as that user. - -If you have Flatpak 1.5.0 or later, you can also prevent the app from being -included in updates (either manual or automatic):: - $ flatpak mask org.gnome.Recipes +Masking +-------- +Flatpak 1.5.0 or later allows to mask a ref to prevent it from being +automatically updated or installed. + +If the Flatpak remote is configured in user location, +``flatpak mask --user`` needs to be used otherwise it defaults to +system location. ``flatpak remote-list`` can be used to find the +location of the Flatpak remote. + +To list the currently masked patterns:: + + # System + $ flatpak mask + + # User + $ flatpak mask --user + +To mask a ref pattern:: + + # System + $ flatpak mask org.example.brokenapp + + # User + $ flatpak mask --user org.example.brokenapp + + # Mask only the beta branch of the ref + $ flatpak mask org.example.brokenapp//beta + +To remove a masked pattern:: + + # System + $ flatpak mask --remove org.example.brokenapp + + # User + $ flatpak mask --user --remove org.example.brokenapp Bisecting regressions in application builds ------------------------------------------- From 0965738662149c11abfa481ec4c736c89e57f0b2 Mon Sep 17 00:00:00 2001 From: bbhtt Date: Thu, 13 Mar 2025 09:53:50 +0530 Subject: [PATCH 2/2] Update po files --- po/de/LC_MESSAGES/tips-and-tricks.po | 91 ++++++++++++++------- po/es/LC_MESSAGES/tips-and-tricks.po | 91 ++++++++++++++------- po/fr/LC_MESSAGES/tips-and-tricks.po | 91 ++++++++++++++------- po/ko/LC_MESSAGES/tips-and-tricks.po | 91 ++++++++++++++------- po/pt_BR/LC_MESSAGES/tips-and-tricks.po | 97 ++++++++++++++-------- po/ru/LC_MESSAGES/tips-and-tricks.po | 103 ++++++++++++++++-------- po/zh_CN/LC_MESSAGES/tips-and-tricks.po | 91 ++++++++++++++------- 7 files changed, 438 insertions(+), 217 deletions(-) diff --git a/po/de/LC_MESSAGES/tips-and-tricks.po b/po/de/LC_MESSAGES/tips-and-tricks.po index a441dd05..bc4ad236 100644 --- a/po/de/LC_MESSAGES/tips-and-tricks.po +++ b/po/de/LC_MESSAGES/tips-and-tricks.po @@ -9,14 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: Flatpak \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-07 16:26-0600\n" +"POT-Creation-Date: 2025-03-13 09:53+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.3\n" +"Generated-By: Babel 2.17.0\n" #: ../../tips-and-tricks.rst:2 msgid "Tips and Tricks" @@ -80,72 +80,96 @@ msgid "" "application is installed per-user you would run it as that user." msgstr "" -#: ../../tips-and-tricks.rst:48 +#: ../../tips-and-tricks.rst:49 +msgid "Masking" +msgstr "" + +#: ../../tips-and-tricks.rst:51 +msgid "" +"Flatpak 1.5.0 or later allows to mask a ref to prevent it from being " +"automatically updated or installed." +msgstr "" + +#: ../../tips-and-tricks.rst:54 msgid "" -"If you have Flatpak 1.5.0 or later, you can also prevent the app from " -"being included in updates (either manual or automatic)::" +"If the Flatpak remote is configured in user location, ``flatpak mask " +"--user`` needs to be used otherwise it defaults to system location. " +"``flatpak remote-list`` can be used to find the location of the Flatpak " +"remote." +msgstr "" + +#: ../../tips-and-tricks.rst:59 +msgid "To list the currently masked patterns::" +msgstr "" + +#: ../../tips-and-tricks.rst:67 +msgid "To mask a ref pattern::" +msgstr "" + +#: ../../tips-and-tricks.rst:78 +msgid "To remove a masked pattern::" msgstr "" -#: ../../tips-and-tricks.rst:55 +#: ../../tips-and-tricks.rst:87 msgid "Bisecting regressions in application builds" msgstr "" -#: ../../tips-and-tricks.rst:57 +#: ../../tips-and-tricks.rst:89 msgid "" "In case the newest builds of an application introduce regressions, you " "can use ``flatpak-bisect`` to discover which commit introduced the " "regression. It works just like ``git bisect``." msgstr "" -#: ../../tips-and-tricks.rst:61 +#: ../../tips-and-tricks.rst:93 msgid "" "In case your distribution doesn't install the ``flatpak-bisect`` utility," " you can find it distributed alongside the Flatpak source code, in " "https://github.com/flatpak/flatpak/blob/main/scripts/flatpak-bisect" msgstr "" -#: ../../tips-and-tricks.rst:65 +#: ../../tips-and-tricks.rst:97 msgid "First you update the application and get its history::" msgstr "" -#: ../../tips-and-tricks.rst:69 +#: ../../tips-and-tricks.rst:101 msgid "Then, you should set the current commit as the first bad commit::" msgstr "" -#: ../../tips-and-tricks.rst:73 +#: ../../tips-and-tricks.rst:105 msgid "" "Now you need to find the hash of the first known good commit. For that, " "you can see the build history by running::" msgstr "" -#: ../../tips-and-tricks.rst:78 +#: ../../tips-and-tricks.rst:110 msgid "To start bisecting, checkout the first known good commit you find::" msgstr "" -#: ../../tips-and-tricks.rst:82 +#: ../../tips-and-tricks.rst:114 msgid "" "After setting the bad commit and the first known good commit, you can " "launch the application to verify if the current commit in the bisecting " "session is a good or a bad one." msgstr "" -#: ../../tips-and-tricks.rst:86 +#: ../../tips-and-tricks.rst:118 msgid "To mark a commit as good or bad, run::" msgstr "" -#: ../../tips-and-tricks.rst:90 +#: ../../tips-and-tricks.rst:122 msgid "Or::" msgstr "" -#: ../../tips-and-tricks.rst:94 +#: ../../tips-and-tricks.rst:126 msgid "``flatpak-bisect`` will inform you when the first bad commit is found." msgstr "" -#: ../../tips-and-tricks.rst:97 +#: ../../tips-and-tricks.rst:129 msgid "Adding a custom installation" msgstr "" -#: ../../tips-and-tricks.rst:99 +#: ../../tips-and-tricks.rst:131 msgid "" "By default Flatpak installs apps system-wide, and can also be made to " "install per-user with the ``--user`` option accepted by most commands. A " @@ -153,19 +177,19 @@ msgid "" " an external hard drive." msgstr "" -#: ../../tips-and-tricks.rst:104 +#: ../../tips-and-tricks.rst:136 msgid "First ensure that the config directory exists::" msgstr "" -#: ../../tips-and-tricks.rst:108 +#: ../../tips-and-tricks.rst:140 msgid "Then open a file in that directory as root::" msgstr "" -#: ../../tips-and-tricks.rst:112 +#: ../../tips-and-tricks.rst:144 msgid "And write something like this::" msgstr "" -#: ../../tips-and-tricks.rst:119 +#: ../../tips-and-tricks.rst:151 msgid "" "See `flatpak-installation(5) `_ for the full format " @@ -174,35 +198,35 @@ msgid "" "``flatpak`` directory so the path specified by ``Path=`` exists." msgstr "" -#: ../../tips-and-tricks.rst:125 +#: ../../tips-and-tricks.rst:157 msgid "Then you can add a remote using a command like::" msgstr "" -#: ../../tips-and-tricks.rst:129 +#: ../../tips-and-tricks.rst:161 msgid "And install to it with::" msgstr "" -#: ../../tips-and-tricks.rst:135 +#: ../../tips-and-tricks.rst:167 msgid "" "If your custom installation is the only one with the remote you're " "installing from, ``--installation`` can be omitted." msgstr "" -#: ../../tips-and-tricks.rst:138 +#: ../../tips-and-tricks.rst:170 msgid "And run apps from it with::" msgstr "" -#: ../../tips-and-tricks.rst:144 +#: ../../tips-and-tricks.rst:176 msgid "" "If your custom installation is the only one with the app you're running, " "``--installation`` can be omitted." msgstr "" -#: ../../tips-and-tricks.rst:148 +#: ../../tips-and-tricks.rst:180 msgid "Configuring resource limits for apps" msgstr "" -#: ../../tips-and-tricks.rst:150 +#: ../../tips-and-tricks.rst:182 msgid "" "When systemd is available, Flatpak tries to put app processes in a scope " "such as ``app-flatpak-com.brave.Browser-*.scope`` (in the case of Brave)," @@ -211,7 +235,7 @@ msgid "" "com.brave.Browser-.scope.d/memory.conf`` with contents like::" msgstr "" -#: ../../tips-and-tricks.rst:159 +#: ../../tips-and-tricks.rst:191 msgid "" "Then after a ``systemctl --user daemon-reload``, those ``systemd" ".resource-control(5)`` parameters will apply to all instances of that " @@ -240,3 +264,10 @@ msgstr "" #~ "``Path=`` exists." #~ msgstr "" +#~ msgid "" +#~ "If you have Flatpak 1.5.0 or " +#~ "later, you can also prevent the " +#~ "app from being included in updates " +#~ "(either manual or automatic)::" +#~ msgstr "" + diff --git a/po/es/LC_MESSAGES/tips-and-tricks.po b/po/es/LC_MESSAGES/tips-and-tricks.po index a441dd05..bc4ad236 100644 --- a/po/es/LC_MESSAGES/tips-and-tricks.po +++ b/po/es/LC_MESSAGES/tips-and-tricks.po @@ -9,14 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: Flatpak \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-07 16:26-0600\n" +"POT-Creation-Date: 2025-03-13 09:53+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.3\n" +"Generated-By: Babel 2.17.0\n" #: ../../tips-and-tricks.rst:2 msgid "Tips and Tricks" @@ -80,72 +80,96 @@ msgid "" "application is installed per-user you would run it as that user." msgstr "" -#: ../../tips-and-tricks.rst:48 +#: ../../tips-and-tricks.rst:49 +msgid "Masking" +msgstr "" + +#: ../../tips-and-tricks.rst:51 +msgid "" +"Flatpak 1.5.0 or later allows to mask a ref to prevent it from being " +"automatically updated or installed." +msgstr "" + +#: ../../tips-and-tricks.rst:54 msgid "" -"If you have Flatpak 1.5.0 or later, you can also prevent the app from " -"being included in updates (either manual or automatic)::" +"If the Flatpak remote is configured in user location, ``flatpak mask " +"--user`` needs to be used otherwise it defaults to system location. " +"``flatpak remote-list`` can be used to find the location of the Flatpak " +"remote." +msgstr "" + +#: ../../tips-and-tricks.rst:59 +msgid "To list the currently masked patterns::" +msgstr "" + +#: ../../tips-and-tricks.rst:67 +msgid "To mask a ref pattern::" +msgstr "" + +#: ../../tips-and-tricks.rst:78 +msgid "To remove a masked pattern::" msgstr "" -#: ../../tips-and-tricks.rst:55 +#: ../../tips-and-tricks.rst:87 msgid "Bisecting regressions in application builds" msgstr "" -#: ../../tips-and-tricks.rst:57 +#: ../../tips-and-tricks.rst:89 msgid "" "In case the newest builds of an application introduce regressions, you " "can use ``flatpak-bisect`` to discover which commit introduced the " "regression. It works just like ``git bisect``." msgstr "" -#: ../../tips-and-tricks.rst:61 +#: ../../tips-and-tricks.rst:93 msgid "" "In case your distribution doesn't install the ``flatpak-bisect`` utility," " you can find it distributed alongside the Flatpak source code, in " "https://github.com/flatpak/flatpak/blob/main/scripts/flatpak-bisect" msgstr "" -#: ../../tips-and-tricks.rst:65 +#: ../../tips-and-tricks.rst:97 msgid "First you update the application and get its history::" msgstr "" -#: ../../tips-and-tricks.rst:69 +#: ../../tips-and-tricks.rst:101 msgid "Then, you should set the current commit as the first bad commit::" msgstr "" -#: ../../tips-and-tricks.rst:73 +#: ../../tips-and-tricks.rst:105 msgid "" "Now you need to find the hash of the first known good commit. For that, " "you can see the build history by running::" msgstr "" -#: ../../tips-and-tricks.rst:78 +#: ../../tips-and-tricks.rst:110 msgid "To start bisecting, checkout the first known good commit you find::" msgstr "" -#: ../../tips-and-tricks.rst:82 +#: ../../tips-and-tricks.rst:114 msgid "" "After setting the bad commit and the first known good commit, you can " "launch the application to verify if the current commit in the bisecting " "session is a good or a bad one." msgstr "" -#: ../../tips-and-tricks.rst:86 +#: ../../tips-and-tricks.rst:118 msgid "To mark a commit as good or bad, run::" msgstr "" -#: ../../tips-and-tricks.rst:90 +#: ../../tips-and-tricks.rst:122 msgid "Or::" msgstr "" -#: ../../tips-and-tricks.rst:94 +#: ../../tips-and-tricks.rst:126 msgid "``flatpak-bisect`` will inform you when the first bad commit is found." msgstr "" -#: ../../tips-and-tricks.rst:97 +#: ../../tips-and-tricks.rst:129 msgid "Adding a custom installation" msgstr "" -#: ../../tips-and-tricks.rst:99 +#: ../../tips-and-tricks.rst:131 msgid "" "By default Flatpak installs apps system-wide, and can also be made to " "install per-user with the ``--user`` option accepted by most commands. A " @@ -153,19 +177,19 @@ msgid "" " an external hard drive." msgstr "" -#: ../../tips-and-tricks.rst:104 +#: ../../tips-and-tricks.rst:136 msgid "First ensure that the config directory exists::" msgstr "" -#: ../../tips-and-tricks.rst:108 +#: ../../tips-and-tricks.rst:140 msgid "Then open a file in that directory as root::" msgstr "" -#: ../../tips-and-tricks.rst:112 +#: ../../tips-and-tricks.rst:144 msgid "And write something like this::" msgstr "" -#: ../../tips-and-tricks.rst:119 +#: ../../tips-and-tricks.rst:151 msgid "" "See `flatpak-installation(5) `_ for the full format " @@ -174,35 +198,35 @@ msgid "" "``flatpak`` directory so the path specified by ``Path=`` exists." msgstr "" -#: ../../tips-and-tricks.rst:125 +#: ../../tips-and-tricks.rst:157 msgid "Then you can add a remote using a command like::" msgstr "" -#: ../../tips-and-tricks.rst:129 +#: ../../tips-and-tricks.rst:161 msgid "And install to it with::" msgstr "" -#: ../../tips-and-tricks.rst:135 +#: ../../tips-and-tricks.rst:167 msgid "" "If your custom installation is the only one with the remote you're " "installing from, ``--installation`` can be omitted." msgstr "" -#: ../../tips-and-tricks.rst:138 +#: ../../tips-and-tricks.rst:170 msgid "And run apps from it with::" msgstr "" -#: ../../tips-and-tricks.rst:144 +#: ../../tips-and-tricks.rst:176 msgid "" "If your custom installation is the only one with the app you're running, " "``--installation`` can be omitted." msgstr "" -#: ../../tips-and-tricks.rst:148 +#: ../../tips-and-tricks.rst:180 msgid "Configuring resource limits for apps" msgstr "" -#: ../../tips-and-tricks.rst:150 +#: ../../tips-and-tricks.rst:182 msgid "" "When systemd is available, Flatpak tries to put app processes in a scope " "such as ``app-flatpak-com.brave.Browser-*.scope`` (in the case of Brave)," @@ -211,7 +235,7 @@ msgid "" "com.brave.Browser-.scope.d/memory.conf`` with contents like::" msgstr "" -#: ../../tips-and-tricks.rst:159 +#: ../../tips-and-tricks.rst:191 msgid "" "Then after a ``systemctl --user daemon-reload``, those ``systemd" ".resource-control(5)`` parameters will apply to all instances of that " @@ -240,3 +264,10 @@ msgstr "" #~ "``Path=`` exists." #~ msgstr "" +#~ msgid "" +#~ "If you have Flatpak 1.5.0 or " +#~ "later, you can also prevent the " +#~ "app from being included in updates " +#~ "(either manual or automatic)::" +#~ msgstr "" + diff --git a/po/fr/LC_MESSAGES/tips-and-tricks.po b/po/fr/LC_MESSAGES/tips-and-tricks.po index a441dd05..bc4ad236 100644 --- a/po/fr/LC_MESSAGES/tips-and-tricks.po +++ b/po/fr/LC_MESSAGES/tips-and-tricks.po @@ -9,14 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: Flatpak \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-07 16:26-0600\n" +"POT-Creation-Date: 2025-03-13 09:53+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.3\n" +"Generated-By: Babel 2.17.0\n" #: ../../tips-and-tricks.rst:2 msgid "Tips and Tricks" @@ -80,72 +80,96 @@ msgid "" "application is installed per-user you would run it as that user." msgstr "" -#: ../../tips-and-tricks.rst:48 +#: ../../tips-and-tricks.rst:49 +msgid "Masking" +msgstr "" + +#: ../../tips-and-tricks.rst:51 +msgid "" +"Flatpak 1.5.0 or later allows to mask a ref to prevent it from being " +"automatically updated or installed." +msgstr "" + +#: ../../tips-and-tricks.rst:54 msgid "" -"If you have Flatpak 1.5.0 or later, you can also prevent the app from " -"being included in updates (either manual or automatic)::" +"If the Flatpak remote is configured in user location, ``flatpak mask " +"--user`` needs to be used otherwise it defaults to system location. " +"``flatpak remote-list`` can be used to find the location of the Flatpak " +"remote." +msgstr "" + +#: ../../tips-and-tricks.rst:59 +msgid "To list the currently masked patterns::" +msgstr "" + +#: ../../tips-and-tricks.rst:67 +msgid "To mask a ref pattern::" +msgstr "" + +#: ../../tips-and-tricks.rst:78 +msgid "To remove a masked pattern::" msgstr "" -#: ../../tips-and-tricks.rst:55 +#: ../../tips-and-tricks.rst:87 msgid "Bisecting regressions in application builds" msgstr "" -#: ../../tips-and-tricks.rst:57 +#: ../../tips-and-tricks.rst:89 msgid "" "In case the newest builds of an application introduce regressions, you " "can use ``flatpak-bisect`` to discover which commit introduced the " "regression. It works just like ``git bisect``." msgstr "" -#: ../../tips-and-tricks.rst:61 +#: ../../tips-and-tricks.rst:93 msgid "" "In case your distribution doesn't install the ``flatpak-bisect`` utility," " you can find it distributed alongside the Flatpak source code, in " "https://github.com/flatpak/flatpak/blob/main/scripts/flatpak-bisect" msgstr "" -#: ../../tips-and-tricks.rst:65 +#: ../../tips-and-tricks.rst:97 msgid "First you update the application and get its history::" msgstr "" -#: ../../tips-and-tricks.rst:69 +#: ../../tips-and-tricks.rst:101 msgid "Then, you should set the current commit as the first bad commit::" msgstr "" -#: ../../tips-and-tricks.rst:73 +#: ../../tips-and-tricks.rst:105 msgid "" "Now you need to find the hash of the first known good commit. For that, " "you can see the build history by running::" msgstr "" -#: ../../tips-and-tricks.rst:78 +#: ../../tips-and-tricks.rst:110 msgid "To start bisecting, checkout the first known good commit you find::" msgstr "" -#: ../../tips-and-tricks.rst:82 +#: ../../tips-and-tricks.rst:114 msgid "" "After setting the bad commit and the first known good commit, you can " "launch the application to verify if the current commit in the bisecting " "session is a good or a bad one." msgstr "" -#: ../../tips-and-tricks.rst:86 +#: ../../tips-and-tricks.rst:118 msgid "To mark a commit as good or bad, run::" msgstr "" -#: ../../tips-and-tricks.rst:90 +#: ../../tips-and-tricks.rst:122 msgid "Or::" msgstr "" -#: ../../tips-and-tricks.rst:94 +#: ../../tips-and-tricks.rst:126 msgid "``flatpak-bisect`` will inform you when the first bad commit is found." msgstr "" -#: ../../tips-and-tricks.rst:97 +#: ../../tips-and-tricks.rst:129 msgid "Adding a custom installation" msgstr "" -#: ../../tips-and-tricks.rst:99 +#: ../../tips-and-tricks.rst:131 msgid "" "By default Flatpak installs apps system-wide, and can also be made to " "install per-user with the ``--user`` option accepted by most commands. A " @@ -153,19 +177,19 @@ msgid "" " an external hard drive." msgstr "" -#: ../../tips-and-tricks.rst:104 +#: ../../tips-and-tricks.rst:136 msgid "First ensure that the config directory exists::" msgstr "" -#: ../../tips-and-tricks.rst:108 +#: ../../tips-and-tricks.rst:140 msgid "Then open a file in that directory as root::" msgstr "" -#: ../../tips-and-tricks.rst:112 +#: ../../tips-and-tricks.rst:144 msgid "And write something like this::" msgstr "" -#: ../../tips-and-tricks.rst:119 +#: ../../tips-and-tricks.rst:151 msgid "" "See `flatpak-installation(5) `_ for the full format " @@ -174,35 +198,35 @@ msgid "" "``flatpak`` directory so the path specified by ``Path=`` exists." msgstr "" -#: ../../tips-and-tricks.rst:125 +#: ../../tips-and-tricks.rst:157 msgid "Then you can add a remote using a command like::" msgstr "" -#: ../../tips-and-tricks.rst:129 +#: ../../tips-and-tricks.rst:161 msgid "And install to it with::" msgstr "" -#: ../../tips-and-tricks.rst:135 +#: ../../tips-and-tricks.rst:167 msgid "" "If your custom installation is the only one with the remote you're " "installing from, ``--installation`` can be omitted." msgstr "" -#: ../../tips-and-tricks.rst:138 +#: ../../tips-and-tricks.rst:170 msgid "And run apps from it with::" msgstr "" -#: ../../tips-and-tricks.rst:144 +#: ../../tips-and-tricks.rst:176 msgid "" "If your custom installation is the only one with the app you're running, " "``--installation`` can be omitted." msgstr "" -#: ../../tips-and-tricks.rst:148 +#: ../../tips-and-tricks.rst:180 msgid "Configuring resource limits for apps" msgstr "" -#: ../../tips-and-tricks.rst:150 +#: ../../tips-and-tricks.rst:182 msgid "" "When systemd is available, Flatpak tries to put app processes in a scope " "such as ``app-flatpak-com.brave.Browser-*.scope`` (in the case of Brave)," @@ -211,7 +235,7 @@ msgid "" "com.brave.Browser-.scope.d/memory.conf`` with contents like::" msgstr "" -#: ../../tips-and-tricks.rst:159 +#: ../../tips-and-tricks.rst:191 msgid "" "Then after a ``systemctl --user daemon-reload``, those ``systemd" ".resource-control(5)`` parameters will apply to all instances of that " @@ -240,3 +264,10 @@ msgstr "" #~ "``Path=`` exists." #~ msgstr "" +#~ msgid "" +#~ "If you have Flatpak 1.5.0 or " +#~ "later, you can also prevent the " +#~ "app from being included in updates " +#~ "(either manual or automatic)::" +#~ msgstr "" + diff --git a/po/ko/LC_MESSAGES/tips-and-tricks.po b/po/ko/LC_MESSAGES/tips-and-tricks.po index a441dd05..bc4ad236 100644 --- a/po/ko/LC_MESSAGES/tips-and-tricks.po +++ b/po/ko/LC_MESSAGES/tips-and-tricks.po @@ -9,14 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: Flatpak \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-07 16:26-0600\n" +"POT-Creation-Date: 2025-03-13 09:53+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.3\n" +"Generated-By: Babel 2.17.0\n" #: ../../tips-and-tricks.rst:2 msgid "Tips and Tricks" @@ -80,72 +80,96 @@ msgid "" "application is installed per-user you would run it as that user." msgstr "" -#: ../../tips-and-tricks.rst:48 +#: ../../tips-and-tricks.rst:49 +msgid "Masking" +msgstr "" + +#: ../../tips-and-tricks.rst:51 +msgid "" +"Flatpak 1.5.0 or later allows to mask a ref to prevent it from being " +"automatically updated or installed." +msgstr "" + +#: ../../tips-and-tricks.rst:54 msgid "" -"If you have Flatpak 1.5.0 or later, you can also prevent the app from " -"being included in updates (either manual or automatic)::" +"If the Flatpak remote is configured in user location, ``flatpak mask " +"--user`` needs to be used otherwise it defaults to system location. " +"``flatpak remote-list`` can be used to find the location of the Flatpak " +"remote." +msgstr "" + +#: ../../tips-and-tricks.rst:59 +msgid "To list the currently masked patterns::" +msgstr "" + +#: ../../tips-and-tricks.rst:67 +msgid "To mask a ref pattern::" +msgstr "" + +#: ../../tips-and-tricks.rst:78 +msgid "To remove a masked pattern::" msgstr "" -#: ../../tips-and-tricks.rst:55 +#: ../../tips-and-tricks.rst:87 msgid "Bisecting regressions in application builds" msgstr "" -#: ../../tips-and-tricks.rst:57 +#: ../../tips-and-tricks.rst:89 msgid "" "In case the newest builds of an application introduce regressions, you " "can use ``flatpak-bisect`` to discover which commit introduced the " "regression. It works just like ``git bisect``." msgstr "" -#: ../../tips-and-tricks.rst:61 +#: ../../tips-and-tricks.rst:93 msgid "" "In case your distribution doesn't install the ``flatpak-bisect`` utility," " you can find it distributed alongside the Flatpak source code, in " "https://github.com/flatpak/flatpak/blob/main/scripts/flatpak-bisect" msgstr "" -#: ../../tips-and-tricks.rst:65 +#: ../../tips-and-tricks.rst:97 msgid "First you update the application and get its history::" msgstr "" -#: ../../tips-and-tricks.rst:69 +#: ../../tips-and-tricks.rst:101 msgid "Then, you should set the current commit as the first bad commit::" msgstr "" -#: ../../tips-and-tricks.rst:73 +#: ../../tips-and-tricks.rst:105 msgid "" "Now you need to find the hash of the first known good commit. For that, " "you can see the build history by running::" msgstr "" -#: ../../tips-and-tricks.rst:78 +#: ../../tips-and-tricks.rst:110 msgid "To start bisecting, checkout the first known good commit you find::" msgstr "" -#: ../../tips-and-tricks.rst:82 +#: ../../tips-and-tricks.rst:114 msgid "" "After setting the bad commit and the first known good commit, you can " "launch the application to verify if the current commit in the bisecting " "session is a good or a bad one." msgstr "" -#: ../../tips-and-tricks.rst:86 +#: ../../tips-and-tricks.rst:118 msgid "To mark a commit as good or bad, run::" msgstr "" -#: ../../tips-and-tricks.rst:90 +#: ../../tips-and-tricks.rst:122 msgid "Or::" msgstr "" -#: ../../tips-and-tricks.rst:94 +#: ../../tips-and-tricks.rst:126 msgid "``flatpak-bisect`` will inform you when the first bad commit is found." msgstr "" -#: ../../tips-and-tricks.rst:97 +#: ../../tips-and-tricks.rst:129 msgid "Adding a custom installation" msgstr "" -#: ../../tips-and-tricks.rst:99 +#: ../../tips-and-tricks.rst:131 msgid "" "By default Flatpak installs apps system-wide, and can also be made to " "install per-user with the ``--user`` option accepted by most commands. A " @@ -153,19 +177,19 @@ msgid "" " an external hard drive." msgstr "" -#: ../../tips-and-tricks.rst:104 +#: ../../tips-and-tricks.rst:136 msgid "First ensure that the config directory exists::" msgstr "" -#: ../../tips-and-tricks.rst:108 +#: ../../tips-and-tricks.rst:140 msgid "Then open a file in that directory as root::" msgstr "" -#: ../../tips-and-tricks.rst:112 +#: ../../tips-and-tricks.rst:144 msgid "And write something like this::" msgstr "" -#: ../../tips-and-tricks.rst:119 +#: ../../tips-and-tricks.rst:151 msgid "" "See `flatpak-installation(5) `_ for the full format " @@ -174,35 +198,35 @@ msgid "" "``flatpak`` directory so the path specified by ``Path=`` exists." msgstr "" -#: ../../tips-and-tricks.rst:125 +#: ../../tips-and-tricks.rst:157 msgid "Then you can add a remote using a command like::" msgstr "" -#: ../../tips-and-tricks.rst:129 +#: ../../tips-and-tricks.rst:161 msgid "And install to it with::" msgstr "" -#: ../../tips-and-tricks.rst:135 +#: ../../tips-and-tricks.rst:167 msgid "" "If your custom installation is the only one with the remote you're " "installing from, ``--installation`` can be omitted." msgstr "" -#: ../../tips-and-tricks.rst:138 +#: ../../tips-and-tricks.rst:170 msgid "And run apps from it with::" msgstr "" -#: ../../tips-and-tricks.rst:144 +#: ../../tips-and-tricks.rst:176 msgid "" "If your custom installation is the only one with the app you're running, " "``--installation`` can be omitted." msgstr "" -#: ../../tips-and-tricks.rst:148 +#: ../../tips-and-tricks.rst:180 msgid "Configuring resource limits for apps" msgstr "" -#: ../../tips-and-tricks.rst:150 +#: ../../tips-and-tricks.rst:182 msgid "" "When systemd is available, Flatpak tries to put app processes in a scope " "such as ``app-flatpak-com.brave.Browser-*.scope`` (in the case of Brave)," @@ -211,7 +235,7 @@ msgid "" "com.brave.Browser-.scope.d/memory.conf`` with contents like::" msgstr "" -#: ../../tips-and-tricks.rst:159 +#: ../../tips-and-tricks.rst:191 msgid "" "Then after a ``systemctl --user daemon-reload``, those ``systemd" ".resource-control(5)`` parameters will apply to all instances of that " @@ -240,3 +264,10 @@ msgstr "" #~ "``Path=`` exists." #~ msgstr "" +#~ msgid "" +#~ "If you have Flatpak 1.5.0 or " +#~ "later, you can also prevent the " +#~ "app from being included in updates " +#~ "(either manual or automatic)::" +#~ msgstr "" + diff --git a/po/pt_BR/LC_MESSAGES/tips-and-tricks.po b/po/pt_BR/LC_MESSAGES/tips-and-tricks.po index 5fc25008..b5c1fe9f 100644 --- a/po/pt_BR/LC_MESSAGES/tips-and-tricks.po +++ b/po/pt_BR/LC_MESSAGES/tips-and-tricks.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Flatpak \n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak-docs/issues\n" -"POT-Creation-Date: 2023-01-07 16:26-0600\n" +"POT-Creation-Date: 2025-03-13 09:53+0530\n" "PO-Revision-Date: 2023-05-31 14:33-0300\n" "Last-Translator: Rafael Fontenelle \n" "Language: pt_BR\n" @@ -17,7 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.3\n" +"Generated-By: Babel 2.17.0\n" #: ../../tips-and-tricks.rst:2 msgid "Tips and Tricks" @@ -96,19 +96,41 @@ msgstr "" "uma ação privilegiada. Se o aplicativo for instalado por usuário, você o " "executará como esse usuário." -#: ../../tips-and-tricks.rst:48 +#: ../../tips-and-tricks.rst:49 +msgid "Masking" +msgstr "" + +#: ../../tips-and-tricks.rst:51 +msgid "" +"Flatpak 1.5.0 or later allows to mask a ref to prevent it from being " +"automatically updated or installed." +msgstr "" + +#: ../../tips-and-tricks.rst:54 msgid "" -"If you have Flatpak 1.5.0 or later, you can also prevent the app from " -"being included in updates (either manual or automatic)::" +"If the Flatpak remote is configured in user location, ``flatpak mask " +"--user`` needs to be used otherwise it defaults to system location. " +"``flatpak remote-list`` can be used to find the location of the Flatpak " +"remote." +msgstr "" + +#: ../../tips-and-tricks.rst:59 +msgid "To list the currently masked patterns::" +msgstr "" + +#: ../../tips-and-tricks.rst:67 +msgid "To mask a ref pattern::" +msgstr "" + +#: ../../tips-and-tricks.rst:78 +msgid "To remove a masked pattern::" msgstr "" -"Se você possui o Flatpak 1.5.0 ou posterior, também pode impedir que o " -"aplicativo seja incluído nas atualizações (manuais ou automáticas)::" -#: ../../tips-and-tricks.rst:55 +#: ../../tips-and-tricks.rst:87 msgid "Bisecting regressions in application builds" msgstr "Fazendo bisect em regressões em compilações de aplicativos" -#: ../../tips-and-tricks.rst:57 +#: ../../tips-and-tricks.rst:89 msgid "" "In case the newest builds of an application introduce regressions, you " "can use ``flatpak-bisect`` to discover which commit introduced the " @@ -118,7 +140,7 @@ msgstr "" "você pode usar ``flatpak-bisect`` para descobrir qual commit introduziu a" " regressão. Funciona como ``git bisect``." -#: ../../tips-and-tricks.rst:61 +#: ../../tips-and-tricks.rst:93 msgid "" "In case your distribution doesn't install the ``flatpak-bisect`` utility," " you can find it distributed alongside the Flatpak source code, in " @@ -128,17 +150,17 @@ msgstr "" "poderá encontrá-lo distribuído juntamente com o código-fonte Flatpak, em " "https://github.com/flatpak/flatpak/blob/main/scripts/flatpak-bisect" -#: ../../tips-and-tricks.rst:65 +#: ../../tips-and-tricks.rst:97 msgid "First you update the application and get its history::" msgstr "Primeiro, você atualiza o aplicativo e obtém seu histórico::" -#: ../../tips-and-tricks.rst:69 +#: ../../tips-and-tricks.rst:101 msgid "Then, you should set the current commit as the first bad commit::" msgstr "" "Em seguida, você deve definir o commit atual como o primeiro commit " "incorreto::" -#: ../../tips-and-tricks.rst:73 +#: ../../tips-and-tricks.rst:105 msgid "" "Now you need to find the hash of the first known good commit. For that, " "you can see the build history by running::" @@ -146,13 +168,13 @@ msgstr "" "Agora você precisa encontrar o hash do primeiro bom commit conhecido. " "Para isso, você pode ver o histórico da compilação executando::" -#: ../../tips-and-tricks.rst:78 +#: ../../tips-and-tricks.rst:110 msgid "To start bisecting, checkout the first known good commit you find::" msgstr "" "Para começar a dividir, faça o checkout do primeiro commit conhecido que " "você encontrar::" -#: ../../tips-and-tricks.rst:82 +#: ../../tips-and-tricks.rst:114 msgid "" "After setting the bad commit and the first known good commit, you can " "launch the application to verify if the current commit in the bisecting " @@ -162,25 +184,25 @@ msgstr "" "iniciar o aplicativo para verificar se o commit atual na sessão de " "divisão é bom ou ruim." -#: ../../tips-and-tricks.rst:86 +#: ../../tips-and-tricks.rst:118 msgid "To mark a commit as good or bad, run::" msgstr "Para marcar um commit como bom ou ruim, execute::" -#: ../../tips-and-tricks.rst:90 +#: ../../tips-and-tricks.rst:122 msgid "Or::" msgstr "Ou::" -#: ../../tips-and-tricks.rst:94 +#: ../../tips-and-tricks.rst:126 msgid "``flatpak-bisect`` will inform you when the first bad commit is found." msgstr "" "``flatpak-bisect`` vai lhe informar quando o primeiro commit ruim for " "encontrado." -#: ../../tips-and-tricks.rst:97 +#: ../../tips-and-tricks.rst:129 msgid "Adding a custom installation" msgstr "Adicionando uma instalação personalizada" -#: ../../tips-and-tricks.rst:99 +#: ../../tips-and-tricks.rst:131 msgid "" "By default Flatpak installs apps system-wide, and can also be made to " "install per-user with the ``--user`` option accepted by most commands. A " @@ -192,19 +214,19 @@ msgstr "" " comandos. Uma terceira opção é configurar uma instalação personalizada, " "que pode ser armazenada em um disco rígido externo." -#: ../../tips-and-tricks.rst:104 +#: ../../tips-and-tricks.rst:136 msgid "First ensure that the config directory exists::" msgstr "Primeiro, certifique-se de que o diretório de configuração existe::" -#: ../../tips-and-tricks.rst:108 +#: ../../tips-and-tricks.rst:140 msgid "Then open a file in that directory as root::" msgstr "Em seguida, abra um arquivo nesse diretório como root::" -#: ../../tips-and-tricks.rst:112 +#: ../../tips-and-tricks.rst:144 msgid "And write something like this::" msgstr "E escreva algo assim::" -#: ../../tips-and-tricks.rst:119 +#: ../../tips-and-tricks.rst:151 msgid "" "See `flatpak-installation(5) `_ for the full format " @@ -219,15 +241,15 @@ msgstr "" " montados e ``mkdir`` para criar um diretório ``flatpak`` para que o " "caminho especificado por ``Path=`` exista." -#: ../../tips-and-tricks.rst:125 +#: ../../tips-and-tricks.rst:157 msgid "Then you can add a remote using a command like::" msgstr "Então você pode adicionar um controle remoto usando um comando como::" -#: ../../tips-and-tricks.rst:129 +#: ../../tips-and-tricks.rst:161 msgid "And install to it with::" msgstr "E instale nele com::" -#: ../../tips-and-tricks.rst:135 +#: ../../tips-and-tricks.rst:167 msgid "" "If your custom installation is the only one with the remote you're " "installing from, ``--installation`` can be omitted." @@ -235,11 +257,11 @@ msgstr "" "Se sua instalação personalizada for a única com o controle remoto do qual" " você está instalando, ``--installation`` pode ser omitido." -#: ../../tips-and-tricks.rst:138 +#: ../../tips-and-tricks.rst:170 msgid "And run apps from it with::" msgstr "E execute aplicativos a partir dele com::" -#: ../../tips-and-tricks.rst:144 +#: ../../tips-and-tricks.rst:176 msgid "" "If your custom installation is the only one with the app you're running, " "``--installation`` can be omitted." @@ -247,11 +269,11 @@ msgstr "" "Se sua instalação personalizada for a única com o aplicativo que você " "está executando, ``--installation`` pode ser omitido." -#: ../../tips-and-tricks.rst:148 +#: ../../tips-and-tricks.rst:180 msgid "Configuring resource limits for apps" msgstr "Configurando limites de recursos para aplicativos" -#: ../../tips-and-tricks.rst:150 +#: ../../tips-and-tricks.rst:182 msgid "" "When systemd is available, Flatpak tries to put app processes in a scope " "such as ``app-flatpak-com.brave.Browser-*.scope`` (in the case of Brave)," @@ -266,7 +288,7 @@ msgstr "" "/app-flatpak-com.brave.Browser-.scope.d/memory.conf`` com conteúdos " "como::" -#: ../../tips-and-tricks.rst:159 +#: ../../tips-and-tricks.rst:191 msgid "" "Then after a ``systemctl --user daemon-reload``, those ``systemd" ".resource-control(5)`` parameters will apply to all instances of that " @@ -276,3 +298,14 @@ msgstr "" "``systemd.resource-control(5)`` serão aplicados a todas as instâncias " "desse aplicativo." +#~ msgid "" +#~ "If you have Flatpak 1.5.0 or " +#~ "later, you can also prevent the " +#~ "app from being included in updates " +#~ "(either manual or automatic)::" +#~ msgstr "" +#~ "Se você possui o Flatpak 1.5.0 ou" +#~ " posterior, também pode impedir que o" +#~ " aplicativo seja incluído nas atualizações" +#~ " (manuais ou automáticas)::" + diff --git a/po/ru/LC_MESSAGES/tips-and-tricks.po b/po/ru/LC_MESSAGES/tips-and-tricks.po index 843f79fd..6eb2416b 100644 --- a/po/ru/LC_MESSAGES/tips-and-tricks.po +++ b/po/ru/LC_MESSAGES/tips-and-tricks.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Flatpak\n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak-docs/issues\n" -"POT-Creation-Date: 2023-01-07 16:26-0600\n" +"POT-Creation-Date: 2025-03-13 09:53+0530\n" "PO-Revision-Date: 2023-02-04 00:45+0700\n" "Last-Translator: Dmitry \n" "Language: ru\n" @@ -19,7 +19,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.3\n" +"Generated-By: Babel 2.17.0\n" #: ../../tips-and-tricks.rst:2 msgid "Tips and Tricks" @@ -98,19 +98,41 @@ msgstr "" "привилегированным действием. Если приложение установлено для каждого " "пользователя, вы должны запустить его от имени этого пользователя." -#: ../../tips-and-tricks.rst:48 +#: ../../tips-and-tricks.rst:49 +msgid "Masking" +msgstr "" + +#: ../../tips-and-tricks.rst:51 +msgid "" +"Flatpak 1.5.0 or later allows to mask a ref to prevent it from being " +"automatically updated or installed." +msgstr "" + +#: ../../tips-and-tricks.rst:54 msgid "" -"If you have Flatpak 1.5.0 or later, you can also prevent the app from " -"being included in updates (either manual or automatic)::" +"If the Flatpak remote is configured in user location, ``flatpak mask " +"--user`` needs to be used otherwise it defaults to system location. " +"``flatpak remote-list`` can be used to find the location of the Flatpak " +"remote." +msgstr "" + +#: ../../tips-and-tricks.rst:59 +msgid "To list the currently masked patterns::" +msgstr "" + +#: ../../tips-and-tricks.rst:67 +msgid "To mask a ref pattern::" +msgstr "" + +#: ../../tips-and-tricks.rst:78 +msgid "To remove a masked pattern::" msgstr "" -"Если у вас Flatpak 1.5.0 или новее, вы также можете запретить включение " -"приложения в обновления (вручную или автоматически)::" -#: ../../tips-and-tricks.rst:55 +#: ../../tips-and-tricks.rst:87 msgid "Bisecting regressions in application builds" msgstr "Поперечная регрессия в сборках приложений" -#: ../../tips-and-tricks.rst:57 +#: ../../tips-and-tricks.rst:89 msgid "" "In case the newest builds of an application introduce regressions, you " "can use ``flatpak-bisect`` to discover which commit introduced the " @@ -120,7 +142,7 @@ msgstr "" "использовать команду flatpak-bisect, чтобы узнать, какая фиксация привела" " к регрессии. Он работает так же, как ``git bisect``." -#: ../../tips-and-tricks.rst:61 +#: ../../tips-and-tricks.rst:93 msgid "" "In case your distribution doesn't install the ``flatpak-bisect`` utility," " you can find it distributed alongside the Flatpak source code, in " @@ -130,15 +152,15 @@ msgstr "" "можете найти ее вместе с исходным кодом Flatpak по адресу: " "https://github.com/flatpak/flatpak/blob/main/scripts/flatpak-bisect" -#: ../../tips-and-tricks.rst:65 +#: ../../tips-and-tricks.rst:97 msgid "First you update the application and get its history::" msgstr "Сначала вы обновляете приложение и получаете его историю::" -#: ../../tips-and-tricks.rst:69 +#: ../../tips-and-tricks.rst:101 msgid "Then, you should set the current commit as the first bad commit::" msgstr "Затем вы должны установить текущий коммит как первый ошибочный коммит::" -#: ../../tips-and-tricks.rst:73 +#: ../../tips-and-tricks.rst:105 msgid "" "Now you need to find the hash of the first known good commit. For that, " "you can see the build history by running::" @@ -146,13 +168,13 @@ msgstr "" "Теперь вам нужно найти хеш первого удачного коммита. Для этого вы можете " "просмотреть историю сборки, запустив::" -#: ../../tips-and-tricks.rst:78 +#: ../../tips-and-tricks.rst:110 msgid "To start bisecting, checkout the first known good commit you find::" msgstr "" "Чтобы начать деление пополам, проверьте первый известный удачный коммит, " "который вы найдете::" -#: ../../tips-and-tricks.rst:82 +#: ../../tips-and-tricks.rst:114 msgid "" "After setting the bad commit and the first known good commit, you can " "launch the application to verify if the current commit in the bisecting " @@ -162,25 +184,25 @@ msgstr "" "можете запустить приложение, чтобы проверить, является ли текущая " "фиксация в сеансе разделения на две части: хорошей или плохой." -#: ../../tips-and-tricks.rst:86 +#: ../../tips-and-tricks.rst:118 msgid "To mark a commit as good or bad, run::" msgstr "Чтобы пометить фиксацию как хорошую или плохую, запустите::" -#: ../../tips-and-tricks.rst:90 +#: ../../tips-and-tricks.rst:122 msgid "Or::" msgstr "Или::" -#: ../../tips-and-tricks.rst:94 +#: ../../tips-and-tricks.rst:126 msgid "``flatpak-bisect`` will inform you when the first bad commit is found." msgstr "" "``flatpak-bisect`` сообщит вам, когда будет обнаружена первая плохая " "фиксация." -#: ../../tips-and-tricks.rst:97 +#: ../../tips-and-tricks.rst:129 msgid "Adding a custom installation" msgstr "Добавление выборочной установки" -#: ../../tips-and-tricks.rst:99 +#: ../../tips-and-tricks.rst:131 msgid "" "By default Flatpak installs apps system-wide, and can also be made to " "install per-user with the ``--user`` option accepted by most commands. A " @@ -193,19 +215,19 @@ msgstr "" "настроить выборочную установку, которая может храниться на внешнем " "жестком диске." -#: ../../tips-and-tricks.rst:104 +#: ../../tips-and-tricks.rst:136 msgid "First ensure that the config directory exists::" msgstr "Сначала убедитесь, что каталог конфигурации существует::" -#: ../../tips-and-tricks.rst:108 +#: ../../tips-and-tricks.rst:140 msgid "Then open a file in that directory as root::" msgstr "Затем откройте файл в этом каталоге как root::" -#: ../../tips-and-tricks.rst:112 +#: ../../tips-and-tricks.rst:144 msgid "And write something like this::" msgstr "И напишите что-нибудь вроде этого::" -#: ../../tips-and-tricks.rst:119 +#: ../../tips-and-tricks.rst:151 msgid "" "See `flatpak-installation(5) `_ for the full format " @@ -220,17 +242,17 @@ msgstr "" "смонтированных файловых систем и ``mkdir`` для создания каталога " "``flatpak``, чтобы существовал путь, указанный в ``Path=``." -#: ../../tips-and-tricks.rst:125 +#: ../../tips-and-tricks.rst:157 msgid "Then you can add a remote using a command like::" msgstr "" "Затем вы можете добавить удалённый компьютер с помощью такой команды, " "как::" -#: ../../tips-and-tricks.rst:129 +#: ../../tips-and-tricks.rst:161 msgid "And install to it with::" msgstr "И установите его с помощью::" -#: ../../tips-and-tricks.rst:135 +#: ../../tips-and-tricks.rst:167 msgid "" "If your custom installation is the only one with the remote you're " "installing from, ``--installation`` can be omitted." @@ -239,11 +261,11 @@ msgstr "" "компьютером, с которого вы выполняете установку, параметр " "``--installation`` можно не указывать." -#: ../../tips-and-tricks.rst:138 +#: ../../tips-and-tricks.rst:170 msgid "And run apps from it with::" msgstr "И запускать из него приложения с помощью::" -#: ../../tips-and-tricks.rst:144 +#: ../../tips-and-tricks.rst:176 msgid "" "If your custom installation is the only one with the app you're running, " "``--installation`` can be omitted." @@ -251,11 +273,11 @@ msgstr "" "Если ваша пользовательская установка является единственной с приложением," " которое вы используете, ``--installation`` можно не указывать." -#: ../../tips-and-tricks.rst:148 +#: ../../tips-and-tricks.rst:180 msgid "Configuring resource limits for apps" msgstr "Настройка лимитов ресурсов для приложений" -#: ../../tips-and-tricks.rst:150 +#: ../../tips-and-tricks.rst:182 msgid "" "When systemd is available, Flatpak tries to put app processes in a scope " "such as ``app-flatpak-com.brave.Browser-*.scope`` (in the case of Brave)," @@ -264,12 +286,12 @@ msgid "" "com.brave.Browser-.scope.d/memory.conf`` with contents like::" msgstr "" "Когда доступен systemd, Flatpak пытается поместить процессы приложения в " -"область действия, такую как app-flatpak-com.brave.Browser-*.scope (в случае " -"Brave), где ``*`` заменяется произвольным суффиксом. Это означает, что вы " -"можете создать файл вида ``~/.config/systemd/user/app-flatpak-" +"область действия, такую как app-flatpak-com.brave.Browser-*.scope (в " +"случае Brave), где ``*`` заменяется произвольным суффиксом. Это означает," +" что вы можете создать файл вида ``~/.config/systemd/user/app-flatpak-" "com.brave.Browser-.scope.d/memory.conf`` с таким содержимым::" -#: ../../tips-and-tricks.rst:159 +#: ../../tips-and-tricks.rst:191 msgid "" "Then after a ``systemctl --user daemon-reload``, those ``systemd" ".resource-control(5)`` parameters will apply to all instances of that " @@ -279,3 +301,14 @@ msgstr "" ".resource-control(5)`` будут применяться ко всем экземплярам этого " "приложения." +#~ msgid "" +#~ "If you have Flatpak 1.5.0 or " +#~ "later, you can also prevent the " +#~ "app from being included in updates " +#~ "(either manual or automatic)::" +#~ msgstr "" +#~ "Если у вас Flatpak 1.5.0 или " +#~ "новее, вы также можете запретить " +#~ "включение приложения в обновления (вручную " +#~ "или автоматически)::" + diff --git a/po/zh_CN/LC_MESSAGES/tips-and-tricks.po b/po/zh_CN/LC_MESSAGES/tips-and-tricks.po index a441dd05..bc4ad236 100644 --- a/po/zh_CN/LC_MESSAGES/tips-and-tricks.po +++ b/po/zh_CN/LC_MESSAGES/tips-and-tricks.po @@ -9,14 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: Flatpak \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-07 16:26-0600\n" +"POT-Creation-Date: 2025-03-13 09:53+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.3\n" +"Generated-By: Babel 2.17.0\n" #: ../../tips-and-tricks.rst:2 msgid "Tips and Tricks" @@ -80,72 +80,96 @@ msgid "" "application is installed per-user you would run it as that user." msgstr "" -#: ../../tips-and-tricks.rst:48 +#: ../../tips-and-tricks.rst:49 +msgid "Masking" +msgstr "" + +#: ../../tips-and-tricks.rst:51 +msgid "" +"Flatpak 1.5.0 or later allows to mask a ref to prevent it from being " +"automatically updated or installed." +msgstr "" + +#: ../../tips-and-tricks.rst:54 msgid "" -"If you have Flatpak 1.5.0 or later, you can also prevent the app from " -"being included in updates (either manual or automatic)::" +"If the Flatpak remote is configured in user location, ``flatpak mask " +"--user`` needs to be used otherwise it defaults to system location. " +"``flatpak remote-list`` can be used to find the location of the Flatpak " +"remote." +msgstr "" + +#: ../../tips-and-tricks.rst:59 +msgid "To list the currently masked patterns::" +msgstr "" + +#: ../../tips-and-tricks.rst:67 +msgid "To mask a ref pattern::" +msgstr "" + +#: ../../tips-and-tricks.rst:78 +msgid "To remove a masked pattern::" msgstr "" -#: ../../tips-and-tricks.rst:55 +#: ../../tips-and-tricks.rst:87 msgid "Bisecting regressions in application builds" msgstr "" -#: ../../tips-and-tricks.rst:57 +#: ../../tips-and-tricks.rst:89 msgid "" "In case the newest builds of an application introduce regressions, you " "can use ``flatpak-bisect`` to discover which commit introduced the " "regression. It works just like ``git bisect``." msgstr "" -#: ../../tips-and-tricks.rst:61 +#: ../../tips-and-tricks.rst:93 msgid "" "In case your distribution doesn't install the ``flatpak-bisect`` utility," " you can find it distributed alongside the Flatpak source code, in " "https://github.com/flatpak/flatpak/blob/main/scripts/flatpak-bisect" msgstr "" -#: ../../tips-and-tricks.rst:65 +#: ../../tips-and-tricks.rst:97 msgid "First you update the application and get its history::" msgstr "" -#: ../../tips-and-tricks.rst:69 +#: ../../tips-and-tricks.rst:101 msgid "Then, you should set the current commit as the first bad commit::" msgstr "" -#: ../../tips-and-tricks.rst:73 +#: ../../tips-and-tricks.rst:105 msgid "" "Now you need to find the hash of the first known good commit. For that, " "you can see the build history by running::" msgstr "" -#: ../../tips-and-tricks.rst:78 +#: ../../tips-and-tricks.rst:110 msgid "To start bisecting, checkout the first known good commit you find::" msgstr "" -#: ../../tips-and-tricks.rst:82 +#: ../../tips-and-tricks.rst:114 msgid "" "After setting the bad commit and the first known good commit, you can " "launch the application to verify if the current commit in the bisecting " "session is a good or a bad one." msgstr "" -#: ../../tips-and-tricks.rst:86 +#: ../../tips-and-tricks.rst:118 msgid "To mark a commit as good or bad, run::" msgstr "" -#: ../../tips-and-tricks.rst:90 +#: ../../tips-and-tricks.rst:122 msgid "Or::" msgstr "" -#: ../../tips-and-tricks.rst:94 +#: ../../tips-and-tricks.rst:126 msgid "``flatpak-bisect`` will inform you when the first bad commit is found." msgstr "" -#: ../../tips-and-tricks.rst:97 +#: ../../tips-and-tricks.rst:129 msgid "Adding a custom installation" msgstr "" -#: ../../tips-and-tricks.rst:99 +#: ../../tips-and-tricks.rst:131 msgid "" "By default Flatpak installs apps system-wide, and can also be made to " "install per-user with the ``--user`` option accepted by most commands. A " @@ -153,19 +177,19 @@ msgid "" " an external hard drive." msgstr "" -#: ../../tips-and-tricks.rst:104 +#: ../../tips-and-tricks.rst:136 msgid "First ensure that the config directory exists::" msgstr "" -#: ../../tips-and-tricks.rst:108 +#: ../../tips-and-tricks.rst:140 msgid "Then open a file in that directory as root::" msgstr "" -#: ../../tips-and-tricks.rst:112 +#: ../../tips-and-tricks.rst:144 msgid "And write something like this::" msgstr "" -#: ../../tips-and-tricks.rst:119 +#: ../../tips-and-tricks.rst:151 msgid "" "See `flatpak-installation(5) `_ for the full format " @@ -174,35 +198,35 @@ msgid "" "``flatpak`` directory so the path specified by ``Path=`` exists." msgstr "" -#: ../../tips-and-tricks.rst:125 +#: ../../tips-and-tricks.rst:157 msgid "Then you can add a remote using a command like::" msgstr "" -#: ../../tips-and-tricks.rst:129 +#: ../../tips-and-tricks.rst:161 msgid "And install to it with::" msgstr "" -#: ../../tips-and-tricks.rst:135 +#: ../../tips-and-tricks.rst:167 msgid "" "If your custom installation is the only one with the remote you're " "installing from, ``--installation`` can be omitted." msgstr "" -#: ../../tips-and-tricks.rst:138 +#: ../../tips-and-tricks.rst:170 msgid "And run apps from it with::" msgstr "" -#: ../../tips-and-tricks.rst:144 +#: ../../tips-and-tricks.rst:176 msgid "" "If your custom installation is the only one with the app you're running, " "``--installation`` can be omitted." msgstr "" -#: ../../tips-and-tricks.rst:148 +#: ../../tips-and-tricks.rst:180 msgid "Configuring resource limits for apps" msgstr "" -#: ../../tips-and-tricks.rst:150 +#: ../../tips-and-tricks.rst:182 msgid "" "When systemd is available, Flatpak tries to put app processes in a scope " "such as ``app-flatpak-com.brave.Browser-*.scope`` (in the case of Brave)," @@ -211,7 +235,7 @@ msgid "" "com.brave.Browser-.scope.d/memory.conf`` with contents like::" msgstr "" -#: ../../tips-and-tricks.rst:159 +#: ../../tips-and-tricks.rst:191 msgid "" "Then after a ``systemctl --user daemon-reload``, those ``systemd" ".resource-control(5)`` parameters will apply to all instances of that " @@ -240,3 +264,10 @@ msgstr "" #~ "``Path=`` exists." #~ msgstr "" +#~ msgid "" +#~ "If you have Flatpak 1.5.0 or " +#~ "later, you can also prevent the " +#~ "app from being included in updates " +#~ "(either manual or automatic)::" +#~ msgstr "" +