l10n: Updates to Chinese (Taiwan) (zh_TW) translation

Transmitted-via: Transifex (translate.moblin.org)

1 files changed, 184 insertions, 139 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c2a6d8d7..8045c74f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-02-26 03:21+0000\n"
+"POT-Creation-Date: 2010-03-13 10:22+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: \n"
@@ -22,115 +22,115 @@ msgstr ""
 msgid "Sync"
 msgstr "同步"
 
-#: ../src/gtk-ui/sync-ui.c:250
+#: ../src/gtk-ui/sync-ui.c:251
 msgid "Contacts"
 msgstr "連絡人"
 
-#: ../src/gtk-ui/sync-ui.c:252
+#: ../src/gtk-ui/sync-ui.c:253
 msgid "Appointments"
 msgstr "約會"
 
-#: ../src/gtk-ui/sync-ui.c:254
+#: ../src/gtk-ui/sync-ui.c:255
 #: ../src/gtk-ui/ui.glade.h:38
 msgid "Tasks"
 msgstr "工作"
 
-#: ../src/gtk-ui/sync-ui.c:256
+#: ../src/gtk-ui/sync-ui.c:257
 msgid "Notes"
-msgstr "註記"
+msgstr "備註"
 
 #. TRANSLATORS: This is a "combination source" for syncing with devices
 #. * that combine appointments and tasks. the name should match the ones
 #. * used for calendar and todo above
-#: ../src/gtk-ui/sync-ui.c:261
+#: ../src/gtk-ui/sync-ui.c:262
 msgid "Appointments & Tasks"
 msgstr "約會與工作"
 
-#: ../src/gtk-ui/sync-ui.c:333
+#: ../src/gtk-ui/sync-ui.c:334
 msgid "Starting sync"
 msgstr "正在開始同步"
 
 #. TRANSLATORS: slow sync confirmation dialog message. Placeholder
 #. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:371
+#: ../src/gtk-ui/sync-ui.c:372
 #, c-format
 msgid "Do you want to slow sync with %s?"
 msgstr "你想要與 %s 進行慢速同步嗎？"
 
-#: ../src/gtk-ui/sync-ui.c:375
+#: ../src/gtk-ui/sync-ui.c:376
 msgid "Yes, do slow sync"
 msgstr "是，執行慢速同步"
 
-#: ../src/gtk-ui/sync-ui.c:375
+#: ../src/gtk-ui/sync-ui.c:376
 msgid "No, cancel sync"
 msgstr "不，取消同步"
 
 #. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
 #. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:408
+#: ../src/gtk-ui/sync-ui.c:409
 #, c-format
 msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
 msgstr "你要刪除所有本機資料，並使用 %s 上的資料取代它嗎？我們通常不建議這麼做。"
 
-#: ../src/gtk-ui/sync-ui.c:413
-#: ../src/gtk-ui/sync-ui.c:444
+#: ../src/gtk-ui/sync-ui.c:414
+#: ../src/gtk-ui/sync-ui.c:445
 msgid "Yes, delete and replace"
 msgstr "是，刪除並取代"
 
-#: ../src/gtk-ui/sync-ui.c:413
-#: ../src/gtk-ui/sync-ui.c:444
-#: ../src/gtk-ui/sync-ui.c:1313
+#: ../src/gtk-ui/sync-ui.c:414
+#: ../src/gtk-ui/sync-ui.c:445
+#: ../src/gtk-ui/sync-ui.c:1317
 msgid "No"
 msgstr "否"
 
 #. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
 #. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:439
+#: ../src/gtk-ui/sync-ui.c:440
 #, c-format
 msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
 msgstr "你要刪除所有在 %s 上的資料，並且使用本機資料取代它嗎？我們通常不建議這麼做。"
 
-#: ../src/gtk-ui/sync-ui.c:471
+#: ../src/gtk-ui/sync-ui.c:472
 msgid "Trying to cancel sync"
 msgstr "正在嘗試取消同步"
 
-#: ../src/gtk-ui/sync-ui.c:504
-msgid "No service selected"
-msgstr "未選取服務"
+#: ../src/gtk-ui/sync-ui.c:505
+msgid "No service or device selected"
+msgstr "未選取服務或裝置"
 
 #. TRANSLATORS: This is the title on main view. Placeholder is
 #. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:512
