Updates for project Nextcloud user documentation

user_manual/locale/ga/LC_MESSAGES/desktop/conflicts.pot

@@ -1,19 +1,19 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2025 Nextcloud GmbH
-# This file is distributed under the same license as the Nextcloud latest User Manual package.
+# Copyright (C) 2016-2026 Nextcloud GmbH and Nextcloud contributors
+# This file is distributed under the same license as the Nextcloud 36 User Manual package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Aindriú Mac Giolla Eoin, 2025
+# Aindriú Mac Giolla Eoin, 2026
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Nextcloud latest User Manual latest\n"
+"Project-Id-Version: Nextcloud 36 User Manual latest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-12 13:02+0000\n"
+"POT-Creation-Date: 2026-10-16 07:16+0000\n"
 "PO-Revision-Date: 2025-02-12 13:33+0000\n"
-"Last-Translator: Aindriú Mac Giolla Eoin, 2025\n"
+"Last-Translator: Aindriú Mac Giolla Eoin, 2026\n"
 "Language-Team: Irish (https://app.transifex.com/nextcloud/teams/64236/ga/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,18 +51,19 @@ msgstr "Sampla"
 
 #: ../../desktop/conflicts.rst:17
 msgid ""
-"Imagine there is a file called ``mydata.txt`` your synchronized folder. It "
-"has not changed for a while and contains the text \"contents\" locally and "
-"remotely. Now, nearly at the same time you update it locally to say \"local "
-"contents\" while the file on the server gets updated to contain \"remote "
-"contents\" by someone else."
+"Imagine there is a file called ``mydata.txt`` in your synchronized folder. "
+"It has not changed for a while and contains the text \"contents\" locally "
+"and remotely. Now, nearly at the same time you update it locally to say "
+"\"local contents\" while the file on the server gets updated to contain "
+"\"remote contents\" by someone else."
 msgstr ""
-"Samhlaigh go bhfuil comhad ann darb ainm ``mydata.txt`` d'fhillteán "
-"sioncronaithe. Níor athraigh sé ar feadh tamaill agus tá an téacs \"ábhar\" "
-"ann go háitiúil agus go cianda. Anois, beagnach ag an am céanna déanann tú é"
-" a nuashonrú go háitiúil chun \"inneachar áitiúil\" a rá agus déanann duine "
-"éigin eile an comhad ar an bhfreastalaí a nuashonrú chun \"cianábhar\" a "
-"bheith ann."
+"Samhlaigh go bhfuil comhad darb ainm ``mydata.txt`` i d’fhillteán "
+"sioncronaithe. Níl aon athrú tagtha air le tamall anuas, agus tá an téacs "
+"\"contents\" ann, idir an chóip áitiúil agus an chóip chianda. Anois, "
+"beagnach ag an am céanna, déanann tú féin nuashonrú air go háitiúil ionas go"
+" mbeidh \"local contents\" ann, agus ag an am céanna, déanann duine éigin "
+"eile nuashonrú ar an gcomhad ar an bhfreastalaí ionas go mbeidh \"remote "
+"contents\" ann."
 
 #: ../../desktop/conflicts.rst:22
 msgid ""
@@ -160,10 +161,14 @@ msgstr ""
 
 #: ../../desktop/conflicts.rst:57
 msgid ""
-"In the future there might be a server-wide switch for this behavior. For now"
-" it can already be tested by setting the environment variable "
-"``OWNCLOUD_UPLOAD_CONFLICT_FILES=1``."
+"The server can enable conflict uploads. To override the server setting, use "
+"``OWNCLOUD_UPLOAD_CONFLICT_FILES=1`` to enable uploads or "
+"``OWNCLOUD_UPLOAD_CONFLICT_FILES=0`` to disable them. See :ref:`desktop-"
+"environment-variables` for how to apply environment variables."
 msgstr ""
-"Sa todhchaí d'fhéadfadh go mbeadh athrú ar fud an fhreastalaí don iompar "
-"seo. Is féidir é a thástáil cheana féin ach an athróg timpeallachta "
-"``OWNCLOUD_UPLOAD_CONFLICT_FILES=1`` a shocrú."
+"Is féidir leis an bhfreastalaí uaslódálacha i gcás coinbhleachta a chumasú. "
+"Chun socrú an fhreastalaí a shárú, bain úsáid as "
+"``OWNCLOUD_UPLOAD_CONFLICT_FILES=1`` chun uaslódálacha a chumasú, nó "
+"``OWNCLOUD_UPLOAD_CONFLICT_FILES=0`` chun iad a dhíchumasú. Féach "
+":ref:`desktop-environment-variables` chun a fháil amach conas athróga "
+"timpeallachta a chur i bhfeidhm."