From ba6a46236e18e75a896c0073d7723a2df02b468a Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 09:36:57 +0000
Subject: [PATCH] Translate conflicts.pot in gl

100% translated source file: 'conflicts.pot'
on 'gl'.
---
 user_manual/locale/gl/LC_MESSAGES/desktop/conflicts.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_manual/locale/gl/LC_MESSAGES/desktop/conflicts.pot b/user_manual/locale/gl/LC_MESSAGES/desktop/conflicts.pot
index 5b915f2f6..752ec6db7 100644
--- a/user_manual/locale/gl/LC_MESSAGES/desktop/conflicts.pot
+++ b/user_manual/locale/gl/LC_MESSAGES/desktop/conflicts.pot
@@ -161,5 +161,5 @@ msgid ""
 "``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 axustando a variábel de contorno "
+"Polo de agora xa se pode probar definindo a variábel de contorno "
 "``OWNCLOUD_UPLOAD_CONFLICT_FILES=1``."