[Bf-translations-svn] SVN commit: [5578] branches/vi/vi.po: Updated Vietnamese translations (from H? Ch?u).

[bf-translations at blender.org]

Revision: 5578
          https://developer.blender.org/rBTS5578
Author:   mont29
Date:     2021-02-22 11:17:27 +0100 (Mon, 22 Feb 2021)
Log Message:
-----------
Updated Vietnamese translations (from H? Ch?u).

Modified Paths:
--------------
    branches/vi/vi.po

Modified: branches/vi/vi.po
===================================================================
--- branches/vi/vi.po	2021-02-20 14:59:57 UTC (rev 5577)
+++ branches/vi/vi.po	2021-02-22 10:17:27 UTC (rev 5578)
@@ -703,8 +703,19 @@
 msgid "Value"
 msgstr "Giá Trị"
 
+<<<<<<< .mine
 #. :src: bpy.types.AOVs
 msgid "List of AOVs"
+msgstr "Danh sách AOV"
+
+#. :src: bpy.types.AOVs
+msgid "Collection of AOVs"
+msgstr "Sưu tập AOV"
+
+||||||| .r5555
+=======
+#. :src: bpy.types.AOVs
+msgid "List of AOVs"
 msgstr ""
 
 #. :src: bpy.types.AOVs
@@ -712,6 +723,7 @@
 msgid "Collection of AOVs"
 msgstr "Sưu tập đường dẫn"
 
+>>>>>>> .r5577
 #. :src: bpy.types.ActionFCurves
 msgid "Action F-Curves"
 msgstr "Cong-F Hành Động"
@@ -56975,11 +56987,19 @@
 msgid "Attribute Vector Math"
 msgstr "Toán Vectơ Đặc Điểm"
 
+<<<<<<< .mine
 #. :src: bpy.types.GeometryNodeAttributeVectorMath.input_type_c
+msgid "Input Type C"
+msgstr "Ngõ Vào Loại C"
+
+||||||| .r5555
+=======
+#. :src: bpy.types.GeometryNodeAttributeVectorMath.input_type_c
 #, fuzzy
 msgid "Input Type C"
 msgstr "Ngõ Vào Loại B"
 
+>>>>>>> .r5577
 #. :src: bpy.types.GeometryNodeAttributeVectorMath.operation:'MULTIPLY'
 #. :src: bpy.types.ShaderNodeVectorMath.operation:'MULTIPLY'
 msgid "Entry-wise multiply"
@@ -132196,10 +132216,20 @@
 msgid "Shear: %.3f %s (Press X or Y to set shear axis)"
 msgstr "Méo Mó: %.3f %s (Bấm X hay Y để đặt trục méo mó)"
 
+<<<<<<< .mine
 #: source/blender/editors/transform/transform_mode_shrink_fatten.c:77
+msgid "Shrink/Fatten: "
+msgstr "Thu Nhỏ/Phình To:"
+||||||| .r5555
+#: source/blender/editors/transform/transform_mode_shrink_fatten.c:76
+msgid "Shrink/Fatten:"
+msgstr "Thu Nhỏ/Phình Ra:"
+=======
+#: source/blender/editors/transform/transform_mode_shrink_fatten.c:77
 #, fuzzy
 msgid "Shrink/Fatten: "
 msgstr "Thu Nhỏ/Phình Ra:"
+>>>>>>> .r5577
 
 #: source/blender/editors/transform/transform_mode_shrink_fatten.c:106
 msgid " or Alt) Even Thickness %s"