+#: ../src/gtk-ui/sync-ui.c:513
 #, c-format
 msgid "%s - synced just now"
 msgstr "%s - 剛才同步過"
 
-#: ../src/gtk-ui/sync-ui.c:516
+#: ../src/gtk-ui/sync-ui.c:517
 #, c-format
 msgid "%s - synced a minute ago"
 msgstr "%s - 一分鐘前同步過"
 
-#: ../src/gtk-ui/sync-ui.c:520
+#: ../src/gtk-ui/sync-ui.c:521
 #, c-format
 msgid "%s - synced %ld minutes ago"
 msgstr "%s - %ld 分鐘前同步過"
 
-#: ../src/gtk-ui/sync-ui.c:525
+#: ../src/gtk-ui/sync-ui.c:526
 #, c-format
 msgid "%s - synced an hour ago"
 msgstr "%s - 一小時前同步過"
 
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:530
 #, c-format
 msgid "%s - synced %ld hours ago"
 msgstr "%s - %ld 小時前同步過"
 
-#: ../src/gtk-ui/sync-ui.c:534
+#: ../src/gtk-ui/sync-ui.c:535
 #, c-format
 msgid "%s - synced a day ago"
 msgstr "%s - 一天前同步過"
 
-#: ../src/gtk-ui/sync-ui.c:538
+#: ../src/gtk-ui/sync-ui.c:539
 #, c-format
 msgid "%s - synced %ld days ago"
 msgstr "%s - %ld 天前同步過"
@@ -138,61 +138,61 @@ msgstr "%s - %ld 天前同步過"
 #. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
 #. * "You've just restored a backup. The changes have not been "
 #. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:588
-#: ../src/gtk-ui/sync-ui.c:699
+#: ../src/gtk-ui/sync-ui.c:589
+#: ../src/gtk-ui/sync-ui.c:701
 msgid "Sync now"
 msgstr "現在同步"
 
 #. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
 #. * "A normal sync is not possible at this time..." message.
 #. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:594
+#: ../src/gtk-ui/sync-ui.c:595
 #: ../src/gtk-ui/ui.glade.h:35
 msgid "Slow sync"
 msgstr "慢速同步"
 
-#: ../src/gtk-ui/sync-ui.c:595
+#: ../src/gtk-ui/sync-ui.c:596
 msgid "Other options..."
 msgstr "其他選項..."
 
 #. TRANSLATORS: Action button in info bar in main view. Shown e.g.
 #. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:600
+#: ../src/gtk-ui/sync-ui.c:601
 msgid "Select sync service"
 msgstr "選取同步服務"
 
 #. TRANSLATORS: Action button in info bar in main view. Shown e.g.
 #. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:605
+#: ../src/gtk-ui/sync-ui.c:606
 msgid "Edit service settings"
 msgstr "編輯服務設定"
 
-#: ../src/gtk-ui/sync-ui.c:653
-msgid "You haven't selected a sync service yet. Sync services let you synchronize your data between your netbook and a web service"
-msgstr "你尚未選取同步服務。同步服務讓你在你的網路筆電與網路服務間同步你的資料"
+#: ../src/gtk-ui/sync-ui.c:654
+msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
+msgstr "你尚未選取同步服務或裝置。同步服務讓你在你的網路筆電與網路服務間同步你的資料。你也可以直接和一些裝置進行同步。"
 
-#: ../src/gtk-ui/sync-ui.c:697
+#: ../src/gtk-ui/sync-ui.c:699
 msgid "Sync again"
 msgstr "再次同步"
 
-#: ../src/gtk-ui/sync-ui.c:710
+#: ../src/gtk-ui/sync-ui.c:712
 msgid "Restoring"
 msgstr "正在還原"
 
-#: ../src/gtk-ui/sync-ui.c:712
+#: ../src/gtk-ui/sync-ui.c:714
 msgid "Syncing"
 msgstr "正在同步中"
 
 #. TRANSLATORS: This is for the button in main view, right side.
 #. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:723
