merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/po/TEAMS b/po/TEAMS
index b3184cb0c04a951f8f39ed1236d624eb23192974..d8f7a2ba38d9520e6f4b62d187bfd4f9fe9ba4b3 100644 (file)
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -13,12 +13,12 @@ Members:    Alex Henrie <alexhenrie24@gmail.com>
 Language:      de (German)
 Repository:    https://github.com/ralfth/git-po-de
 Leader:                Ralf Thielow <ralf.thielow@gmail.com>
-Members:       Thomas Rast <tr@thomasrast.ch>
-               Jan Krüger <jk@jk.gs>
-               Christian Stimming <stimming@tuhh.de>
+Members:       Matthias Rüster <matthias.ruester@gmail.com>
                Phillip Szelat <phillip.szelat@gmail.com>
-               Matthias Rüster <matthias.ruester@gmail.com>
-               Magnus Görlitz <magnus.goerlitz@googlemail.com>
+
+Language:      es (Spanish)
+Repository:    https://github.com/ChrisADR/git-po
+Leader:                Christopher Díaz <christopher.diaz.riv@gmail.com>
 
 Language:      fr (French)
 Repository:    https://github.com/jnavila/git
@@ -34,8 +34,10 @@ Leader:              Marco Paolone <marcopaolone AT gmail.com>
 Members:       Stefano Lattarini <stefano.lattarini AT gmail.com>
 
 Language:      ko (Korean)
-Repository:    https://github.com/changwoo/git-l10n-ko/
-Leader:                Changwoo Ryu <cwryu@debian.org>
+Repository:    https://github.com/git-l10n-ko/git-l10n-ko/
+Leader:                Gwan-gyeong Mun <elongbug@gmail.com>
+Members:       Changwoo Ryu <cwryu@debian.org>
+               Sihyeon Jang <uneedsihyeon@gmail.com>
 
 Language:      pt_PT (Portuguese - Portugal)
 Repository:    https://github.com/vascool/git-po-pt/
@@ -61,3 +63,4 @@ Repository:   https://github.com/jiangxin/git/
 Leader:                Jiang Xin <worldhello.net AT gmail.com>
 Members:       Ray Chen <oldsharp AT gmail.com>
                依云 <lilydjwg AT gmail.com>
+               Fangyi Zhou <fangyi.zhou AT yuriko.moe>