From: Björn Jacke <bj@sernet.de>
Date: Thu, 29 Oct 2020 16:47:37 +0000 (+0100)
Subject: pam_winbind/ro.po: fix error from previous patch merge
X-Git-Tag: talloc-2.3.2~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8f31e5c23434ca04c921693376624a44dc36849;p=thirdparty%2Fsamba.git

pam_winbind/ro.po: fix error from previous patch merge

fixes up d619a57804d200e351b509d67a8c76042cb9daa8

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14491

Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Björn Baumbach <bbaumbach@samba.org>

Autobuild-User(master): Björn Jacke <bjacke@samba.org>
Autobuild-Date(master): Thu Oct 29 20:49:16 UTC 2020 on sn-devel-184
---

diff --git a/source3/locale/pam_winbind/ru.po b/source3/locale/pam_winbind/ru.po
index 24c482be46b..1c2ff904be8 100644
--- a/source3/locale/pam_winbind/ru.po
+++ b/source3/locale/pam_winbind/ru.po
@@ -557,6 +557,3 @@ msgstr ""
 #: ../../libsmb/nterr.c:649
 msgid "No more files"
 msgstr ""
-=======
-msgstr "Извините, пароли не совпадают"
->>>>>>> s3: update Russian translation of pam_winbind