Updates to Russian i18n by Danil Smirnov.

Removed some 'prior translator' files from Russian templates directory.

5 files changed, 7 insertions, 161 deletions

diff --git a/templates/ru/Makefile b/templates/ru/Makefile
deleted file mode 100644
index 148099df..00000000
--- a/templates/ru/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# FILES=admindbpreamble.html adminsubscribeack.txt adminunsubscribeack.txt admlogin.html approve.txt article.html bounce.txt checkdbs.txt convert.txt cronpass.txt headfoot.html help.txt listinfo.html masthead.txt newlist.txt nopass.txt options.html postack.txt postauth.txt postheld.txt private.html reenable.txt refuse.txt roster.html subauth.txt subscribeack.txt subscribe.html unsub.txt userpass.txt verify.txt
-FILES=$(shell cat status | sed -e 's/ .*$$//')
-TARGET=/var/home/mailman/templates/ru/
-WEB=/var/www/mailman-ru
-WFILES_DIR=/var/www/mailman-ru/files
-
-TFILES=$(addprefix $(TARGET),$(FILES))
-WFILES=$(addprefix $(WEB),$(FILES))
-
-diff_args=-ub
-
-all:
-	@echo there is nothing to do
-
-diff-%: %
-	@-(cd ../en/ ; cvs -z6 diff $(diff_args) -r$(shell fgrep $< status | awk '{ print $$2; }') $<)
-
-check:
-	@(cd ../en/ ; cvs -z6 -q status ) | ./s2s.py
-
-todo:
-	@cat status | while read name version status rest; do [ "$$status" == "done" ] || echo $$name; done | sort
-
-done:
-	@cat status | while read name version status rest; do [ "$$status" == "done" ] && echo $$name; done | sort
-
-started:
-	@cat status | while read name version status rest; do [ "$$status" == "started" ] && echo $$name; done | sort
-
-status-%: %
-	@ cat status | grep "^$< "
-
-$(WEB)/%: %
-	cp $< $@
-
-#update: $(WFILES)
-update: update-files update-status
-
-update-files:
-	install -d $(WFILES_DIR)
-	@for file in $(FILES); do if [ ! -e $(WFILES_DIR)/$$file -o $$file -nt $(WFILES_DIR)/$$file ]; then cp -vf $$file $(WFILES_DIR)/$$file; fi; done
-
-update-status: $(WEB)/status.html
-
-$(WEB)/status.html: status s2h.py
-	./s2h.py > $@
-
-install:
-	sudo -u mailman install -d $(TARGET)
-	sudo -u mailman install $(FILES) $(TARGET)
diff --git a/templates/ru/adminaddrchgack.txt b/templates/ru/adminaddrchgack.txt
new file mode 100644
index 00000000..00486a03
--- /dev/null
+++ b/templates/ru/adminaddrchgack.txt
@@ -0,0 +1,5 @@
+Адрес подписки на %(listname)s
+для %(name)s был успешно изменен
+с %(oldaddr)s на %(newaddr)s.
+
+
diff --git a/templates/ru/admindbdetails.html b/templates/ru/admindbdetails.html
index 55a163c2..5759ea23 100644
--- a/templates/ru/admindbdetails.html
+++ b/templates/ru/admindbdetails.html
@@ -13,7 +13,8 @@
     действие, если вы хотите указанно сообжение переправить или сохранить (см.
     ниже).
 
-    <li><b>Одобрить</b> &mdash; переправить сообщение в список рассылки.
+    <li><b>Принять/Одобрить</b> &mdash; принять сообщение и переправить его
+    в список рассылки. Для запросов об изменении подписки, одобрить их.
 
     <li><b>Отказать</b> &mdash; отвергнуть сообщение, отправив отправителю
     уведомление, что его сообщение принято не было.  Само сообщение после
diff --git a/templates/ru/s2s.py b/templates/ru/s2s.py
deleted file mode 100644
index 5f3e08bd..00000000
--- a/templates/ru/s2s.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /usr/bin/python
-
-# A simple script to check the status of the translation.
-
-import sys, string
-from pprint import pprint
-
-def chop (line):
-    if line[-2:] == '\r\n':
-        line = line[:-2]
-
-    if line[-1:] == '\n':
-        line = line[:-1]
-
-    return line
-
-def cmprevision (a, b):
-    '''revisions are something delimited with dots'''
-
-    return cmp (map (lambda x: x.lower (), a.split ('.')), map (lambda x: x.lower (), b.split ('.')))
-
-name = None
-revision = None
-
-files = {}
-
-for line in sys.stdin.readlines ():
-    parts = string.split (chop (line))
-
-    if len (parts) > 0:
-        if parts[0] == 'File:':
-            name = parts[1]
-        elif parts[0] == 'Repository':
-            files[name] = parts[2]
-
-# pprint (files)
-
-action = 0
-
-for line in open ('status', 'r').readlines ():
-    parts = string.split (chop (line))
-
-    if len (parts) > 0:
-        if files.has_key (parts[0]):
-            pass    # check the version
-
-            relation = cmprevision (parts[1], files[parts[0]])
-
-            if relation < 0:
-                print 'Update: %s (%s -> %s)' % (parts[0], parts[1], files[parts[0]])
-                action = 1
-            elif relation > 0:
-                print 'Downgrade?: %s (%s -> %s)' % (parts[0], parts[1], files[parts[0]])
-                action = 1
-
-            del files[parts[0]] # delete the item
-        else:
-            print 'Delete:', parts[0]
-            action = 1
-
-for file in files.keys ():
-    print 'New:', file
-    action = 1
-
-if not action:
-    print 'You are translating the latest versions'
diff --git a/templates/ru/status b/templates/ru/status
deleted file mode 100644
index 5a3dd145..00000000
--- a/templates/ru/status
+++ /dev/null
@@ -1,44 +0,0 @@
-admindbdetails.html      2.1.2.1    done
-admindbpreamble.html     2.3    done
-adminsubscribeack.txt    2.0    done
-adminunsubscribeack.txt  2.0    done
-admlogin.html            2.0    done
-approve.txt              2.0    done
-article.html             2.2    done
-bounce.txt               2.1    done
-checkdbs.txt             2.0    done
-convert.txt              2.0    done
-cronpass.txt             2.0    done
-headfoot.html            2.1.2.1    done
-help.txt                 2.2    done
-invite.txt               2.0    done
-listinfo.html            2.4    done
-masthead.txt             2.0    done
-newlist.txt              2.1    done
-nomoretoday.txt          2.0    done
-options.html             2.10.2.3   started
-postack.txt              2.1    done
-postauth.txt             2.0    done
-postheld.txt             2.1    done
-private.html             2.1.2.1    done
-refuse.txt               2.0    done
-roster.html              2.0    done
-subauth.txt              2.1    done
-subscribeack.txt         2.1    done
-subscribe.html           2.1    done
-unsub.txt                2.1    done
-unsubauth.txt            2.0    done
-userpass.txt             2.1    done
-verify.txt               2.1.2.1    done
-emptyarchive.html        2.0    done
-admindbsummary.html      2.0    done
-disabled.txt             2.1    done
-archidxentry.html        1.1    done
-archidxfoot.html         1.1    done
-archidxhead.html         1.1    done
-archlistend.html         1.1    done
-archliststart.html       1.1    done
-archtocentry.html        1.1    done
-archtoc.html             1.2    done
-probe.txt                1.1.2.1 done
-archtocnombox.html       1.1.2.1 done