diff --git a/user_manual/locale/ga/LC_MESSAGES/desktop/conflicts.pot b/user_manual/locale/ga/LC_MESSAGES/desktop/conflicts.pot new file mode 100644 index 000000000..baf0d715d --- /dev/null +++ b/user_manual/locale/ga/LC_MESSAGES/desktop/conflicts.pot @@ -0,0 +1,169 @@ +# 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 , YEAR. +# +# Translators: +# Aindriú Mac Giolla Eoin, 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: Aindriú Mac Giolla Eoin, 2025\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" +"Content-Transfer-Encoding: 8bit\n" +"Language: ga\n" +"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n" + +#: ../../desktop/conflicts.rst:3 +msgid "Conflicts" +msgstr "Coinbhleachtaí" + +#: ../../desktop/conflicts.rst:6 +msgid "Overview" +msgstr "Forbhreathnú" + +#: ../../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 "" +"Uaslódálann cliant deisce Nextcloud athruithe áitiúla agus íoslódálann sé " +"athruithe cianda. Nuair a athraítear comhad ar an taobh áitiúil agus ar an " +"gcianrialtán idir ritheann sioncrónaithe ní bheidh an cliant in ann an cás a" +" réiteach leis féin. Cruthóidh sé comhad coinbhleachta leis an leagan " +"áitiúil, íoslódálfaidh sé an cianleagan agus cuirfidh sé in iúl don " +"úsáideoir gur tharla coinbhleacht ar gá aird a thabhairt uirthi." + +#: ../../desktop/conflicts.rst:15 +msgid "Example" +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." +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." + +#: ../../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 "" +"Agus é ag iarraidh d'athruithe áitiúla a uaslódáil tabharfaidh an cliant " +"deisce faoi deara go bhfuil leagan an fhreastalaí athraithe freisin. " +"Cruthaíonn sé coinbhleacht agus beidh dhá chomhad agat ar do mheaisín " +"áitiúil anois:" + +#: ../../desktop/conflicts.rst:26 +msgid "``mydata.txt`` containing \"remote contents\"" +msgstr "``mydata.txt`` ina bhfuil \"inneachar iargúlta\"" + +#: ../../desktop/conflicts.rst:27 +msgid "" +"``mydata (conflicted copy 2018-04-10 093612).txt`` containing \"local " +"contents\"" +msgstr "" +"``mydata (cóip choinbhleachta 2018-04-10 093612). txt`` ina bhfuil " +"\"inneachar áitiúil\"" + +#: ../../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 "" +"Sa chás seo tá na cianathruithe ar an gcomhad ``mydata.txt`` (agus leanfar " +"de bheith á nuashonrú le tuilleadh cianathruithe nuair a tharlaíonn siad), " +"ach níor seoladh do choigeartuithe áitiúla chuig an bhfreastalaí (mura " +"bhfuil an freastalaí in ann uaslódáil coinbhleachta, féach thíos)." + +#: ../../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 "" +"Cuireann an cliant deisce an cás seo in iúl duit trí fhógraí córais, " +"deilbhín an tráidire córais agus suaitheantas buí \"coimhlintí gan " +"réiteach\" i bhfuinneog socruithe an chuntais. Nuair a chliceáiltear ar an " +"suaitheantas seo taispeántar liosta a chuimsíonn na coinbhleachtaí gan " +"réiteach agus trí chliceáil ar cheann acu osclaíonn fuinneog taiscéalaí ag " +"díriú ar an gcomhad ábhartha." + +#: ../../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 "" +"Chun an choimhlint seo a réiteach, oscail an dá chomhad, déan comparáid idir" +" na difríochtaí agus cóipeáil d'athruithe áitiúla ón gcomhad \"cóip " +"choinbhleachta\" isteach sa bhunchomhad nuair is cuí. Sa sampla seo " +"b'fhéidir go n-athróidh tú `` mydata.txt`` chun \"inneachar áitiúil agus " +"cianda\" a rá agus scrios an comhad le \"cóip choinbhleachta\" ina ainm. " +"Leis sin, réitítear an choimhlint." + +#: ../../desktop/conflicts.rst:46 +msgid "Uploading conflicts (experimental)" +msgstr "Coinbhleachtaí á uaslódáil (turgnamhach)" + +#: ../../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 réir réamhshocraithe ní uaslódáiltear an comhad coinbhleachta (an comhad " +"a bhfuil \"cóip choinbhleachta\" ina ainm ina bhfuil d'athruithe contrártha " +"áitiúla) chuig an bhfreastalaí. Is é an smaoineamh gurb tusa, údar na " +"n-athruithe, an duine is fearr chun an choimhlint a réiteach agus go " +"bhféadfadh mearbhall a bheith ag baint leis an gcoimhlint a thaispeáint " +"d’úsáideoirí eile." + +#: ../../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 "" +"Mar sin féin, i gcásanna áirithe bíonn an-chiall leis na hathruithe " +"contrártha seo a uaslódáil ionas go mbeidh obair áitiúil infheicthe fiú mura" +" réiteofar an choinbhleacht láithreach." + +#: ../../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 "" +"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ú."