Skip to content

Commit 0e5cbdf

Browse files
Merge pull request #13641 from nextcloud/translations_69a91e60dcfe40f79ec4694e579bbaa8
2 parents f70cb91 + 2c2bb1a commit 0e5cbdf

File tree

2 files changed

+292
-0
lines changed

2 files changed

+292
-0
lines changed
Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
# SOME DESCRIPTIVE TITLE.
2+
# Copyright (C) 2025 Nextcloud GmbH
3+
# This file is distributed under the same license as the Nextcloud latest User Manual package.
4+
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5+
#
6+
# Translators:
7+
# Gioele Molinari, 2025
8+
# albanobattistella <albanobattistella@gmail.com>, 2025
9+
#
10+
#, fuzzy
11+
msgid ""
12+
msgstr ""
13+
"Project-Id-Version: Nextcloud latest User Manual latest\n"
14+
"Report-Msgid-Bugs-To: \n"
15+
"POT-Creation-Date: 2025-02-12 13:02+0000\n"
16+
"PO-Revision-Date: 2025-02-12 13:33+0000\n"
17+
"Last-Translator: albanobattistella <albanobattistella@gmail.com>, 2025\n"
18+
"Language-Team: Italian (https://app.transifex.com/nextcloud/teams/64236/it/)\n"
19+
"MIME-Version: 1.0\n"
20+
"Content-Type: text/plain; charset=UTF-8\n"
21+
"Content-Transfer-Encoding: 8bit\n"
22+
"Language: it\n"
23+
"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
24+
25+
#: ../../desktop/conflicts.rst:3
26+
msgid "Conflicts"
27+
msgstr "Conflitti"
28+
29+
#: ../../desktop/conflicts.rst:6
30+
msgid "Overview"
31+
msgstr "Panoramica"
32+
33+
#: ../../desktop/conflicts.rst:8
34+
msgid ""
35+
"The Nextcloud desktop client uploads local changes and downloads remote "
36+
"changes. When a file has changed on the local side and on the remote between"
37+
" synchronization runs the client will be unable to resolve the situation on "
38+
"its own. It will create a conflict file with the local version, download the"
39+
" remote version and notify the user that a conflict occurred which needs "
40+
"attention."
41+
msgstr ""
42+
"Il client desktop Nextcloud carica le modifiche locali e scarica quelle "
43+
"remote. Quando un file viene modificato sia localmente che in remoto tra due"
44+
" sincronizzazioni, il client non sarà in grado di risolvere autonomamente la"
45+
" situazione. Creerà un file di conflitto con la versione locale, scaricherà "
46+
"la versione remota e notificherà all'utente che si è verificato un conflitto"
47+
" che richiede attenzione."
48+
49+
#: ../../desktop/conflicts.rst:15
50+
msgid "Example"
51+
msgstr "Esempio"
52+
53+
#: ../../desktop/conflicts.rst:17
54+
msgid ""
55+
"Imagine there is a file called ``mydata.txt`` your synchronized folder. It "
56+
"has not changed for a while and contains the text \"contents\" locally and "
57+
"remotely. Now, nearly at the same time you update it locally to say \"local "
58+
"contents\" while the file on the server gets updated to contain \"remote "
59+
"contents\" by someone else."
60+
msgstr ""
61+
"Immagina che ci sia un file chiamato ``mydata.txt`` nella tua cartella "
62+
"sincronizzata. Non è stato modificato per un po' e contiene il testo "
63+
"\"contenuto\" sia localmente che in remoto. Ora, quasi contemporaneamente, "
64+
"lo aggiorni localmente per indicare \"contenuto locale\", mentre il file sul"
65+
" server viene aggiornato per contenere il \"contenuto remoto\" da qualcun "
66+
"altro."
67+
68+
#: ../../desktop/conflicts.rst:22
69+
msgid ""
70+
"When attempting to upload your local changes the desktop client will notice "
71+
"that the server version has also changed. It creates a conflict and you will"
72+
" now have two files on your local machine:"
73+
msgstr ""
74+
"Quando si tenta di caricare le modifiche locali, il client desktop noterà "
75+
"che anche la versione del server è cambiata. Questo crea un conflitto e ora "
76+
"si troveranno due file sul computer locale:"
77+
78+
#: ../../desktop/conflicts.rst:26
79+
msgid "``mydata.txt`` containing \"remote contents\""
80+
msgstr "``mydata.txt`` contenente \"contenuti remoti\""
81+
82+
#: ../../desktop/conflicts.rst:27
83+
msgid ""
84+
"``mydata (conflicted copy 2018-04-10 093612).txt`` containing \"local "
85+
"contents\""
86+
msgstr ""
87+
"``mydata (copia in conflitto 2018-04-10 093612).txt`` contenente \"contenuti"
88+
" locali\""
89+
90+
#: ../../desktop/conflicts.rst:29
91+
msgid ""
92+
"In this situation the file ``mydata.txt`` has the remote changes (and will "
93+
"continue to be updated with further remote changes when they happen), but "
94+
"your local adjustments have not been sent to the server (unless the server "
95+
"enables conflict uploading, see below)."
96+
msgstr ""
97+
"In questa situazione il file ``mydata.txt`` contiene le modifiche remote (e "
98+
"continuerà a essere aggiornato con ulteriori modifiche remote quando si "
99+
"verificheranno), ma le modifiche locali non sono state inviate al server (a "
100+
"meno che il server non abiliti il ​​caricamento in caso di conflitto, vedere"
101+
" di seguito)."
102+
103+
#: ../../desktop/conflicts.rst:34
104+
msgid ""
105+
"The desktop client notifies you of this situation via system notifications, "
106+
"the system tray icon and a yellow \"unresolved conflicts\" badge in the "
107+
"account settings window. Clicking this badge shows a list that includes the "
108+
"unresolved conflicts and clicking one of them opens an explorer window "
109+
"pointing at the relevant file."
110+
msgstr ""
111+
"Il client desktop ti avvisa di questa situazione tramite notifiche di "
112+
"sistema, l'icona nella barra delle applicazioni e un badge giallo "
113+
"\"conflitti irrisolti\" nella finestra delle impostazioni dell'account. "
114+
"Cliccando su questo badge viene visualizzato un elenco che include i "
115+
"conflitti irrisolti e cliccando su uno di essi si apre una finestra di "
116+
"Explorer che punta al file in questione."
117+
118+
#: ../../desktop/conflicts.rst:39
119+
msgid ""
120+
"To resolve this conflict, open both files, compare the differences and copy "
121+
"your local changes from the \"conflicted copy\" file into the base file "
122+
"where applicable. In this example you might change ``mydata.txt`` to say "
123+
"\"local and remote contents\" and delete the file with \"conflicted copy\" "
124+
"in its name. With that, the conflict is resolved."
125+
msgstr ""
126+
"Per risolvere questo conflitto, apri entrambi i file, confronta le "
127+
"differenze e copia le modifiche locali dal file \"copia in conflitto\" al "
128+
"file di base, se applicabile. In questo esempio, potresti modificare "
129+
"``mydata.txt`` in \"contenuti locali e remoti\" ed eliminare il file con "
130+
"\"copia in conflitto\" nel nome. In questo modo, il conflitto sarà risolto."
131+
132+
#: ../../desktop/conflicts.rst:46
133+
msgid "Uploading conflicts (experimental)"
134+
msgstr "Caricamento conflitti (sperimentale)"
135+
136+
#: ../../desktop/conflicts.rst:48
137+
msgid ""
138+
"By default the conflict file (the file with \"conflicted copy\" in its name "
139+
"that contains your local conflicting changes) is not uploaded to the server."
140+
" The idea is that you, the author of the changes, are the best person for "
141+
"resolving the conflict and showing the conflict to other users might create "
142+
"confusion."
143+
msgstr ""
144+
"Per impostazione predefinita, il file di conflitto (il file con \"copia in "
145+
"conflitto\" nel nome che contiene le modifiche locali in conflitto) non "
146+
"viene caricato sul server. L'idea è che tu, l'autore delle modifiche, sia la"
147+
" persona più adatta a risolvere il conflitto e mostrarlo ad altri utenti "
148+
"potrebbe creare confusione."
149+
150+
#: ../../desktop/conflicts.rst:53
151+
msgid ""
152+
"However, in some scenarios it makes a lot of sense to upload these "
153+
"conflicting changes such that local work can become visible even if the "
154+
"conflict won't be resolved immediately."
155+
msgstr ""
156+
"Tuttavia, in alcuni scenari ha molto senso caricare queste modifiche in "
157+
"conflitto, in modo che il lavoro locale possa diventare visibile anche se il"
158+
" conflitto non verrà risolto immediatamente."
159+
160+
#: ../../desktop/conflicts.rst:57
161+
msgid ""
162+
"In the future there might be a server-wide switch for this behavior. For now"
163+
" it can already be tested by setting the environment variable "
164+
"``OWNCLOUD_UPLOAD_CONFLICT_FILES=1``."
165+
msgstr ""
166+
"In futuro potrebbe essere implementato un cambiamento a livello di server "
167+
"per questo comportamento. Per ora è già possibile testarlo impostando la "
168+
"variabile d'ambiente ``OWNCLOUD_UPLOAD_CONFLICT_FILES=1``."
Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
# SOME DESCRIPTIVE TITLE.
2+
# Copyright (C) 2025 Nextcloud GmbH
3+
# This file is distributed under the same license as the Nextcloud latest User Manual package.
4+
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5+
#
6+
# Translators:
7+
# albanobattistella <albanobattistella@gmail.com>, 2025
8+
#
9+
#, fuzzy
10+
msgid ""
11+
msgstr ""
12+
"Project-Id-Version: Nextcloud latest User Manual latest\n"
13+
"Report-Msgid-Bugs-To: \n"
14+
"POT-Creation-Date: 2025-03-04 12:42+0000\n"
15+
"PO-Revision-Date: 2025-03-04 14:20+0000\n"
16+
"Last-Translator: albanobattistella <albanobattistella@gmail.com>, 2025\n"
17+
"Language-Team: Italian (https://app.transifex.com/nextcloud/teams/64236/it/)\n"
18+
"MIME-Version: 1.0\n"
19+
"Content-Type: text/plain; charset=UTF-8\n"
20+
"Content-Transfer-Encoding: 8bit\n"
21+
"Language: it\n"
22+
"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
23+
24+
#: ../../desktop/updatechannel.rst:3
25+
msgid "Update channels"
26+
msgstr "Aggiorna i canali"
27+
28+
#: ../../desktop/updatechannel.rst:5
29+
msgid ""
30+
"Whether you want the latest features, want to help with testing, or just "
31+
"want to wait until everything is perfectly ready to go, we’ve got options "
32+
"for you."
33+
msgstr ""
34+
"Che tu voglia le ultime funzionalità, che tu voglia dare una mano con i test"
35+
" o che tu voglia semplicemente aspettare che tutto sia pronto per l'uso, "
36+
"abbiamo le opzioni che fa per te."
37+
38+
#: ../../desktop/updatechannel.rst:7
39+
msgid ""
40+
"The desktop client has 4 update channels: *Enterprise*, *Stable*, *Beta* and"
41+
" *Daily*."
42+
msgstr ""
43+
"Il client desktop ha 4 canali di aggiornamento: *Enterprise*, *Stable*, "
44+
"*Beta* e *Daily*."
45+
46+
#: ../../desktop/updatechannel.rst:12
47+
msgid "Channels"
48+
msgstr "Canali"
49+
50+
#: ../../desktop/updatechannel.rst:14
51+
msgid "Enterprise"
52+
msgstr "Enterprise"
53+
54+
#: ../../desktop/updatechannel.rst:14
55+
msgid ""
56+
"Special version for enterprise customers for the best possible experience."
57+
msgstr ""
58+
"Versione speciale per i clienti aziendali, per la migliore esperienza "
59+
"possibile."
60+
61+
#: ../../desktop/updatechannel.rst:16
62+
msgid "Stable"
63+
msgstr "Stable"
64+
65+
#: ../../desktop/updatechannel.rst:16
66+
msgid "Latest feature releases ready for most users at minimal risk."
67+
msgstr ""
68+
"Le ultime versioni delle funzionalità sono pronte per la maggior parte degli"
69+
" utenti con un rischio minimo."
70+
71+
#: ../../desktop/updatechannel.rst:18
72+
msgid "Beta"
73+
msgstr "Beta"
74+
75+
#: ../../desktop/updatechannel.rst:18
76+
msgid ""
77+
"Short-term versions created in preparation for testers to report bugs "
78+
"against before a stable release."
79+
msgstr ""
80+
"Versioni a breve termine create in preparazione per consentire ai tester di "
81+
"segnalare bug prima di una versione stabile."
82+
83+
#: ../../desktop/updatechannel.rst:20
84+
msgid "Daily"
85+
msgstr "Daily"
86+
87+
#: ../../desktop/updatechannel.rst:20
88+
msgid ""
89+
"Daily versions to reproduce bugs and to follow the development of the next "
90+
"stable version."
91+
msgstr ""
92+
"Versioni giornaliere per riprodurre bug e seguire lo sviluppo della prossima"
93+
" versione stabile."
94+
95+
#: ../../desktop/updatechannel.rst:23
96+
msgid "References:"
97+
msgstr "Riferimenti:"
98+
99+
#: ../../desktop/updatechannel.rst:25
100+
msgid ""
101+
"`Enterprise deployment options <https://nextcloud.com/blog/branded-"
102+
"nextcloud-clients/>`_"
103+
msgstr ""
104+
"`Opzioni di distribuzione aziendale <https://nextcloud.com/blog/branded-"
105+
"nextcloud-clients/>`_"
106+
107+
#: ../../desktop/updatechannel.rst:26
108+
msgid ""
109+
"`Latest stable release <https://github.com/nextcloud-"
110+
"releases/desktop/releases/latest/>`_"
111+
msgstr ""
112+
"`Ultima versione stabile <https://github.com/nextcloud-"
113+
"releases/desktop/releases/latest/>`_"
114+
115+
#: ../../desktop/updatechannel.rst:27
116+
msgid ""
117+
"`Pre-releases <https://github.com/nextcloud-releases/desktop/releases/>`_"
118+
msgstr ""
119+
"`Versioni preliminari <https://github.com/nextcloud-"
120+
"releases/desktop/releases/>`_"
121+
122+
#: ../../desktop/updatechannel.rst:28
123+
msgid "`Daily builds <https://download.nextcloud.com/desktop/daily/>`_"
124+
msgstr "`Build giornaliere <https://download.nextcloud.com/desktop/daily/>`_"

0 commit comments

Comments
 (0)