aboutsummaryrefslogtreecommitdiffstats
path: root/po/vi.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-08-14 04:06:34 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-08-14 04:06:34 +0800
commitea3c05968806735f578c6be92ecd3862b28bc192 (patch)
treeaae67b5d92998724fefa137cb7ef3aff43dd6c58 /po/vi.po
parent2b6606fbf8072adb7d7ddf0d620d77eabe92e60d (diff)
downloadgsoc2013-evolution-ea3c05968806735f578c6be92ecd3862b28bc192.tar.gz
gsoc2013-evolution-ea3c05968806735f578c6be92ecd3862b28bc192.tar.zst
gsoc2013-evolution-ea3c05968806735f578c6be92ecd3862b28bc192.zip
bump version. requires
2004-08-13 JP Rosevear <jpr@novell.com> * configure.in: bump version. requires svn path=/trunk/; revision=26926
Diffstat (limited to 'po/vi.po')
-rw-r--r--po/vi.po889
1 files changed, 508 insertions, 381 deletions
diff --git a/po/vi.po b/po/vi.po
index a84b5fdbda..dc0480563f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2004-08-02 15:35-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-13 14:55-0400\n"
"PO-Revision-Date: 2004-06-26 22:59+0700\n"
"Last-Translator: pclouds <pclouds@vnlinux.org>\n"
"Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -114,6 +115,17 @@ msgid "Could not remove addressbook."
msgstr "Không thể nạp sổ địa chỉ"
#. addressbook:remove-addressbook secondary
+#. addressbook:generic-error primary
+#. addressbook:load-error secondary
+#. addressbook:search-error secondary
+#. mail:session-message-info secondary
+#. mail:session-message-info-cancel secondary
+#. mail:session-message-warning secondary
+#. mail:session-message-warning-cancel secondary
+#. mail:session-message-error secondary
+#. mail:session-message-error-cancel secondary
+#. mail:ask-session-password secondary
+#. mail:filter-load-error secondary
#: addressbook/addressbook-errors.xml.h:22
#: addressbook/addressbook-errors.xml.h:26
#: addressbook/addressbook-errors.xml.h:34
@@ -131,6 +143,8 @@ msgid "Category editor not available."
msgstr "Bộ biên soạn phân loại không tồn tại."
#. addressbook:generic-error secondary
+#. mail-composer:no-attach secondary
+#. mail:no-save-path secondary
#: addressbook/addressbook-errors.xml.h:28
#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
msgid "{1}"
@@ -338,6 +352,7 @@ msgid "Migrating `%s':"
msgstr "Đang nâng cấp `%s`:"
#. create the local source group
+#. On This Computer is always first and VFolders is always last
#: addressbook/gui/component/addressbook-migrate.c:493
#: calendar/gui/migration.c:450 calendar/gui/migration.c:532
#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
@@ -346,6 +361,9 @@ msgid "On This Computer"
msgstr "Trên máy này"
#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
#: addressbook/gui/component/addressbook-migrate.c:501
#: addressbook/gui/contact-editor/contact-editor.glade.h:34
#: calendar/gui/migration.c:458 calendar/gui/migration.c:540
@@ -417,17 +435,17 @@ msgstr "Xoá"
msgid "Properties..."
msgstr "Thuộc tính..."
-#: addressbook/gui/component/addressbook.c:89
+#: addressbook/gui/component/addressbook.c:98
msgid "Accessing LDAP Server anonymously"
msgstr "Truy cập vô danh tới LDAP server"
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:417
+#: addressbook/gui/component/addressbook.c:184
+#: camel/providers/groupwise/camel-gw-listener.c:420
msgid "Failed to authenticate.\n"
msgstr "Lỗi xác thực.\n"
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:406
+#: addressbook/gui/component/addressbook.c:191
+#: camel/providers/groupwise/camel-gw-listener.c:409
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%sNhập mật khẩu cho %s (người dùng %s)"
@@ -774,7 +792,7 @@ msgid "Send HTML Mail?"
msgstr "Gửi thư HTML"
#: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:982
+#: addressbook/gui/widgets/eab-popup-control.c:983
msgid "Add to Contacts"
msgstr "Thêm vào liên lạc"
@@ -896,7 +914,7 @@ msgstr "Công ty:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
#: addressbook/gui/contact-editor/e-contact-editor.c:272
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:172
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
msgid "Contact"
@@ -1029,7 +1047,7 @@ msgstr "Địa chỉ"
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
#: addressbook/gui/contact-editor/e-contact-editor.c:293
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:186
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard-label.c:164
@@ -2283,7 +2301,7 @@ msgid "Insert email adresses from Adress Book"
msgstr "Chọn liên lạc từ sổ địa chỉ"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:704
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:714
msgid "Members"
msgstr "Thành viên"
@@ -2313,7 +2331,7 @@ msgstr "_Nhập địa chỉ thư hoặc kéo liên lạc vào danh sách dướ
msgid "dialog1"
msgstr "dialog1"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:165
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
#: addressbook/gui/widgets/e-addressbook-view.c:221
@@ -2322,17 +2340,17 @@ msgstr "dialog1"
msgid "Book"
msgstr "Sách"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:179
msgid "Is New List"
msgstr "Là danh sách mới"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:726
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:736
#: calendar/gui/e-meeting-list-view.c:60
#: calendar/gui/e-meeting-list-view.c:457
msgid "Required Participants"
msgstr "Người tham dự yêu cầu"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:803
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813
msgid "Contact List Editor"
msgstr "Bộ hiệu chỉnh danh sách liên lạc"
@@ -2527,7 +2545,7 @@ msgid "Paste"
msgstr "Dán"
#: addressbook/gui/widgets/e-addressbook-view.c:1128
-#: calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1418
msgid "Current View"
msgstr "Khung xem hiện thời"
@@ -2581,12 +2599,12 @@ msgid "Email"
msgstr "Email"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:441
+#: addressbook/gui/widgets/eab-popup-control.c:442
msgid "Email 2"
msgstr "Email 2"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:451
+#: addressbook/gui/widgets/eab-popup-control.c:452
msgid "Email 3"
msgstr "Email 3"
@@ -2998,7 +3016,7 @@ msgid "Error adding list"
msgstr "Lỗi khi thêm danh sách"
#: addressbook/gui/widgets/eab-gui-util.c:170
-#: addressbook/gui/widgets/eab-gui-util.c:581
+#: addressbook/gui/widgets/eab-gui-util.c:640
msgid "Error adding contact"
msgstr "Lỗi thêm liên lạc"
@@ -3015,7 +3033,7 @@ msgid "Error removing list"
msgstr "Lỗi khi loại bỏ danh sách"
#: addressbook/gui/widgets/eab-gui-util.c:193
-#: addressbook/gui/widgets/eab-gui-util.c:539
+#: addressbook/gui/widgets/eab-gui-util.c:598
msgid "Error removing contact"
msgstr "Lỗi loại bỏ liên lạc"
@@ -3042,39 +3060,39 @@ msgid "Overwrite"
msgstr "Ghi đè"
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:366
+#: addressbook/gui/widgets/eab-gui-util.c:383
msgid "card.vcf"
msgstr "card.vcf"
-#: addressbook/gui/widgets/eab-gui-util.c:500
+#: addressbook/gui/widgets/eab-gui-util.c:545
msgid "list"
msgstr "danh sách"
-#: addressbook/gui/widgets/eab-gui-util.c:635
+#: addressbook/gui/widgets/eab-gui-util.c:694
msgid "Move contact to"
msgstr "Chuyển liên lạc tới"
-#: addressbook/gui/widgets/eab-gui-util.c:637
+#: addressbook/gui/widgets/eab-gui-util.c:696
msgid "Copy contact to"
msgstr "Chép liên lạc tới"
-#: addressbook/gui/widgets/eab-gui-util.c:640
+#: addressbook/gui/widgets/eab-gui-util.c:699
msgid "Move contacts to"
msgstr "Chuyển các liên lạc tới"
-#: addressbook/gui/widgets/eab-gui-util.c:642
+#: addressbook/gui/widgets/eab-gui-util.c:701
msgid "Copy contacts to"
msgstr "Chép các liên lạc tới"
-#: addressbook/gui/widgets/eab-gui-util.c:645
+#: addressbook/gui/widgets/eab-gui-util.c:704
msgid "Select target addressbook."
msgstr "Chọn sổ địa chỉ đích."
-#: addressbook/gui/widgets/eab-gui-util.c:868
+#: addressbook/gui/widgets/eab-gui-util.c:927
msgid "Multiple VCards"
msgstr "Nhiều VCard"
-#: addressbook/gui/widgets/eab-gui-util.c:871
+#: addressbook/gui/widgets/eab-gui-util.c:930
#, c-format
msgid "VCard for %s"
msgstr "VCard cho %s"
@@ -3084,37 +3102,37 @@ msgstr "VCard cho %s"
#. * addresses (and *only* the e-mail addresses) associated with an existing
#. * contact.
#.
-#: addressbook/gui/widgets/eab-popup-control.c:198
+#: addressbook/gui/widgets/eab-popup-control.c:199
msgid "(none)"
msgstr "(không)"
-#: addressbook/gui/widgets/eab-popup-control.c:431
+#: addressbook/gui/widgets/eab-popup-control.c:432
msgid "Primary Email"
msgstr "Email chính"
-#: addressbook/gui/widgets/eab-popup-control.c:567
+#: addressbook/gui/widgets/eab-popup-control.c:568
msgid "Select an Action"
msgstr "Chọn hành động"
-#: addressbook/gui/widgets/eab-popup-control.c:575
+#: addressbook/gui/widgets/eab-popup-control.c:576
#, c-format
msgid "Create a new contact \"%s\""
msgstr "Tạo liên lạc mới \"%s\""
-#: addressbook/gui/widgets/eab-popup-control.c:591
+#: addressbook/gui/widgets/eab-popup-control.c:592
#, c-format
msgid "Add address to existing contact \"%s\""
msgstr "Thêm địa chỉ vào liên lạc đã có \"%s\""
-#: addressbook/gui/widgets/eab-popup-control.c:869
+#: addressbook/gui/widgets/eab-popup-control.c:870
msgid "Querying Address Book..."
msgstr "Đang truy vấn sổ địa chỉ..."
-#: addressbook/gui/widgets/eab-popup-control.c:952
+#: addressbook/gui/widgets/eab-popup-control.c:953
msgid "Edit Contact Info"
msgstr "Sửa thông tin liên lạc"
-#: addressbook/gui/widgets/eab-popup-control.c:1007
+#: addressbook/gui/widgets/eab-popup-control.c:1008
msgid "Merge E-Mail Address"
msgstr "Trộn địa chỉ email"
@@ -3146,17 +3164,17 @@ msgstr "Cửa sổ card"
msgid "GTK Tree View"
msgstr "GTK Tree View"
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
msgid "Reflow Test"
msgstr ""
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
#: addressbook/printing/test-contact-print-style-editor.c:54
#: addressbook/printing/test-print.c:53
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "Copyright (C) 2000, Ximian, Inc."
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
msgid "This should test the reflow canvas item"
msgstr ""
@@ -3463,6 +3481,7 @@ msgid "Unnamed List"
msgstr "Danh sách vô danh"
#. calendar:prompt-cancel-meeting primary
+#. calendar:prompt-cancel-task primary
#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
msgid "Would you like to send all the participants a cancellation notice?"
msgstr ""
@@ -3475,9 +3494,9 @@ msgid ""
msgstr ""
#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
-#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
-#: calendar/calendar-errors.xml.h:97
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:87
+#: calendar/calendar-errors.xml.h:93 calendar/calendar-errors.xml.h:99
+#: calendar/calendar-errors.xml.h:105
#, fuzzy
msgid "Don't Send"
msgstr "Không xóa"
@@ -3514,6 +3533,8 @@ msgid "Are you sure you want to delete this task?"
msgstr "Bạn có chắc muốn xóa %d công việc?"
#. calendar:prompt-delete-task secondary
+#. calendar:prompt-delete-named-task secondary
+#. calendar:prompt-delete-task secondary
#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
#: calendar/calendar-errors.xml.h:46
msgid "All information on this task will be deleted and can not be restored."
@@ -3552,6 +3573,7 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "Bạn có chắc muốn xóa cuộc hẹn `%s'?"
#. calendar:prompt-delete-titled-appointment secondary
+#. calendar:prompt-delete-appointment secondary
#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
msgid ""
"All information on this appointment will be deleted and can not be restored."
@@ -3576,6 +3598,7 @@ msgid "Are you sure you want to delete the journal entry '{0}'?"
msgstr "Bạn có chắc muốn xóa mục nhật ky1 `%s'?"
#. calendar:prompt-delete-named-journal secondary
+#. calendar:prompt-delete-journal secondary
#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
msgid ""
"All information in this journal will be deleted and can not be restored."
@@ -3638,87 +3661,108 @@ msgstr ""
"%s Bạn đã tạo ra vài thay đổi. Bỏ qua những thay đổi này và cập nhật bộ "
"biên soạn?"
-#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
+#: composer/mail-composer-errors.xml.h:33
#, fuzzy
msgid "Discard Changes"
msgstr "_Hủy thay đổi"
-#: calendar/calendar-errors.xml.h:74
+#: calendar/calendar-errors.xml.h:74 calendar/calendar-errors.xml.h:82
#, fuzzy
msgid "Save Changes"
msgstr "Lake Charles"
-#. calendar:prompt-meeting-invite primary
+#. calendar:prompt-save-task title
#: calendar/calendar-errors.xml.h:76
+#, fuzzy
+msgid "Save Task"
+msgstr "Lưu mới"
+
+#. calendar:prompt-save-task primary
+#: calendar/calendar-errors.xml.h:78
+#, fuzzy
+msgid "Would you like to save your changes to this task?"
+msgstr "Bạn có muốn lưu các thay đổi không?"
+
+#. calendar:prompt-save-task secondary
+#: calendar/calendar-errors.xml.h:80
+#, fuzzy
+msgid "You have made changes to this task, but not yet saved them."
+msgstr ""
+"%s Bạn đã tạo ra vài thay đổi. Bỏ qua những thay đổi này và cập nhật bộ "
+"biên soạn?"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:84
msgid "Would you like to send meeting invitations to participants?"
msgstr ""
#. calendar:prompt-meeting-invite secondary
-#: calendar/calendar-errors.xml.h:78
+#: calendar/calendar-errors.xml.h:86
msgid ""
"Email invitations will be sent to all participants and allow them to RSVP."
msgstr ""
-#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
-#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: calendar/calendar-errors.xml.h:88 calendar/calendar-errors.xml.h:94
+#: calendar/calendar-errors.xml.h:100 calendar/calendar-errors.xml.h:106
#: ui/evolution-message-composer.xml.h:24
msgid "Send"
msgstr "Gửi"
#. calendar:prompt-send-updated-meeting-info primary
-#: calendar/calendar-errors.xml.h:82
+#: calendar/calendar-errors.xml.h:90
msgid "Would you like to send updated meeting information to participants?"
msgstr ""
#. calendar:prompt-send-updated-meeting-info secondary
-#: calendar/calendar-errors.xml.h:84
+#: calendar/calendar-errors.xml.h:92
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
msgstr ""
#. calendar:prompt-send-task primary
-#: calendar/calendar-errors.xml.h:88
+#: calendar/calendar-errors.xml.h:96
msgid "Would you like to send this task to participants?"
msgstr ""
#. calendar:prompt-send-task secondary
-#: calendar/calendar-errors.xml.h:90
+#: calendar/calendar-errors.xml.h:98
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
msgstr ""
#. calendar:prompt-send-updated-task-info primary
-#: calendar/calendar-errors.xml.h:94
+#: calendar/calendar-errors.xml.h:102
msgid "Would you like to send updated task information to participants?"
msgstr ""
#. calendar:prompt-send-updated-task-info secondary
-#: calendar/calendar-errors.xml.h:96
+#: calendar/calendar-errors.xml.h:104
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
msgstr ""
#. calendar:tasks-crashed primary
-#: calendar/calendar-errors.xml.h:100
+#: calendar/calendar-errors.xml.h:108
msgid "The Evolution tasks have quit unexpectedly."
msgstr ""
#. calendar:tasks-crashed secondary
-#: calendar/calendar-errors.xml.h:102
+#: calendar/calendar-errors.xml.h:110
msgid "Your tasks will not be available until Evolution is restarted."
msgstr ""
#. calendar:calendar-crashed primary
-#: calendar/calendar-errors.xml.h:104
+#: calendar/calendar-errors.xml.h:112
#, fuzzy
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Bộ xem lịch iTip/iMip Evolution"
#. calendar:calendar-crashed secondary
-#: calendar/calendar-errors.xml.h:106
+#: calendar/calendar-errors.xml.h:114
msgid "Your calendars will not be available until Evolution is restarted."
msgstr ""
@@ -3766,7 +3810,7 @@ msgid "Calendar and Tasks"
msgstr "Công việc và Lịch"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#: calendar/gui/calendar-component.c:1072
+#: calendar/gui/calendar-component.c:1079
msgid "Calendars"
msgstr "Lịch"
@@ -3800,8 +3844,8 @@ msgstr "Thành phần công việc Evolution"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
#: calendar/gui/e-tasks.c:1198 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:884
-#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:83
+#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:889
+#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
#: calendar/importers/icalendar-importer.c:709
msgid "Tasks"
msgstr "Công việc"
@@ -3848,24 +3892,24 @@ msgstr "_Sửa cuộc hẹn"
msgid "_Snooze"
msgstr "_Ngủ"
-#: calendar/gui/alarm-notify/alarm-queue.c:881
+#: calendar/gui/alarm-notify/alarm-queue.c:885
#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr "Mở"
-#: calendar/gui/alarm-notify/alarm-queue.c:883
+#: calendar/gui/alarm-notify/alarm-queue.c:887
msgid "Dismiss"
msgstr "Bỏ qua"
-#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:889
msgid "Dismiss All"
msgstr "Bỏ qua tất cả"
-#: calendar/gui/alarm-notify/alarm-queue.c:949
+#: calendar/gui/alarm-notify/alarm-queue.c:954
msgid "No description available."
msgstr "Không có mô tả."
-#: calendar/gui/alarm-notify/alarm-queue.c:969
+#: calendar/gui/alarm-notify/alarm-queue.c:974
#, c-format
msgid ""
"Alarm on %s\n"
@@ -3878,12 +3922,12 @@ msgstr ""
"Bắt đầu lúc %s\n"
"Kết thúc lúc %s"
-#: calendar/gui/alarm-notify/alarm-queue.c:1069
-#: calendar/gui/alarm-notify/alarm-queue.c:1093
+#: calendar/gui/alarm-notify/alarm-queue.c:1074
+#: calendar/gui/alarm-notify/alarm-queue.c:1098
msgid "Warning"
msgstr "Cảnh báo"
-#: calendar/gui/alarm-notify/alarm-queue.c:1073
+#: calendar/gui/alarm-notify/alarm-queue.c:1078
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3895,7 +3939,7 @@ msgstr ""
"gửi thư. Thay vào đó, Evolution sẽ hiển thị một\n"
"hộp thoại nhắc nhở thông thường:"
-#: calendar/gui/alarm-notify/alarm-queue.c:1099
+#: calendar/gui/alarm-notify/alarm-queue.c:1104
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3912,7 +3956,7 @@ msgstr ""
"\n"
"Bạn có chắc muốn chạy chương trình này không?"
-#: calendar/gui/alarm-notify/alarm-queue.c:1113
+#: calendar/gui/alarm-notify/alarm-queue.c:1118
msgid "Do not ask me about this program again."
msgstr "Đừng hỏi tôi về chương trình này lần nữa."
@@ -4078,7 +4122,7 @@ msgstr "Không khớp"
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564
#: calendar/gui/dialogs/select-source-dialog.c:112
-#: calendar/gui/gnome-cal.c:1858
+#: calendar/gui/gnome-cal.c:1860
#: camel/providers/groupwise/camel-gw-listener.c:331
#: camel/providers/groupwise/camel-gw-listener.c:361
msgid "Calendar"
@@ -4111,6 +4155,10 @@ msgstr "%A %d %B %Y"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:519
#: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588
#: calendar/gui/e-week-view-main-item.c:329
@@ -4158,6 +4206,9 @@ msgstr "%d %B %Y"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
#: calendar/gui/calendar-component.c:545
#: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604
#: calendar/gui/e-week-view-main-item.c:343
@@ -4168,62 +4219,62 @@ msgstr "%d %b"
msgid "Failed upgrading calendars."
msgstr "Lỗi cập nhật lịch."
-#: calendar/gui/calendar-component.c:929
+#: calendar/gui/calendar-component.c:931
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/calendar-component.c:941
+#: calendar/gui/calendar-component.c:947
msgid "There is no calendar available for creating events and meetings"
msgstr ""
-#: calendar/gui/calendar-component.c:1238
+#: calendar/gui/calendar-component.c:1245
msgid "New appointment"
msgstr "Cuộc hẹn mới"
-#: calendar/gui/calendar-component.c:1239
+#: calendar/gui/calendar-component.c:1246
msgid "_Appointment"
msgstr "_Cuộc hẹn"
-#: calendar/gui/calendar-component.c:1240
+#: calendar/gui/calendar-component.c:1247
msgid "Create a new appointment"
msgstr "Tạo cuộc hẹn mới"
-#: calendar/gui/calendar-component.c:1246
+#: calendar/gui/calendar-component.c:1253
msgid "New meeting"
msgstr "Cuộc họp mới"
-#: calendar/gui/calendar-component.c:1247
+#: calendar/gui/calendar-component.c:1254
msgid "M_eeting"
msgstr "_Cuộc họp"
-#: calendar/gui/calendar-component.c:1248
+#: calendar/gui/calendar-component.c:1255
msgid "Create a new meeting request"
msgstr "Tạo yêu cầu cuộc họp mới"
-#: calendar/gui/calendar-component.c:1254
+#: calendar/gui/calendar-component.c:1261
msgid "New all day appointment"
msgstr "Cuộc hẹn nguyên ngày mới"
-#: calendar/gui/calendar-component.c:1255
+#: calendar/gui/calendar-component.c:1262
#, fuzzy
msgid "All Day A_ppointment"
msgstr "Cuộc hẹn n_guyên ngày"
-#: calendar/gui/calendar-component.c:1256
+#: calendar/gui/calendar-component.c:1263
msgid "Create a new all-day appointment"
msgstr "Tạo cuộc hẹn nguyên ngày mới"
-#: calendar/gui/calendar-component.c:1262
+#: calendar/gui/calendar-component.c:1269
msgid "New calendar"
msgstr "Lịch mới"
-#: calendar/gui/calendar-component.c:1263
+#: calendar/gui/calendar-component.c:1270
#, fuzzy
msgid "Cale_ndar"
msgstr "Lịch"
-#: calendar/gui/calendar-component.c:1264
+#: calendar/gui/calendar-component.c:1271
msgid "Create a new calendar"
msgstr "Tạo lịch mới"
@@ -4505,7 +4556,7 @@ msgstr "Công bố bận/rảnh"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:581
msgid "Friday"
msgstr "Thứ Sáu"
@@ -4519,7 +4570,7 @@ msgstr "Phút"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
#: calendar/gui/dialogs/recurrence-page.c:1034
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:577
msgid "Monday"
msgstr "Thứ Hai"
@@ -4529,7 +4580,7 @@ msgstr "_CN"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:582
msgid "Saturday"
msgstr "Thứ Bảy"
@@ -4543,7 +4594,7 @@ msgstr "Hiện số tuần trong bộ duyệt ngày"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:551
+#: calendar/gui/e-itip-control.c:576
msgid "Sunday"
msgstr "Chủ nhật"
@@ -4557,7 +4608,7 @@ msgstr "_Năm"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:580
msgid "Thursday"
msgstr "Thứ Năm"
@@ -4571,7 +4622,7 @@ msgstr "Dạng thức thời gian:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
#: calendar/gui/dialogs/recurrence-page.c:1035
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:578
msgid "Tuesday"
msgstr "Thứ Ba"
@@ -4581,7 +4632,7 @@ msgstr "Tuần _bắt đầu:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:579
msgid "Wednesday"
msgstr "Thứ Tư"
@@ -4712,8 +4763,9 @@ msgid "_Add Calendar"
msgstr "_Thêm lịch"
#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Thêm nhóm"
+#, fuzzy
+msgid "_Add Task List"
+msgstr "Thêm Danh sách công việc mới"
#: calendar/gui/dialogs/calendar-setup.glade.h:9
msgid "_Refresh:"
@@ -4969,19 +5021,19 @@ msgstr "Thời điểm kết thúc sai"
msgid "Unable to open the calendar '%s'."
msgstr "Không thể mở lịch '%s'."
-#: calendar/gui/dialogs/event-page.c:1799
+#: calendar/gui/dialogs/event-page.c:1804
#, fuzzy, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "trước khi mỗi cuộc hẹn"
-#: calendar/gui/dialogs/event-page.c:1807
+#: calendar/gui/dialogs/event-page.c:1812
#, fuzzy, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "kết thúc cuộc hẹn"
-#: calendar/gui/dialogs/event-page.c:1815
+#: calendar/gui/dialogs/event-page.c:1820
#, fuzzy, c-format
msgid "%d minute before appointement"
msgid_plural "%d minutes before appointment"
@@ -5096,9 +5148,14 @@ msgid "_Start time:"
msgstr "Thời điểm đầ_u:"
#. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
#: calendar/gui/dialogs/meeting-page.c:316
#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:953
#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877
#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933
#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
@@ -5121,11 +5178,11 @@ msgstr "Cần một tổ chức."
msgid "At least one attendee is required."
msgstr "Cần ít nhất một người tham dự."
-#: calendar/gui/dialogs/meeting-page.c:764
+#: calendar/gui/dialogs/meeting-page.c:793
msgid "_Delegate To..."
msgstr "Ủ_y nhiệm cho..."
-#: calendar/gui/dialogs/meeting-page.c:768
+#: calendar/gui/dialogs/meeting-page.c:797
#: composer/e-msg-composer-attachment-bar.c:453
msgid "_Remove"
msgstr "_Loại bỏ"
@@ -5167,7 +5224,7 @@ msgid "Member"
msgstr "Thành viên"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-list-view.c:241
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -5403,7 +5460,7 @@ msgstr "<span weight=\"bold\">Chữ ký điện tử</span>"
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-cal-component-preview.c:230
#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
-#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:745
#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
#: calendar/gui/print.c:2346
msgid "Completed"
@@ -5652,7 +5709,7 @@ msgid "Untitled"
msgstr "Vô danh"
#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "Tóm tắt:"
@@ -5667,7 +5724,7 @@ msgstr "Ngày đến hạn:"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:981
msgid "Status:"
msgstr "Trạng thái:"
@@ -5676,7 +5733,7 @@ msgid "Priority:"
msgstr "Độ ưu tiên:"
#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
msgid "Description:"
msgstr "Mô tả"
@@ -5746,20 +5803,20 @@ msgstr "Không"
#. This is the default filename used for temporary file creation
#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:998 calendar/gui/e-itip-control.c:1212
#: calendar/gui/e-meeting-list-view.c:122
#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
#: camel/camel-gpg-context.c:1763 camel/camel-gpg-context.c:1814
#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1382
-#: camel/providers/imap4/camel-imap4-engine.c:1412
-#: camel/providers/imap4/camel-imap4-engine.c:1444
-#: camel/providers/imap4/camel-imap4-engine.c:1486
-#: camel/providers/imap4/camel-imap4-store.c:1222
+#: camel/providers/imap4/camel-imap4-engine.c:1402
+#: camel/providers/imap4/camel-imap4-engine.c:1432
+#: camel/providers/imap4/camel-imap4-engine.c:1464
+#: camel/providers/imap4/camel-imap4-engine.c:1506
+#: camel/providers/imap4/camel-imap4-store.c:1223
#: camel/providers/imap4/camel-imap4-utils.c:457
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1155
#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
#: widgets/misc/e-charset-picker.c:62
msgid "Unknown"
@@ -5826,7 +5883,7 @@ msgid "Updating objects"
msgstr "Đang cập nhật đối tượng"
#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1440
+#: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512
#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "_Mở"
@@ -5836,15 +5893,15 @@ msgid "Open _Web Page"
msgstr "Mở trang _Web"
#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
-#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1446
+#: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518
#: mail/em-folder-view.c:901 mail/em-popup.c:691 mail/em-popup.c:807
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr "Lư_u mới..."
#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
-#: calendar/gui/e-calendar-view.c:1339 calendar/gui/e-calendar-view.c:1362
-#: calendar/gui/e-calendar-view.c:1444 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1410 calendar/gui/e-calendar-view.c:1433
+#: calendar/gui/e-calendar-view.c:1516 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
#: ui/evolution-tasks.xml.h:25
@@ -5852,14 +5909,14 @@ msgid "_Print..."
msgstr "_In..."
#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
-#: calendar/gui/e-calendar-view.c:1367 calendar/gui/e-calendar-view.c:1410
+#: calendar/gui/e-calendar-view.c:1438 calendar/gui/e-calendar-view.c:1482
#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
#: ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "_Cắt"
#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077
-#: calendar/gui/e-calendar-view.c:1368 calendar/gui/e-calendar-view.c:1408
+#: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480
#: mail/em-folder-tree.c:965 mail/message-list.c:1702
#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
@@ -5868,8 +5925,8 @@ msgid "_Copy"
msgstr "_Sao chép"
#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
-#: calendar/gui/e-calendar-view.c:1343 calendar/gui/e-calendar-view.c:1369
-#: calendar/gui/e-calendar-view.c:1442 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1414 calendar/gui/e-calendar-view.c:1440
+#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
msgid "_Paste"
@@ -5893,7 +5950,7 @@ msgstr "Đánh _dấu công việc hoàn tất"
#. FIXME: need to disable for undeletable folders
#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1380 calendar/gui/e-calendar-view.c:1412
+#: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484
#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:924
#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
@@ -5955,77 +6012,90 @@ msgstr "Đang di chuyển"
msgid "Copying items"
msgstr "Đang sao chép"
-#: calendar/gui/e-calendar-view.c:1332 calendar/gui/e-calendar-view.c:1420
+#: calendar/gui/e-calendar-view.c:1403 calendar/gui/e-calendar-view.c:1492
msgid "New _Appointment..."
msgstr "Cuộc hẹn mớ_i..."
-#: calendar/gui/e-calendar-view.c:1333 calendar/gui/e-calendar-view.c:1425
+#: calendar/gui/e-calendar-view.c:1404 calendar/gui/e-calendar-view.c:1497
msgid "New All Day _Event"
msgstr "Sự _kiện mọi ngày mới"
-#: calendar/gui/e-calendar-view.c:1334 calendar/gui/e-calendar-view.c:1430
+#: calendar/gui/e-calendar-view.c:1405 calendar/gui/e-calendar-view.c:1502
msgid "New Meeting"
msgstr "Cuộc họp mới"
-#: calendar/gui/e-calendar-view.c:1335 calendar/gui/e-calendar-view.c:1435
+#: calendar/gui/e-calendar-view.c:1406 calendar/gui/e-calendar-view.c:1507
msgid "New Task"
msgstr "Công việc mới"
-#: calendar/gui/e-calendar-view.c:1349 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1420 ui/evolution-calendar.xml.h:26
msgid "Select _Today"
msgstr "Chọn _hôm nay"
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1421
msgid "_Select Date..."
msgstr "_Chọn ngày..."
-#: calendar/gui/e-calendar-view.c:1354 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1425 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr "_Công bố thông tin bận/rảnh"
-#: calendar/gui/e-calendar-view.c:1373
+#: calendar/gui/e-calendar-view.c:1444
msgid "Cop_y to Calendar..."
msgstr "_Chép vào lịch..."
-#: calendar/gui/e-calendar-view.c:1374
+#: calendar/gui/e-calendar-view.c:1445
msgid "Mo_ve to Calendar..."
msgstr "_Chuyển vào lịch..."
-#: calendar/gui/e-calendar-view.c:1375
+#: calendar/gui/e-calendar-view.c:1446
msgid "_Schedule Meeting..."
msgstr "Lập lịch _cuộc họp..."
-#: calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1447
msgid "_Forward as iCalendar..."
msgstr "_Chuyển như iCalendar..."
-#: calendar/gui/e-calendar-view.c:1381 calendar/gui/e-calendar-view.c:1413
+#: calendar/gui/e-calendar-view.c:1452
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "Xóa lần này"
+
+#: calendar/gui/e-calendar-view.c:1453 calendar/gui/e-calendar-view.c:1485
msgid "Delete this _Occurrence"
msgstr "_Xóa lần này"
-#: calendar/gui/e-calendar-view.c:1382 calendar/gui/e-calendar-view.c:1414
+#: calendar/gui/e-calendar-view.c:1454 calendar/gui/e-calendar-view.c:1486
msgid "Delete _All Occurrences"
msgstr "Xóa _mọi lần"
-#: calendar/gui/e-calendar-view.c:1416
+#: calendar/gui/e-calendar-view.c:1488
msgid "Go to _Today"
msgstr "Đi tới ngày _hôm nay"
-#: calendar/gui/e-calendar-view.c:1418
+#: calendar/gui/e-calendar-view.c:1490
msgid "_Go to Date..."
msgstr "Đi tới _ngày..."
-#: calendar/gui/e-calendar-view.c:1448 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1520 ui/evolution.xml.h:35
msgid "_Settings..."
msgstr "T_hiết lập..."
#. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
#: e-util/e-time-utils.c:402
msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -6049,6 +6119,10 @@ msgstr "lệch %02i phút"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
#: calendar/gui/e-day-view-top-item.c:710 calendar/gui/e-day-view.c:1571
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
@@ -6066,401 +6140,401 @@ msgstr "am"
msgid "pm"
msgstr "pm"
-#: calendar/gui/e-itip-control.c:585
+#: calendar/gui/e-itip-control.c:610
msgid "Yes. (Complex Recurrence)"
msgstr "Có. (Truy hồi phức)"
-#: calendar/gui/e-itip-control.c:596
+#: calendar/gui/e-itip-control.c:621
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "Mỗi ngày"
msgstr[1] "Mỗi %d ngày"
-#: calendar/gui/e-itip-control.c:601
+#: calendar/gui/e-itip-control.c:626
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "Mỗi tuần"
msgstr[1] "Mỗi %d tuần"
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:628
#, fuzzy, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "Mỗi tuần lúc "
msgstr[1] "Mỗi %d tuần lúc "
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:636
msgid " and "
msgstr " và "
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:643
#, c-format
msgid "The %s day of "
msgstr "%s ngày của "
-#: calendar/gui/e-itip-control.c:631
+#: calendar/gui/e-itip-control.c:656
#, c-format
msgid "The %s %s of "
msgstr "%s %s của "
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:663
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "mỗi tháng"
msgstr[1] "mỗi %d tháng"
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:667
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "mỗi năm"
msgstr[1] "mỗi %d năm"
-#: calendar/gui/e-itip-control.c:653
+#: calendar/gui/e-itip-control.c:678
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] " tổng cộng %d lần"
msgstr[1] " tổng cộng %d lần"
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:687
msgid ", ending on "
msgstr ", kết thúc lúc "
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:711
#, fuzzy
msgid "Starts"
msgstr "Trạng thái"
-#: calendar/gui/e-itip-control.c:699
+#: calendar/gui/e-itip-control.c:724
#, fuzzy
msgid "Ends"
msgstr "Enid"
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:758
#, fuzzy
msgid "Due"
msgstr "Đến hạn "
-#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
+#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:855
msgid "iCalendar Information"
msgstr "Thông tin iCalendar"
#. Title
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:815
msgid "iCalendar Error"
msgstr "Lỗi iCalendar"
-#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
-#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:887 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:914 calendar/gui/e-itip-control.c:931
msgid "An unknown person"
msgstr "Người lạ"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:913
+#: calendar/gui/e-itip-control.c:938
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr ""
"<br> Vui lòng xem lại các chỉ dẫn sau và chọn một hành động từ menu bên dưới."
-#: calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:967
msgid "Location:"
msgstr "Địa điểm:"
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:986 calendar/gui/e-meeting-list-view.c:158
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "Chấp nhận"
-#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "Tạm chấp nhận"
-#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:994 calendar/gui/e-meeting-list-view.c:159
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr "Từ chối"
-#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
-#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1107 calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1133 calendar/gui/e-itip-control.c:1158
msgid "Choose an action:"
msgstr "Chọn hành động:"
-#: calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1054
msgid "Update"
msgstr "Cập nhật"
-#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1055 calendar/gui/e-itip-control.c:1086
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1135 calendar/gui/e-itip-control.c:1160
#: shell/e-shell.c:1210 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "Đồng ý"
-#: calendar/gui/e-itip-control.c:1057
+#: calendar/gui/e-itip-control.c:1082
msgid "Accept"
msgstr "Chấp nhận"
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1083
msgid "Tentatively accept"
msgstr "Tạm chấp nhận"
-#: calendar/gui/e-itip-control.c:1059
+#: calendar/gui/e-itip-control.c:1084
msgid "Decline"
msgstr "Từ chối"
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1108
msgid "Send Free/Busy Information"
msgstr "Gửi thông tin Rảnh/Bận"
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1121
msgid "Update respondent status"
msgstr "Cập nhật trạng thái trả lời"
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1134
msgid "Send Latest Information"
msgstr "Gửi thông tin mới nhất"
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1144
msgid ""
"The meeting has been cancelled, however it could not be found in your "
"calendars"
msgstr ""
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1146
msgid ""
"The task has been cancelled, however it could not be found in your task lists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1159 calendar/gui/itip-utils.c:442
#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Bỏ"
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1235
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> đã công bố thông tin cuộc họp."
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1236
msgid "Meeting Information"
msgstr "Thông tin cuộc họp"
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1241
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> yêu cầu sự hiện diện của %s tại cuộc họp."
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1243
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> yêu cầu sự hiện diện của bạn tại cuộc họp."
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1244
msgid "Meeting Proposal"
msgstr "Đề nghị cuộc họp"
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1265
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b? muốn được dự cuộc họp đã có."
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1266
msgid "Meeting Update"
msgstr "Cập nhật cuộc họp"
-#: calendar/gui/e-itip-control.c:1258
+#: calendar/gui/e-itip-control.c:1270
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> muốn nhận thông tin mới nhất về cuộc họp"
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1271
msgid "Meeting Update Request"
msgstr "Yêu cầu cập nhật cuộc họp"
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1278
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> đã trả lời yêu cầu họp."
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1279
msgid "Meeting Reply"
msgstr "Trả lời họp"
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1286
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> đã hủy bỏ cuộc họp."
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1287
msgid "Meeting Cancellation"
msgstr "Hủy bỏ cuộc họp"
-#: calendar/gui/e-itip-control.c:1282 calendar/gui/e-itip-control.c:1350
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1294 calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1397
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> đã gửi một thông điệp khó hiểu."
-#: calendar/gui/e-itip-control.c:1283
+#: calendar/gui/e-itip-control.c:1295
msgid "Bad Meeting Message"
msgstr "Thông điệp lạ về cuộc họp"
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1320
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> đã công bố thông tin công việc."
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1321
msgid "Task Information"
msgstr "Thông tin công việc"
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1326
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> yêu cầu %s để thực hiện công việc."
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1328
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> yêu cầu thực hiện công việc."
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1329
msgid "Task Proposal"
msgstr "Đề nghị công việc"
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1333
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> muốn thêm vào công việc đã có."
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1334
msgid "Task Update"
msgstr "Cập nhật công việc"
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1338
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> muốn nhận thông tin mới nhất về công việc."
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1339
msgid "Task Update Request"
msgstr "Yêu cầu cập nhật công việc"
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1346
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> đã trả lời việc gán công việc."
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1347
msgid "Task Reply"
msgstr "Trả lời công việc"
-#: calendar/gui/e-itip-control.c:1342
+#: calendar/gui/e-itip-control.c:1354
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> đã hủy bỏ công việc."
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1355
msgid "Task Cancellation"
msgstr "Hủy bỏ công việc"
-#: calendar/gui/e-itip-control.c:1351
+#: calendar/gui/e-itip-control.c:1363
msgid "Bad Task Message"
msgstr "Thông điệp lạ về công việc"
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1382
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> đã công bố thông tin bận/rảnh."
-#: calendar/gui/e-itip-control.c:1371
+#: calendar/gui/e-itip-control.c:1383
msgid "Free/Busy Information"
msgstr "Thông tin bận/rảnh"
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1387
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> yêu cầu thông tin bận/rảnh của bạn."
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1388
msgid "Free/Busy Request"
msgstr "Yêu cầu thông tin bận/rảnh"
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1392
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> đã trả lời yêu cầu thông tin bận/rảnh."
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1393
msgid "Free/Busy Reply"
msgstr "Trả lời thông tin bận/rảnh"
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1398
msgid "Bad Free/Busy Message"
msgstr "Thông điệp bận/rảnh sai"
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1473
msgid "The message does not appear to be properly formed"
msgstr "Thông điệp có lẽ không đúng hình thức"
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1532
msgid "The message contains only unsupported requests."
msgstr "Thông điệp chỉ chứa yêu cầu chưa được hỗ trợ."
-#: calendar/gui/e-itip-control.c:1551
+#: calendar/gui/e-itip-control.c:1563
msgid "The attachment does not contain a valid calendar message"
msgstr "Đồ đính kèm không chứa thông điệp lịch hợp lệ"
-#: calendar/gui/e-itip-control.c:1583
+#: calendar/gui/e-itip-control.c:1595
msgid "The attachment has no viewable calendar items"
msgstr "Đồ đính kèm không chứa mục lịch nào có thể xem được"
-#: calendar/gui/e-itip-control.c:1817
+#: calendar/gui/e-itip-control.c:1829
msgid "Update complete\n"
msgstr "Hoàn tất cập nhật\n"
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1857
msgid "Object is invalid and cannot be updated\n"
msgstr "Đối tượng không hợp lệ và không thể được cập nhật\n"
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1867
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
"Hồi đáp này đến từ một người dự hiện thời. Thêm người này như là người tham "
"dự nhé?"
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1879
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
"Không thể cập nhật trạng thái người tham dự vì trạng thái không hợp lệ!\n"
-#: calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:1896
msgid "Attendee status updated\n"
msgstr "Đã cập nhật trạng thái người tham dự\n"
-#: calendar/gui/e-itip-control.c:1887
+#: calendar/gui/e-itip-control.c:1899
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
"Không thể cập nhật trạng thái người tham dự vì chưa có người nào tham dự"
-#: calendar/gui/e-itip-control.c:1914
+#: calendar/gui/e-itip-control.c:1926
msgid "Removal Complete"
msgstr "Hoàn tất loại bỏ"
-#: calendar/gui/e-itip-control.c:1937 calendar/gui/e-itip-control.c:1985
+#: calendar/gui/e-itip-control.c:1949 calendar/gui/e-itip-control.c:1997
msgid "Item sent!\n"
msgstr "Đã gửi!\n"
-#: calendar/gui/e-itip-control.c:1939 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2001
msgid "The item could not be sent!\n"
msgstr "Không thể gửi!\n"
@@ -6581,6 +6655,10 @@ msgstr "%A, %d %B, %Y"
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
#: calendar/gui/e-meeting-time-sel-item.c:456
#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6589,6 +6667,10 @@ msgstr "%a %d/%m/%Y"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
msgid "%m/%d/%Y"
@@ -6652,7 +6734,7 @@ msgstr "Người yêu cầu _và một tài nguyên"
msgid "Enter the password for %s"
msgstr "Nhập mật khẩu cho %s"
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2255
+#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2263
#, c-format
msgid ""
"Error on %s:\n"
@@ -6687,22 +6769,22 @@ msgstr "Đang xóa"
msgid "Updating query"
msgstr "Đang cập nhật đối tượng"
-#: calendar/gui/gnome-cal.c:2038
+#: calendar/gui/gnome-cal.c:2040
#, c-format
msgid "Loading appointments at %s"
msgstr "Đang nạp cuộc hẹn lúc %s"
-#: calendar/gui/gnome-cal.c:2057
+#: calendar/gui/gnome-cal.c:2059
#, c-format
msgid "Loading tasks at %s"
msgstr "Đang nạp công việc lúc %s"
-#: calendar/gui/gnome-cal.c:2144
+#: calendar/gui/gnome-cal.c:2152
#, c-format
msgid "Opening %s"
msgstr "Đang mở %s"
-#: calendar/gui/gnome-cal.c:3111
+#: calendar/gui/gnome-cal.c:3122
msgid "Purging"
msgstr "Đang xóa"
@@ -7112,58 +7194,58 @@ msgstr[1] "%d được chọn"
msgid "Failed upgrading tasks."
msgstr "Lỗi nâng cấp công việc."
-#: calendar/gui/tasks-component.c:756
+#: calendar/gui/tasks-component.c:758
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/tasks-component.c:768
+#: calendar/gui/tasks-component.c:773
msgid "There is no calendar available for creating tasks"
msgstr ""
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1047
msgid "New task"
msgstr "Công việc mới"
-#: calendar/gui/tasks-component.c:1043
+#: calendar/gui/tasks-component.c:1048
msgid "_Task"
msgstr "Nhiệm _vụ"
-#: calendar/gui/tasks-component.c:1044
+#: calendar/gui/tasks-component.c:1049
msgid "Create a new task"
msgstr "Tạo công việc mới"
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1055
#, fuzzy
msgid "New assigned task"
msgstr "Gán công việc"
-#: calendar/gui/tasks-component.c:1051
+#: calendar/gui/tasks-component.c:1056
#, fuzzy
msgid "Assigne_d Task"
msgstr "Gán công việc"
-#: calendar/gui/tasks-component.c:1052
+#: calendar/gui/tasks-component.c:1057
#, fuzzy
msgid "Create a new assigned task"
msgstr "Tạo công việc mới"
-#: calendar/gui/tasks-component.c:1058
+#: calendar/gui/tasks-component.c:1063
#, fuzzy
msgid "New task list"
msgstr "Danh sách công việc"
-#: calendar/gui/tasks-component.c:1059
+#: calendar/gui/tasks-component.c:1064
#, fuzzy
msgid "Task l_ist"
msgstr "Danh sách công việc"
-#: calendar/gui/tasks-component.c:1060
+#: calendar/gui/tasks-component.c:1065
#, fuzzy
msgid "Create a new task list"
msgstr "Tạo công việc mới"
-#: calendar/gui/tasks-control.c:367
+#: calendar/gui/tasks-control.c:370
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -7175,11 +7257,11 @@ msgstr ""
"\n"
"Bạn có thật sự muốn xóa những công việc này không?"
-#: calendar/gui/tasks-control.c:370
+#: calendar/gui/tasks-control.c:373
msgid "Do not ask me again."
msgstr "Đừng hỏi tôi lần nữa"
-#: calendar/gui/tasks-control.c:428
+#: calendar/gui/tasks-control.c:431
msgid "Print Tasks"
msgstr "In công việc"
@@ -8939,7 +9021,8 @@ msgstr "Đối số không hợp lệ (user-tag)"
msgid "Failed to create create child process '%s': %s"
msgstr "Lỗi tạo tiến trình con '%s': %s"
-#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
+#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
+#: camel/camel-filter-search.c:671 camel/camel-filter-search.c:679
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Lỗi thực hiện tìm kiếm bộ lọc: %s: %s"
@@ -9358,37 +9441,37 @@ msgstr "Hồi đáp của server chứa dữ liệu xác thực không hoàn ch
msgid "Server response does not match\n"
msgstr "Tín hiệu trả lời của server không khớp\n"
-#: camel/camel-sasl-gssapi.c:48
+#: camel/camel-sasl-gssapi.c:52
msgid "GSSAPI"
msgstr "GSSAPI"
-#: camel/camel-sasl-gssapi.c:50
+#: camel/camel-sasl-gssapi.c:54
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "Tùy chọn này sẽ kết nối tới server bằng cơ chế xác minh Kerberos 5."
-#: camel/camel-sasl-gssapi.c:148
+#: camel/camel-sasl-gssapi.c:152
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
msgstr ""
-#: camel/camel-sasl-gssapi.c:153
+#: camel/camel-sasl-gssapi.c:157
msgid "The provided target_name parameter was ill-formed."
msgstr "Tham số target_name sai dạng thức."
-#: camel/camel-sasl-gssapi.c:156
+#: camel/camel-sasl-gssapi.c:160
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "Tham số target_name chứa loại tên không hỗ trợ hoặc không hợp lệ."
-#: camel/camel-sasl-gssapi.c:160
+#: camel/camel-sasl-gssapi.c:164
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
msgstr ""
-#: camel/camel-sasl-gssapi.c:165
+#: camel/camel-sasl-gssapi.c:169
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
@@ -9396,41 +9479,41 @@ msgstr ""
"Tham số input_token chứa chữ ký không hợp lệ, hoặc chữ ký không được xác "
"nhận."
-#: camel/camel-sasl-gssapi.c:169
+#: camel/camel-sasl-gssapi.c:173
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
msgstr ""
-#: camel/camel-sasl-gssapi.c:174
+#: camel/camel-sasl-gssapi.c:178
msgid "The supplied context handle did not refer to a valid context."
msgstr ""
-#: camel/camel-sasl-gssapi.c:177
+#: camel/camel-sasl-gssapi.c:181
msgid "The consistency checks performed on the input_token failed."
msgstr ""
-#: camel/camel-sasl-gssapi.c:180
+#: camel/camel-sasl-gssapi.c:184
msgid "The consistency checks performed on the credential failed."
msgstr ""
-#: camel/camel-sasl-gssapi.c:183
+#: camel/camel-sasl-gssapi.c:187
msgid "The referenced credentials have expired."
msgstr ""
-#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
-#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242
+#: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293
#: camel/camel-sasl-kerberos4.c:219
#: camel/providers/imap/camel-imap-store.c:1236
msgid "Bad authentication response from server."
msgstr "Trả lời xác thực từ server sai."
-#: camel/camel-sasl-gssapi.c:213
+#: camel/camel-sasl-gssapi.c:217
#, c-format
msgid "Failed to resolve host `%s': %s"
msgstr "Lỗi phân giải máy '%s': %s"
-#: camel/camel-sasl-gssapi.c:299
+#: camel/camel-sasl-gssapi.c:303
msgid "Unsupported security layer."
msgstr "Tầng bảo mật chưa được hỗ trợ."
@@ -10112,7 +10195,7 @@ msgstr "_Tự động kiểm tra có thư mới"
#: camel/providers/groupwise/camel-groupwise-provider.c:69
#, fuzzy
-msgid "Address Book And Calendar"
+msgid "Address Book and Calendar"
msgstr "Sổ địa chỉ"
#: camel/providers/groupwise/camel-groupwise-provider.c:72
@@ -10124,8 +10207,9 @@ msgid "Post Office Agent SOAP Port:"
msgstr ""
#: camel/providers/groupwise/camel-groupwise-provider.c:78
-msgid "Use ssl"
-msgstr ""
+#, fuzzy
+msgid "Use Secure Connection (SSL)"
+msgstr "Dùng kết nối _an toàn (SSL):"
#: camel/providers/groupwise/camel-groupwise-provider.c:92
msgid "Novell GroupWise"
@@ -10171,7 +10255,7 @@ msgstr "Server đã ngắt kết nối bất ngờ: %s"
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:282
+#: camel/providers/imap4/camel-imap4-store.c:283
#: camel/providers/pop3/camel-pop3-store.c:543
#: camel/providers/pop3/camel-pop3-store.c:550
#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1220
@@ -10356,21 +10440,21 @@ msgid "For reading and storing mail on IMAP servers."
msgstr "Để đọc và lưu thư trên IMAP server."
#: camel/providers/imap/camel-imap-store.c:424
-#: camel/providers/imap4/camel-imap4-store.c:176
+#: camel/providers/imap4/camel-imap4-store.c:177
#, c-format
msgid "IMAP server %s"
msgstr "Máy chủ IMAP %s"
#: camel/providers/imap/camel-imap-store.c:426
-#: camel/providers/imap4/camel-imap4-store.c:178
+#: camel/providers/imap4/camel-imap4-store.c:179
#, c-format
msgid "IMAP service for %s on %s"
msgstr "Dịch vụ IMAP cho %s trên %s"
#: camel/providers/imap/camel-imap-store.c:547
#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap4-store.c:213
-#: camel/providers/imap4/camel-imap4-store.c:229
+#: camel/providers/imap4/camel-imap4-store.c:214
+#: camel/providers/imap4/camel-imap4-store.c:230
#: camel/providers/imapp/camel-imapp-store.c:231
#: camel/providers/nntp/camel-nntp-store.c:209
#: camel/providers/pop3/camel-pop3-store.c:175
@@ -10381,7 +10465,7 @@ msgid "Could not connect to %s (port %d): %s"
msgstr "Không thể kết nối tới %s (cổng %d): %s"
#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap4-store.c:215
+#: camel/providers/imap4/camel-imap4-store.c:216
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
@@ -10389,7 +10473,7 @@ msgstr "Không có SSL"
#: camel/providers/imap/camel-imap-store.c:564
#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imap4/camel-imap4-store.c:226
+#: camel/providers/imap4/camel-imap4-store.c:227
#: camel/providers/imapp/camel-imapp-store.c:228
#: camel/providers/nntp/camel-nntp-store.c:206
#: camel/providers/nntp/camel-nntp-store.c:224
@@ -10399,7 +10483,7 @@ msgstr "Kết nối bị hủy bỏ"
#: camel/providers/imap/camel-imap-store.c:675
#: camel/providers/imap/camel-imap-store.c:706
-#: camel/providers/imap4/camel-imap4-store.c:281
+#: camel/providers/imap4/camel-imap4-store.c:282
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Lỗi kết nối tới IMAP server %s trong chế độ an toàn: %s"
@@ -10459,7 +10543,7 @@ msgstr "Không có thư mục %s"
#: camel/providers/imap/camel-imap-store.c:1881
#: camel/providers/imap/camel-imap-store.c:2259
-#: camel/providers/imap4/camel-imap4-store.c:763
+#: camel/providers/imap4/camel-imap4-store.c:764
#, fuzzy, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10494,25 +10578,25 @@ msgstr "Không thể xác thực tại POP server: %s: %s"
msgid "Unexpected response from IMAP4 server %s: %s"
msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
-#: camel/providers/imap4/camel-imap4-engine.c:229
+#: camel/providers/imap4/camel-imap4-engine.c:230
#, fuzzy, c-format
msgid "Unexpected greeting from IMAP server %s."
msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
-#: camel/providers/imap4/camel-imap4-engine.c:413
+#: camel/providers/imap4/camel-imap4-engine.c:414
#, fuzzy, c-format
msgid "Cannot select folder `%s': Invalid mailbox name"
msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
-#: camel/providers/imap4/camel-imap4-engine.c:419
+#: camel/providers/imap4/camel-imap4-engine.c:420
#, fuzzy, c-format
msgid "Cannot select folder `%s': Bad command"
msgstr "Không thể lấy thư mục: %s: %s"
-#: camel/providers/imap4/camel-imap4-engine.c:1381
-#: camel/providers/imap4/camel-imap4-engine.c:1411
-#: camel/providers/imap4/camel-imap4-engine.c:1443
-#: camel/providers/imap4/camel-imap4-engine.c:1485
+#: camel/providers/imap4/camel-imap4-engine.c:1401
+#: camel/providers/imap4/camel-imap4-engine.c:1431
+#: camel/providers/imap4/camel-imap4-engine.c:1463
+#: camel/providers/imap4/camel-imap4-engine.c:1505
#, c-format
msgid "IMAP4 server %s unexpectedly disconnected: %s"
msgstr "Máy chủ IMAP4 %s ngắt kết nối bất ngờ: %s"
@@ -10605,100 +10689,100 @@ msgid ""
msgstr ""
"Tùy chọn này sẽ kết nối tới IMAP server bằng mật khẩu thô (không mã hóa)."
-#: camel/providers/imap4/camel-imap4-store.c:256
+#: camel/providers/imap4/camel-imap4-store.c:257
#, fuzzy, c-format
msgid ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
"STARTTLS"
msgstr "Lỗi kết nối tới IMAP server %s trong chế độ an toàn: %s"
-#: camel/providers/imap4/camel-imap4-store.c:362
+#: camel/providers/imap4/camel-imap4-store.c:363
#, fuzzy, c-format
msgid ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
msgstr ""
"Không thể kết nối tới POP server %s: Không hỗ trợ cơ chế xác thực yêu cầu."
-#: camel/providers/imap4/camel-imap4-store.c:407
+#: camel/providers/imap4/camel-imap4-store.c:408
#, fuzzy, c-format
msgid "%sPlease enter the IMAP password for %s on host %s"
msgstr "%sVui lòng nhập mật khẩu SMTP cho %s@%s"
-#: camel/providers/imap4/camel-imap4-store.c:477
+#: camel/providers/imap4/camel-imap4-store.c:478
#, fuzzy, c-format
msgid "Cannot authenticate to IMAP server %s using %s"
msgstr "Không thể xác thực tại POP server: %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:700
+#: camel/providers/imap4/camel-imap4-store.c:701
#, fuzzy, c-format
msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
msgstr "Không thể lấy thư mục: %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:814
+#: camel/providers/imap4/camel-imap4-store.c:815
#, fuzzy, c-format
msgid "Cannot create folder `%s': Invalid mailbox name"
msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
-#: camel/providers/imap4/camel-imap4-store.c:820
+#: camel/providers/imap4/camel-imap4-store.c:821
#, fuzzy, c-format
msgid "Cannot create folder `%s': Bad command"
msgstr "Không thể lấy thư mục: %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:851
+#: camel/providers/imap4/camel-imap4-store.c:852
#, fuzzy, c-format
msgid "Cannot delete folder `%s': Special folder"
msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
-#: camel/providers/imap4/camel-imap4-store.c:910
+#: camel/providers/imap4/camel-imap4-store.c:911
#, fuzzy, c-format
msgid "Cannot delete folder `%s': Invalid mailbox name"
msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
-#: camel/providers/imap4/camel-imap4-store.c:915
+#: camel/providers/imap4/camel-imap4-store.c:916
#, fuzzy, c-format
msgid "Cannot delete folder `%s': Bad command"
msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
-#: camel/providers/imap4/camel-imap4-store.c:935
+#: camel/providers/imap4/camel-imap4-store.c:936
#, fuzzy, c-format
msgid "Cannot rename folder `%s' to `%s': Special folder"
msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
-#: camel/providers/imap4/camel-imap4-store.c:967
+#: camel/providers/imap4/camel-imap4-store.c:968
#, fuzzy, c-format
msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
-#: camel/providers/imap4/camel-imap4-store.c:972
+#: camel/providers/imap4/camel-imap4-store.c:973
#, fuzzy, c-format
msgid "Cannot rename folder `%s' to `%s': Bad command"
msgstr "Không thể lấy thư mục: %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:1220
+#: camel/providers/imap4/camel-imap4-store.c:1221
#, c-format
msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
msgstr ""
-#: camel/providers/imap4/camel-imap4-store.c:1222
+#: camel/providers/imap4/camel-imap4-store.c:1223
msgid "Bad command"
msgstr "Lệnh sai"
-#: camel/providers/imap4/camel-imap4-store.c:1298
+#: camel/providers/imap4/camel-imap4-store.c:1299
#, fuzzy, c-format
msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
-#: camel/providers/imap4/camel-imap4-store.c:1303
+#: camel/providers/imap4/camel-imap4-store.c:1304
#, fuzzy, c-format
msgid "Cannot subscribe to folder `%s': Bad command"
msgstr "Không thể lấy thư mục: %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:1363
+#: camel/providers/imap4/camel-imap4-store.c:1364
#, fuzzy, c-format
msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
-#: camel/providers/imap4/camel-imap4-store.c:1368
+#: camel/providers/imap4/camel-imap4-store.c:1369
#, fuzzy, c-format
msgid "Cannot unsubscribe from folder `%s': Bad command"
msgstr "Không thể lấy thư mục: %s: %s"
@@ -11953,7 +12037,7 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:410
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:436
msgid "attachment"
msgstr "đồ đính kèm"
@@ -11993,7 +12077,8 @@ msgid "MIME type:"
msgstr "Kiểu MIME:"
#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:74
+#: composer/e-msg-composer-select-file.c:92
+#: composer/e-msg-composer-select-file.c:111
msgid "Suggest automatic display of attachment"
msgstr "Đề nghị tự động hiển thị đồ đính kèm"
@@ -12075,7 +12160,7 @@ msgstr "Gửi tới:"
msgid "Click here to select folders to post to"
msgstr "<nhấn đây để chọn thư mục>"
-#: composer/e-msg-composer-select-file.c:127
+#: composer/e-msg-composer-select-file.c:186
msgid "Attach file(s)"
msgstr "Đính kèm tập tin"
@@ -12187,6 +12272,11 @@ msgid "Could not retrieve messages to attach from {0}."
msgstr "Không thể nhận thông điệp từ POP server %s: %s"
#. mail-composer:attach-nomessages secondary
+#. mail-composer:no-sig-file secondary
+#. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
#: composer/mail-composer-errors.xml.h:14
#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
@@ -12292,6 +12382,7 @@ msgstr ""
"khi có thể biên soạn thư."
#. mail-composer:no-address-control primary
+#. mail-composer:no-editor-control primary
#: composer/mail-composer-errors.xml.h:48
#: composer/mail-composer-errors.xml.h:52
#, fuzzy
@@ -12320,15 +12411,14 @@ msgstr ""
"Vui lòng kiểm tra xem GtkHTML và libGtkHTML\n"
"có được cài đặt đúng phiên bản chưa.\n"
-#: data/evolution.desktop.in.in.h:1
-#, fuzzy
-msgid "The Ximian Evolution Groupware Suite"
-msgstr "Bộ phần mềm nhóm Evolution"
+#: data/evolution.desktop.in.in.h:1 shell/main.c:503
+msgid "Evolution"
+msgstr "Evolution"
#: data/evolution.desktop.in.in.h:2
#, fuzzy
-msgid "Ximian Evolution (Unstable)"
-msgstr "Ximian Evolution"
+msgid "The Evolution Groupware Suite"
+msgstr "Bộ phần mềm nhóm Evolution"
#: data/evolution.keys.in.in.h:1
msgid "address card"
@@ -12435,7 +12525,7 @@ msgid ""
"do?"
msgstr ""
-#: e-util/e-dialog-utils.c:253
+#: e-util/e-dialog-utils.c:265
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -12444,26 +12534,30 @@ msgstr ""
"Ghi đè tập tin này?"
#. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:255 widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:267 widgets/misc/e-system-errors.xml.h:2
msgid "Overwrite file?"
msgstr "Ghi đè tập tin?"
-#: e-util/e-passwords.c:358
-msgid "Remember this password"
-msgstr "Nhớ mật khẩu này"
+#: e-util/e-passwords.c:460
+msgid "_Remember this password"
+msgstr "_Nhớ mật khẩu này"
-#: e-util/e-passwords.c:360
-msgid "Remember this password for the remainder of this session"
-msgstr "Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
+#: e-util/e-passwords.c:461
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
@@ -12515,23 +12609,31 @@ msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y %H"
#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
@@ -12626,6 +12728,7 @@ msgid "Missing file name."
msgstr "Tên _phân biệt:"
#. filter:no-file secondary
+#. filter:bad-file secondary
#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
msgid "You must specify a file name."
msgstr "Bạn phải xác định tên tập tin."
@@ -12650,6 +12753,7 @@ msgid "Could not compile regular expression \"{1}\"."
msgstr ""
#. filter:no-name primary
+#. mail:no-name-vfolder primary
#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
#, fuzzy
msgid "Missing name."
@@ -13566,7 +13670,7 @@ msgstr "Đã ngắt"
#: mail/em-format-html-display.c:650
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
-"The Internet."
+"the Internet."
msgstr ""
#: mail/em-format-html-display.c:651 mail/em-format-html.c:592
@@ -13711,7 +13815,7 @@ msgid "Bcc"
msgstr "Bcc"
#. pseudo-header
-#: mail/em-format-html.c:1554 mail/em-format-quote.c:312
+#: mail/em-format-html.c:1554 mail/em-format-quote.c:314
#: mail/em-mailer-prefs.c:939
msgid "Mailer"
msgstr ""
@@ -13726,7 +13830,7 @@ msgstr ""
msgid "<I> (%R %Z)</I>"
msgstr ""
-#: mail/em-format-html.c:1594 mail/em-format-quote.c:319 mail/em-format.c:806
+#: mail/em-format-html.c:1594 mail/em-format-quote.c:321 mail/em-format.c:806
#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
msgid "Date"
msgstr "Ngày"
@@ -13914,23 +14018,23 @@ msgstr "Đừng hiện thông báo này lần nữa."
msgid "Filters"
msgstr "Bộ lọc"
-#: mail/em-utils.c:408
+#: mail/em-utils.c:434
#, fuzzy
msgid "message"
msgstr "Thông báo"
-#: mail/em-utils.c:511
+#: mail/em-utils.c:543
#, fuzzy
msgid "Save Message..."
msgstr "Lưu thông điệp là..."
-#: mail/em-utils.c:560
+#: mail/em-utils.c:592
#, fuzzy
msgid "Add address"
msgstr "Địa chỉ"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1021
+#: mail/em-utils.c:1053
#, fuzzy, c-format
msgid "Messages from %s"
msgstr "Thừ từ %s"
@@ -15642,6 +15746,7 @@ msgid ""
msgstr ""
#. mail:ask-send-only-bcc-contact primary
+#. mail:ask-send-only-bcc primary
#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
#, fuzzy
msgid "Are you sure you want to send a message with only BCC recipients?"
@@ -15711,6 +15816,7 @@ msgstr ""
"Bạn có chắc muốn mở tất cả %d thông điệp trong những cửa sổ riêng biệt không?"
#. mail:ask-expunge secondary
+#. mail:ask-empty-trash secondary
#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
msgid "If you continue, you will not be able to recover these messages."
msgstr ""
@@ -15807,6 +15913,8 @@ msgid "Cannot save to directory \"{0}\"."
msgstr "Không thể tạo thư mục %s: %s"
#. mail:no-create-path primary
+#. mail:no-write-path-exists primary
+#. mail:no-write-path-notfile primary
#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
#: mail/mail-errors.xml.h:106
#, fuzzy
@@ -15857,6 +15965,7 @@ msgid "Cannot delete system folder \"{0}\"."
msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
#. mail:no-delete-spethal-folder secondary
+#. mail:no-rename-spethal-folder secondary
#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
@@ -15889,12 +15998,14 @@ msgid ""
msgstr ""
#. mail:no-rename-folder-exists primary
+#. mail:no-rename-folder primary
#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
#, fuzzy
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "Không thể di chuyển thư mục: %s"
#. mail:no-rename-folder-exists secondary
+#. mail:vfolder-notunique secondary
#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr ""
@@ -15905,24 +16016,28 @@ msgid "Because \"{2}\"."
msgstr "Vì \"{2}\"."
#. mail:no-move-folder-nostore primary
+#. mail:no-move-folder-to-nostore primary
#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
#, fuzzy
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "Không thể di chuyển thư mục: %s"
#. mail:no-move-folder-nostore secondary
+#. mail:no-copy-folder-nostore secondary
#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
#, fuzzy
msgid "Cannot open source \"{2}\"."
msgstr "Không thể mở thư mục chia sẽ: %s."
#. mail:no-move-folder-to-nostore secondary
+#. mail:no-copy-folder-to-nostore secondary
#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
#, fuzzy
msgid "Cannot open target \"{2}\"."
msgstr "Không thể mở thông điệp"
#. mail:no-copy-folder-nostore primary
+#. mail:no-copy-folder-to-nostore primary
#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
#, fuzzy
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15941,6 +16056,7 @@ msgid "Cannot open source \"{1}\""
msgstr "Không thể mở thư mục chia sẽ: %s."
#. mail:account-incomplete primary
+#. mail:account-notunique primary
#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
#, fuzzy
msgid "Cannot save changes to account."
@@ -16354,26 +16470,18 @@ msgstr "Đang cập nhập..."
msgid "Waiting..."
msgstr "Đang chờ..."
-#: mail/mail-session.c:240
-msgid "User canceled operation."
-msgstr "Người dùng đã hủy bỏ tác vụ."
-
-#: mail/mail-session.c:274
+#: mail/mail-session.c:207
#, c-format
msgid "Enter Password for %s"
msgstr "Nhập mật khẩu cho %s"
-#: mail/mail-session.c:276
+#: mail/mail-session.c:209
msgid "Enter Password"
msgstr "Nhập mật khẩu"
-#: mail/mail-session.c:304
-msgid "_Remember this password"
-msgstr "_Nhớ mật khẩu này"
-
-#: mail/mail-session.c:305
-msgid "_Remember this password for the remainder of this session"
-msgstr "_Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
+#: mail/mail-session.c:238
+msgid "User canceled operation."
+msgstr "Người dùng đã hủy bỏ tác vụ."
#: mail/mail-signature-editor.c:371
msgid "Edit signature"
@@ -16745,7 +16853,7 @@ msgstr ""
msgid "Select importer"
msgstr "Chọn bộ nhập"
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1056
#, c-format
msgid "File %s does not exist"
msgstr "Tập tin %s không tồn tại"
@@ -16785,22 +16893,22 @@ msgstr "_Tên tập tin:"
msgid "Select a file"
msgstr "Chọn tập tin"
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:643
#, fuzzy
msgid "File _type:"
msgstr "Kiểu tập tin:"
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:682
#, fuzzy
msgid "Import data and settings from _older programs"
msgstr "Nhập dữ liệu và thiết lập từ chương trình cũ"
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:685
#, fuzzy
msgid "Import a _single file"
msgstr "Nhập tập tin đơn"
-#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:753 shell/e-shell-startup-wizard.c:571
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -16808,26 +16916,26 @@ msgstr ""
"Vui lòng chờ...\n"
"Đang quét tìm thiết lập hiện có"
-#: shell/e-shell-importer.c:756
+#: shell/e-shell-importer.c:757
msgid "Starting Intelligent Importers"
msgstr "Đang khởi động bộ nhập thông minh"
-#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:698
#, c-format
msgid "From %s:"
msgstr "Từ %s:"
-#: shell/e-shell-importer.c:1073
+#: shell/e-shell-importer.c:1074
#, fuzzy, c-format
msgid "No importer available for file %s"
msgstr "Không có bên nào cung cấp giao thức `%s'"
-#: shell/e-shell-importer.c:1085
+#: shell/e-shell-importer.c:1086
#, fuzzy
msgid "Unable to execute importer"
msgstr "Lỗi thực hiện GPG."
-#: shell/e-shell-importer.c:1199
+#: shell/e-shell-importer.c:1200
msgid "_Import"
msgstr "_Nhập"
@@ -17074,7 +17182,7 @@ msgid "Evolution can import data from the following files:"
msgstr "Evolution có thể nhập dữ liệu từ các tập tin sau:"
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:225
+#: shell/main.c:226
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -17106,7 +17214,7 @@ msgstr ""
"Chúng tôi hy vọng bạn thích kết quả của quá trình làm việc của chúng tôi,\n"
"và chúng tôi háo hức chờ đời sự đóng góp của bạn!\n"
-#: shell/main.c:249
+#: shell/main.c:250
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -17114,39 +17222,35 @@ msgstr ""
"Xin cám ơn\n"
"Nhóm Evolution\n"
-#: shell/main.c:256
+#: shell/main.c:257
msgid "Don't tell me again"
msgstr "Đừng nói điều này lần nữa"
-#: shell/main.c:461
+#: shell/main.c:462
msgid "Start Evolution activating the specified component"
msgstr ""
-#: shell/main.c:463
+#: shell/main.c:464
msgid "Start in offline mode"
msgstr "Khởi động trong chế độ ngoại tuyến"
-#: shell/main.c:465
+#: shell/main.c:466
msgid "Start in online mode"
msgstr "Khởi động trong chế độ trực tuyến"
-#: shell/main.c:468
+#: shell/main.c:469
msgid "Forcibly shut down all evolution components"
msgstr ""
-#: shell/main.c:472
+#: shell/main.c:473
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Buộc tái nâng cấp từ Evolution 1.4"
-#: shell/main.c:475
+#: shell/main.c:476
msgid "Send the debugging output of all components to a file."
msgstr "Gửi thông tin debug của mọi thành phần vào tập tin."
-#: shell/main.c:502
-msgid "Evolution"
-msgstr "Evolution"
-
-#: shell/main.c:506
+#: shell/main.c:507
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -17191,6 +17295,7 @@ msgid "Continue"
msgstr "Tiếp tục"
#. shell:upgrade-remove-1-4 title
+#. shell:upgrade-remove-1-4 primary
#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
msgid "Delete old data from version {0}?"
msgstr ""
@@ -17208,17 +17313,22 @@ msgstr ""
#: shell/shell-errors.xml.h:25
#, fuzzy
-msgid "Keep"
-msgstr "Bíp"
+msgid "_Remind Me Later"
+msgstr "Gửi _sau"
+
+#: shell/shell-errors.xml.h:26
+msgid "_Keep Data"
+msgstr ""
#. shell:upgrade-remove-1-4-confirm title
-#: shell/shell-errors.xml.h:27 shell/shell-errors.xml.h:29
+#. shell:upgrade-remove-1-4-confirm primary
+#: shell/shell-errors.xml.h:28 shell/shell-errors.xml.h:30
#, fuzzy
msgid "Really delete old data?"
msgstr "Bạn thật sự muốn xóa thư mục \"%s\" chứ?"
#. shell:upgrade-remove-1-4-confirm secondary
-#: shell/shell-errors.xml.h:31
+#: shell/shell-errors.xml.h:32
msgid ""
"The entire contents of the \"evolution\" directory is about to be be "
"permanently removed.\n"
@@ -17232,17 +17342,19 @@ msgid ""
msgstr ""
#. shell:noshell title
-#: shell/shell-errors.xml.h:38 shell/shell-errors.xml.h:46
+#. shell:noshell-reason title
+#: shell/shell-errors.xml.h:39 shell/shell-errors.xml.h:47
msgid "Cannot start Evolution"
msgstr "Lhông thể khởi động Evolution"
#. shell:noshell primary
-#: shell/shell-errors.xml.h:40 shell/shell-errors.xml.h:48
+#. shell:noshell-reason primary
+#: shell/shell-errors.xml.h:41 shell/shell-errors.xml.h:49
msgid "Evolution can not start."
msgstr "Evolution không thể khởi động."
#. shell:noshell secondary
-#: shell/shell-errors.xml.h:42
+#: shell/shell-errors.xml.h:43
msgid ""
"Your system configuration does not match your Evolution configuration.\n"
"\n"
@@ -17250,7 +17362,7 @@ msgid ""
msgstr ""
#. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:50
+#: shell/shell-errors.xml.h:51
msgid ""
"Your system configuration does not match your Evolution configuration:\n"
"\n"
@@ -17281,30 +17393,31 @@ msgid ""
"unless otherwise indicated here"
msgstr ""
-#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
-#: smime/gui/certificate-manager.c:556
+#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
+#: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
+#: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
msgid "Select a cert to import..."
msgstr "Chọn chứng nhận cần nhập..."
-#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
-#: smime/gui/certificate-manager.c:638
+#: smime/gui/certificate-manager.c:263 smime/gui/certificate-manager.c:472
+#: smime/gui/certificate-manager.c:690
msgid "Certificate Name"
msgstr "Tên Chứng nhận"
-#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
+#: smime/gui/certificate-manager.c:272 smime/gui/certificate-manager.c:490
msgid "Purposes"
msgstr "Mục đích"
-#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:281 smime/gui/smime-ui.glade.h:36
#: smime/lib/e-cert.c:569
msgid "Serial Number"
msgstr ""
-#: smime/gui/certificate-manager.c:271
+#: smime/gui/certificate-manager.c:289
msgid "Expires"
msgstr "Hết hạn"
-#: smime/gui/certificate-manager.c:446
+#: smime/gui/certificate-manager.c:481
msgid "E-Mail Address"
msgstr "Địa chỉ E-Mail"
@@ -19559,6 +19672,23 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% hoàn tất)"
+#~ msgid "_Add Group"
+#~ msgstr "_Thêm nhóm"
+
+#, fuzzy
+#~ msgid "Ximian Evolution (Unstable)"
+#~ msgstr "Ximian Evolution"
+
+#~ msgid "Remember this password"
+#~ msgstr "Nhớ mật khẩu này"
+
+#~ msgid "Remember this password for the remainder of this session"
+#~ msgstr "Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
+
+#, fuzzy
+#~ msgid "Keep"
+#~ msgstr "Bíp"
+
#~ msgid "New Contacts Group"
#~ msgstr "Nhóm Liên lạc mới"
@@ -31989,9 +32119,6 @@ msgstr "%s (%d%% hoàn tất)"
#~ msgid "Insert text file..."
#~ msgstr "Chèn tập tin text..."
-#~ msgid "Send _Later"
-#~ msgstr "Gửi _sau"
-
#~ msgid "Configure the task view's settings"
#~ msgstr "Cấu hình thiết lập khung công việc"