diff --git a/user_manual/locale/gl/LC_MESSAGES/desktop/conflicts.pot b/user_manual/locale/gl/LC_MESSAGES/desktop/conflicts.pot
new file mode 100644
index 000000000..9a8c44aab
--- /dev/null
+++ b/user_manual/locale/gl/LC_MESSAGES/desktop/conflicts.pot
@@ -0,0 +1,165 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2025 Nextcloud GmbH
+# This file is distributed under the same license as the Nextcloud latest User Manual package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2025
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Nextcloud latest User Manual latest\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-02-12 13:02+0000\n"
+"PO-Revision-Date: 2025-02-12 13:33+0000\n"
+"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>, 2025\n"
+"Language-Team: Galician (https://app.transifex.com/nextcloud/teams/64236/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../desktop/conflicts.rst:3
+msgid "Conflicts"
+msgstr "Conflitos"
+
+#: ../../desktop/conflicts.rst:6
+msgid "Overview"
+msgstr "Vista xeral"
+
+#: ../../desktop/conflicts.rst:8
+msgid ""
+"The Nextcloud desktop client uploads local changes and downloads remote "
+"changes. When a file has changed on the local side and on the remote between"
+" synchronization runs the client will be unable to resolve the situation on "
+"its own. It will create a conflict file with the local version, download the"
+" remote version and notify the user that a conflict occurred which needs "
+"attention."
+msgstr ""
+"O cliente de escritorio de NextCloud envía os cambios locais e descarga "
+"cambios remotos. Cando un ficheiro cambia no lado local e no lado remoto "
+"entre sincronizacións, o cliente non poderá resolver a situación por si só. "
+"Creará un ficheiro de conflito coa versión local, descargará a versión "
+"remota e notificará ao usuario que se produciu un conflito que precisa "
+"atención."
+
+#: ../../desktop/conflicts.rst:15
+msgid "Example"
+msgstr "Exemplo"
+
+#: ../../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."
+msgstr ""
+"Imaxine que hai un ficheiro chamado ``as-miñas-cousas.txt`` no seu cartafol "
+"sincronizado. Non cambiou durante un tempo e contén o texto «contidos» tanto"
+" a nivel local como a nivel remoto. Agora, case ao mesmo tempo actualizase "
+"localmente para dicir «contidos locais» mentres que o ficheiro do servidor é"
+" actualizado por outra persoa para que conteña o texto «contidos remotos»."
+
+#: ../../desktop/conflicts.rst:22
+msgid ""
+"When attempting to upload your local changes the desktop client will notice "
+"that the server version has also changed. It creates a conflict and you will"
+" now have two files on your local machine:"
+msgstr ""
+"Ao tentar enviar os seus cambios locais, o cliente de escritorio decatase de"
+" que a versión do servidor tamén cambiou. Isto crea un conflito e agora terá"
+" dous ficheiros na súa máquina local:"
+
+#: ../../desktop/conflicts.rst:26
+msgid "``mydata.txt`` containing \"remote contents\""
+msgstr "``as-miñas-cousas.txt`` que contén o texto «contidos remotos»"
+
+#: ../../desktop/conflicts.rst:27
+msgid ""
+"``mydata (conflicted copy 2018-04-10 093612).txt`` containing \"local "
+"contents\""
+msgstr ""
+"``as-miñas-cousas (copia en conflito 2018-04-10 093612).txt`` que contén o "
+"texto «contidos locais»"
+
+#: ../../desktop/conflicts.rst:29
+msgid ""
+"In this situation the file ``mydata.txt`` has the remote changes (and will "
+"continue to be updated with further remote changes when they happen), but "
+"your local adjustments have not been sent to the server (unless the server "
+"enables conflict uploading, see below)."
+msgstr ""
+"Nesta situación, o ficheiro `as-miñas-cousas.txt`` ten os cambios remotos (e"
+" seguirá a ser actualizado con máis cambios remotos cando se produzan), mais"
+" os seus axustes locais non se enviaron ao servidor (a non ser que o "
+"servidor permita o envío de conflitos , consulte máis abaixo)."
+
+#: ../../desktop/conflicts.rst:34
+msgid ""
+"The desktop client notifies you of this situation via system notifications, "
+"the system tray icon and a yellow \"unresolved conflicts\" badge in the "
+"account settings window. Clicking this badge shows a list that includes the "
+"unresolved conflicts and clicking one of them opens an explorer window "
+"pointing at the relevant file."
+msgstr ""
+"O cliente de escritorio notifica esta situación mediante notificacións do "
+"sistema, a icona da área de notificación e unha insignia amarela de "
+"«conflitos sen resolver» na xanela de configuración da conta. Ao premer "
+"nesta insignia amosase unha lista que inclúe os conflitos non resoltos e ao "
+"premer nunha delas abre unha xanela do explorador apuntando ao ficheiro "
+"correspondente."
+
+#: ../../desktop/conflicts.rst:39
+msgid ""
+"To resolve this conflict, open both files, compare the differences and copy "
+"your local changes from the \"conflicted copy\" file into the base file "
+"where applicable. In this example you might change ``mydata.txt`` to say "
+"\"local and remote contents\" and delete the file with \"conflicted copy\" "
+"in its name. With that, the conflict is resolved."
+msgstr ""
+"Para resolver este conflito, abra os dous ficheiros, compare as diferenzas e"
+" copie os cambios locais do ficheiro «copia en conflito» no ficheiro base, "
+"se procede. Neste exemplo, pode cambiar ``as-miñas cousas.txt`` para dicir "
+"«contidos locais e remotos» e eliminar o ficheiro con «copia en conflito» no"
+" seu nome. Con iso, o conflito está resolto."
+
+#: ../../desktop/conflicts.rst:46
+msgid "Uploading conflicts (experimental)"
+msgstr "Enviando conflitos (experimental)"
+
+#: ../../desktop/conflicts.rst:48
+msgid ""
+"By default the conflict file (the file with \"conflicted copy\" in its name "
+"that contains your local conflicting changes) is not uploaded to the server."
+" The idea is that you, the author of the changes, are the best person for "
+"resolving the conflict and showing the conflict to other users might create "
+"confusion."
+msgstr ""
+"De xeito predeterminado, o ficheiro de conflito (o ficheiro con «copia en "
+"conflito» no seu nome que contén os seus cambios locais en conflito) non se "
+"envía ao servidor. A idea é que vostede, o autor dos cambios, é a persoa "
+"axeitada para resolver o conflito e amosar o conflito aos demais pode crear "
+"confusión."
+
+#: ../../desktop/conflicts.rst:53
+msgid ""
+"However, in some scenarios it makes a lot of sense to upload these "
+"conflicting changes such that local work can become visible even if the "
+"conflict won't be resolved immediately."
+msgstr ""
+"Non obstante, nalgúns escenarios ten moito sentido enviar estes cambios en "
+"conflito de xeito que o traballo local poida facerse visíbel mesmo se o "
+"conflito non se resolve inmediatamente."
+
+#: ../../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``."
+msgstr ""
+"No futuro pode haber un cambio no lado do servidor para este comportamento. "
+"Polo de agora xa se pode probar configurando a variábel de contorno "
+"``OWNCLOUD_UPLOAD_CONFLICT_FILES=1``."