From b12e98c8adf4e14ea9e63c097bda32252a1f45c3 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Fri, 11 Jul 2025 08:36:33 +0000 Subject: [PATCH] Translate conflicts.pot in zh_TW [Manual Sync] 100% translated source file: 'conflicts.pot' on 'zh_TW'. --- .../zh_TW/LC_MESSAGES/desktop/conflicts.pot | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 user_manual/locale/zh_TW/LC_MESSAGES/desktop/conflicts.pot diff --git a/user_manual/locale/zh_TW/LC_MESSAGES/desktop/conflicts.pot b/user_manual/locale/zh_TW/LC_MESSAGES/desktop/conflicts.pot new file mode 100644 index 000000000..03559daca --- /dev/null +++ b/user_manual/locale/zh_TW/LC_MESSAGES/desktop/conflicts.pot @@ -0,0 +1,135 @@ +# 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: +# 黃柏諺 , 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: 黃柏諺 , 2025\n" +"Language-Team: Chinese (Taiwan) (https://app.transifex.com/nextcloud/teams/64236/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../../desktop/conflicts.rst:3 +msgid "Conflicts" +msgstr "衝突" + +#: ../../desktop/conflicts.rst:6 +msgid "Overview" +msgstr "概覽" + +#: ../../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 "" +"Nextcloud " +"桌面客戶端會上傳本機變更並下載遠端變更。當檔案在本地端和遠端同步執行之間發生變更時，客戶端無法自行解決問題。它會與本機版本建立衝突檔案，下載遠端版本，並通知使用者發生衝突需要注意。" + +#: ../../desktop/conflicts.rst:15 +msgid "Example" +msgstr "範例" + +#: ../../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 "" +"想像您的同步資料夾中有一個名為 ``mydata.txt`` " +"的檔案。它已經有一段時間沒有變更了，並包含本機和遠端「內容」文字。現在，幾乎在同一時間，您在本機更新為「本機內容」，而伺服器上的檔案卻被其他人更新為包含「遠端內容」。" + +#: ../../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 "當嘗試上傳您的本機變更時，桌面客戶端會注意到伺服器版本也已變更。這會造成衝突，您的本機現在會有兩個檔案：" + +#: ../../desktop/conflicts.rst:26 +msgid "``mydata.txt`` containing \"remote contents\"" +msgstr "``mydata.txt`` 包含「遠端內容」" + +#: ../../desktop/conflicts.rst:27 +msgid "" +"``mydata (conflicted copy 2018-04-10 093612).txt`` containing \"local " +"contents\"" +msgstr "``mydata (conflicted copy 2018-04-10 093612).txt`` 包含「本機內容」" + +#: ../../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 "" +"在這種情況下，``mydata.txt`` " +"檔案會有遠端變更（並會在遠端變更發生時持續更新），但您的本機調整並未傳送到伺服器（除非伺服器啟用衝突上傳，請參閱下文）。" + +#: ../../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 "" +"桌面客戶端會透過系統通知、系統匣圖示與帳號設定視窗中的黃色「未解決衝突」徽章通知您這種情況。按一下此徽章會顯示包含未解決衝突的清單，按一下其中一個會開啟一個檔案總管視窗，指向相關檔案。" + +#: ../../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 "" +"要解決此衝突時，請開啟兩個檔案，比較兩者的差異，並在適用的情況下，將您在「衝突副本」檔案中的本機變更複製到基本檔案中。在這個範例中，您可以將 " +"``mydata.txt`` 改為「本機與遠端內容」，並刪除名稱中包含「衝突副本」的檔案。這樣，衝突就解決了。" + +#: ../../desktop/conflicts.rst:46 +msgid "Uploading conflicts (experimental)" +msgstr "上傳衝突（實驗性）" + +#: ../../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 "" +"預設情況下，衝突檔案（名稱中含有「衝突副本」的檔案，包含您本機的衝突變更）不會上傳到伺服器。這樣做的目的是，您作為變更的作者，是解決衝突的最佳人選，向其他使用者顯示衝突可能會造成混亂。" + +#: ../../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 "不過，在某些情況下，上傳這些衝突的變更是很有意義的，這樣即使衝突不會立即解決，本機工作也能變得可見。" + +#: ../../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 "" +"將來可能會有一個伺服器範圍的開關來處理這個行為。目前已可透過設定環境變數 ``OWNCLOUD_UPLOAD_CONFLICT_FILES=1`` " +"來測試。"