-#: ../src/gtk-ui/sync-ui.c:3091
+#: ../src/gtk-ui/sync-ui.c:725
+#: ../src/gtk-ui/sync-ui.c:3115
 msgid "Cancel sync"
 msgstr "取消同步"
 
 #. TRANSLATORS: button in the Moblin window title bar when main view is
 #. * not visible
-#: ../src/gtk-ui/sync-ui.c:803
+#: ../src/gtk-ui/sync-ui.c:807
 msgid "Back to sync"
 msgstr "返回同步"
 
@@ -200,51 +200,53 @@ msgstr "返回同步"
 #. * currently selected data sources. First placeholder is service/device
 #. * name, second a comma separeted list of sources.
 #. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1230
+#: ../src/gtk-ui/sync-ui.c:1234
 #, c-format
 msgid "Affected data: %s %s"
 msgstr "受影響的資料：%s %s"
 
-#: ../src/gtk-ui/sync-ui.c:1235
+#: ../src/gtk-ui/sync-ui.c:1239
 #, c-format
 msgid "Affected data: none"
 msgstr "受影響的資料：無"
 
 #. TRANSLATORS: confirmation for restoring a backup. placeholder is the
 #. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1310
+#: ../src/gtk-ui/sync-ui.c:1314
 #, c-format
 msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
 msgstr "你想要還原來自 %s 的備份嗎？所有你從那時起的變更都會喪失。"
 
-#: ../src/gtk-ui/sync-ui.c:1313
+#: ../src/gtk-ui/sync-ui.c:1317
 msgid "Yes, restore"
 msgstr "是，還原"
 
-#: ../src/gtk-ui/sync-ui.c:1345
+#. TRANSLATORS: date/time for strftime(), used in emergency view backup
+#. * label. Any time format that shows date and time is good.
+#: ../src/gtk-ui/sync-ui.c:1349
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
 #. TRANSLATORS: label for a backup in emergency view. Placeholder is
 #. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1364
+#: ../src/gtk-ui/sync-ui.c:1368
 #, c-format
 msgid "Backed up before syncing with %s"
 msgstr "在與 %s 同步前已備份"
 
-#: ../src/gtk-ui/sync-ui.c:1381
+#: ../src/gtk-ui/sync-ui.c:1385
 msgid "Restore"
 msgstr "還原"
 
 #. TRANSLATORS: this is an explanation in Emergency view.
 #. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1488
+#: ../src/gtk-ui/sync-ui.c:1492
 #, c-format
 msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
 msgstr "與 %s 的一般同步目前無法使用。你可以執行慢速雙方同步，或是從零開始。你也可以從備份中還原，但是在一般同步可以使用之前，會需要慢速同步或從零開始。"
 
-#: ../src/gtk-ui/sync-ui.c:1498
+#: ../src/gtk-ui/sync-ui.c:1502
 #, c-format
 msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
 msgstr "如果有東西發生可怕錯誤，你可以嘗試慢速同步、從零開始或是從備份還原。"
@@ -252,7 +254,7 @@ msgstr "如果有東西發生可怕錯誤，你可以嘗試慢速同步、從零
 #. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
 #. * service/device name. Please don't use too long lines, but feel free to
 #. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1507
+#: ../src/gtk-ui/sync-ui.c:1511
 #, c-format
 msgid ""
 "Delete all your local\n"
@@ -263,7 +265,7 @@ msgstr ""
 "資料並使用來自\n"
 "%s 的資料取代"
 
-#: ../src/gtk-ui/sync-ui.c:1513
+#: ../src/gtk-ui/sync-ui.c:1517
 #, c-format
 msgid ""
 "Delete all data on\n"
@@ -274,67 +276,67 @@ msgstr ""
 "資料並使用你的本機\n"
 "資料取代"
 
-#: ../src/gtk-ui/sync-ui.c:1955
+#: ../src/gtk-ui/sync-ui.c:1966
 msgid "Failed to get list of supported services from SyncEvolution"
 msgstr "從 SyncEvolution 取得支援的服務清單時失敗"
 
-#: ../src/gtk-ui/sync-ui.c:2057
+#: ../src/gtk-ui/sync-ui.c:2074
 msgid "Restore failed"
 msgstr "還原失敗"
 
