[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Thu Oct 29 20:50:03 UTC 2020


The branch, master has been updated
       via  e8f31e5c234 pam_winbind/ro.po: fix error from previous patch merge
      from  9214fcec349 tests: avoid returning an already used ID in randomXid()

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e8f31e5c23434ca04c921693376624a44dc36849
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Oct 29 17:47:37 2020 +0100

    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 at samba.org>
    Reviewed-by: Björn Baumbach <bbaumbach at samba.org>
    
    Autobuild-User(master): Björn Jacke <bjacke at samba.org>
    Autobuild-Date(master): Thu Oct 29 20:49:16 UTC 2020 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/locale/pam_winbind/ru.po | 3 ---
 1 file changed, 3 deletions(-)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository



More information about the samba-cvs mailing list