Merged r11529 from trunk to 2.2-stable (#13343, #13339)

r11529 has some 2.2-stable translation.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11532 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index e2b1bf01041beceb764b2d1b3b4efb53b17b2681..82e37297689dbce5532b2064222c3cef15976952 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1126,13 +1126,13 @@ vi:
   permission_set_notes_private: Đặt ghi chú thành riêng tư
   label_no_issues_in_project: Không có vấn đề nào trong dự án
   label_any: tất cả
-  label_last_n_weeks: last %{count} weeks
-  setting_cross_project_subtasks: Allow cross-project subtasks
-  label_cross_project_descendants: With subprojects
-  label_cross_project_tree: With project tree
-  label_cross_project_hierarchy: With project hierarchy
-  label_cross_project_system: With all projects
-  button_hide: Hide
-  setting_non_working_week_days: Non-working days
-  label_in_the_next_days: in the next
-  label_in_the_past_days: in the past
+  label_last_n_weeks: "%{count} tuần qua"
+  setting_cross_project_subtasks: Cho phép các nhiệm vụ con liên dự án
+  label_cross_project_descendants: Trong các dự án con
+  label_cross_project_tree: Trong cùng cây dự án
+  label_cross_project_hierarchy: Trong dự án cùng cấp bậc
+  label_cross_project_system: Trong tất cả các dự án
+  button_hide: Ẩn
+  setting_non_working_week_days: Các ngày không làm việc
+  label_in_the_next_days: Trong tương lai
+  label_in_the_past_days: Trong quá khứ