-#: ../src/gtk-ui/sync-ui.c:2060
-#: ../src/gtk-ui/sync-ui.c:2960
+#: ../src/gtk-ui/sync-ui.c:2077
+#: ../src/gtk-ui/sync-ui.c:2984
 msgid "Sync failed"
 msgstr "同步失敗"
 
-#: ../src/gtk-ui/sync-ui.c:2066
+#: ../src/gtk-ui/sync-ui.c:2083
 msgid "Restore complete"
 msgstr "還原完成"
 
-#: ../src/gtk-ui/sync-ui.c:2069
+#: ../src/gtk-ui/sync-ui.c:2086
 msgid "Sync complete"
 msgstr "同步完成"
 
-#: ../src/gtk-ui/sync-ui.c:2161
+#: ../src/gtk-ui/sync-ui.c:2178
 #, c-format
 msgid "Preparing '%s'"
-msgstr "正在準備 '%s'"
+msgstr "正在準備「%s」"
 
-#: ../src/gtk-ui/sync-ui.c:2164
+#: ../src/gtk-ui/sync-ui.c:2181
 #, c-format
 msgid "Receiving '%s'"
-msgstr "正在接收 '%s'"
+msgstr "正在接收「%s」"
 
-#: ../src/gtk-ui/sync-ui.c:2167
+#: ../src/gtk-ui/sync-ui.c:2184
 #, c-format
 msgid "Sending '%s'"
 msgstr "正在傳送「%s」"
 
-#: ../src/gtk-ui/sync-ui.c:2288
+#: ../src/gtk-ui/sync-ui.c:2305
 #, c-format
 msgid "There was one remote rejection."
 msgid_plural "There were %ld remote rejections."
 msgstr[0] "有過一次遠端拒絕。"
 msgstr[1] "有過 %ld 次遠端拒絕。"
 
-#: ../src/gtk-ui/sync-ui.c:2293
+#: ../src/gtk-ui/sync-ui.c:2310
 #, c-format
 msgid "There was one local rejection."
 msgid_plural "There were %ld local rejections."
 msgstr[0] "有過一次本機拒絕。"
 msgstr[1] "有過 %ld 次本機拒絕。"
 
-#: ../src/gtk-ui/sync-ui.c:2298
+#: ../src/gtk-ui/sync-ui.c:2315
 #, c-format
 msgid "There were %ld local rejections and %ld remote rejections."
 msgstr "有過 %ld  次本機拒絕和 %ld  次遠端拒絕。"
 
-#: ../src/gtk-ui/sync-ui.c:2303
+#: ../src/gtk-ui/sync-ui.c:2320
 #, c-format
 msgid "Last time: No changes."
 msgstr "上次：沒有變更。"
 
-#: ../src/gtk-ui/sync-ui.c:2305
+#: ../src/gtk-ui/sync-ui.c:2322
 #, c-format
 msgid "Last time: Sent one change."
 msgid_plural "Last time: Sent %ld changes."
@@ -344,129 +346,127 @@ msgstr[1] "上次：傳送了 %ld 個變更。"
 #. This is about changes made to the local data. Not all of these
 #. changes were requested by the remote server, so "applied"
 #. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2313
+#: ../src/gtk-ui/sync-ui.c:2330
 #, c-format
 msgid "Last time: Applied one change."
 msgid_plural "Last time: Applied %ld changes."
 msgstr[0] "上次：套用了一個變更。"
 msgstr[1] "上次：套用了 %ld 個變更。"
 
-#: ../src/gtk-ui/sync-ui.c:2318
+#: ../src/gtk-ui/sync-ui.c:2335
 #, c-format
 msgid "Last time: Applied %ld changes and sent %ld changes."
 msgstr "上次：套用了 %ld 個變更並傳送了 %ld 個變更。"
 
-#: ../src/gtk-ui/sync-ui.c:2527
+#: ../src/gtk-ui/sync-ui.c:2544
 #, c-format
 msgid "You've just restored a backup. The changes have not been synced with %s yet"
 msgstr "你剛才已經還原一份備份。這些變更尚未與 %s 同步"
 
-#: ../src/gtk-ui/sync-ui.c:2815
+#: ../src/gtk-ui/sync-ui.c:2832
 msgid "Waiting for current operation to finish..."
 msgstr "正在等候目前的操作完成..."
 
