Revert Vietnamese translation update. It should go in upstream patches

2014-04-30 22:53:10 +02:00
parent 5fc7602f3e
commit 2ef82ecb53
2 changed files with 746 additions and 439 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,12 +15,15 @@ shadow (1:4.2-2) UNRELEASED; urgency=low
    This will allow initscripts to drop /etc/init.d/motd.
    Closes: #741129

+<<<<<<< HEAD
  [ Trần Ngọc Quân ]
  * Vietnamese translation update.

  [ Laurent Bigonville ]
  * Enable libaudit support. Closes: #745774

+=======
+>>>>>>> parent of 0274441... Vietnamese translation update.
 -- Christian Perrier <bubulle@debian.org>  Wed, 30 Apr 2014 22:14:23 +0200

 shadow (1:4.2-1) experimental; urgency=low
--- a/po/vi.po
+++ b/po/vi.po