mirrors/nextcloud-documentation
3
0
Fork 0
mirror of https://github.com/nextcloud/documentation.git synced 2025-10-26 11:18:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Translate conflicts.pot in ca

Browse Source 
100% translated source file: 'conflicts.pot'
on 'ca'.
This commit is contained in:
transifex-integration[bot] 2025-02-20 22:24:56 +00:00 committed by GitHub
parent 9482ab5d8b
commit a8082633ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 165 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
user_manual/locale/ca/LC_MESSAGES/desktop/conflicts.pot Normal file
View File

@ -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:
# v v <e670006006@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: v v <e670006006@gmail.com>, 2025\n"
"Language-Team: Catalan (https://app.transifex.com/nextcloud/teams/64236/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../../desktop/conflicts.rst:3
msgid "Conflicts"
msgstr "Conflictes"
#: ../../desktop/conflicts.rst:6
msgid "Overview"
msgstr "Visió general"
#: ../../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 ""
"El client d'escriptori Nextcloud puja canvis locals i baixa canvis remots. "
"Quan un fitxer ha canviat al costat local i al control remot entre "
"execucions de sincronització, el client no podrà resoldre la situació per si"
" mateix. Crearà un fitxer de conflicte amb la versió local, baixarà la "
"versió remota i notificarà a l'usuari que s'ha produït un conflicte que "
"necessita atenció."
#: ../../desktop/conflicts.rst:15
msgid "Example"
msgstr "Exemple"
#: ../../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 ""
"Imagineu que hi ha un fitxer anomenat ``mydata.txt`` la vostra carpeta "
"sincronitzada. Fa temps que no ha canviat i conté el text \"contents\" de "
"manera local i remota. Ara, gairebé al mateix temps, l'actualitzeu localment"
" per dir \"local contents\", mentre que el fitxer del servidor s'actualitza "
"per contenir \"remote contents\" per una altra persona."
#: ../../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 ""
"Quan intenteu pujar els vostres canvis locals, el client d'escriptori notarà"
" que la versió del servidor també ha canviat. Crea un conflicte i ara "
"tindreu dos fitxers a la vostra màquina local:"
#: ../../desktop/conflicts.rst:26
msgid "``mydata.txt`` containing \"remote contents\""
msgstr "``mydata.txt`` que conté \"remote contents\""
#: ../../desktop/conflicts.rst:27
msgid ""
"``mydata (conflicted copy 2018-04-10 093612).txt`` containing \"local "
"contents\""
msgstr ""
"``mydata (còpia en conflicte 2018-04-10 093612).txt`` que conté \"local "
"contents\""
#: ../../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 ""
"En aquesta situació, el fitxer ``mydata.txt`` té els canvis remots (i es "
"continuarà actualitzant amb més canvis remots a mesura que es produeixin), "
"però la vostra configuració local no s'ha enviat al servidor (tret que el "
"servidor permeti la càrrega de conflictes, vegeu a sota)."
#: ../../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 ""
"El client d'escriptori us notifica aquesta situació mitjançant notificacions"
" del sistema, la icona de la safata del sistema i una insígnia groga de "
"\"conflictes no resolts\" a la finestra de configuració del compte. Si feu "
"clic a aquesta insígnia, es mostra una llista que inclou els conflictes no "
"resolts i si feu clic a un d'ells s'obre una finestra de l'explorador que "
"apunta al fitxer rellevant."
#: ../../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 ""
"Per resoldre aquest conflicte, obriu tots dos fitxers, compareu les "
"diferències i copieu els vostres canvis locals del fitxer de \"còpia en "
"conflicte\" al fitxer base si escau. En aquest exemple, podeu canviar "
"``mydata.txt`` per dir \"continguts locals i remots\" i suprimir el fitxer "
"amb \"còpia en conflicte\" al seu nom. Amb això, el conflicte queda resolt."
#: ../../desktop/conflicts.rst:46
msgid "Uploading conflicts (experimental)"
msgstr "Pujant conflictes (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 ""
"Per defecte, el fitxer de conflicte (el fitxer amb \"còpia en conflicte\" al"
" seu nom que conté els vostres canvis locals en conflicte) no es carrega al "
"servidor. La idea és que tú, l'autor dels canvis, sigui la millor persona "
"per resoldre el conflicte i mostrar el conflicte a altres usuaris pot crear "
"confusió."
#: ../../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 ""
"Tanmateix, en alguns escenaris té molt sentit penjar aquests canvis "
"conflictius de manera que el treball local es pugui fer visible encara que "
"el conflicte no es resolgui immediatament."
#: ../../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 ""
"En el futur podria haver-hi un canvi a tot el servidor per a aquest "
"comportament. De moment ja es pot provar configurant la variable d'entorn "
"``OWNCLOUD_UPLOAD_CONFLICT_FILES=1``."