-#: ../src/gtk-ui/sync-ui.c:2888
+#. TRANSLATORS: next strings are error messages.
+#: ../src/gtk-ui/sync-ui.c:2906
 msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
 msgstr "一般同步目前無法使用。這台伺服器建議使用慢速同步，但這可能不總是你想要的，因為雙方可能都已經有資料。"
 
-#: ../src/gtk-ui/sync-ui.c:2892
+#: ../src/gtk-ui/sync-ui.c:2910
 msgid "The sync service died unexpectedly."
 msgstr "同步服務在沒有預料的情況下終止了。"
 
-#: ../src/gtk-ui/sync-ui.c:2897
+#: ../src/gtk-ui/sync-ui.c:2915
 msgid "Failed to login. Could there be a problem with your username or password?"
 msgstr "登入失敗。你的使用者名稱或密碼是否有問題？"
 
-#: ../src/gtk-ui/sync-ui.c:2900
+#: ../src/gtk-ui/sync-ui.c:2918
 msgid "Forbidden"
 msgstr "禁止"
 
-#: ../src/gtk-ui/sync-ui.c:2905
-msgid "The source could not be found. Could there be a problem with the server settings?"
-msgstr "無法找到來源。伺服器設定是否有問題？"
+#. TRANSLATORS: data source means e.g. calendar or addressbook
+#: ../src/gtk-ui/sync-ui.c:2924
+msgid "A data source could not be found. Could there be a problem with the settings?"
+msgstr "無法找到資料來源。設定值是否有問題？"
 
-#: ../src/gtk-ui/sync-ui.c:2908
-msgid "Fatal database error"
-msgstr "致命數據錯誤"
+#: ../src/gtk-ui/sync-ui.c:2928
+msgid "Remote database error"
+msgstr "遠端資料庫錯誤"
 
 #. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:2911
+#: ../src/gtk-ui/sync-ui.c:2931
 msgid "There is a problem with the local database. Syncing again or rebooting may help."
 msgstr "本機資料庫有問題。再次同步或是重新開機可能會有所幫助。"
 
-#: ../src/gtk-ui/sync-ui.c:2914
-msgid "Database error"
-msgstr "數據錯誤"
-
-#: ../src/gtk-ui/sync-ui.c:2916
+#: ../src/gtk-ui/sync-ui.c:2934
 msgid "No space left"
 msgstr "沒有空間"
 
-#: ../src/gtk-ui/sync-ui.c:2918
+#: ../src/gtk-ui/sync-ui.c:2936
 msgid "Failed to process SyncML"
 msgstr "進行 SyncML 動作失敗"
 
-#: ../src/gtk-ui/sync-ui.c:2920
+#: ../src/gtk-ui/sync-ui.c:2938
 msgid "Server authorization failed"
 msgstr "伺服器授權失敗"
 
-#: ../src/gtk-ui/sync-ui.c:2922
+#: ../src/gtk-ui/sync-ui.c:2940
 msgid "Failed to parse configuration file"
 msgstr "解析設置檔案動作失敗"
 
-#: ../src/gtk-ui/sync-ui.c:2924
+#: ../src/gtk-ui/sync-ui.c:2942
 msgid "Failed to read configuration file"
 msgstr "讀取設置檔案動作失敗"
 
-#: ../src/gtk-ui/sync-ui.c:2926
+#: ../src/gtk-ui/sync-ui.c:2944
 msgid "No configuration found"
 msgstr "未找到設置"
 
-#: ../src/gtk-ui/sync-ui.c:2928
+#: ../src/gtk-ui/sync-ui.c:2946
 msgid "No configuration file found"
 msgstr "未找到設置檔案"
 
-#: ../src/gtk-ui/sync-ui.c:2930
+#: ../src/gtk-ui/sync-ui.c:2948
 msgid "Server sent bad content"
 msgstr "伺服器傳送出壞的內容"
 
-#: ../src/gtk-ui/sync-ui.c:2932
+#: ../src/gtk-ui/sync-ui.c:2950
 msgid "Connection certificate has expired"
 msgstr "連線憑證己過期"
 
-#: ../src/gtk-ui/sync-ui.c:2934
+#: ../src/gtk-ui/sync-ui.c:2952
 msgid "Connection certificate is invalid"
 msgstr "連線憑證無效"
 
-#: ../src/gtk-ui/sync-ui.c:2942
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the server settings."
-msgstr "我們無法連接到伺服器。問題可能是暫時的，或是伺服器設定可能有問題。"
+#: ../src/gtk-ui/sync-ui.c:2960
+msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
+msgstr "我們無法連接到伺服器。問題可能是暫時的，或是伺服器的設定值可能有問題。"
 
-#: ../src/gtk-ui/sync-ui.c:2946
-msgid "URL is bad"
-msgstr "URL 不對"
+#: ../src/gtk-ui/sync-ui.c:2967
+msgid "The server URL is bad"
+msgstr "伺服器的 URL 不對"
 
-#: ../src/gtk-ui/sync-ui.c:2948
-msgid "Server not found"
+#: ../src/gtk-ui/sync-ui.c:2972
+msgid "The server was not found"
 msgstr "找不到伺服器"
 
-#: ../src/gtk-ui/sync-ui.c:2950
+#: ../src/gtk-ui/sync-ui.c:2974
 #, c-format
 msgid "Error %d"
 msgstr "錯誤 %d"
 
 #. TRANSLATORS: password request dialog contents: title, cancel button
 #. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3088
+#: ../src/gtk-ui/sync-ui.c:3112
 msgid "Password is required for sync"
 msgstr "同步需要密碼"
 
-#: ../src/gtk-ui/sync-ui.c:3092
+#: ../src/gtk-ui/sync-ui.c:3116
 msgid "Sync with password"
 msgstr "使用密碼進行同步"
 
 #. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3102
+#: ../src/gtk-ui/sync-ui.c:3126
 #, c-format
 msgid "Please enter password for syncing with %s:"
 msgstr "請輸入使用 %s 進行同步的密碼："
@@ -667,8 +667,8 @@ msgstr "不，維持設定"
 
 #: ../src/gtk-ui/sync-config-widget.c:391
 #, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove this service configuration."
-msgstr "你想要為 %s 刪除設定值嗎？這不會移除任何兩方同步過的資訊，但是它會移除本服務設定檔。"
+msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
+msgstr "你想要為 %s 刪除設定值嗎？這不會移除任何兩端同步過的資訊，但是它會移除這些設定值。"
 
 #. TRANSLATORS: buttons in delete-service warning dialog
 #: ../src/gtk-ui/sync-config-widget.c:396
@@ -676,12 +676,12 @@ msgid "Yes, delete"
 msgstr "是，刪除"
 
 #: ../src/gtk-ui/sync-config-widget.c:425
-msgid "Reset service"
-msgstr "重設服務"
+msgid "Reset settings"
+msgstr "重設設定值"
 
 #: ../src/gtk-ui/sync-config-widget.c:428
-msgid "Delete service"
-msgstr "刪除服務"
+msgid "Delete settings"
+msgstr "刪除設定值"
 
 #: ../src/gtk-ui/sync-config-widget.c:438
 msgid "Save and use"
@@ -695,93 +695,138 @@ msgstr ""
 "儲存並取代\n"
 "目前的服務"
 
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "Stop using device"
+msgstr "停止使用裝置"
+
+#: ../src/gtk-ui/sync-config-widget.c:454
+msgid "Stop using service"
+msgstr "停止使用服務"
+
 #. TRANSLATORS: label for an entry in service configuration form.
 #. * Placeholder is a source  name.
 #. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:672
+#: ../src/gtk-ui/sync-config-widget.c:683
 #, c-format
 msgid "%s URI"
 msgstr "%s URI"
 
 #. TRANSLATORS: toggles in service configuration form, placeholder is service
 #. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:850
+#: ../src/gtk-ui/sync-config-widget.c:861
 #, c-format
 msgid "Send changes to %s"
 msgstr "傳送變更到 %s"
 
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:865
 #, c-format
 msgid "Receive changes from %s"
 msgstr "接收來自 %s 的變更"
 
-#: ../src/gtk-ui/sync-config-widget.c:869
+#: ../src/gtk-ui/sync-config-widget.c:880
 msgid "<b>Sync</b>"
 msgstr "<b>同步</b>"
 
 #. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:885
+#: ../src/gtk-ui/sync-config-widget.c:896
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: ../src/gtk-ui/sync-config-widget.c:1067
+#: ../src/gtk-ui/sync-config-widget.c:1079
 #, c-format
 msgid "%s - Bluetooth device"
 msgstr "%s - 藍牙裝置"
 
 #. TRANSLATORS: service title for services that are not based on a
 #. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1073
+#: ../src/gtk-ui/sync-config-widget.c:1085
 #, c-format
 msgid "%s - manually setup"
 msgstr "%s - 手動設置"
 
 #. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1727
+#: ../src/gtk-ui/sync-config-widget.c:1754
 msgid "Launch website"
 msgstr "開啟網站"
 
 #. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1736
+#: ../src/gtk-ui/sync-config-widget.c:1763
 msgid "Setup now"
 msgstr "立刻設置"
 
 #. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1799
+#: ../src/gtk-ui/sync-config-widget.c:1844
 msgid "Username"
 msgstr "使用者名稱"
 
-#: ../src/gtk-ui/sync-config-widget.c:1814
+#: ../src/gtk-ui/sync-config-widget.c:1859
 msgid "Password"
 msgstr "密碼"
 
 #. TRANSLATORS: warning in service configuration form for people
 #. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1837
-msgid "Current service configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "目前的服務設定檔比這裡能夠顯示的還要複雜許多。變更為同步模式或是同步過的資料類型將會覆蓋寫入那份設定檔。"
+#: ../src/gtk-ui/sync-config-widget.c:1882
+msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
+msgstr "目前的設定檔比這裡能夠顯示的還要複雜許多。變更為同步模式或是同步過的資料類型將會覆蓋寫入那份設定檔。"
 
 #. TRANSLATORS: this is the epander label for server settings
 #. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1856
+#: ../src/gtk-ui/sync-config-widget.c:1901
 msgid "Hide server settings"
 msgstr "隱藏伺服器設定"
 
 #. TRANSLATORS: this is the epander label for server settings
 #. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1876
+#: ../src/gtk-ui/sync-config-widget.c:1921
 msgid "Show server settings"
 msgstr "顯示伺服器設定"
 
-#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1889
-msgid "Stop using service"
-msgstr "停止使用服務"
-
 #: ../src/gnome-bluetooth/syncevolution.c:110
 msgid "Sync in the Sync application"
 msgstr "在「同步」應用程式內同步"
 
+#: ../src/syncevo-dbus-server.cpp:5269
+#, c-format
+msgid "%s is syncing"
+msgstr "%s 正在同步中"
+
+#: ../src/syncevo-dbus-server.cpp:5270
+#, c-format
+msgid "We have just started to sync your computer with the %s sync service."
+msgstr "我們剛開始將你的電腦同步到 %s 同步服務。"
+
+#. if sync is successfully started and done
+#: ../src/syncevo-dbus-server.cpp:5284
+#, c-format
+msgid "%s sync complete"
+msgstr "%s 同步完成"
+
+#: ../src/syncevo-dbus-server.cpp:5285
+#, c-format
+msgid "We have just finished syncing your computer with the %s sync service."
+msgstr "我們剛完成將你的電腦同步到 %s 同步服務。"
+
+#. if sync is successfully started and has errors, or not started successful with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:5290
+msgid "Sync problem."
+msgstr "同步發生問題。"
+
+#: ../src/syncevo-dbus-server.cpp:5291
+msgid "Sorry, there's a problem with your sync that you need to attend to."
+msgstr "抱歉，你的同步有個問題是你需要關心的。"
+
+#: ../src/syncevo-dbus-server.cpp:5364
+msgid "View"
+msgstr "檢視"
+
+#: ../src/syncevo-dbus-server.cpp:5365
+msgid "Dismiss"
+msgstr "摒棄"
+
+#~ msgid "Database error"
+#~ msgstr "數據錯誤"
+#~ msgid "Reset service"
+#~ msgstr "重設服務"
 #~ msgid "Todo"
 #~ msgstr "要做的事"
 #~ msgid "Memo"