changeset 3669:86f8f213d044

merge 2 heads
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 05 Jun 2008 11:31:57 +0200
parents 1a5fe473e649 (current diff) d027dd4948d7 (diff)
children a799b224389f
files MoinMoin/auth/ldap_login.py docs/CHANGES
diffstat 59 files changed, 2283 insertions(+), 1776 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jun 05 11:18:40 2008 +0200
+++ b/.hgtags	Thu Jun 05 11:31:57 2008 +0200
@@ -19,3 +19,4 @@
 2b734fe96f5746e621721ce181ac983118222dea 1.7.0beta2
 f126ec68060508be14ddd01f1e35103329b805d1 1.7.0rc1
 00af8e564f9651d0684fb4e93dbe11251d9749ba SOC2008-START
+9901ffff5280b81d0476e8d1e434ea70e3a6fbdc 1.7.0rc2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/_tests/ldap_testbase.py	Thu Jun 05 11:31:57 2008 +0200
@@ -0,0 +1,264 @@
+# -*- coding: utf-8 -*-
+"""
+    LDAPTestBase: LDAP testing support for py.test based unit tests
+
+    Features
+    --------
+
+    * setup_class
+      * automatic creation of a temporary LDAP server environment
+      * automatic creation of a LDAP server process (slapd)
+
+    * teardown_class
+      * LDAP server process will be killed and termination will be waited for
+      * temporary LDAP environment will be removed
+
+    Usage
+    -----
+
+    Write your own test class and derive from LDAPTestBase:
+
+    class TestLdap(LDAPTestBase):
+        def testFunction(self):
+            server_url = self.ldap_env.slapd.url
+            lo = ldap.initialize(server_url)
+            lo.simple_bind_s('', '')
+
+    Notes
+    -----
+
+    On Ubuntu 8.04 there is apparmor imposing some restrictions on /usr/sbin/slapd,
+    so you need to disable apparmor by invoking this as root:
+
+    # /etc/init.d/apparmor stop
+
+    @copyright: 2008 by Thomas Waldmann
+    @license: GNU GPL, see COPYING for details.
+"""
+
+SLAPD_EXECUTABLE = 'slapd'  # filename of LDAP server executable - if it is not
+                            # in your PATH, you have to give full path/filename.
+
+import os, shutil, tempfile, time
+from StringIO import StringIO
+import signal
+
+try:
+    import subprocess  # needs Python 2.4
+except ImportError:
+    subprocess = None
+
+try:
+    import ldap, ldif, ldap.modlist  # needs python-ldap
+except ImportError:
+    ldap = None
+
+
+def check_environ():
+    """ Check the system environment whether we are able to run.
+        Either return some failure reason if we can't or None if everything
+        looks OK.
+    """
+    if subprocess is None:
+        return "You need at least python 2.4 to use ldap_testbase."
+    if ldap is None:
+        return "You need python-ldap installed to use ldap_testbase."
+    slapd = False
+    try:
+        p = subprocess.Popen([SLAPD_EXECUTABLE, '-V'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        pid = p.pid
+        rc = p.wait()
+        if pid and rc == 1:
+            slapd = True  # it works
+    except OSError, err:
+        import errno
+        if not (err.errno == errno.ENOENT or
+                (err.errno == 3 and os.name == 'nt')):
+            raise
+    if not slapd:
+        return "Can't start %s (see SLAPD_EXECUTABLE)." % SLAPD_EXECUTABLE
+    return None
+
+
+class Slapd(object):
+    """ Manage a slapd process for testing purposes """
+    def __init__(self,
+                 config=None,  # config filename for -f
+                 executable=SLAPD_EXECUTABLE,
+                 debug_flags='', # None,  # for -d stats,acl,args,trace,sync,config
+                 proto='ldap', ip='127.0.0.1', port=3890,  # use -h proto://ip:port
+                 service_name=''  # defaults to -n executable:port, use None to not use -n
+                ):
+        self.executable = executable
+        self.config = config
+        self.debug_flags = debug_flags
+        self.proto = proto
+        self.ip = ip
+        self.port = port
+        self.url = '%s://%s:%d' % (proto, ip, port) # can be used for ldap.initialize() call
+        if service_name == '':
+            self.service_name = '%s:%d' % (executable, port)
+        else:
+            self.service_name = service_name
+
+    def start(self, timeout=0):
+        """ start a slapd process and optionally wait up to timeout seconds until it responds """
+        args = [self.executable, '-h', self.url, ]
+        if self.config is not None:
+            args.extend(['-f', self.config])
+        if self.debug_flags is not None:
+            args.extend(['-d', self.debug_flags])
+        if self.service_name:
+            args.extend(['-n', self.service_name])
+        self.process = subprocess.Popen(args)
+        started = None
+        if timeout:
+            lo = ldap.initialize(self.url)
+            ldap.set_option(ldap.OPT_PROTOCOL_VERSION, ldap.VERSION3) # ldap v2 is outdated
+            started = False
+            wait_until = time.time() + timeout
+            while time.time() < wait_until:
+                try:
+                    lo.simple_bind_s('', '')
+                    started = True
+                except ldap.SERVER_DOWN, err:
+                    time.sleep(0.1)
+                else:
+                    break
+        return started
+
+    def stop(self):
+        """ stop this slapd process and wait until it has terminated """
+        pid = self.process.pid
+        os.kill(pid, signal.SIGTERM)
+        os.waitpid(pid, 0)
+
+
+class LdapEnvironment(object):
+    """ Manage a (temporary) environment for running a slapd in it """
+
+    # default DB_CONFIG bdb configuration file contents
+    DB_CONFIG = """\
+# STRANGE: if i use those settings, after the test slapd goes to 100% and doesn't terminate on SIGTERM
+# Set the database in memory cache size.
+#set_cachesize 0 10000000 1
+
+# Set log values.
+#set_lg_regionmax 262144
+#set_lg_bsize 262144
+#set_lg_max 10485760
+
+#set_tas_spins 0
+"""
+
+    def __init__(self,
+                 basedn,
+                 rootdn, rootpw,
+                 instance=0,  # use different values when running multiple LdapEnvironments
+                 schema_dir='/etc/ldap/schema',  # directory with schemas
+                 coding='utf-8',  # coding used for config files
+                 timeout=10,  # how long to wait for slapd starting [s]
+                ):
+        self.basedn = basedn
+        self.rootdn = rootdn
+        self.rootpw = rootpw
+        self.instance = instance
+        self.schema_dir = schema_dir
+        self.coding = coding
+        self.ldap_dir = None
+        self.slapd_conf = None
+        self.timeout = timeout
+
+    def create_env(self, slapd_config, db_config=DB_CONFIG):
+        """ create a temporary LDAP server environment in a temp. directory,
+            including writing a slapd.conf (see configure_slapd) and a
+            DB_CONFIG there.
+        """
+        # create directories
+        self.ldap_dir = tempfile.mkdtemp(prefix='LdapEnvironment-%d.' % self.instance)
+        self.ldap_db_dir = os.path.join(self.ldap_dir, 'db')
+        os.mkdir(self.ldap_db_dir)
+
+        # create DB_CONFIG for bdb backend
+        db_config_fname = os.path.join(self.ldap_db_dir, 'DB_CONFIG')
+        f = open(db_config_fname, 'w')
+        f.write(db_config)
+        f.close()
+
+        # create slapd.conf from content template in slapd_config
+        slapd_config = slapd_config % {
+            'ldap_dir': self.ldap_dir,
+            'ldap_db_dir': self.ldap_db_dir,
+            'schema_dir': self.schema_dir,
+            'basedn': self.basedn,
+            'rootdn': self.rootdn,
+            'rootpw': self.rootpw,
+        }
+        if isinstance(slapd_config, unicode):
+            slapd_config = slapd_config.encode(self.coding)
+        self.slapd_conf = os.path.join(self.ldap_dir, "slapd.conf")
+        f = open(self.slapd_conf, 'w')
+        f.write(slapd_config)
+        f.close()
+
+    def start_slapd(self):
+        """ start a slapd and optionally wait until it talks with us """
+        self.slapd = Slapd(config=self.slapd_conf, port=3890+self.instance)
+        started = self.slapd.start(timeout=self.timeout)
+        return started
+
+    def load_directory(self, ldif_content):
+        """ load the directory with the ldif_content (str) """
+        lo = ldap.initialize(self.slapd.url)
+        ldap.set_option(ldap.OPT_PROTOCOL_VERSION, ldap.VERSION3) # ldap v2 is outdated
+        lo.simple_bind_s(self.rootdn, self.rootpw)
+
+        class LDIFLoader(ldif.LDIFParser):
+            def handle(self, dn, entry):
+                lo.add_s(dn, ldap.modlist.addModlist(entry))
+
+        loader = LDIFLoader(StringIO(ldif_content))
+        loader.parse()
+
+    def stop_slapd(self):
+        """ stop a slapd """
+        self.slapd.stop()
+
+    def destroy_env(self):
+        """ remove the temporary LDAP server environment """
+        shutil.rmtree(self.ldap_dir)
+
+try:
+    import py.test
+
+    class LDAPTstBase:
+        """ Test base class for py.test based tests which need a LDAP server to talk to.
+
+            Inherit your test class from this base class to test LDAP stuff.
+        """
+
+        # You MUST define these in your derived class:
+        slapd_config = None  # a string with your slapd.conf template
+        ldif_content = None  # a string with your ldif contents
+        basedn = None  # your base DN
+        rootdn = None  # root DN
+        rootpw = None  # root password
+
+        def setup_class(self):
+            """ Create LDAP server environment, start slapd """
+            self.ldap_env = LdapEnvironment(self.basedn, self.rootdn, self.rootpw)
+            self.ldap_env.create_env(slapd_config=self.slapd_config)
+            started = self.ldap_env.start_slapd()
+            if not started:
+                py.test.skip("Failed to start %s process, please see your syslog / log files"
+                             " (and check if stopping apparmor helps, in case you use it)." % SLAPD_EXECUTABLE)
+            self.ldap_env.load_directory(ldif_content=self.ldif_content)
+
+        def teardown_class(self):
+            """ Stop slapd, remove LDAP server environment """
+            self.ldap_env.stop_slapd()
+            self.ldap_env.destroy_env()
+
+except ImportError:
+    pass  # obviously py.test not in use
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/_tests/ldap_testdata.py	Thu Jun 05 11:31:57 2008 +0200
@@ -0,0 +1,109 @@
+BASEDN = "ou=testing,dc=example,dc=org"
+ROOTDN = "cn=root,%s" % BASEDN
+ROOTPW = "secret"
+
+SLAPD_CONFIG = """\
+# See slapd.conf(5) for details on configuration options.
+
+include		%(schema_dir)s/core.schema
+include		%(schema_dir)s/cosine.schema
+include		%(schema_dir)s/inetorgperson.schema
+#include	%(schema_dir)s/misc.schema
+
+moduleload	back_bdb.la
+
+threads 2
+
+# Global access control ###############################################
+
+# Root DSE: allow anyone to read it
+access to dn.base="" by * read
+# Subschema (sub)entry DSE: allow anyone to read it
+access to dn.base="cn=Subschema" by * read
+
+# we don't need restrictive ACLs for tests:
+access to * by * read
+
+allow bind_anon_dn
+
+# Test-Datenbank ou=testing,dc=example,dc=org ################
+
+database	bdb
+
+directory	%(ldap_db_dir)s
+suffix		"%(basedn)s"
+rootdn		"%(rootdn)s"
+rootpw		%(rootpw)s
+lastmod		on
+
+index 		uid eq
+
+checkpoint 200 5
+
+# Entries to cache in memory
+cachesize 500
+# Search results to cache in memory
+idlcachesize 50
+
+sizelimit	-1
+"""
+
+LDIF_CONTENT = """\
+########################################################################
+# regression testing
+########################################################################
+version: 1
+
+dn: ou=testing,dc=example,dc=org
+objectClass: organizationalUnit
+ou: testing
+
+dn: ou=Groups,ou=testing,dc=example,dc=org
+objectClass: organizationalUnit
+ou: Groups
+
+dn: ou=Users,ou=testing,dc=example,dc=org
+objectClass: organizationalUnit
+ou: Users
+
+dn: ou=Unit A,ou=Users,ou=testing,dc=example,dc=org
+objectClass: organizationalUnit
+ou: Unit A
+
+dn: ou=Unit B,ou=Users,ou=testing,dc=example,dc=org
+objectClass: organizationalUnit
+ou: Unit B
+
+dn: uid=usera,ou=Unit A,ou=Users,ou=testing,dc=example,dc=org
+objectClass: account
+objectClass: simpleSecurityObject
+uid: usera
+userPassword: usera
+
+dn: uid=userb,ou=Unit B,ou=Users,ou=testing,dc=example,dc=org
+cn: Vorname Nachname
+objectClass: inetOrgPerson
+sn: Nachname
+uid: userb
+userPassword: userb
+
+dn: cn=Group A,ou=Groups,ou=testing,dc=example,dc=org
+cn: Group A
+member: cn=dummy
+member: uid=usera,ou=Unit A,ou=Users,ou=testing,dc=example,dc=org
+objectClass: groupOfNames
+
+dn: cn=Group B,ou=Groups,ou=testing,dc=example,dc=org
+cn: Group B
+objectClass: groupOfUniqueNames
+uniqueMember: cn=dummy
+uniqueMember: uid=userb,ou=Unit B,ou=Users,ou=testing,dc=example,dc=org
+
+dn: cn=Group C,ou=Groups,ou=testing,dc=example,dc=org
+cn: Group C
+description: Nested group!
+member: cn=dummy
+member: cn=Group A,ou=Groups,ou=testing,dc=example,dc=org
+objectClass: groupOfNames
+"""
+
--- a/MoinMoin/auth/__init__.py	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/auth/__init__.py	Thu Jun 05 11:31:57 2008 +0200
@@ -60,6 +60,12 @@
     methods will use the message feature only along with returning False for
     the continue flag.
 
+    Note, however, that when no username is entered or the username is not
+    found in the database, it may be appropriate to return with a message
+    and the continue flag set to true (ContinueLogin) because a subsequent auth
+    plugin might work even without the username, say the openid plugin for
+    example.
+
     The multistage member must evaluate to false or be callable. If it is
     callable, this indicates that the authentication method requires a second
     login stage. In that case, the multistage item will be called with the
@@ -207,13 +213,13 @@
     def login_hint(self, request):
         return None
 
-class MoinLogin(BaseAuth):
+class MoinAuth(BaseAuth):
     """ handle login from moin login form """
     def __init__(self):
         BaseAuth.__init__(self)
 
     login_inputs = ['username', 'password']
-    name = 'moin_login'
+    name = 'moin'
     logout_possible = True
 
     def login(self, request, user_obj, **kw):
--- a/MoinMoin/auth/_tests/test_auth.py	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/auth/_tests/test_auth.py	Thu Jun 05 11:31:57 2008 +0200
@@ -204,12 +204,12 @@
             trail = request.session['trail']
             assert trail == trail_expected
 
-    def testMoinLoginAuthSession(self):
-        """ run some requests with moin_login auth, check whether session works """
-        from MoinMoin.auth import MoinLogin
+    def testMoinAuthSession(self):
+        """ run some requests with MoinAuth, check whether session works """
+        from MoinMoin.auth import MoinAuth
         from MoinMoin.user import User
-        self.config = self.TestConfig(auth=[MoinLogin()])
-        username = u'MoinLoginAuthTestUser'
+        self.config = self.TestConfig(auth=[MoinAuth()])
+        username = u'MoinAuthTestUser'
         password = u'secret'
         User(self.request, name=username, password=password).save() # create user
         trail_expected = []
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/auth/_tests/test_ldap_login.py	Thu Jun 05 11:31:57 2008 +0200
@@ -0,0 +1,224 @@
+# -*- coding: utf-8 -*-
+"""
+    MoinMoin - MoinMoin.auth.ldap Tests
+
+    @copyright: 2008 MoinMoin:ThomasWaldmann
+    @license: GNU GPL, see COPYING for details.
+"""
+
+import py.test
+
+from MoinMoin._tests.ldap_testbase import LDAPTstBase, LdapEnvironment, check_environ, SLAPD_EXECUTABLE
+from MoinMoin._tests.ldap_testdata import *
+from MoinMoin._tests import nuke_user
+
+# first check if we have python 2.4, python-ldap and slapd:
+msg = check_environ()
+if msg:
+    py.test.skip(msg)
+del msg
+
+import ldap
+
+class TestSimpleLdap(LDAPTstBase):
+    basedn = BASEDN
+    rootdn = ROOTDN
+    rootpw = ROOTPW
+    slapd_config = SLAPD_CONFIG
+    ldif_content = LDIF_CONTENT
+
+    def testLDAP(self):
+        """ Just try accessing the LDAP server and see if usera and userb are in LDAP. """
+        server_uri = self.ldap_env.slapd.url
+        base_dn = self.ldap_env.basedn
+        lo = ldap.initialize(server_uri)
+        ldap.set_option(ldap.OPT_PROTOCOL_VERSION, ldap.VERSION3) # ldap v2 is outdated
+        lo.simple_bind_s('', '')
+        lusers = lo.search_st(base_dn, ldap.SCOPE_SUBTREE, '(uid=*)')
+        uids = [ldap_dict['uid'][0] for dn, ldap_dict in lusers]
+        assert 'usera' in uids
+        assert 'userb' in uids
+
+    def testMoinLDAPLogin(self):
+        """ Just try accessing the LDAP server and see if usera and userb are in LDAP. """
+        server_uri = self.ldap_env.slapd.url
+        base_dn = self.ldap_env.basedn
+
+        from MoinMoin.auth.ldap_login import LDAPAuth
+        ldap_auth1 = LDAPAuth(server_uri=server_uri, base_dn=base_dn)
+        self.config = self.TestConfig(auth=[ldap_auth1, ], user_autocreate=True)
+        handle_auth = self.request.handle_auth
+
+        # tests that must not authenticate:
+        u = handle_auth(None, username='', password='', login=True)
+        assert u is None
+        u = handle_auth(None, username='usera', password='', login=True)
+        assert u is None
+        u = handle_auth(None, username='usera', password='userawrong', login=True)
+        assert u is None
+        u = handle_auth(None, username='userawrong', password='usera', login=True)
+        assert u is None
+
+        # tests that must authenticate:
+        u1 = handle_auth(None, username='usera', password='usera', login=True)
+        assert u1 is not None
+        assert u1.valid
+
+        u2 = handle_auth(None, username='userb', password='userb', login=True)
+        assert u2 is not None
+        assert u2.valid
+
+        # check if usera and userb have different ids:
+        assert u1.id != u2.id
+
+
+class TestBugDefaultPasswd(LDAPTstBase):
+    basedn = BASEDN
+    rootdn = ROOTDN
+    rootpw = ROOTPW
+    slapd_config = SLAPD_CONFIG
+    ldif_content = LDIF_CONTENT
+
+    def teardown_class(self):
+        """ Stop slapd, remove LDAP server environment """
+        #self.ldap_env.stop_slapd()  # it is already stopped
+        self.ldap_env.destroy_env()
+
+    def testBugDefaultPasswd(self):
+        """ Login via LDAP (this creates user profile and up to 1.7.0rc1 it put
+            a default password there), then try logging in via moin login using
+            that default password or an empty password.
+        """
+        server_uri = self.ldap_env.slapd.url
+        base_dn = self.ldap_env.basedn
+
+        from MoinMoin.auth.ldap_login import LDAPAuth
+        ldap_auth = LDAPAuth(server_uri=server_uri, base_dn=base_dn)
+        from MoinMoin.auth import MoinAuth
+        moin_auth = MoinAuth()
+        self.config = self.TestConfig(auth=[ldap_auth, moin_auth], user_autocreate=True)
+
+        nuke_user(self.request, u'usera')
+
+        handle_auth = self.request.handle_auth
+
+        # do a LDAPAuth login (as a side effect, this autocreates the user profile):
+        u1 = handle_auth(None, username='usera', password='usera', login=True)
+        assert u1 is not None
+        assert u1.valid
+
+        # now we kill the LDAP server:
+        self.ldap_env.slapd.stop()
+
+        # now try a MoinAuth login:
+        # try the default password that worked in 1.7 up to rc1:
+        u2 = handle_auth(None, username='usera', password='{SHA}NotStored', login=True)
+        assert u2 is None
+
+        # try using no password:
+        u2 = handle_auth(None, username='usera', password='', login=True)
+        assert u2 is None
+
+        # try using wrong password:
+        u2 = handle_auth(None, username='usera', password='wrong', login=True)
+        assert u2 is None
+
+
+class TestTwoLdapServers:
+    basedn = BASEDN
+    rootdn = ROOTDN
+    rootpw = ROOTPW
+    slapd_config = SLAPD_CONFIG
+    ldif_content = LDIF_CONTENT
+
+    def setup_class(self):
+        """ Create LDAP servers environment, start slapds """
+        self.ldap_envs = []
+        for instance in range(2):
+            ldap_env = LdapEnvironment(self.basedn, self.rootdn, self.rootpw, instance=instance)
+            ldap_env.create_env(slapd_config=self.slapd_config)
+            started = ldap_env.start_slapd()
+            if not started:
+                py.test.skip("Failed to start %s process, please see your syslog / log files"
+                             " (and check if stopping apparmor helps, in case you use it)." % SLAPD_EXECUTABLE)
+            ldap_env.load_directory(ldif_content=self.ldif_content)
+            self.ldap_envs.append(ldap_env)
+
+    def teardown_class(self):
+        """ Stop slapd, remove LDAP server environment """
+        for ldap_env in self.ldap_envs:
+            ldap_env.stop_slapd()
+            ldap_env.destroy_env()
+
+    def testLDAP(self):
+        """ Just try accessing the LDAP servers and see if usera and userb are in LDAP. """
+        for ldap_env in self.ldap_envs:
+            server_uri = ldap_env.slapd.url
+            base_dn = ldap_env.basedn
+            lo = ldap.initialize(server_uri)
+            ldap.set_option(ldap.OPT_PROTOCOL_VERSION, ldap.VERSION3) # ldap v2 is outdated
+            lo.simple_bind_s('', '')
+            lusers = lo.search_st(base_dn, ldap.SCOPE_SUBTREE, '(uid=*)')
+            uids = [ldap_dict['uid'][0] for dn, ldap_dict in lusers]
+            assert 'usera' in uids
+            assert 'userb' in uids
+
+
+class TestLdapFailover:
+    basedn = BASEDN
+    rootdn = ROOTDN
+    rootpw = ROOTPW
+    slapd_config = SLAPD_CONFIG
+    ldif_content = LDIF_CONTENT
+
+    def setup_class(self):
+        """ Create LDAP servers environment, start slapds """
+        self.ldap_envs = []
+        for instance in range(2):
+            ldap_env = LdapEnvironment(self.basedn, self.rootdn, self.rootpw, instance=instance)
+            ldap_env.create_env(slapd_config=self.slapd_config)
+            started = ldap_env.start_slapd()
+            if not started:
+                py.test.skip("Failed to start %s process, please see your syslog / log files"
+                             " (and check if stopping apparmor helps, in case you use it)." % SLAPD_EXECUTABLE)
+            ldap_env.load_directory(ldif_content=self.ldif_content)
+            self.ldap_envs.append(ldap_env)
+
+    def teardown_class(self):
+        """ Stop slapd, remove LDAP server environment """
+        for ldap_env in self.ldap_envs:
+            try:
+                ldap_env.stop_slapd()
+            except:
+                pass # one will fail, because it is already stopped
+            ldap_env.destroy_env()
+
+    def testMoinLDAPFailOver(self):
+        """ Try if it does a failover to a secondary LDAP, if the primary fails. """
+        from MoinMoin.auth.ldap_login import LDAPAuth
+        authlist = []
+        for ldap_env in self.ldap_envs:
+            server_uri = ldap_env.slapd.url
+            base_dn = ldap_env.basedn
+            ldap_auth = LDAPAuth(server_uri=server_uri, base_dn=base_dn,
+                                 timeout=1) # short timeout, faster testing
+            authlist.append(ldap_auth)
+
+        self.config = self.TestConfig(auth=authlist, user_autocreate=True)
+        handle_auth = self.request.handle_auth
+
+        # authenticate user (with primary slapd):
+        u1 = handle_auth(None, username='usera', password='usera', login=True)
+        assert u1 is not None
+        assert u1.valid
+
+        # now we kill our primary LDAP server:
+        self.ldap_envs[0].slapd.stop()
+
+        # try if we can still authenticate (with the second slapd):
+        u2 = handle_auth(None, username='usera', password='usera', login=True)
+        assert u2 is not None
+        assert u2.valid
+
+
+
--- a/MoinMoin/config/multiconfig.py	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/config/multiconfig.py	Thu Jun 05 11:31:57 2008 +0200
@@ -245,7 +245,7 @@
     allow_xslt = False
     antispam_master_url = "http://master.moinmo.in/?action=xmlrpc2"
 
-    auth = [authmodule.MoinLogin()]
+    auth = [authmodule.MoinAuth()]
     # default to http and xmlrpc_applytoken to get old semantics
     # xmlrpc_applytoken shall be removed once that code is changed
     # to have proper session handling and use request.handle_auth()
--- a/MoinMoin/events/_tests/test_events.py	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/events/_tests/test_events.py	Thu Jun 05 11:31:57 2008 +0200
@@ -49,6 +49,7 @@
                    "StupidType", request, page, "en", revisions=page.getRevList())
 
 def test_user_created_event(request):
+    py.test.skip("Test is wrong, because it assumes send_notification will be called - but if there is no superuser subscribed to UserCreatedEvent, then no notification needs to be sent.")
     class server_dummy:
         def __init__(self):
             self.sent = False
--- a/MoinMoin/i18n/MoinMoin.pot	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/MoinMoin.pot	Thu Jun 05 11:31:57 2008 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-22 22:32+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -519,6 +519,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr ""
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr ""
 
@@ -1215,14 +1219,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 msgid "Attachment link"
 msgstr ""
 
--- a/MoinMoin/i18n/ar.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/ar.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: moin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-04-12 20:07+0200\n"
 "Last-Translator: Mohamed Yahya <yahya.mohamed@gmail.com>\n"
 "Language-Team: \n"
@@ -552,6 +552,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "لا يوجد كلمة سر. الرجاء إدخال إسم مستخدم و كلمة سر"
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "لقد قمت بتسجيل الخروج."
@@ -1271,14 +1275,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "المرفقات"
@@ -1712,6 +1708,12 @@
 msgstr ""
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr ""
 
@@ -2378,12 +2380,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/bg.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/bg.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2006-02-11 12:20-0800\n"
 "Last-Translator: Hristo Iliev <hristo@phys.uni-sofia.bg>\n"
 "Language-Team: Bulgarian <moin-devel@lists.sourceforge.net>\n"
@@ -586,6 +586,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Липсва парола. Моля, въведете потребителско име и парола."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Вие излязохте успешно."
@@ -1329,14 +1333,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Приложения"
@@ -1821,6 +1817,14 @@
 msgstr "Моля използвайте по-избирателни термини за търсене вместо {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Заявката за търсене {{{\"%s\"}}} е невалидна. Моля, погледнете "
+"HelpOnSearching за повече информация."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Качване на ново приложение \"%(filename)s\""
 
@@ -2563,14 +2567,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Заявката за търсене {{{\"%s\"}}} е невалидна. Моля, погледнете "
-"HelpOnSearching за повече информация."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/ca.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/ca.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: moin 0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-10-10 13:40+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -575,6 +575,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Manca la contrasenya. Introduïu el nom d'usuari i contrasenya."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Heu sortit del vostre compte."
@@ -1315,14 +1319,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Adjuncions"
@@ -1806,6 +1802,12 @@
 msgstr "Utilitzeu un terme més selectiu en comptes de {{{«%s»}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Apuja una nova adjunció «%(filename)s»"
 
@@ -2465,12 +2467,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/cs.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/cs.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-11-05 22:11+0100\n"
 "Last-Translator: Václav Haisman <v.haisman@sh.cvut.cz>\n"
 "Language-Team: Czech <moin@lists.sourceforge.net>\n"
@@ -573,6 +573,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Prázdné heslo. Prosím vložte jméno a heslo."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Jste nyní odhlášeni."
@@ -1316,14 +1320,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Přílohy"
@@ -1804,6 +1800,13 @@
 msgstr "Použijte prosím selektivnější vyhledávací výraz místo {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Váš dotaz {{{\"%s\"}}} je neplatný. Více informací viz HelpOnSearching."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Upload nové přílohy \"%(filename)s\""
 
@@ -2525,13 +2528,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Váš dotaz {{{\"%s\"}}} je neplatný. Více informací viz HelpOnSearching."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/da.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/da.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-04-22 18:50+0100\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: Danish <moin-devel@lists.sourceforge.net>\n"
@@ -581,6 +581,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Manglende adgangskode. Angiv venligst brugernavn og adgangskode."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Du er nu logget ud."
@@ -1323,14 +1327,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Vedhæftninger"
@@ -1814,6 +1810,14 @@
 msgstr "Brug venligst mere præcise søgekriterier end {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Din søgningsforespørgsel {{{\"%s\"}}} er forkert. Se venligst "
+"HjælpTilSøgning for yderligere information."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Overfør ny vedhæftning \"%(filename)s\""
 
@@ -2550,14 +2554,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Din søgningsforespørgsel {{{\"%s\"}}} er forkert. Se venligst "
-"HjælpTilSøgning for yderligere information."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/de.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/de.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-05-12 14:33+0200\n"
 "Last-Translator: Thomas Waldmann <tw-public@gmx.de>\n"
 "Language-Team: German <moin-user@lists.sourceforge.net>\n"
@@ -590,6 +590,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Fehlendes Passwort. Bitte geben Sie Benutzername und Passwort ein."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr "LDAP-Server %(server)s kann nicht erreicht werden."
+
 msgid "You need to log in."
 msgstr "Sie müssen sich anmelden."
 
@@ -1355,14 +1359,6 @@
 "Verweis zu Dateianhang: %(attach)s\n"
 "Verweis zu Seite: %(page)s\n"
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr "XML-RPC-Fehler: %s"
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr "Kommunikationsfehler auf unterer Ebene: %s"
-
 msgid "Attachment link"
 msgstr "Verweis zu Dateianhang"
 
@@ -1836,6 +1832,14 @@
 "Bitte verwenden Sie einen selektiveren Suchbegriff anstatt {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Ihre Suchanfrage {{{\"%s\"}}} ist ungültig. Siehe HilfeZumSuchen für weitere "
+"Informationen."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Neuen Dateianhang \"%(filename)s\" hochladen"
 
@@ -2590,14 +2594,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Ihre Suchanfrage {{{\"%s\"}}} ist ungültig. Siehe HilfeZumSuchen für weitere "
-"Informationen."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
@@ -3043,3 +3039,9 @@
 
 msgid "Login and try again."
 msgstr "Melden Sie sich an und probieren Sie es noch einmal."
+
+#~ msgid "XML RPC error: %s"
+#~ msgstr "XML-RPC-Fehler: %s"
+
+#~ msgid "Low-level communication error: %s"
+#~ msgstr "Kommunikationsfehler auf unterer Ebene: %s"
--- a/MoinMoin/i18n/el.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/el.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-12-22 17:56+0200\n"
 "Last-Translator: YiannisValassakis <tungolcild@gmail.com>\n"
 "Language-Team: Greek <moin-devel@lists.sourceforge.net>\n"
@@ -561,6 +561,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr ""
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr ""
 
@@ -1292,14 +1296,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Επισυναπτόμενα αρχεία"
@@ -1725,6 +1721,12 @@
 "{{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr ""
 
@@ -2376,12 +2378,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/en.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/en.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-22 22:32+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2005-01-8 00:00+0100\n"
 "Last-Translator: Thomas Waldmann <tw-public@gmx.de>\n"
 "Language-Team: German <moin-devel@lists.sourceforge.net>\n"
@@ -526,6 +526,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr ""
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr ""
 
@@ -1222,14 +1226,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 msgid "Attachment link"
 msgstr ""
 
--- a/MoinMoin/i18n/es.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/es.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-11-24 23:12-0300\n"
 "Last-Translator: Ramiro Morales <rm0@gmx.net>\n"
 "Language-Team: Spanish <moin-devel@lists.sourceforge.net>\n"
@@ -595,6 +595,10 @@
 "Faltó ingresar la contraseña. Por favor, ingresa el nombre de usuario y "
 "contraseña"
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Has salido del sistema."
@@ -1341,14 +1345,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Adjuntos"
@@ -1832,6 +1828,14 @@
 msgstr "Por favor, usa un término de búsqueda más específico que {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"La búsqueda de {{{\"%s\"}}} no es válida. Por favor visita "
+"AyudaSobreBúsquedas para más información."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Subir nuevo adjunto \"%(filename)s\""
 
@@ -2569,14 +2573,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"La búsqueda de {{{\"%s\"}}} no es válida. Por favor visita "
-"AyudaSobreBúsquedas para más información."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/fa.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/fa.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2005-11-06 17:11+0330\n"
 "Last-Translator: Mehdi Hassanpour <h.mehdi@gmail.com>\n"
 "Language-Team: Persian <h.mehdi@gmail.com>\n"
@@ -577,6 +577,10 @@
 "کلمه رمز وارد نشده است. لطفا نام کاربری و کلمه عبور صحیح خود را مجددا وارد "
 "نمایید."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "شما از سیستم خارج شدید."
@@ -1329,14 +1333,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "ضمیمه ها"
@@ -1832,6 +1828,12 @@
 msgstr "لطفا به جای {{{\"%s\"}}} جستجوی گزیده تری انجام دهید"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "ارسال ضمیمه جدید \"%(filename)s\""
 
@@ -2540,12 +2542,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/fi.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/fi.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -6,11 +6,14 @@
 #format gettext
 #language fi
 
+#
+# MoinMoin fi system text translation
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-05-21 20:46+0300\n"
 "Last-Translator: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>\n"
 "Language-Team: Finnish <moin-devel@lists.sourceforge.net>\n"
@@ -25,8 +28,8 @@
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
+# Is ”asettamiseksi uudelleen” ok in Finnish?
 #, python-format
-# Is ”asettamiseksi uudelleen” ok in Finnish?
 msgid ""
 "Login Name: %s\n"
 "\n"
@@ -38,7 +41,8 @@
 "\n"
 "Salasanan palautustunniste: %s\n"
 "\n"
-"Osoite salasanan asettamiseksi uudelleen: %s/?action=recoverpass&name=%s&token=%s\n"
+"Osoite salasanan asettamiseksi uudelleen: %s/?action=recoverpass&name=%"
+"s&token=%s\n"
 
 msgid ""
 "Somebody has requested to email you a password recovery token.\n"
@@ -579,6 +583,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Salasana puuttuu. Anna käyttäjänimi ja salasana."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr "Sinun on kirjauduttava sisään."
 
@@ -588,8 +596,8 @@
 "one now</a>. <a href=\"%(sendmypasswordlink)s\">Forgot your password?</a>"
 msgstr ""
 "Jos sinulla ei ole käyttäjätunnusta, <a href=\"%(userprefslink)s\">voit "
-"luoda sen nyt</a>. <a href=\"%(sendmypasswordlink)s\">Unohditko salasanasi?"
-"</a>"
+"luoda sen nyt</a>. <a href=\"%(sendmypasswordlink)s\">Unohditko salasanasi?</"
+"a>"
 
 msgid ""
 "Please choose an account name now.\n"
@@ -655,8 +663,8 @@
 "If you do not have an account yet, you can still log in with your OpenID and "
 "create one during login."
 msgstr ""
-"Jos sinulla ei vielä ole käyttäjätunnusta, voit silti kirjautua OpenID:lläsi ja "
-"luoda tunnuksen kirjautumisen aikana."
+"Jos sinulla ei vielä ole käyttäjätunnusta, voit silti kirjautua OpenID:lläsi "
+"ja luoda tunnuksen kirjautumisen aikana."
 
 msgid "Failed to connect to database."
 msgstr "Tietokantaan yhdistäminen epäonnistui."
@@ -1072,8 +1080,8 @@
 "You can now change the settings of the selected user account; log out to get "
 "back to your account."
 msgstr ""
-"Voit nyt vaihtaa valitun käyttäjätunnuksen asetuksia. Kirjaudu ulos päästäksesi "
-"takaisin omaan tunnukseesi."
+"Voit nyt vaihtaa valitun käyttäjätunnuksen asetuksia. Kirjaudu ulos "
+"päästäksesi takaisin omaan tunnukseesi."
 
 msgid "You are the only user."
 msgstr "Olet ainoa käyttäjä."
@@ -1229,8 +1237,7 @@
 "\n"
 msgstr ""
 "Hei!\n"
-"Olet tilannut wikin \"%(sitename)s\" sivun "
-"muutosilmoitukset.\n"
+"Olet tilannut wikin \"%(sitename)s\" sivun muutosilmoitukset.\n"
 "\n"
 "%(editor)s on poistanut sivun \"%(pagename)s\":\n"
 "\n"
@@ -1246,11 +1253,10 @@
 "s:\n"
 msgstr ""
 "Hei!\n"
-"Olet tilannut wikin \"%(sitename)s\" sivun "
-"muutosilmoitukset.\n"
+"Olet tilannut wikin \"%(sitename)s\" sivun muutosilmoitukset.\n"
 "\n"
-"%(editor)s on nimennyt sivun \"%(oldname)s\" uudelleen, sen uusi nimi on "
-" \"%(pagename)s\":\n"
+"%(editor)s on nimennyt sivun \"%(oldname)s\" uudelleen, sen uusi nimi on  \"%"
+"(pagename)s\":\n"
 
 #, python-format
 msgid "New user account created on %(sitename)s"
@@ -1285,8 +1291,8 @@
 "Attachment size: %(attach_size)s\n"
 msgstr ""
 "Hei!\n"
-"Olet tilannut wikisivun \"%(page_name)s\" muutosilmoitukset. Käyttäjä "
-"%(editor)s on lisännyt tälle sivulle liitteen. Lisätietoja:\n"
+"Olet tilannut wikisivun \"%(page_name)s\" muutosilmoitukset. Käyttäjä %"
+"(editor)s on lisännyt tälle sivulle liitteen. Lisätietoja:\n"
 "\n"
 "Liitteen nimi: %(attach_name)s\n"
 "Liitteen koko: %(attach_size)s\n"
@@ -1335,14 +1341,6 @@
 "Linkki liitteeseen: %(attach)s\n"
 "Linkki sivulle: %(page)s\n"
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr "XML RPC -virhe: %s"
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr "Matalan tason yhteysvirhe: %s"
-
 msgid "Attachment link"
 msgstr "Linkki liitteeseen"
 
@@ -1443,8 +1441,8 @@
 "kursiivi'''''<<Verbatim(''''')>>; <<Verbatim('')>>''sekä ''<<Verbatim(''')"
 ">>'''''lihavoitua'''<<Verbatim(''')>> että kursiivia''<<Verbatim('')>>; "
 "<<Verbatim(----)>> vaakatason viiva.\n"
-" Otsikot:: = Otsikko 1 =; == Otsikko 2 ==; === Otsikko 3 ===; "
-"==== Otsikko 4 ====; ===== Otsikko 5 =====.\n"
+" Otsikot:: = Otsikko 1 =; == Otsikko 2 ==; === Otsikko 3 ===; ==== Otsikko 4 "
+"====; ===== Otsikko 5 =====.\n"
 " Luettelot:: väli ja jokin näistä: * numeroimaton kohta; 1., a., A., i., I. "
 "numeroitu kohta; 1.#n aloita numerointi n:stä; pelkkä väli sisentää.\n"
 " Linkit:: <<Verbatim(YhteenIsollaKirjoitetutSanat)>>; <<Verbatim([[kohde|"
@@ -1514,10 +1512,10 @@
 ">>'''''lihavoitua'''<<Verbatim(***)>> että kursiivia''<<Verbatim(//)>>;\n"
 " Vaakatason viiva:: <<Verbatim(----)>>\n"
 " Pakotettu rivinvaihto:: <<Verbatim(\\\\)>>\n"
-" Otsikot:: = Otsikko 1 =; == Otsikko 2 ==; === Otsikko 3 ===; "
-"==== Otsikko 4 ====; ===== Otsikko 5 =====.\n"
-" Luettelot:: * numeroimaton kohta; ** numeroimaton alikohta; "
-"# numeroitu kohta; ## numeroitu alikohta.\n"
+" Otsikot:: = Otsikko 1 =; == Otsikko 2 ==; === Otsikko 3 ===; ==== Otsikko 4 "
+"====; ===== Otsikko 5 =====.\n"
+" Luettelot:: * numeroimaton kohta; ** numeroimaton alikohta; # numeroitu "
+"kohta; ## numeroitu alikohta.\n"
 " Linkit:: <<Verbatim([[kohde]])>>; <<Verbatim([[kohde|linkkiteksti]])>>.\n"
 " Taulukot:: |= otsikkoteksti | tekstiä solussa | lisää tekstiä solussa |;\n"
 "\n"
@@ -1814,6 +1812,14 @@
 msgstr "Käytä tarkempaa hakuehtoa kuin {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Hakuehto {{{\"%s\"}}} ei ole kelvollinen. Lisätietoja on sivulla "
+"OhjeHakemisesta."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Lähetä uusi liitetiedosto \"%(filename)s\""
 
@@ -1822,8 +1828,8 @@
 "%(extension_name)s %(extension_type)s: Required argument %(argument_name)s "
 "missing."
 msgstr ""
-"%(extension_name)s %(extension_type)s: Pakollinen argumentti %(argument_name)s "
-"puuttuu."
+"%(extension_name)s %(extension_type)s: Pakollinen argumentti %(argument_name)"
+"s puuttuu."
 
 #, python-format
 msgid ""
@@ -2399,8 +2405,8 @@
 "empty, we derive the page name from the file name."
 msgstr ""
 "Voit ladata palvelimelle sisältöä alla nimettyä sivua varten. Jos muutat "
-"sivun nimeä, voir myös ladata palvelimelle sisältöä toista sivua varten. "
-"Jos sivun nimi on tyhjä, sivu nimetään tiedoston nimen mukaan."
+"sivun nimeä, voit myös ladata palvelimelle sisältöä toista sivua varten. Jos "
+"sivun nimi on tyhjä, sivu nimetään tiedoston nimen mukaan."
 
 msgid "File to load page content from"
 msgstr "Tiedosto, josta ladataan sisältöä"
@@ -2424,8 +2430,8 @@
 "Add your email address or Jabber ID in your user settings to use "
 "subscriptions."
 msgstr ""
-"Lisää sähköpostiosoitteesi tai Jabber-tunnuksesi asetuksiisi "
-"käyttääksesi tilauksia."
+"Lisää sähköpostiosoitteesi tai Jabber-tunnuksesi asetuksiisi käyttääksesi "
+"tilauksia."
 
 msgid "You are already subscribed to this page."
 msgstr "Olet jo tilannut tämän sivun."
@@ -2554,14 +2560,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Hakuehto {{{\"%s\"}}} ei ole kelvollinen. Lisätietoja on sivulla "
-"OhjeHakemisesta."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
@@ -2838,8 +2836,8 @@
 "Attachment '%(pagename)s/%(filename)s' moved to '%(new_pagename)s/%"
 "(new_filename)s'."
 msgstr ""
-"Liitetiedosto '%(pagename)s/%(filename)s' on siirretty sivulle "
-"'%(new_pagename)s/%(new_filename)s'."
+"Liitetiedosto '%(pagename)s/%(filename)s' on siirretty sivulle '%"
+"(new_pagename)s/%(new_filename)s'."
 
 msgid "Nothing changed"
 msgstr "Muutoksia ei tehty"
@@ -2998,6 +2996,12 @@
 msgid "Login and try again."
 msgstr "Kirjaudu sisään ja yritä uudelleen."
 
+#~ msgid "XML RPC error: %s"
+#~ msgstr "XML RPC -virhe: %s"
+
+#~ msgid "Low-level communication error: %s"
+#~ msgstr "Matalan tason yhteysvirhe: %s"
+
 #~ msgid "New Page or New Attachment"
 #~ msgstr "Uusi sivu tai liitetiedosto"
 
--- a/MoinMoin/i18n/fr.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/fr.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: moin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
-"PO-Revision-Date: 2008-03-25 05:16+0100\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
+"PO-Revision-Date: 2008-05-25 03:43+0200\n"
 "Last-Translator: Jean-Philippe Guérard <fevrier@tigreraye.org>\n"
 "Language-Team: Français\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@
 msgid "<unknown>"
 msgstr "<inconnu>"
 
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Login Name: %s\n"
 "\n"
@@ -37,11 +37,12 @@
 "\n"
 "Password reset URL: %s/?action=recoverpass&name=%s&token=%s\n"
 msgstr ""
-"Nom : %s\n"
+"Nom d'utilisateur : %s\n"
 "\n"
-"Mot de passe : %s\n"
+"Code de récupération du mot de passe : %s\n"
 "\n"
-"URL de connexion : %s/%s?action=login\n"
+"URL de remise à zéro du mot de passe : %s/?action=recoverpass&name=%s&token=%"
+"s\n"
 
 msgid ""
 "Somebody has requested to email you a password recovery token.\n"
@@ -50,6 +51,13 @@
 "go to the password recovery page again and enter your username and the\n"
 "recovery token.\n"
 msgstr ""
+"Quelqu'un a demandé qu'un code de récupération du mot de passe\n"
+"vous soit envoyé.\n"
+"\n"
+"Si vous avez perdu votre mot de passe, allez à l'adresse de remise à\n"
+"zéro du mot de passe ci-dessous ou retournez à la page de\n"
+"récupération du mot de passe et entrez votre nom d'utilisateur et le\n"
+"code de récupération.\n"
 
 #, python-format
 msgid "[%(sitename)s] Your wiki account data"
@@ -59,31 +67,31 @@
 msgstr "Vous n'êtes pas autorisé à modifier cette page."
 
 msgid "Page is immutable!"
-msgstr "Page immuable !"
+msgstr "Page immuable !"
 
 msgid "Cannot edit old revisions!"
-msgstr "Impossible de modifier d'anciennes versions !"
+msgstr "Impossible de modifier d'anciennes versions !"
 
 msgid "The lock you held timed out. Be prepared for editing conflicts!"
 msgstr ""
 "Le verrou que vous déteniez à expiré. Vos modifications risquent d'engendrer "
-"des conflits !"
+"des conflits !"
 
 #, python-format
 msgid "Draft of \"%(pagename)s\""
-msgstr "Brouillon de « %(pagename)s »"
+msgstr "Brouillon de « %(pagename)s »"
 
 #, python-format
 msgid "Edit \"%(pagename)s\""
-msgstr "Éditer « %(pagename)s »"
+msgstr "Éditer « %(pagename)s »"
 
 #, python-format
 msgid "Preview of \"%(pagename)s\""
-msgstr "Aperçu de « %(pagename)s »"
+msgstr "Aperçu de « %(pagename)s »"
 
 #, python-format
 msgid "Your edit lock on %(lock_page)s has expired!"
-msgstr "Votre verrou sur %(lock_page)s a expiré !"
+msgstr "Votre verrou sur %(lock_page)s a expiré !"
 
 #, python-format
 msgid "Your edit lock on %(lock_page)s will expire in # minutes."
@@ -94,18 +102,18 @@
 msgstr "Votre verrou sur %(lock_page)s va expirer dans # secondes."
 
 msgid "Someone else deleted this page while you were editing!"
-msgstr "Quelqu'un a effacé la page alors que vous l'éditiez !"
+msgstr "Quelqu'un a effacé la page alors que vous l'éditiez !"
 
 msgid "Someone else changed this page while you were editing!"
-msgstr "Quelqu'un a modifié la page alors que vous l'éditiez !"
+msgstr "Quelqu'un a modifié la page alors que vous l'éditiez !"
 
 msgid ""
 "Someone else saved this page while you were editing!\n"
 "Please review the page and save then. Do not save this page as it is!"
 msgstr ""
-"Quelqu'un a enregistré cette page pendant que vous l'éditiez !\n"
+"Quelqu'un a enregistré cette page pendant que vous l'éditiez !\n"
 "Vérifiez d'abord la page puis enregistrez-la. N'enregistrez pas cette page "
-"telle quelle !"
+"telle quelle !"
 
 msgid "[Content loaded from draft]"
 msgstr "[Contenu chargé depuis le brouillon]"
@@ -131,7 +139,7 @@
 "preview, cancel an edit or unsuccessfully save."
 msgstr ""
 "'''<<BR>>Si vous avez perdu vos dernières modifications, vous pouvez "
-"utiliser le bouton « Recharger le brouillon » pour reprendre, à la place de "
+"utiliser le bouton « Recharger le brouillon » pour reprendre, à la place de "
 "la version actuelle (%(page_rev)d), le brouillon créé à partir de la version "
 "%(draft_rev)d (enregistré %(draft_timestamp_str)s).''' Un brouillon est "
 "conservé, à votre intention, chaque fois que vous utilisez l'aperçu, que "
@@ -139,7 +147,7 @@
 
 #, python-format
 msgid "Describe %s here."
-msgstr "Rédiger « %s » ici."
+msgstr "Rédiger « %s » ici."
 
 msgid "Check Spelling"
 msgstr "Vérifier l'orthographe"
@@ -175,57 +183,57 @@
 msgstr "Modification mineure"
 
 msgid "Comment:"
-msgstr "Commentaire :"
+msgstr "Commentaire :"
 
 msgid "<No addition>"
 msgstr "<Pas d'ajout>"
 
 #, python-format
 msgid "Add to: %(category)s"
-msgstr "Ajouter à : %(category)s"
+msgstr "Ajouter à : %(category)s"
 
 msgid "Remove trailing whitespace from each line"
 msgstr "Supprimer les espaces en fin de ligne"
 
 #, python-format
 msgid "Argument \"%s\" must be a boolean value, not \"%s\""
-msgstr "L'argument « %s » doit être un booléen, et non « %s »"
+msgstr "L'argument « %s » doit être un booléen, et non « %s »"
 
 #, python-format
 msgid "Argument must be a boolean value, not \"%s\""
-msgstr "L'argument doit être un booléen, et non « %s »"
+msgstr "L'argument doit être un booléen, et non « %s »"
 
 #, python-format
 msgid "Argument \"%s\" must be an integer value, not \"%s\""
-msgstr "L'argument « %s » doit être un entier, et non « %s »"
+msgstr "L'argument « %s » doit être un entier, et non « %s »"
 
 #, python-format
 msgid "Argument must be an integer value, not \"%s\""
-msgstr "L'argument doit être un entier, et non « %s »"
+msgstr "L'argument doit être un entier, et non « %s »"
 
 #, python-format
 msgid "Argument \"%s\" must be a floating point value, not \"%s\""
-msgstr "L'argument « %s » doit être un nombre à virgule flotante, et non « %s »"
+msgstr "L'argument « %s » doit être un nombre à virgule flotante, et non « %s »"
 
 #, python-format
 msgid "Argument must be a floating point value, not \"%s\""
-msgstr "L'argument doit être un nombre à virgule flotante, et non « %s »"
+msgstr "L'argument doit être un nombre à virgule flotante, et non « %s »"
 
 #, python-format
 msgid "Argument \"%s\" must be a complex value, not \"%s\""
-msgstr "L'argument « %s » doit être un nombre complexe, et non « %s »"
+msgstr "L'argument « %s » doit être un nombre complexe, et non « %s »"
 
 #, python-format
 msgid "Argument must be a complex value, not \"%s\""
-msgstr "L'argument doit être un nombre complexe, et non « %s »"
+msgstr "L'argument doit être un nombre complexe, et non « %s »"
 
 #, python-format
 msgid "Argument \"%s\" must be one of \"%s\", not \"%s\""
-msgstr "L'argument « %s » doit être l'une des valeurs « %s », et non « %s »"
+msgstr "L'argument « %s » doit être l'une des valeurs « %s », et non « %s »"
 
 #, python-format
 msgid "Argument must be one of \"%s\", not \"%s\""
-msgstr "L'argument doit être l'une des valeurs « %s », et non « %s »"
+msgstr "L'argument doit être l'une des valeurs « %s », et non « %s »"
 
 msgid "Too many arguments"
 msgstr "Trop d'arguments"
@@ -237,22 +245,22 @@
 
 #, python-format
 msgid "Argument \"%s\" is required"
-msgstr "L'argument « %s » est obligatoire"
+msgstr "L'argument « %s » est obligatoire"
 
 #, python-format
 msgid "No argument named \"%s\""
-msgstr "Aucun argument n'est nommé « %s »"
+msgstr "Aucun argument n'est nommé « %s »"
 
 #, python-format
 msgid "Expected \"=\" to follow \"%(token)s\""
-msgstr "« = » était attendu après « %(token)s »"
+msgstr "« = » était attendu après « %(token)s »"
 
 #, python-format
 msgid "Expected a value for key \"%(token)s\""
-msgstr "Une valeur était attendue pour la clef « %(token)s »"
+msgstr "Une valeur était attendue pour la clef « %(token)s »"
 
 msgid "Your changes are not saved!"
-msgstr "Vos modifications ne sont pas enregistrées !"
+msgstr "Vos modifications ne sont pas enregistrées !"
 
 msgid "Page name is too long, try shorter name."
 msgstr "Nom de page trop long, essayez un nom plus court."
@@ -267,7 +275,7 @@
 msgstr "Impossible de copier vers un nom de page vide."
 
 msgid "You are not allowed to copy this page!"
-msgstr "Vous n'êtes pas autorisé à copier cette page !"
+msgstr "Vous n'êtes pas autorisé à copier cette page !"
 
 #, python-format
 msgid ""
@@ -275,18 +283,18 @@
 "\n"
 "Try a different name."
 msgstr ""
-"'''Une page ayant pour nom « {{{%s}}} » existe déjà.'''\n"
+"'''Une page ayant pour nom « {{{%s}}} » existe déjà.'''\n"
 "\n"
 "Essayez un autre nom."
 
 #, python-format
 msgid "Could not copy page because of file system error: %s."
 msgstr ""
-"Impossible de renommer la page du fait d'une erreur du système de fichiers : "
+"Impossible de renommer la page du fait d'une erreur du système de fichiers : "
 "%s."
 
 msgid "You are not allowed to rename this page!"
-msgstr "Vous n'êtes pas autorisé à renommer cette page !"
+msgstr "Vous n'êtes pas autorisé à renommer cette page !"
 
 msgid "You can't rename to an empty pagename."
 msgstr "Impossible de renommer sans indiquer de nouveau nom."
@@ -294,11 +302,11 @@
 #, python-format
 msgid "Could not rename page because of file system error: %s."
 msgstr ""
-"Impossible de renommer la page à cause d'une erreur du système de fichier : %"
+"Impossible de renommer la page à cause d'une erreur du système de fichier : %"
 "s."
 
 msgid "You are not allowed to delete this page!"
-msgstr "Vous n'êtes pas autorisé à supprimer cette page !"
+msgstr "Vous n'êtes pas autorisé à supprimer cette page !"
 
 msgid "Thank you for your changes. Your attention to detail is appreciated."
 msgstr ""
@@ -307,21 +315,21 @@
 
 #, python-format
 msgid "Page \"%s\" was successfully deleted!"
-msgstr "Page « %s » supprimée avec succès !"
+msgstr "Page « %s » supprimée avec succès !"
 
 #, python-format
 msgid "Page could not get locked. Unexpected error (errno=%d)."
 msgstr "Impossible de verrouiller la page. Erreur inattendue (errno=%d)."
 
 msgid "Page could not get locked. Missing 'current' file?"
-msgstr "Impossible de verrouiller la page. Fichier « current » manquant ?"
+msgstr "Impossible de verrouiller la page. Fichier « current » manquant ?"
 
 #, python-format
 msgid ""
 "Unable to determine current page revision from the 'current' file. The page %"
 "s is damaged and cannot be edited right now."
 msgstr ""
-"Le fichier « current » ne permet pas de déterminer la version de la page en "
+"Le fichier « current » ne permet pas de déterminer la version de la page en "
 "cours. La page %s est endommagée et ne peut être modifiée pour l'instant."
 
 #, python-format
@@ -336,32 +344,32 @@
 "page %s (errno=%d)"
 
 msgid "You are not allowed to edit this page!"
-msgstr "Vous n'êtes pas autorisé à modifier cette page !"
+msgstr "Vous n'êtes pas autorisé à modifier cette page !"
 
 msgid "You cannot save empty pages."
 msgstr "Vous ne pouvez pas enregistrer de pages vides."
 
 msgid "You already saved this page!"
-msgstr "Vous avez déjà enregistré cette page !"
+msgstr "Vous avez déjà enregistré cette page !"
 
 msgid "You already edited this page! Please do not use the back button."
 msgstr ""
-"Vous avez déjà modifié cette page ! Veuillez ne pas utiliser le bouton "
-"« Précédent »."
+"Vous avez déjà modifié cette page ! Veuillez ne pas utiliser le bouton « "
+"Précédent »."
 
 msgid "You did not change the page content, not saved!"
 msgstr ""
 "Vous n'avez pas modifié le contenu de cette page, elle n'a pas été "
-"enregistrée !"
+"enregistrée !"
 
 msgid ""
 "You can't change ACLs on this page since you have no admin rights on it!"
 msgstr ""
 "Vous ne pouvez pas modifier la liste de contrôle d'accès (ACL) de cette "
-"page, car vous n'en avez pas les droits d'administration !"
+"page, car vous n'en avez pas les droits d'administration !"
 
 msgid "Notifications sent to:"
-msgstr ""
+msgstr "Notifications envoyées à :"
 
 #, python-format
 msgid ""
@@ -388,7 +396,7 @@
 
 msgid "Use the Preview button to extend the locking period."
 msgstr ""
-"Utilisez le bouton « Aperçu » pour prolonger la période de verrouillage."
+"Utilisez le bouton « Aperçu » pour prolonger la période de verrouillage."
 
 #, python-format
 msgid ""
@@ -411,7 +419,7 @@
 "dernière fois le %(timestamp)s.<<BR>> '''Afin d'éviter des conflits "
 "d'édition,  vous ''ne'' devriez ''pas'' éditer cette page avant au moins %"
 "(mins_valid)d nouvelles minutes.'''<<BR>>\n"
-"Pour quitter l'éditeur, utilisez le bouton « Annuler »."
+"Pour quitter l'éditeur, utilisez le bouton « Annuler »."
 
 msgid "The wiki is currently not reachable."
 msgstr "Il n'est pas possible pour l'instant de se connecter à ce wiki."
@@ -442,7 +450,7 @@
 
 #, python-format
 msgid "Installation of '%(filename)s' failed."
-msgstr "Enregistrement du dessin « %(filename)s »."
+msgstr "Enregistrement du dessin « %(filename)s »."
 
 #, python-format
 msgid "The file %s is not a MoinMoin package file."
@@ -453,7 +461,7 @@
 msgstr "La page %s n'existe pas."
 
 msgid "Invalid package file header."
-msgstr "Fichier d'en-tête du paquet non valide."
+msgstr "Le fichier d'en-tête du paquet est incorrect."
 
 msgid "Package file format unsupported."
 msgstr "Format de paquet non compatible."
@@ -469,7 +477,7 @@
 #, python-format
 msgid "Invalid highlighting regular expression \"%(regex)s\": %(error)s"
 msgstr ""
-"L'expression rationnelle de surlignage : « %(regex)s » est incorrecte : %"
+"L'expression rationnelle de surlignage : « %(regex)s » est incorrecte : %"
 "(error)s"
 
 msgid ""
@@ -477,7 +485,7 @@
 "search results!"
 msgstr ""
 "Le contenu sauvegardé de cette page est obsolète et ne sera pas inclus dans "
-"les résultats d'une recherche !"
+"les résultats d'une recherche !"
 
 #, python-format
 msgid "Revision %(rev)d as of %(date)s"
@@ -485,11 +493,11 @@
 
 #, python-format
 msgid "Redirected from page \"%(page)s\""
-msgstr "Redirigé depuis la page « %(page)s »"
+msgstr "Redirigé depuis la page « %(page)s »"
 
 #, python-format
 msgid "This page redirects to page \"%(page)s\""
-msgstr "Cette page vous redirige vers la page « %(page)s »"
+msgstr "Cette page vous redirige vers la page « %(page)s »"
 
 msgid "Create New Page"
 msgstr "Créer une page"
@@ -534,7 +542,7 @@
 
 #, python-format
 msgid "last modified: %s"
-msgstr "dernière modification : %s"
+msgstr "dernière modification : %s"
 
 msgid "match"
 msgstr "correspondance"
@@ -546,7 +554,7 @@
 msgstr "Ligne"
 
 msgid "No differences found!"
-msgstr "Aucune différence trouvée !"
+msgstr "Aucune différence trouvée !"
 
 msgid "Deletions are marked like this."
 msgstr "Texte supprimé."
@@ -561,24 +569,22 @@
 msgstr "Mot de passe"
 
 msgid "OpenID"
-msgstr ""
+msgstr "identifiant OpenID"
 
 msgid "Login"
 msgstr "Connexion"
 
-#, fuzzy
 msgid "Username"
-msgstr "Utilisateur"
-
-#, fuzzy
+msgstr "Nom d'utilisateur"
+
 msgid "Member of Groups"
-msgstr "Nombre de pages"
+msgstr "Membre des groupes"
 
 msgid "Email"
 msgstr "Adresse électronique"
 
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 msgid "Action"
 msgstr "Action"
@@ -600,24 +606,33 @@
 "Mot de passe manquant. Veuillez indiquer un nom d'utilisateur et un mot de "
 "passe."
 
-#, fuzzy
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
-msgstr "Vous êtes maintenant déconnecté."
+msgstr "Vous devez d'abord vous connecter."
 
 #, python-format
 msgid ""
 "If you do not have an account, <a href=\"%(userprefslink)s\">you can create "
 "one now</a>. <a href=\"%(sendmypasswordlink)s\">Forgot your password?</a>"
 msgstr ""
+"Si vous n'avez pas de compte, <a href=\"%(userprefslink)s\">vous pouvez en "
+"créer un maintenant</a>. <a href=\"%(sendmypasswordlink)s\">Mot de passe "
+"oublié ?</a>"
 
 msgid ""
 "Please choose an account name now.\n"
 "If you choose an existing account name you will be asked for the\n"
 "password and be able to associate the account with your OpenID."
 msgstr ""
+"Merci d'indiquer maintenant votre nom d'utilisateur\n"
+"Si vous choisissez un compte existant le mot de mot de passe\n"
+"vous sera demandé afin de l'associer avec l'identifiant OpenID."
 
 msgid "Choose this name"
-msgstr ""
+msgstr "Choisir ce nom"
 
 msgid ""
 "The username you have chosen is already\n"
@@ -625,55 +640,63 @@
 "the username with your OpenID. Otherwise, please choose a different\n"
 "username and leave the password field blank."
 msgstr ""
+"Le nom d'utilisateur que vous avez choisi est déjà utilisé\n"
+"S'il s'agit de votre nom d'utilisateur, entrez votre mot de passe\n"
+"ci-dessous pour l'associer avec votre identifiant OpenID. Sinon\n"
+"merci de choisir un autre nom d'utilisateur et de laisser le\n"
+"champ du mot de passe vide."
 
 msgid "Associate this name"
-msgstr ""
+msgstr "Associer à ce nom"
 
 #, python-format
 msgid "OpenID error: %s."
-msgstr ""
-
-#, fuzzy
+msgstr "Erreur OpenID: %s."
+
 msgid "Verification canceled."
-msgstr "L'opération a été annulée."
+msgstr "La vérification a été annulée."
 
 msgid "OpenID failure."
-msgstr ""
+msgstr "Echec OpenID."
 
 msgid "This is not a valid username, choose a different one."
-msgstr ""
+msgstr "Ce nom d'utilisateur n'est pas valide, choisissez-en un autre."
 
 msgid "Your account is now associated to your OpenID."
-msgstr ""
+msgstr "Votre compte est maintenant associé à votre identifiant OpenID."
 
 msgid "The password you entered is not valid."
-msgstr ""
+msgstr "Le mot de passe entré est incorrect."
 
 msgid "OpenID verification requires that you click this button:"
-msgstr ""
+msgstr "Veuillez cliquer sur ce bouton pour l'identification OpenID:"
 
 msgid "Anonymous sessions need to be enabled for OpenID login."
 msgstr ""
+"Les sessions anonymes doivent être activées pour utiliser un identifiant "
+"OpenID."
 
 msgid "Failed to resolve OpenID."
-msgstr ""
+msgstr "Échec de la résolution de l'identifiant OpenID."
 
 msgid "OpenID discovery failure, not a valid OpenID."
-msgstr ""
+msgstr "Échec de la découverte OpenID, identifiant OpenID non valable."
 
 msgid "No OpenID."
-msgstr ""
+msgstr "Pas d'identifiant OpenID."
 
 msgid ""
 "If you do not have an account yet, you can still log in with your OpenID and "
 "create one during login."
 msgstr ""
+"Si vous n'avez pas encore de compte, vous pouvez vous connecter avec\n"
+"votre identifiant OpenID et en créer un durant la connection."
 
 msgid "Failed to connect to database."
-msgstr ""
+msgstr "Echec de connexion à la base de donnée."
 
 msgid "Could not contact botbouncer.com."
-msgstr ""
+msgstr "Impossible de contacter botbouncer.com."
 
 msgid "Wiki"
 msgstr "Wiki"
@@ -748,7 +771,7 @@
 msgstr "Cliquez ici pour faire une recherche de ce titre dans les pages"
 
 msgid "Settings"
-msgstr ""
+msgstr "Paramètres"
 
 msgid "Logout"
 msgstr "Déconnexion"
@@ -764,9 +787,9 @@
 msgid "last modified %(time)s"
 msgstr "dernière modification %(time)s"
 
-# Il faut utiliser une espace normale après « Rechercher »,
+# Il faut utiliser une espace normale après « Rechercher »,
 # sinon, du fait d'un défaut du moteur de Mozilla, le texte
-# « Rechercher » ne s'efface pas de la barre de recherche.
+# « Rechercher » ne s'efface pas de la barre de recherche.
 msgid "Search:"
 msgstr "Rechercher :"
 
@@ -780,7 +803,7 @@
 msgstr "Rechercher"
 
 msgid "More Actions:"
-msgstr "Autres actions :"
+msgstr "Autres actions :"
 
 msgid "------------------------"
 msgstr "------------------------"
@@ -869,7 +892,7 @@
 msgstr "(mémorisé dans le cache le %s)"
 
 msgid "Or try one of these actions:"
-msgstr "Ou essayez l'une de ces actions :"
+msgstr "Ou essayez l'une de ces actions :"
 
 msgid "Date"
 msgstr "Date"
@@ -886,7 +909,7 @@
 #, python-format
 msgid "Connection to mailserver '%(server)s' failed: %(reason)s"
 msgstr ""
-"La connexion au serveur de messagerie « %(server)s » a échouée : %(reason)s"
+"La connexion au serveur de messagerie « %(server)s » a échouée : %(reason)s"
 
 msgid "Mail not sent"
 msgstr "Courrier non envoyé"
@@ -905,12 +928,12 @@
 
 #, python-format
 msgid "**You are not allowed to read the page: %s**"
-msgstr "** Vous n'êtes pas autorisé à lire la page : %s ! **"
+msgstr "** Vous n'êtes pas autorisé à lire la page : %s ! **"
 
 #, python-format
 msgid "**Could not find the referenced page: %s**"
 msgstr ""
-"**Impossible de trouver la page à laquelle il est fait référence : %s**"
+"**Impossible de trouver la page à laquelle il est fait référence : %s**"
 
 msgid "XSLT option disabled, please look at HelpOnConfiguration."
 msgstr "L'option XSLT a été désactivée, consultez l'AideDeParamétrage."
@@ -922,24 +945,24 @@
 
 #, python-format
 msgid "%(errortype)s processing error"
-msgstr "Erreur d'exécution : %(errortype)s"
+msgstr "Erreur d'exécution : %(errortype)s"
 
 #, python-format
 msgid "Expected \"%(wanted)s\" after \"%(key)s\", got \"%(token)s\""
 msgstr ""
-"« %(wanted)s » était attendu après « %(key)s », mais « %(token)s » a été obtenu"
+"« %(wanted)s » était attendu après « %(key)s », mais « %(token)s » a été obtenu"
 
 #, python-format
 msgid "Expected an integer \"%(key)s\" before \"%(token)s\""
-msgstr "Un entier « %(key)s » était attendu avant « %(token)s »"
+msgstr "Un entier « %(key)s » était attendu avant « %(token)s »"
 
 #, python-format
 msgid "Expected an integer \"%(arg)s\" after \"%(key)s\""
-msgstr "Un entier « %(arg)s » était attendu après « %(key)s »"
+msgstr "Un entier « %(arg)s » était attendu après « %(key)s »"
 
 #, python-format
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
-msgstr "Une couleur « %(arg)s » était attendue après « %(key)s »"
+msgstr "Une couleur « %(arg)s » était attendue après « %(key)s »"
 
 msgid "FrontPage"
 msgstr "PageD'Accueil"
@@ -1014,124 +1037,128 @@
 msgstr "Orthographe"
 
 msgid "Discussion"
-msgstr ""
+msgstr "Discussion"
 
 #, python-format
 msgid ""
 "Sorry, can not save page because \"%(content)s\" is not allowed in this wiki."
 msgstr ""
-"Désolé, impossible d'enregistrer la page car « %(content)s » n'est pas "
+"Désolé, impossible d'enregistrer la page car « %(content)s » n'est pas "
 "autorisé sur ce wiki."
 
 msgid "Notification"
-msgstr ""
+msgstr "Notification"
 
 msgid "Notification settings saved!"
-msgstr ""
-
-#, fuzzy
+msgstr "Paramètres de notification sauvegardés !"
+
 msgid "'''Email'''"
-msgstr "Adresse électronique"
+msgstr "'''Adresse électronique'''"
 
 msgid "'''Jabber'''"
-msgstr ""
+msgstr "'''Jabber'''"
 
 msgid "'''Event type'''"
-msgstr ""
+msgstr "'''Type d'évènement'''"
 
 msgid "Select the events you want to be notified about."
-msgstr ""
+msgstr "Sélectionnez les évènement dont vous voulez être averti."
 
 msgid ""
 "Before you can be notified, you need to provide a way to contact you in the "
 "general preferences."
 msgstr ""
-
-#, fuzzy
+"Avant de pouvoir être averti, vous devez donner un moyen de vous "
+"contacterdans les préférences générales"
+
 msgid "Subscribed events"
-msgstr "Abonner un utilisateur"
-
-#, fuzzy
+msgstr "Évènements auxquels vous êtes abonnés"
+
 msgid "Subscribed wiki pages<<BR>>(one regex per line)"
-msgstr "Abonnements (une expression rationnelle par ligne)"
+msgstr ""
+"Pages du wiki auxquelles vous êtes abonnés<<BR>>(une expression rationnelle "
+"par ligne)"
 
 msgid "Save"
 msgstr "Enregistrer"
 
-#, fuzzy
 msgid "Change password"
-msgstr "Mot de passe"
+msgstr "Modifier le mot de passe"
 
 msgid "Passwords don't match!"
-msgstr "Les mots de passe ne correspondent pas !"
+msgstr "Les mots de passe ne correspondent pas !"
 
 msgid "Please specify a password!"
-msgstr "Veuillez indiquer un mot de passe !"
+msgstr "Veuillez indiquer un mot de passe !"
 
 #, python-format
 msgid "Password not acceptable: %s"
-msgstr "Mot de passe non acceptable : %s"
+msgstr "Mot de passe non acceptable : %s"
 
 msgid "Your password has been changed."
-msgstr ""
+msgstr "Votre mot de passe a été changé."
 
 msgid "To change your password, enter a new password twice."
 msgstr ""
+"Pour changer votre mot de passe, entrez deux fois un nouveau mot de passe."
 
 msgid "Password repeat"
 msgstr "Répétez le mot de passe"
 
 msgid "Switch user"
-msgstr ""
+msgstr "Changer d'utilisateur"
 
 msgid "No user selected"
-msgstr ""
+msgstr "Pas d'utilisateur sélectionné"
 
 msgid ""
 "You can now change the settings of the selected user account; log out to get "
 "back to your account."
 msgstr ""
+"Vous pouvez changer les réglages du compte utilisateur sélectionné;"
+"déconnectez-vous pour retourner à votre compte."
 
 msgid "You are the only user."
-msgstr ""
+msgstr "Vous êtes le seul utilisateur."
 
 msgid ""
 "As a superuser, you can temporarily assume the identity of another user."
 msgstr ""
+"En tant que superutilisateur, vous pouvez vous connecter temporairement sous "
+"l'identité d'un autre utilisateur."
 
 msgid "Select User"
 msgstr "Choix du compte"
 
 msgid "OpenID settings"
-msgstr ""
+msgstr "Paramètres OpenID"
 
 msgid "Cannot remove all OpenIDs."
-msgstr ""
+msgstr "Impossible d'enlever tous les identifiants OpenID."
 
 msgid "The selected OpenIDs have been removed."
-msgstr ""
+msgstr "Les identifiants OpenID sélectionnés ont été enlevés."
 
 msgid "No OpenID given."
-msgstr ""
+msgstr "Pas d'identifiant OpenID entré."
 
 msgid "OpenID is already present."
-msgstr ""
-
-#, fuzzy
+msgstr "OpenID est déjà présent."
+
 msgid "This OpenID is already used for another account."
-msgstr "Cette page a déjà été supprimée ou n'a jamais existé !"
+msgstr "Cet identifiant OpenID est déjà utilisé par un autre compte."
 
 msgid "OpenID added successfully."
-msgstr ""
+msgstr "Identifiant OpenID ajouté avec succès."
 
 msgid "Current OpenIDs"
-msgstr ""
+msgstr "Identifiants OpenID actuels"
 
 msgid "Remove selected"
-msgstr ""
+msgstr "Enlever les sélectionnés"
 
 msgid "Add OpenID"
-msgstr ""
+msgstr "Ajouter un identifiant OpenID"
 
 msgid "Preferences"
 msgstr "Préférences"
@@ -1142,10 +1169,10 @@
 "Name may contain any Unicode alpha numeric character, with optional one\n"
 "space between words. Group page name is not allowed."
 msgstr ""
-"Non d'utilisateur non valide « {{{%s}}} ».\n"
-"Les noms d'utilisateurs peuvent inclure tout caractère Unicode\n"
-"alphanumérique, avec éventuellement un espace entre les mots.\n"
-"Les noms des pages des groupes sont interdits."
+"Non d'utilisateur incorrect « {{{%s}}} ».\n"
+"Les noms d'utilisateurs peuvent contenir tout caractère Unicode\n"
+"alphanumérique, avec éventuellement un espace entre chaque mot.\n"
+"Les noms des pages correspondant aux groupes sont interdits."
 
 msgid "This user name already belongs to somebody else."
 msgstr "Ce nom d'utilisateur appartient déjà à quelqu'un d'autre."
@@ -1166,16 +1193,15 @@
 msgid "This email already belongs to somebody else."
 msgstr "Cette adresse électronique appartient déjà à quelqu'un d'autre."
 
-#, fuzzy
 msgid "This jabber id already belongs to somebody else."
-msgstr "Cette adresse électronique appartient déjà à quelqu'un d'autre."
+msgstr "Cet identifiant Jabber appartient déjà à quelqu'un d'autre."
 
 #, python-format
 msgid "The theme '%(theme_name)s' could not be loaded!"
-msgstr "Le thème « %(theme_name)s » n'a pu être chargé !"
+msgstr "Le thème « %(theme_name)s » n'a pu être chargé !"
 
 msgid "User preferences saved!"
-msgstr "Vos préférences utilisateur ont été enregistrées !"
+msgstr "Vos préférences utilisateur ont été enregistrées !"
 
 msgid "Default"
 msgstr "par défaut"
@@ -1219,7 +1245,7 @@
 msgid "Quick links"
 msgstr "Liens rapides"
 
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Dear Wiki user,\n"
 "\n"
@@ -1228,21 +1254,20 @@
 "\n"
 "The \"%(pagename)s\" page has been changed by %(editor)s:\n"
 msgstr ""
-"Cher utilisateur du Wiki,\n"
+"Cher utilisateur du wiki,\n"
 "\n"
-"vous vous êtes abonné aux notifications de changements de la page wiki ou de "
-"la catégorie wiki de « %(sitename)s ».\n"
+"vous vous êtes abonné aux notifications des modifications d'une page ou "
+"d'une catégorie du wiki « %(sitename)s ».\n"
 "\n"
-"La page suivante a été modifiée par %(editor)s :\n"
-"%(pagelink)s\n"
+"La page « %(pagename)s » a été modifiée par %(editor)s :\n"
 
 msgid "New page:\n"
-msgstr "Nouvelle page :\n"
+msgstr "Nouvelle page :\n"
 
 msgid "No differences found!\n"
-msgstr "Aucune différence n'a été trouvée !\n"
-
-#, fuzzy, python-format
+msgstr "Aucune différence n'a été trouvée !\n"
+
+#, python-format
 msgid ""
 "Dear wiki user,\n"
 "\n"
@@ -1252,15 +1277,15 @@
 "The page \"%(pagename)s\" has been deleted by %(editor)s:\n"
 "\n"
 msgstr ""
-"Cher utilisateur du Wiki,\n"
+"Cher utilisateur du wiki,\n"
 "\n"
-"vous vous êtes abonné aux notifications de changements de la page wiki ou de "
-"la catégorie wiki de « %(sitename)s ».\n"
+"vous vous êtes abonné aux notifications des modifications d'une page ou "
+"d'une catégorie du wiki « %(sitename)s ».\n"
 "\n"
-"La page suivante a été modifiée par %(editor)s :\n"
-"%(pagelink)s\n"
-
-#, fuzzy, python-format
+"La page « %(pagename)s » a été supprimée par %(editor)s :\n"
+"\n"
+
+#, python-format
 msgid ""
 "Dear wiki user,\n"
 "\n"
@@ -1270,17 +1295,16 @@
 "The page \"%(pagename)s\" has been renamed from \"%(oldname)s\" by %(editor)"
 "s:\n"
 msgstr ""
-"Cher utilisateur du Wiki,\n"
+"Cher utilisateur du wiki,\n"
 "\n"
-"vous vous êtes abonné aux notifications de changements de la page wiki ou de "
-"la catégorie wiki de « %(sitename)s ».\n"
+"vous vous êtes abonné aux notifications des modifications d'une page\n"
+"du wiki « %(sitename)s ».\n"
 "\n"
-"La page suivante a été modifiée par %(editor)s :\n"
-"%(pagelink)s\n"
+"La page « %(oldname)s » a été renommée « %(pagename)s » par %(editor)s :\n"
 
 #, python-format
 msgid "New user account created on %(sitename)s"
-msgstr ""
+msgstr "Nouveau compte utilisateur créé sur %(sitename)s"
 
 #, python-format
 msgid ""
@@ -1289,10 +1313,17 @@
 "    User name: %(username)s\n"
 "    Email address: %(useremail)s"
 msgstr ""
-
-#, fuzzy, python-format
+"Cher super-utilisateur, un nouveau compte vient d'être créé, dont voici les "
+"détails:\n"
+"\n"
+"    Nom d'utilisateur: %(username)s\n"
+"    Adresse de courrier électronique: %(useremail)s"
+
+#, python-format
 msgid "New attachment added to page %(pagename)s on %(sitename)s"
-msgstr "<<Verbatim(attachment:)>> %(filename)s de %(pagename)s"
+msgstr ""
+"Une nouvelle pièce jointe a été ajoutée à la page %(pagename)s de %(sitename)"
+"s"
 
 #, python-format
 msgid ""
@@ -1305,43 +1336,46 @@
 "Attachment name: %(attach_name)s\n"
 "Attachment size: %(attach_size)s\n"
 msgstr ""
+"Cher utilisateur du Wiki,\n"
+"\n"
+"vous vous êtes abonné aux notifications de changements pour la page \"%"
+"(page_name)s\".Une pièce jointe vient d'y être ajouté par %(editor)s. "
+"Quelques détails sur la pièce jointe:\n"
+"\n"
+"Nom: %(attach_name)s\n"
+"Taille: %(attach_size)s\n"
 
 msgid "Page has been modified"
-msgstr ""
+msgstr "La page a été modifiée"
 
 msgid "Page has been modified in a trivial fashion"
-msgstr ""
-
-#, fuzzy
+msgstr "Une modification mineure a été apportée à la page"
+
 msgid "Page has been renamed"
-msgstr "Nombre de consultations et de modifications"
-
-#, fuzzy
+msgstr "La page a été renommée"
+
 msgid "Page has been deleted"
-msgstr "Page « %s » supprimée avec succès !"
-
-#, fuzzy
+msgstr "La page a été supprimée"
+
 msgid "Page has been copied"
-msgstr "Nombre de consultations et de modifications"
-
-#, fuzzy
+msgstr "La page a été copiée"
+
 msgid "A new attachment has been added"
-msgstr "Nom de la pièce jointe"
+msgstr "Une nouvelle pièce jointe a été ajoutée"
 
 msgid "A page has been reverted to a previous state"
-msgstr ""
-
-#, fuzzy
+msgstr "Une version antérieure d'une page a été restaurée"
+
 msgid "A user has subscribed to a page"
-msgstr "Vous avez été abonné à cette page."
+msgstr "Un utilisateur s'est abonné à une page"
 
 msgid "A new account has been created"
-msgstr ""
+msgstr "Un nouveau compte vient d'être créé"
 
 #, python-format
 msgid "[%(sitename)s] %(trivial)sUpdate of \"%(pagename)s\" by %(username)s"
 msgstr ""
-"[%(sitename)s] Mise à jour %(trivial)sde « %(pagename)s » par %(username)s"
+"[%(sitename)s] Mise à jour %(trivial)sde « %(pagename)s » par %(username)s"
 
 msgid "Trivial "
 msgstr "mineure "
@@ -1351,43 +1385,33 @@
 "Attachment link: %(attach)s\n"
 "Page link: %(page)s\n"
 msgstr ""
-
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
-#, fuzzy
+"Lien vers la pièce jointe: %(attach)s\n"
+"Lien vers une page: %(page)s\n"
+
 msgid "Attachment link"
-msgstr "Pièces jointes"
-
-#, fuzzy
+msgstr "Lien vers une pièce jointe"
+
 msgid "Page link"
-msgstr "Pages similaires à « %s »"
-
-#, fuzzy
+msgstr "Liens vers une page"
+
 msgid "Changed page"
-msgstr "Pages du paquet"
-
-#, fuzzy
+msgstr "Page modifiée"
+
 msgid "Page changed"
-msgstr "Enregistrer les modifications"
+msgstr "La page a été modifiée"
 
 msgid "Options --pages and --search are mutually exclusive!"
-msgstr "Les options --pages et --search sont mutuellement exclusives !"
+msgstr "Les options --pages et --search sont mutuellement exclusives !"
 
 msgid "You must specify an output file!"
-msgstr "Vous devez indiquer un fichier de sortie !"
+msgstr "Vous devez indiquer un fichier de sortie !"
 
 msgid "No pages specified using --pages or --search, assuming full package."
 msgstr ""
 "Aucune page indiquée via --pages ou --search, on prend le paquet complet."
 
 msgid "Output file already exists! Cowardly refusing to continue!"
-msgstr "Le fichier de sortie existe déjà ! Abandon lâche de l'opération."
+msgstr "Le fichier de sortie existe déjà ! Abandon lâche de l'opération."
 
 msgid "Language"
 msgstr "Langue"
@@ -1396,7 +1420,7 @@
 msgstr "Autres"
 
 msgid "Charts are not available!"
-msgstr "Les graphiques ne sont pas disponibles !"
+msgstr "Les graphiques ne sont pas disponibles !"
 
 msgid "Page Size Distribution"
 msgstr "Page Taille Répartition"
@@ -1408,10 +1432,10 @@
 msgstr "Nombre de pages de cette taille"
 
 msgid "Views/day"
-msgstr "Consultations / jour"
+msgstr "Consultations / jour"
 
 msgid "Edits/day"
-msgstr "Modifications / jour"
+msgstr "Modifications / jour"
 
 msgid "Page hits and edits"
 msgstr "Nombre de consultations et de modifications"
@@ -1439,7 +1463,6 @@
 msgid "Distribution of User-Agent Types"
 msgstr "Répartition des types d'agents utilisateurs"
 
-#, fuzzy
 msgid ""
 " Emphasis:: <<Verbatim('')>>''italics''<<Verbatim('')>>; <<Verbatim(''')"
 ">>'''bold'''<<Verbatim(''')>>; <<Verbatim(''''')>>'''''bold "
@@ -1457,27 +1480,23 @@
 "\n"
 "(!) For more help, see HelpOnEditing or SyntaxReference.\n"
 msgstr ""
-" Mise en relief:: <<Verbatim('')>>''italique''<<Verbatim('')>> ; <<Verbatim"
-"(''')>>'''gras'''<<Verbatim(''')>> ; <<Verbatim(''''')>>'''''gras "
-"italique'''''<<Verbatim(''''')>> ; <<Verbatim('')>>''mélange de ''<<Verbatim"
-"(''')>>'''''gras'''<<Verbatim(''')>> et d'italique''<<Verbatim('')>> ; "
+" Mise en relief:: <<Verbatim('')>>''italique''<<Verbatim('')>> ; <<Verbatim"
+"(''')>>'''gras'''<<Verbatim(''')>> ; <<Verbatim(''''')>>'''''gras "
+"italique'''''<<Verbatim(''''')>> ; <<Verbatim('')>>''mélange de ''<<Verbatim"
+"(''')>>'''''gras'''<<Verbatim(''')>> et d'italique''<<Verbatim('')>> ; "
 "<<Verbatim(----)>> filet horizontal.\n"
-" Titres:: <<Verbatim(=)>> Titre 1 <<Verbatim(=)>> ; <<Verbatim(==)>> Titre 2 "
-"<<Verbatim(==)>> ; <<Verbatim(===)>> Titre 3 <<Verbatim(===)>> ;   <<Verbatim"
-"(====)>> Titre 4 <<Verbatim(====)>> ; <<Verbatim(=====)>> Titre 5 <<Verbatim"
-"(=====)>>.\n"
-" Listes:: une espace suivi de : « * » puces ; « 1. », « a. », « A. », « i.  », "
-"« I. » énumérations ; « 1.#n » énumération commençant à n ; une espace seule "
-"ajoute une indentation.\n"
-" Liens:: <<Verbatim(MotsAccolésDébutantParDesMajuscules)>> ; <<Verbatim"
+" Titres:: = Titre 1 = ; == Titre 2 == ; === Titre 3 === ; ==== Titre 4 "
+"==== ; ===== Titre 5 =====.\n"
+" Listes:: une espace suivi de : * puces ; 1., a., A., i., I. énumérations ; "
+"1.#n énumération commençant à n ; une espace seule ajoute une indentation.\n"
+" Liens:: <<Verbatim(MotsAccolésDébutantParDesMajuscules)>> ; <<Verbatim"
 "([[cible|intitulé]])>>.\n"
-" Tables:: || texte de la cellule |||| texte s'étendant sur 2 colonnes || ; "
+" Tables:: || texte de la cellule |||| texte s'étendant sur 2 colonnes || ; "
 "aucune espace ne doit suivre la fin d'un tableau ou d'un titre.\n"
 "\n"
 "(!) Pour plus d'informations, reportez-vous à l'[AideDeL'Édition|"
 "AideDeL'Édition] ou au RésuméDeLaSyntaxe.\n"
 
-#, fuzzy
 msgid ""
 "{{{\n"
 "Emphasis: *italic* **bold** ``monospace``\n"
@@ -1498,25 +1517,24 @@
 "reStructuredText Quick Reference]].\n"
 msgstr ""
 "{{{\n"
-"Mise en relief : *italique* **gras** ``à chasse fixe``<br/>\n"
+"Mise en relief : *italique* **gras** ``à chasse fixe``\n"
 "\n"
-"Titres : Titre 1  Titre 2  Titre 3\n"
+"Titres : Titre 1  Titre 2  Titre 3\n"
 "         =======  -------  ~~~~~~~\n"
 "\n"
-"Filet horizontal : ---- \n"
+"Filet horizontal : ---- \n"
 "\n"
-"Liens : SoulignéFinal_ `plusieurs mots encadrés d'accents graves`_ "
+"Liens : SoulignéFinal_ `plusieurs mots encadrés d'accents graves`_ "
 "externe_ \n"
 "\n"
-".. _externe : http://exemple.fr.invalid/blabla/\n"
+".. _externe : http://exemple.fr.invalid/blabla/\n"
 "\n"
-"Listes : * puces ; 1., a. numérotées.\n"
+"Listes : * puces ; 1., a. énumérations.\n"
 "}}}\n"
 "(!) Pour en savoir plus, consultez le \n"
 "[[http://docutils.sourceforge.net/docs/user/rst/quickref.html|Guide de "
 "référence rapide de reStructuredText]] (en anglais).\n"
 
-#, fuzzy
 msgid ""
 " Emphasis:: <<Verbatim(//)>>''italics''<<Verbatim(//)>>; <<Verbatim(**)"
 ">>'''bold'''<<Verbatim(**)>>; <<Verbatim(**//)>>'''''bold "
@@ -1533,25 +1551,21 @@
 "\n"
 "(!) For more help, see HelpOnEditing or HelpOnCreoleSyntax.\n"
 msgstr ""
-" Mise en relief:: <<Verbatim('')>>''italique''<<Verbatim('')>> ; <<Verbatim"
-"(''')>>'''gras'''<<Verbatim(''')>> ; <<Verbatim(''''')>>'''''gras "
-"italique'''''<<Verbatim(''''')>> ; <<Verbatim('')>>''mélange de ''<<Verbatim"
-"(''')>>'''''gras'''<<Verbatim(''')>> et d'italique''<<Verbatim('')>> ; "
-"<<Verbatim(----)>> filet horizontal.\n"
-" Titres:: <<Verbatim(=)>> Titre 1 <<Verbatim(=)>> ; <<Verbatim(==)>> Titre 2 "
-"<<Verbatim(==)>> ; <<Verbatim(===)>> Titre 3 <<Verbatim(===)>> ;   <<Verbatim"
-"(====)>> Titre 4 <<Verbatim(====)>> ; <<Verbatim(=====)>> Titre 5 <<Verbatim"
-"(=====)>>.\n"
-" Listes:: une espace suivi de : « * » puces ; « 1. », « a. », « A. », « i.  », "
-"« I. » énumérations ; « 1.#n » énumération commençant à n ; une espace seule "
-"ajoute une indentation.\n"
-" Liens:: <<Verbatim(MotsAccolésDébutantParDesMajuscules)>> ; <<Verbatim"
-"([[cible|intitulé]])>>.\n"
-" Tables:: || texte de la cellule |||| texte s'étendant sur 2 colonnes || ; "
-"aucune espace ne doit suivre la fin d'un tableau ou d'un titre.\n"
+" Mise en relief:: <<Verbatim(//)>>''italique''<<Verbatim(//)>> ; <<Verbatim"
+"(**)>>'''gras'''<<Verbatim(**)>> ; <<Verbatim(**//)>>'''''gras "
+"italique'''''<<Verbatim(//**)>> ; <<Verbatim(//)>>''mélange de ''<<Verbatim"
+"(**)>>'''''gras'''<<Verbatim(**)>> et d'italique''<<Verbatim(//)>> ;\n"
+" <<Verbatim(----)>> filet horizontal.\n"
+" Forcer un passage à la ligne:: <<Verbatim(\\\\)>>\n"
+" Titres:: = Titre 1 = ; == Titre 2 == ; === Titre 3 === ; ==== Titre 4 "
+"==== ; ===== Titre 5 =====.\n"
+" Listes:: * puces ; ** puces secondaires ; # énumérations ; ## énumérations "
+"secondaires.\n"
+" Liens:: <<Verbatim([[cible]])>> ; <<Verbatim([[cible|intitulé]])>>.\n"
+" Tables:: |= texte d'en-tête | texte d'une cellule | texte d'une autre "
+"cellule | ;\n"
 "\n"
-"(!) Pour plus d'informations, reportez-vous à l'[AideDeL'Édition|"
-"AideDeL'Édition] ou au RésuméDeLaSyntaxe.\n"
+"(!) Pour plus d'informations, reportez-vous à l'AideDeLaSyntaxeCréole.\n"
 
 msgid "UnSubscribe"
 msgstr "SeDésabonner"
@@ -1602,7 +1616,7 @@
 msgstr "Pseudonyme"
 
 msgid "Jabber ID"
-msgstr ""
+msgstr "Indentifiant Jabber"
 
 msgid "User CSS URL"
 msgstr "URL du style CSS personnel"
@@ -1613,35 +1627,34 @@
 msgid "Editor size"
 msgstr "Taille de l'éditeur"
 
-#, fuzzy
 msgid "File attachment browser"
-msgstr "Nom de la pièce jointe"
+msgstr "Parcourrir les pièces jointes"
 
 msgid "User account browser"
-msgstr ""
+msgstr "Parcourrir les comptes utilisateurs"
 
 #, python-format
 msgid "Invalid include arguments \"%s\"!"
-msgstr "Les arguments du include ne sont pas valides : « %s » !"
+msgstr "Les arguments du include sont incorrects : « %s » !"
 
 #, python-format
 msgid "Nothing found for \"%s\"!"
-msgstr "Rien n'a été trouvé sur « %s » !"
+msgstr "Rien n'a été trouvé sur « %s » !"
 
 msgid "edit"
 msgstr "éditer"
 
 #, python-format
 msgid "Upload of attachment '%(filename)s'."
-msgstr "Ajout de la pièce jointe « %(filename)s »."
+msgstr "Ajout de la pièce jointe « %(filename)s »."
 
 #, python-format
 msgid "Attachment '%(filename)s' deleted."
-msgstr "Suppression de la pièce jointe « %(filename)s »."
+msgstr "Suppression de la pièce jointe « %(filename)s »."
 
 #, python-format
 msgid "Drawing '%(filename)s' saved."
-msgstr "Enregistrement du dessin « %(filename)s »."
+msgstr "Enregistrement du dessin « %(filename)s »."
 
 #, python-format
 msgid "Revert to revision %(rev)d."
@@ -1649,7 +1662,7 @@
 
 #, python-format
 msgid "Renamed from '%(oldpagename)s'."
-msgstr "Page créée en renommant la page « %(oldpagename)s »."
+msgstr "Page créée en renommant la page « %(oldpagename)s »."
 
 #, python-format
 msgid "%(mins)dm ago"
@@ -1660,7 +1673,7 @@
 
 #, python-format
 msgid "(currently set to %s)"
-msgstr "(ayant actuellement la valeur : %s)"
+msgstr "(ayant actuellement la valeur : %s)"
 
 msgid "Delete bookmark"
 msgstr "Supprimer le signet"
@@ -1694,7 +1707,7 @@
 
 #, python-format
 msgid "Release %s [Revision %s]"
-msgstr "Version %s [édition « %s »]"
+msgstr "Version %s [édition « %s »]"
 
 msgid "4Suite Version"
 msgstr "Version de 4Suite"
@@ -1792,7 +1805,7 @@
 msgstr "ne contenant aucun des termes suivants"
 
 msgid "last modified since (e.g. last 2 weeks)"
-msgstr "modifié depuis (p. ex. « last 2 weeks »)"
+msgstr "modifié depuis (p. ex. « last 2 weeks »)"
 
 msgid "any category"
 msgstr "n'importe quelle catégorie"
@@ -1825,7 +1838,7 @@
 msgstr "Recherche incluant toutes les révisions"
 
 msgid "Go get it!"
-msgstr "Lancer la récupération !"
+msgstr "Lancer la récupération !"
 
 #, python-format
 msgid "No quotes on %(pagename)s."
@@ -1845,39 +1858,53 @@
 
 #, python-format
 msgid "Please use a more selective search term instead of {{{\"%s\"}}}"
-msgstr "Choisissez un critère de recherche plus sélectif que « {{{%s}}} »"
+msgstr "Choisissez un critère de recherche plus sélectif que « {{{%s}}} »"
+
+#, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Le texte de cette recherche, « {{{%s}}} », est incorrect. Veuillez consulter "
+"la page AideDeLaRecherche pour plus d'informations."
 
 #, python-format
 msgid "Upload new attachment \"%(filename)s\""
-msgstr "Ajout de la nouvelle pièce jointe « %(filename)s »"
+msgstr "Ajout de la nouvelle pièce jointe « %(filename)s »"
 
 #, python-format
 msgid ""
 "%(extension_name)s %(extension_type)s: Required argument %(argument_name)s "
 "missing."
 msgstr ""
+"%(extension_name)s %(extension_type)s : l'argument %(argument_name)s requis "
+"est absent."
 
 #, python-format
 msgid ""
 "%(extension_name)s %(extension_type)s: Invalid %(argument_name)s=%"
 "(argument_value)s!"
 msgstr ""
+"%(extension_name)s %(extension_type)s : %(argument_name)s=%(argument_value)s "
+"est incorrect !"
 
 #, python-format
 msgid ""
 "Current configuration does not allow embedding of the file %(file)s because "
 "of its mimetype %(mimetype)s."
 msgstr ""
+"Le paramétrage actuel ne permet pas d'intégrer à la page le fichier %(file)s "
+"du fait de son type MIME : %(mimetype)s."
 
 msgid "Embedded"
 msgstr "intégré"
 
 #, python-format
 msgid "Unsupported navigation scheme '%(scheme)s'!"
-msgstr "Schéma de navigation inconnu « %(scheme)s » !"
+msgstr "Schéma de navigation inconnu « %(scheme)s » !"
 
 msgid "No parent page found!"
-msgstr "Page supérieure non trouvée !"
+msgstr "Page supérieure non trouvée !"
 
 msgid "Slideshow"
 msgstr "Présentation"
@@ -1899,19 +1926,18 @@
 msgstr "Aucune page référencée ne reste à créer."
 
 msgid "You need to provide a chart type!"
-msgstr "Vous devez fournir un type de graphique !"
+msgstr "Vous devez fournir un type de graphique !"
 
 #, python-format
 msgid "Bad chart type \"%s\"!"
-msgstr "Type de graphique « %s » incorrect !"
-
-#, fuzzy
+msgstr "Type de graphique « %s » incorrect !"
+
 msgid "Revert"
-msgstr "Tout restaurer !"
+msgstr "Restaurer !"
 
 msgid "You are not allowed to revert this page!"
 msgstr ""
-"Vous n'êtes pas autorisé à restaurer une version antérieure de cette page !"
+"Vous n'êtes pas autorisé à restaurer une version antérieure de cette page !"
 
 msgid ""
 "You were viewing the current revision of this page when you called the "
@@ -1924,24 +1950,22 @@
 "utiliser à nouveau l'action de restauration."
 
 msgid "This page is already deleted or was never created!"
-msgstr "Cette page a déjà été supprimée ou n'a jamais existé !"
-
-#, fuzzy
+msgstr "Cette page a déjà été supprimée ou n'a jamais existé !"
+
 msgid "Optional reason for reverting this page"
-msgstr "Motif de cette copie (optionnel)"
-
-#, fuzzy
+msgstr "Raison optionnelle de cette restauration"
+
 msgid "Really revert this page?"
-msgstr "Voulez-vous vraiment renommer cette page ?"
+msgstr "Voulez-vous vraiment restaurer cette page ?"
 
 #, python-format
 msgid "Rolled back changes to the page %s."
-msgstr "Annulation des modifications apportées à la page %s"
+msgstr "Annulation des modifications apportées à la page %s."
 
 msgid "Exception while calling rollback function:"
 msgstr ""
 "Une exception est survenue lors de l'appel à la fonction d'annulation des "
-"modifications :"
+"modifications :"
 
 msgid ""
 "Please enter your password of your account at the remote wiki below. "
@@ -1971,15 +1995,14 @@
 "Refer to HelpOnSynchronisation for help."
 msgstr ""
 "Paramètres incorrects. Veuillez au moins indiquer le paramètre "
-"''remoteWiki'' (« wiki distant ») dans cette page.Consultez la page "
+"''remoteWiki'' (« wiki distant ») dans cette page.Consultez la page "
 "AideDeSynchronisation pour plus d'informations."
 
 msgid "The ''remoteWiki'' is unknown."
 msgstr "Le wiki distant (paramètre ''remoteWiki'') est inconnu."
 
-#, fuzzy
 msgid "A severe error occurred:"
-msgstr "Une erreur sévère s'est produite :"
+msgstr "Une erreur sévère s'est produite :"
 
 msgid "Synchronisation finished. Look below for the status messages."
 msgstr ""
@@ -1989,17 +2012,17 @@
 msgid "Synchronisation started -"
 msgstr "Synchronisation lancée -"
 
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Got a list of %s local and %s remote pages. This results in %s pages to "
 "process."
 msgstr ""
 "Une liste de %s pages locales et de %s pages distantes a été obtenue. Au "
-"total, il y a %s pages différentes en tout."
+"total, il faudra traiter %s pages."
 
 #, python-format
 msgid "After filtering: %s pages"
-msgstr "Après filtrage : %s pages"
+msgstr "Après filtrage : %s pages"
 
 #, python-format
 msgid "Skipped page %s because of no write access to local page."
@@ -2013,7 +2036,7 @@
 
 #, python-format
 msgid "Error while deleting page %s locally:"
-msgstr "Erreur lors de la suppression de la page locale %s :"
+msgstr "Erreur lors de la suppression de la page locale %s :"
 
 #, python-format
 msgid "Deleted page %s remotely."
@@ -2021,7 +2044,7 @@
 
 #, python-format
 msgid "Error while deleting page %s remotely:"
-msgstr "Erreur lors de la suppression de la page distante %s :"
+msgstr "Erreur lors de la suppression de la page distante %s :"
 
 #, python-format
 msgid ""
@@ -2090,7 +2113,7 @@
 
 #, python-format
 msgid "Page %s successfully merged."
-msgstr "Page %s fusionnée avec succès !"
+msgstr "Page %s fusionnée avec succès !"
 
 #, python-format
 msgid "Page %s contains conflicts that were introduced on the remote side."
@@ -2109,13 +2132,18 @@
 "\n"
 "Once you have logged in, simply reload this page."
 msgstr ""
+"Vous devrez aller sur le wiki du fournisseur de votre identifiant OpenID\n"
+"et vous y connecter avant de pouvoir utiliser votre identifiant OpenID.\n"
+"MoinMoin ne vous permettra pas d'entrer votre mot de passe ici.\n"
+"\n"
+"Une fois connecté, rechargez simplement cette page."
 
 msgid "OpenID Trust verification"
-msgstr ""
+msgstr "Vérification de la confiance OpenID"
 
 #, python-format
 msgid "The site %s has asked for your identity."
-msgstr ""
+msgstr "Le site %s a demandé votre identité."
 
 #, python-format
 msgid ""
@@ -2125,28 +2153,34 @@
 "identity, the site will take care of reversing the\n"
 "delegation on its own.)"
 msgstr ""
+"\n"
+"Si vous acceptez, le site correspondant à la racine de confiance ci-dessous\n"
+"sera informé que vous contrôlez l'identité dont l'URL est %s (si vous\n"
+"utilisez une identitée déléguée, le site se chargera de lui-même de\n"
+"remonter la délégation)."
 
 msgid "Trust root"
-msgstr ""
+msgstr "Racine de confiance"
 
 msgid "Identity URL"
-msgstr ""
-
-#, fuzzy
+msgstr "URL d'identification"
+
 msgid "Remember decision"
-msgstr "Version de PyStemmer"
+msgstr "Se rappeler de cette décision"
 
 msgid "Remember this trust decision and don't ask again"
 msgstr ""
+"Se rappeler de cette décision quant à la confiance et ne plus poser la "
+"question"
 
 msgid "Approve"
-msgstr ""
+msgstr "Approuver"
 
 msgid "Don't approve"
-msgstr ""
+msgstr "Ne pas approuver"
 
 msgid "OpenID not served"
-msgstr ""
+msgstr "OpenID n'est pas proposé"
 
 msgid ""
 "\n"
@@ -2155,15 +2189,21 @@
 "and then reload this page or click the button below to cancel this\n"
 "verification."
 msgstr ""
+"\n"
+"Malheureusement vous n'avez pas encore créé votre page personnelle "
+"(homepage).\n"
+"En conséquence nous ne pouvons vous délivrer un identifiant OpenID.\n"
+"Merci de créer votre page personnelle puis de recharger cette page,\n"
+"ou cliquez sur le bouton ci-dessous pour annuler cette vérification."
 
 #, python-format
 msgid "Invalid filename \"%s\"!"
-msgstr "Nom de fichier non valide : « %s » !"
+msgstr "Nom de fichier incorrect : « %s » !"
 
 #, python-format
 msgid "Attachment '%(target)s' (remote name '%(filename)s') already exists."
 msgstr ""
-"La pièce jointe « %(target)s » (nom distant « %(filename)s ») existe déjà."
+"La pièce jointe « %(target)s » (nom distant « %(filename)s ») existe déjà."
 
 #, python-format
 msgid "Created the package %s containing the pages %s."
@@ -2180,14 +2220,14 @@
 
 #, python-format
 msgid "No pages like \"%s\"!"
-msgstr "Aucune page n'est similaire à « %s » !"
+msgstr "Aucune page n'est similaire à « %s » !"
 
 msgid "Please choose:"
-msgstr ""
-
-#, fuzzy, python-format
+msgstr "Choisissez"
+
+#, python-format
 msgid "You must login to use this action: %(action)s."
-msgstr "Vous devez être identifié pour utiliser l'abonnement."
+msgstr "Vous devez être identifié pour utiliser l'action %(action)s."
 
 msgid "You must login to remove a quicklink."
 msgstr "Vous devez être identifié pour supprimer un lien rapide."
@@ -2207,13 +2247,13 @@
 "Restored Backup: %(filename)s to target dir: %(targetdir)s.\n"
 "Files: %(filecount)d, Directories: %(dircount)d"
 msgstr ""
-"Sauvegarde restaurée : %(filename)s dans le répertoire : %(targetdir)s.\n"
-"Fichiers : %(filecount)d ; répertoires : %(dircount)d"
+"Sauvegarde restaurée : %(filename)s dans le répertoire : %(targetdir)s.\n"
+"Fichiers : %(filecount)d ; répertoires : %(dircount)d"
 
 #, python-format
 msgid "Restoring backup: %(filename)s to target dir: %(targetdir)s failed."
 msgstr ""
-"Restauration de sauvegarde : échec de la restauration de %(filename)s vers %"
+"Restauration de sauvegarde : échec de la restauration de %(filename)s vers %"
 "(targetdir)s."
 
 msgid "Wiki Backup / Restore"
@@ -2236,8 +2276,8 @@
 "complete.\n"
 "\n"
 msgstr ""
-"Quelques astuces :\n"
-" * Pour restaurer une sauvegarde :\n"
+"Quelques astuces :\n"
+" * Pour restaurer une sauvegarde :\n"
 "  * Restaurer une sauvegarde effacera les données existantes. Soyez "
 "prudents.\n"
 "  * Renommez-la en <identifiant_site>.tar.<compression> (enlevez les --date--"
@@ -2264,18 +2304,18 @@
 
 #, python-format
 msgid "Unknown backup subaction: %s."
-msgstr "Sous-action de sauvegarde inconnue : %s."
+msgstr "Sous-action de sauvegarde inconnue : %s."
 
 msgid "Do it."
 msgstr "Exécuter."
 
 #, python-format
 msgid "Execute action %(actionname)s?"
-msgstr "Exécuter l'action %(actionname)s ?"
+msgstr "Exécuter l'action %(actionname)s ?"
 
 #, python-format
 msgid "Action %(actionname)s is excluded in this wiki!"
-msgstr "L'action %(actionname)s est interdite sur ce wiki !"
+msgstr "L'action %(actionname)s est interdite sur ce wiki !"
 
 #, python-format
 msgid "You are not allowed to use action %(actionname)s on this page!"
@@ -2285,7 +2325,7 @@
 #, python-format
 msgid "Please use the interactive user interface to use action %(actionname)s!"
 msgstr ""
-"Utilisez l'interface interactive pour exécuter l'action %(actionname)s !"
+"Utilisez l'interface interactive pour exécuter l'action %(actionname)s !"
 
 msgid "Please log in first."
 msgstr "Veuillez d'abord vous identifier."
@@ -2336,8 +2376,8 @@
 "Utilisez le ModèleDeGroupeDePagePersonnelle lors de la création des pages\n"
 "correspondant aux groupes.\n"
 "\n"
-"||'''Ajout d'une nouvelle page personnelle :'''||'''Groupes utilisés pour "
-"les listes de contrôle d'accès :'''||\n"
+"||'''Ajout d'une nouvelle page personnelle :'''||'''Groupes utilisés pour "
+"les listes de contrôle d'accès :'''||\n"
 "||<<NewPage(HomepageReadWritePageTemplate,page ouverte en écriture,%"
 "(username)s)>>||[\"%(username)s/GroupeDesRédacteurs\"]||\n"
 "||<<NewPage(HomepageReadPageTemplate,page en lecture seule,%(username)s)>>||"
@@ -2350,7 +2390,7 @@
 msgstr "Gestion de MesPages"
 
 msgid "Rename all /subpages too?"
-msgstr "Renommer également tous les /SousPages ?"
+msgstr "Renommer également tous les /SousPages ?"
 
 msgid "New name"
 msgstr "Nouveau nom"
@@ -2359,42 +2399,41 @@
 msgstr "Raison de ce changement de nom (optionnelle)"
 
 msgid "Really rename this page?"
-msgstr "Voulez-vous vraiment renommer cette page ?"
+msgstr "Voulez-vous vraiment renommer cette page ?"
 
 msgid "Your subscription to this page has been removed."
 msgstr "Votre abonnement à cette page a été supprimé."
 
 msgid "Can't remove regular expression subscription!"
 msgstr ""
-"Impossible de retirer un abonnement défini par une expression rationnelle !"
-
-#, fuzzy
+"Impossible de retirer un abonnement défini par une expression rationnelle !"
+
 msgid "Edit the subscription regular expressions in your settings."
 msgstr ""
-"Modifiez les expressions rationnelles contenues dans vos "
-"PréférencesUtilisateur."
+"Modifiez les expressions rationnelles d'abonnement contenues dans vos "
+"préférences."
 
 msgid "You need to be subscribed to unsubscribe."
 msgstr "Il est nécessaire d'être abonné pour se désabonner."
 
 msgid "TextCha: Wrong answer! Go back and try again..."
-msgstr "TextCha : mauvaise réponse ! Revenez en arrière et réessayez..."
+msgstr "TextCha : mauvaise réponse ! Revenez en arrière et réessayez..."
 
 msgid "Copy all /subpages too?"
-msgstr "Copier également toutes les /SousPages ?"
+msgstr "Copier également toutes les /SousPages ?"
 
 msgid "Optional reason for the copying"
 msgstr "Motif de cette copie (optionnel)"
 
 msgid "Really copy this page?"
-msgstr "Voulez-vous vraiment copier cette page ?"
+msgstr "Voulez-vous vraiment copier cette page ?"
 
 msgid "No older revisions available!"
 msgstr "Il n'y a pas de version antérieure."
 
 #, python-format
 msgid "Diff for \"%s\""
-msgstr "Modifications de « %s »"
+msgstr "Modifications de « %s »"
 
 #, python-format
 msgid "Differences between revisions %d and %d"
@@ -2404,17 +2443,15 @@
 msgid "(spanning %d versions)"
 msgstr "(s'étendant sur %d versions)"
 
-#, fuzzy
 msgid "Previous change"
-msgstr "Précédent"
-
-#, fuzzy
+msgstr "Modification précédente"
+
 msgid "Next change"
-msgstr "Aucune modification"
+msgstr "Modification suivante"
 
 #, python-format
 msgid "The page was saved %(count)d times, though!"
-msgstr "Cette page a pourtant été enregistrée %(count)d fois !"
+msgstr "Cette page a pourtant été enregistrée %(count)d fois !"
 
 msgid "(ignoring whitespace)"
 msgstr "(en ignorant les blancs)"
@@ -2425,48 +2462,48 @@
 msgid "Load"
 msgstr "Charger"
 
-#, fuzzy
 msgid "Pagename not specified!"
-msgstr "Le nom du fichier à ajouter n'est pas spécifié !"
+msgstr "Nom de page non indiqué !"
 
 msgid "Upload page content"
-msgstr ""
+msgstr "Envoyer le contenu de la page"
 
 msgid ""
 "You can upload content for the page named below. If you change the page "
 "name, you can also upload content for another page. If the page name is "
 "empty, we derive the page name from the file name."
 msgstr ""
+"Vous pouvez ajouter du contenu à la page nommé ci-dessous. Si vous changez "
+"le nom de la page, vous pourrez ainsi ajouter du contenu à une autre page. "
+"Si le champ donnant le nom de la page est vide, le nom du fichier sera "
+"utilisé comme nom de page."
 
 msgid "File to load page content from"
-msgstr ""
+msgstr "Choisissez le fichier d'où importer le contenu de la page"
 
 msgid "Comment"
 msgstr "Commentaire"
 
-#, fuzzy
 msgid "Page Name"
-msgstr "Nom du paquet"
+msgstr "Nom de la page"
 
 msgid "You are not allowed to subscribe to a page you can't read."
 msgstr ""
 "Vous n'êtes pas autorisé à vous abonner à une page que vous ne pouvez pas "
 "lire."
 
-#, fuzzy
 msgid "This wiki is not enabled for mail/Jabber processing."
-msgstr "La gestion du courrier n'est pas activée sur ce wiki."
+msgstr "La traitement du courrier et de Jabber n'est pas activée sur ce wiki."
 
 msgid "You must log in to use subscriptions."
 msgstr "Vous devez être identifié pour utiliser l'abonnement."
 
-#, fuzzy
 msgid ""
 "Add your email address or Jabber ID in your user settings to use "
 "subscriptions."
 msgstr ""
-"Ajoutez votre adresse électronique dans les PréférencesUtilisateur pour "
-"utiliser l'abonnement."
+"Ajoutez votre adresse électronique ou votre identifiant Jabber dans vos "
+"préférences pour utiliser l'abonnement."
 
 msgid "You are already subscribed to this page."
 msgstr "Vous êtes déjà abonné à cette page."
@@ -2482,16 +2519,16 @@
 
 #, python-format
 msgid "Page size: %d"
-msgstr "Taille de la page : %d"
+msgstr "Taille de la page : %d"
 
 msgid "SHA digest of this page's content is:"
-msgstr "L'empreinte SHA du contenu de cette page est :"
+msgstr "L'empreinte SHA du contenu de cette page est :"
 
 msgid "The following users subscribed to this page:"
-msgstr "Les utilisateurs suivants sont abonnés à cette page :"
+msgstr "Les utilisateurs suivants sont abonnés à cette page :"
 
 msgid "This page links to the following pages:"
-msgstr "Cette page est reliée aux pages suivantes :"
+msgstr "Cette page est reliée aux pages suivantes :"
 
 msgid "Size"
 msgstr "Taille"
@@ -2505,9 +2542,8 @@
 msgid "view"
 msgstr "voir"
 
-#, fuzzy
 msgid "to previous"
-msgstr "Précédent"
+msgstr "précédent"
 
 msgid "get"
 msgstr "obtenir"
@@ -2519,15 +2555,15 @@
 msgstr "Historique des révisions"
 
 msgid "No log entries found."
-msgstr "Aucune entrée de journal trouvée !"
+msgstr "Aucune entrée de journal trouvée !"
 
 #, python-format
 msgid "Info for \"%s\""
-msgstr "Informations sur « %s »"
+msgstr "Informations sur « %s »"
 
 #, python-format
 msgid "Show \"%(title)s\""
-msgstr "Voir : %(title)s"
+msgstr "Voir : %(title)s"
 
 msgid "General Page Infos"
 msgstr "Informations générales"
@@ -2541,41 +2577,40 @@
 msgstr "Supprimer"
 
 msgid "Delete all /subpages too?"
-msgstr "Supprimer également toutes les /SousPages ?"
+msgstr "Supprimer également toutes les /SousPages ?"
 
 msgid "Optional reason for the deletion"
 msgstr "Raison de cette suppression (optionnelle)"
 
 msgid "Really delete this page?"
-msgstr "Voulez-vous vraiment supprimer cette page ?"
+msgstr "Voulez-vous vraiment supprimer cette page ?"
 
 msgid "You are not allowed to create the supplementation page."
 msgstr "Vous n'êtes pas autorisé à créer une page complémentaire"
 
-#, fuzzy
 msgid "Only superuser is allowed to use this action."
-msgstr "Vous n'êtes pas autorisé à utiliser cette action."
+msgstr "Seul le superutilisateur peut réaliser cette action."
 
 #, python-format
 msgid "Subscribe users to the page %s"
 msgstr "Abonner les utilisateurs à la page %s"
 
 msgid "Enter user names (comma separated):"
-msgstr "Entrez les noms d'utilisateurs (séparés par des virgules) :"
+msgstr "Entrez les noms d'utilisateurs (séparés par des virgules) :"
 
 #, python-format
 msgid "Subscribed for %s:"
 msgstr "Abonné à %s"
 
 msgid "Not a user:"
-msgstr "N'est pas un utilisateur :"
+msgstr "N'est pas un utilisateur :"
 
 msgid "You are not allowed to perform this action."
 msgstr "Vous n'êtes pas autorisé à réaliser cette action."
 
 #, python-format
 msgid "(!) Only pages changed since '''%s''' are being displayed!"
-msgstr "(!) Seules les pages modifiées depuis '''%s''' sont affichées !"
+msgstr "(!) Seules les pages modifiées depuis '''%s''' sont affichées !"
 
 msgid ""
 "/!\\ The modification date you entered was not recognized and is therefore "
@@ -2583,34 +2618,26 @@
 msgstr ""
 "/!\\ La date de modification que vous avez indiqué n'a pas été reconnue. En "
 "conséquence, elle ne sera pas prise en compte pour les résultats de la "
-"recherche !"
+"recherche !"
 
 #, python-format
 msgid "Title Search: \"%s\""
-msgstr "Recherche de « %s » dans les titres"
+msgstr "Recherche de « %s » dans les titres"
 
 #, python-format
 msgid "Advanced Search: \"%s\""
-msgstr "Recherche avancée : « %s »"
+msgstr "Recherche avancée : « %s »"
 
 #, python-format
 msgid "Full Text Search: \"%s\""
-msgstr "Recherche de « %s » dans les textes"
-
-#, python-format
-msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Le texte de cette recherche, « {{{%s}}} », est incorrect. Veuillez consulter "
-"la page AideDeLaRecherche pour plus d'informations."
+msgstr "Recherche de « %s » dans les textes"
 
 #, python-format
 msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
-"Votre recherche « {{{%s}}} » n'a donné aucun résultat. Veuillez la modifier "
+"Votre recherche « {{{%s}}} » n'a donné aucun résultat. Veuillez la modifier "
 "ou consulter la page AideDeLaRecherche pour plus d'informations. %s"
 
 msgid "(!) Consider performing a"
@@ -2628,11 +2655,11 @@
 
 msgid "Click here to perform a full-text search with your search terms!"
 msgstr ""
-"Cliquez ici pour appliquer cette recherche au texte des pages du wiki !"
+"Cliquez ici pour appliquer cette recherche au texte des pages du wiki !"
 
 msgid "User account created! You can use this account to login now..."
 msgstr ""
-"Compte utilisateur créé ! Vous pouvez l'utiliser dès à présent pour vous "
+"Compte utilisateur créé ! Vous pouvez l'utiliser dès à présent pour vous "
 "connecter..."
 
 msgid "TextCha (required)"
@@ -2642,7 +2669,7 @@
 msgstr "Créer le compte"
 
 msgid "Create Account"
-msgstr ""
+msgstr "Créer un Compte"
 
 msgid "You must login to add a quicklink."
 msgstr "Vous devez être identifié pour ajouter un lien rapide."
@@ -2654,7 +2681,7 @@
 msgstr "Il n'a pas été possible d'ajouter pour vous un lien vers cette page."
 
 msgid "You already have a quicklink to this page."
-msgstr "Vous avez déjà créé un lien rapide vers cette page !"
+msgstr "Vous avez déjà créé un lien rapide vers cette page !"
 
 msgid "You are not allowed to use this action."
 msgstr "Vous n'êtes pas autorisé à utiliser cette action."
@@ -2669,13 +2696,13 @@
 "(totalwords)d words%(localwords)s and are highlighted below:"
 msgstr ""
 "Les %(badwords)d mots suivants n'ont pu être trouvé dans le dictionnaire sur "
-"un total de %(totalwords)d mots%(localwords)s et sont surlignés ci-dessous :"
+"un total de %(totalwords)d mots%(localwords)s et sont surlignés ci-dessous :"
 
 msgid "Add checked words to dictionary"
 msgstr "Ajouter les mots cochés au dictionnaire"
 
 msgid "No spelling errors found!"
-msgstr "Aucune faute d'orthographe n'a été trouvée !"
+msgstr "Aucune faute d'orthographe n'a été trouvée !"
 
 msgid "You can't save spelling words."
 msgstr "Impossible de sauvegarder le nouveau vocabulaire."
@@ -2688,9 +2715,8 @@
 msgid "You are now logged out."
 msgstr "Vous êtes maintenant déconnecté."
 
-#, fuzzy
 msgid "If this account exists an email was sent."
-msgstr "Si le compte existe, un courrier va être envoyé."
+msgstr "Si ce compte existe, un courrier a été envoyé."
 
 msgid ""
 "This wiki is not enabled for mail processing.\n"
@@ -2699,51 +2725,45 @@
 "La gestion du courrier n'est pas activée sur ce wiki.\n"
 "Contactez le propriétaire de ce wiki, qui pourra l'activer."
 
-#, fuzzy
 msgid "Please provide a valid email address or a username!"
-msgstr "Veuillez fournir une adresse électronique valide !"
+msgstr ""
+"Veuillez indiquer une adresse électronique ou un nom d'utilisateur correct !"
 
 msgid "Mail me my account data"
 msgstr "Envoyez-moi mes identifiants de connexion"
 
-#, fuzzy
 msgid "Recovery token"
-msgstr "Tout restaurer !"
-
-#, fuzzy
+msgstr "Code de récupération"
+
 msgid "New password"
-msgstr "Mot de passe"
-
-#, fuzzy
+msgstr "Nouveau mot de passe"
+
 msgid "New password (repeat)"
-msgstr "Répétez le mot de passe"
-
-#, fuzzy
+msgstr "Nouveau mot de passe (vérification)"
+
 msgid "Reset my password"
-msgstr "Mot de passe"
+msgstr "Réinitialiser mon mot de passe"
 
 msgid "Your password has been changed, you can log in now."
-msgstr ""
+msgstr "Votre mot de passe a été changé, vous pouvez vous connecter."
 
 msgid "Your token is invalid!"
-msgstr ""
-
-#, fuzzy
+msgstr "Le code indiqué est incorrect !"
+
 msgid "Password reset"
-msgstr "Répétez le mot de passe"
-
-#, fuzzy
+msgstr "Réinitialisation du mot de passe"
+
 msgid ""
 "\n"
 "== Password reset ==\n"
 "Enter a new password below."
 msgstr ""
-"Mot de passe manquant. Veuillez indiquer un nom d'utilisateur et un mot de "
-"passe."
-
-#, fuzzy
+"\n"
+"== Réinitialisation du mot de passe ==\n"
+"Veuillez indiquer le nouveau mot de passe ci-dessous."
+
 msgid "Lost password"
-msgstr "Mot de passe"
+msgstr "Mot de passe oublié"
 
 msgid ""
 "\n"
@@ -2754,6 +2774,14 @@
 "used to change your password. The email will also contain further\n"
 "instructions."
 msgstr ""
+"\n"
+"== Récupération d'un mot de passe oublié ==\n"
+"Si vous avez oublié votre mot de passe, donnez votre adresse de courrier \n"
+"électronique et cliquez sur '''Envoyez-moi mes identifiants de "
+"connexion'''.\n"
+"Vous recevrez un courrier contenant un mot-clef de récupération qui peut\n"
+"être utilisé pour changer votre mot de passe. Le courrier contiendra\n"
+"d'autres instructions."
 
 msgid ""
 "\n"
@@ -2761,10 +2789,15 @@
 "If you already have received the email with the recovery token, enter your\n"
 "username, the recovery token and a new password (twice) below."
 msgstr ""
+"\n"
+"=== Réinitialisation du mot de passe ===\n"
+"Si vous avez déjà reçu le courrier électronique avec le mot-clef\n"
+"de récupération, entrez votre nom d'utilisateur, le mot-clef et\n"
+"un nouveau mot de passe (deux fois) ci-dessous"
 
 #, python-format
 msgid "Local Site Map for \"%s\""
-msgstr "Carte locale du site pour « %s »"
+msgstr "Carte locale du site pour « %s »"
 
 msgid "Pages"
 msgstr "Pages"
@@ -2773,7 +2806,7 @@
 msgstr "Sélection de l'auteur"
 
 msgid "Revert all!"
-msgstr "Tout restaurer !"
+msgstr "Tout restaurer !"
 
 #, python-format
 msgid "[%d attachments]"
@@ -2786,11 +2819,11 @@
 msgstr "Il y a <a href=\"%(link)s\">%(count)s pièces jointes</a> à cette page."
 
 msgid "Filename of attachment not specified!"
-msgstr "Le nom du fichier à ajouter n'est pas spécifié !"
+msgstr "Le nom du fichier à ajouter n'est pas spécifié !"
 
 #, python-format
 msgid "Attachment '%(filename)s' does not exist!"
-msgstr "La pièce jointe « %(filename)s » n'existe pas !"
+msgstr "La pièce jointe « %(filename)s » n'existe pas !"
 
 msgid ""
 "To refer to attachments on a page, use '''{{{attachment:filename}}}''', \n"
@@ -2843,15 +2876,14 @@
 
 #, python-format
 msgid "Unsupported AttachFile sub-action: %s"
-msgstr "Sous-action d'ajout non disponible : %s"
+msgstr "Sous-action d'ajout non disponible : %s"
 
 #, python-format
 msgid "Attachments for \"%(pagename)s\""
-msgstr "Pièces jointes de « %(pagename)s »"
-
-#, fuzzy
+msgstr "Pièces jointes de « %(pagename)s »"
+
 msgid "You are not allowed to overwrite a file attachment of this page."
-msgstr "Vous n'êtes pas autorisé à voir les pièces jointes de cette page."
+msgstr "Vous n'êtes pas autorisé à remplacer les pièces jointes de cette page."
 
 msgid ""
 "No file content. Delete non ASCII characters from the file name and try "
@@ -2865,7 +2897,7 @@
 "Attachment '%(target)s' (remote name '%(filename)s') with %(bytes)d bytes "
 "saved."
 msgstr ""
-"Pièce jointe « %(target)s » enregistrée (nom distant « %(filename)s » ; %"
+"Pièce jointe « %(target)s » enregistrée (nom distant « %(filename)s » ; %"
 "(bytes)d octets)."
 
 msgid "You are not allowed to save a drawing on this page."
@@ -2874,48 +2906,48 @@
 msgid "You are not allowed to delete attachments on this page."
 msgstr "Vous n'êtes pas autorisé à supprimer les pièces jointes de cette page."
 
-#, fuzzy, python-format
+#, python-format
 msgid "Attachment '%(new_pagename)s/%(new_filename)s' already exists."
-msgstr "La pièce jointe « %(filename)s » existe déjà."
-
-#, fuzzy, python-format
+msgstr "La pièce jointe « %(new_pagename)s/%(new_filename)s » existe déjà."
+
+#, python-format
 msgid ""
 "Attachment '%(pagename)s/%(filename)s' moved to '%(new_pagename)s/%"
 "(new_filename)s'."
-msgstr "La pièce jointe « %(filename)s » a été déplacée vers %(page)s."
+msgstr ""
+"La pièce jointe « %(pagename)s/%(filename)s » a été déplacée vers « %"
+"(new_pagename)s/%(new_filename)s »."
 
 msgid "Nothing changed"
 msgstr "Aucune modification"
 
-#, fuzzy, python-format
+#, python-format
 msgid "Page '%(new_pagename)s' does not exist or you don't have enough rights."
 msgstr ""
-"La page %(newpagename)s n'existe pas ou bien vous ne disposez pas des droits "
-"nécessaires."
+"La page %(new_pagename)s n'existe pas ou bien vous ne disposez pas des "
+"droits nécessaires."
 
 msgid "Move aborted!"
-msgstr "Déplacement annulé !"
+msgstr "Déplacement annulé !"
 
 msgid "Please use the interactive user interface to move attachments!"
-msgstr "Utilisez l'interface interactive pour déplacer des pièces jointes !"
+msgstr "Utilisez l'interface interactive pour déplacer des pièces jointes !"
 
 msgid "You are not allowed to move attachments from this page."
 msgstr ""
 "Vous n'êtes pas autorisé à déplacer des pièces jointes depuis cette page."
 
-#, fuzzy
 msgid "Move aborted because new page name is empty."
-msgstr "Impossible de renommer sans indiquer un nouveau nom"
+msgstr "Impossible de renommer sans indiquer un nouveau nom."
 
 #, python-format
 msgid "Please use a valid filename for attachment '%(filename)s'."
 msgstr ""
-"Veuillez indiquer un nom de fichier valable pour la pièce jointe « %(filename)"
-"s »."
-
-#, fuzzy
+"Veuillez indiquer un nom de fichier valable pour la pièce jointe « %(filename)"
+"s »."
+
 msgid "Move aborted because new attachment name is empty."
-msgstr "Déplacement annulé : le nom de la pièce jointe est vide"
+msgstr "Déplacement annulé : le nom de la nouvelle pièce jointe est vide."
 
 msgid "Move"
 msgstr "Déplacer"
@@ -2934,7 +2966,7 @@
 
 #, python-format
 msgid "Attachment '%(filename)s' installed."
-msgstr "Pièce jointe « %(filename)s » installée."
+msgstr "Pièce jointe « %(filename)s » installée."
 
 msgid "You are not allowed to unzip attachments of this page."
 msgstr ""
@@ -2945,7 +2977,7 @@
 "Attachment '%(filename)s' could not be unzipped because the resulting files "
 "would be too large (%(space)d kB missing)."
 msgstr ""
-"La pièce jointe « %(filename)s » n'a pu être décompressée, car les fichiers "
+"La pièce jointe « %(filename)s » n'a pu être décompressée, car les fichiers "
 "résultants seraient trop volumineux (il manque %(space)d ko)."
 
 #, python-format
@@ -2953,19 +2985,19 @@
 "Attachment '%(filename)s' could not be unzipped because the resulting files "
 "would be too many (%(count)d missing)."
 msgstr ""
-"La pièce jointe « %(filename)s » n'a pu être décompressée, car les fichiers "
+"La pièce jointe « %(filename)s » n'a pu être décompressée, car les fichiers "
 "résultants seraient trop nombreux (%(count)d en trop)."
 
 #, python-format
 msgid "Attachment '%(filename)s' unzipped."
-msgstr "Pièce jointe « %(filename)s » décompressée."
+msgstr "Pièce jointe « %(filename)s » décompressée."
 
 #, python-format
 msgid ""
 "Attachment '%(filename)s' not unzipped because the files are too big, .zip "
 "files only, exist already or reside in folders."
 msgstr ""
-"La pièce jointe « %(filename)s » n'a pas été décompressée, car les fichiers "
+"La pièce jointe « %(filename)s » n'a pas été décompressée, car les fichiers "
 "sont trop volumineux, sont uniquement des fichiers .zip, existent déjà ou "
 "sont contenus dans des répertoires."
 
@@ -2975,13 +3007,13 @@
 
 #, python-format
 msgid "Attachment '%(filename)s'"
-msgstr "Pièce jointe « %(filename)s »"
+msgstr "Pièce jointe « %(filename)s »"
 
 msgid "Download"
 msgstr "Téléchargement"
 
 msgid "Package script:"
-msgstr "Script d'installation :"
+msgstr "Script d'installation :"
 
 msgid "File Name"
 msgstr "Nom du fichier"
@@ -3002,27 +3034,27 @@
 
 #, python-format
 msgid "Full Link List for \"%s\""
-msgstr "Liste de tout les liens pour « %s »"
+msgstr "Liste de tout les liens pour « %s »"
 
 #, python-format
 msgid "Exactly one page like \"%s\" found, redirecting to page."
-msgstr "Une seule page similaire à « %s » trouvée, redirection vers cette page."
+msgstr "Une seule page similaire à « %s » trouvée, redirection vers cette page."
 
 #, python-format
 msgid "Pages like \"%s\""
-msgstr "Pages similaires à « %s »"
+msgstr "Pages similaires à « %s »"
 
 #, python-format
 msgid "%(matchcount)d %(matches)s for \"%(title)s\""
-msgstr "%(matchcount)d %(matches)s pour « %(title)s »"
+msgstr "%(matchcount)d %(matches)s pour « %(title)s »"
 
 #, python-format
 msgid "Inlined image: %(url)s"
-msgstr "Image incluse : %(url)s"
+msgstr "Image incluse : %(url)s"
 
 #, python-format
 msgid "Create new drawing \"%(filename)s (opens in new window)\""
-msgstr "Créer un nouveau dessin « %(filename)s » (dans une nouvelle fenêtre)"
+msgstr "Créer un nouveau dessin « %(filename)s » (dans une nouvelle fenêtre)"
 
 #, python-format
 msgid "Edit drawing %(filename)s (opens in new window)"
@@ -3047,170 +3079,8 @@
 msgid "Login and try again."
 msgstr "Connectez-vous et essayez à nouveau."
 
-#~ msgid "New Page or New Attachment"
-#~ msgstr "Nouvelle page ou pièce jointe"
-
-#~ msgid ""
-#~ "You can upload a file to a new page or choose to upload a file as "
-#~ "attachment for the current page"
-#~ msgstr ""
-#~ "Vous pouvez ajouter un fichier à une nouvelle page ou le joindre à la "
-#~ "page actuelle"
-
-#~ msgid "attachment"
-#~ msgstr "pièce jointe"
-
-#~ msgid "New Name"
-#~ msgstr "Nouveau nom"
-
-#~ msgid "Attachment '%(target)s' already exists."
-#~ msgstr "La pièce jointe « %(target)s » existe déjà."
-
-#~ msgid ""
-#~ "An upload will never overwrite an existing file. If there is a name\n"
-#~ "conflict, you have to rename the file that you want to upload.\n"
-#~ "Otherwise, if \"Rename to\" is left blank, the original filename will be "
-#~ "used."
-#~ msgstr ""
-#~ "L'ajout d'un fichier n'écrasera jamais un fichier existant. S'il y a\n"
-#~ "conflit sur le nom, vous devrez renommer le fichier que vous voulez\n"
-#~ "ajouter. Si ce n'est pas le cas, si « Renommer en » n'est pas rempli,\n"
-#~ "le nom original sera conservé."
-
-#~ msgid "overwrite"
-#~ msgstr "remplacer"
-
-#~ msgid ""
-#~ "Somebody has requested to submit your account data to this email "
-#~ "address.\n"
-#~ "\n"
-#~ "If you lost your password, please use the data below and just enter the\n"
-#~ "password AS SHOWN into the wiki's password form field (use copy and "
-#~ "paste\n"
-#~ "for that).\n"
-#~ "\n"
-#~ "After successfully logging in, it is of course a good idea to set a new "
-#~ "and known password.\n"
-#~ msgstr ""
-#~ "Quelqu'un à demandé l'envoi des données relatives à votre compte à cette\n"
-#~ "adresse électronique.\n"
-#~ "\n"
-#~ "Si vous avez oublié votre mot de passe, utilisez les informations ci-"
-#~ "dessous\n"
-#~ "et entrez simplement le mot de passe TEL QUEL dans le champs mot de "
-#~ "passe\n"
-#~ "du formulaire d'identification du wiki (utilisez pour cela un copier-"
-#~ "coller).\n"
-#~ "\n"
-#~ "Après vous être identifié avec succès, il vous est naturellement "
-#~ "recommandé\n"
-#~ "d'enregistrer un nouveau mot de passe que vous connaissiez.\n"
-
-#~ msgid "Found no account matching the given email address '%(email)s'!"
-#~ msgstr ""
-#~ "Aucun compte correspondant à l'adresse « %(email)s » n'a été trouvé !"
-
-#~ msgid "File attachments are not allowed in this wiki!"
-#~ msgstr "Les pièces jointes ne sont pas autorisées sur ce wiki !"
-
-#~ msgid "SendMyPassword"
-#~ msgstr "EnvoiDeMonMotDePasse"
-
-#~ msgid "Use UserPreferences to change your settings or create an account."
-#~ msgstr ""
-#~ "Utilisez les PréférencesUtilisateur pour modifier vos paramètres ou pour "
-#~ "créer un compte."
-
-#~ msgid "Use UserPreferences to change settings of the selected user account"
-#~ msgstr ""
-#~ "Utilisez les PréférencesUtilisateur pour modifier les paramètres du "
-#~ "compte sélectionné"
-
-#~ msgid ""
-#~ "This list does not work, unless you have entered a valid email address!"
-#~ msgstr ""
-#~ "Cette liste ne marche pas, sauf si vous avez entré une adresse "
-#~ "électronique valide !"
-
-#~ msgid ""
-#~ "To create an account, see the %(userprefslink)s page. To recover a lost "
-#~ "password, go to %(sendmypasswordlink)s."
-#~ msgstr ""
-#~ "Pour créer un compte, consultez la page des %(userprefslink)s. Pour "
-#~ "retrouver un mot de passe perdu, voyez %(sendmypasswordlink)s."
-
-#~ msgid ""
-#~ "'''A page with the name {{{'%s'}}} already exists.'''\n"
-#~ "Try a different name."
-#~ msgstr ""
-#~ "'''Une page ayant pour nom « {{{%s}}} » existe déjà.'''\n"
-#~ "Essayez un autre nom."
-
-#~ msgid ""
-#~ "The comment on the change is:\n"
-#~ "%(comment)s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Le commentaire associé à cette modification est :\n"
-#~ "%(comment)s\n"
-#~ "\n"
-
-#~ msgid "Status of sending notification mails:"
-#~ msgstr "Bilan d'envoi des courriers de notification :"
-
-#~ msgid "[%(lang)s] %(recipients)s: %(status)s"
-#~ msgstr "[%(lang)s] %(recipients)s : %(status)s"
-
-#~ msgid "UserPreferences"
-#~ msgstr "PréférencesUtilisateur"
-
-#~ msgid "Subscribe to trivial changes"
-#~ msgstr "S'abonner aux modifications mineures"
-
-#~ msgid "(Only for password change or new account)"
-#~ msgstr "(pour créer un compte ou changer de mot de passe)"
-
-#~ msgid "Check your argument %s"
-#~ msgstr "Vérifiez le paramètre %s"
-
-#~ msgid "ERROR in regex '%s'"
-#~ msgstr "ERREUR dans l'expression rationnelle « %s »"
-
-#~ msgid "Bad timestamp '%s'"
-#~ msgstr "Mauvais horodatage « %s »"
-
-#~ msgid "Not supported mimetype of file: %s"
-#~ msgstr "Le type MIME de  ce fichier n'est pas compatible : %s"
-
-#~ msgid "Embedding of object by chosen formatter not possible"
-#~ msgstr ""
-#~ "L'intégration de l'objet à la page n'est pas possible avec le moteur de "
-#~ "formatage sélectionné"
-
-#~ msgid ""
-#~ "Not enough arguments given to EmbedObject macro! Try <<EmbedObject"
-#~ "(attachment [,width=width] [,height=height] [,alt=alternate Text])>>"
-#~ msgstr ""
-#~ "Trop peu d'arguments ont été donnés à la macro EmbedObject. Essayez "
-#~ "<<EmbedObject(pièce-jointe [,width=largeur] [,height=hauteur] [,alt=texte "
-#~ "de remplacement])>>"
-
-#~ msgid ""
-#~ "Not enough arguments given to EmbedObject macro! Try <<EmbedObject(url, "
-#~ "url_mimetype [,width=width] [,height=height] [,alt=alternate Text])>>"
-#~ msgstr ""
-#~ "Trop peu d'arguments ont été donnés à la macro EmbedObject. Essayez "
-#~ "<<EmbedObject(url, type_mime_de_l_url [,width=largeur] [,height=hauteur] "
-#~ "[,alt=texte de remplacement])>>"
-
-#~ msgid "Invalid MonthCalendar calparms \"%s\"!"
-#~ msgstr "Le paramètre calparms de MonthCalendar n'est pas valide : « %s » !"
-
-#~ msgid "Invalid MonthCalendar arguments \"%s\"!"
-#~ msgstr "Les arguments de MonthCalendar ne sont pas valides : « %s » !"
-
-#~ msgid "Sorry, login failed."
-#~ msgstr "Désolé, la connexion a échoué."
-
-#~ msgid "Filename"
-#~ msgstr "Nom du fichier"
+#~ msgid "XML RPC error: %s"
+#~ msgstr "Erreur XML RPC:  %s"
+
+#~ msgid "Low-level communication error: %s"
+#~ msgstr "Erreur de communication de bas niveau: %s"
--- a/MoinMoin/i18n/gl.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/gl.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-02-22 17:39-0300\n"
 "Last-Translator: Iván Méndez <imendez@udc.es>\n"
 "Language-Team: Galician <moin-devel@lists.sourceforge.net>\n"
@@ -593,6 +593,10 @@
 "Faltou introducir o contrasinal. Por favor, introduza o nome de usuario e o "
 "contrasinal"
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Saiu do sistema."
@@ -1346,14 +1350,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Anexos"
@@ -1851,6 +1847,12 @@
 msgstr "Por favor, use un termo de busca máis específico que {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Subir un novo anexo \"%(filename)s\""
 
@@ -2574,12 +2576,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/he.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/he.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-12-05 11:49+0200\n"
 "Last-Translator: Dor Fire <dorfire@gmail.com>\n"
 "Language-Team: Hebrew <moin-devel@lists.sourceforge.net>\n"
@@ -559,6 +559,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "סיסמה חסרה. אנא הכנס שם משתמש וסיסמה."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "נותקת מהמערכת."
@@ -1288,14 +1292,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "קבצים מצורפים"
@@ -1775,6 +1771,12 @@
 msgstr "השתמשו במונח חיפוש בררני יותר מאשר {{{\"%s\"}}}."
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr "מונח החיפוש {{{\"%s\"}}} אינו חוקי. ראה HelpOnSearching למידע נוסף."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "שליחת קובץ מצורף חדש \"%(filename)s\""
 
@@ -2478,12 +2480,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr "מונח החיפוש {{{\"%s\"}}} אינו חוקי. ראה HelpOnSearching למידע נוסף."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/hi.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/hi.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Rakesh Pandit <rakesh.pandit@gmail.com>\n"
 "Language-Team: Hindi\n"
@@ -542,6 +542,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr ""
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "आप अभी लागूड आवूट है।"
@@ -1251,14 +1255,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 msgid "Attachment link"
 msgstr ""
 
@@ -1680,6 +1676,12 @@
 msgstr ""
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr ""
 
@@ -2344,12 +2346,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/hr.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/hr.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2006-08-17 20:50+0100\n"
 "Last-Translator: Translation sponsored by Tenalt Ltd. (info@tenalt.com)\n"
 "Language-Team: \n"
@@ -575,6 +575,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Lozinka nije unešena. Upišite korisničko ime i lozinku"
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Uspješno ste se odjavili."
@@ -1317,14 +1321,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Privitci"
@@ -1808,6 +1804,14 @@
 msgstr "Navedite precizniji izraz za pretraživanje od {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Vaš upit za pretragu {{{\"%s\"}}} nije važeći. Pogledajte "
+"PomoćPriPretraživanju za više informacija"
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Podigni novi privitak \"%(filename)s\" na server"
 
@@ -2534,14 +2538,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Vaš upit za pretragu {{{\"%s\"}}} nije važeći. Pogledajte "
-"PomoćPriPretraživanju za više informacija"
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/hu.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/hu.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2006-06-15 15:55+0200\n"
 "Last-Translator: jmarton@omikk.bme.hu, arostas@omikk.bme.hu\n"
 "Language-Team: Hungarian <HU@li.org>\n"
@@ -573,6 +573,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Hiányzik a jelszó. Kérjük adja meg a felhasználónevet és a jelszót."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "A sütit letöröltük. Ön kilépett."
@@ -1318,14 +1322,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Mellékletek (fájlok)"
@@ -1805,6 +1801,12 @@
 msgstr "Kérjük a(z) {{{\"%s\"}}} helyett használjon szelektívebb kifejezést!"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "A(z) \"%(filename)s\" melléklet feltöltése"
 
@@ -2516,12 +2518,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/id.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/id.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2006-10-07 23:19+0700\n"
 "Last-Translator: Fajrin Azis <fajrin.azis@gmail.com>\n"
 "Language-Team: Indonesian <id@ll.com>\n"
@@ -587,6 +587,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Kurang kata sandi. Silakan masukkan nama pengguna dan kata sandi."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Sekarang Anda telah logout."
@@ -1330,14 +1334,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Lampiran"
@@ -1826,6 +1822,14 @@
 "\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Pertanyaan pencarian Anda {{{\"%s\"}}} invalid. Silakan lihat "
+"HelpOnSearching untuk informasi lebih lanjut."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Upload lampiran baru \"%(filename)s\""
 
@@ -2551,14 +2555,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Pertanyaan pencarian Anda {{{\"%s\"}}} invalid. Silakan lihat "
-"HelpOnSearching untuk informasi lebih lanjut."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/it.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/it.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-05-13 21:18+0200\n"
 "Last-Translator: Milo Casagrande <milo_casagrande@yahoo.it>\n"
 "Language-Team: Italian\n"
@@ -592,6 +592,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Password mancante. Inserire nome utente e password."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr "È necessario accedere."
 
@@ -1352,14 +1356,6 @@
 "Collegamento allegato: %(attach)s\n"
 "Collegamento pagina: %(page)s\n"
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr "Errore XML RPC: %s"
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr "Errore di comunicazione a basso livello: %s"
-
 msgid "Attachment link"
 msgstr "Collegamento allegato"
 
@@ -1834,6 +1830,14 @@
 msgstr "Usare un termine di ricerca più selettivo di {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"La ricerca {{{\"%s\"}}} non è valida. Consultare AiutoSuRicerche per "
+"ulteriori informazioni."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Carica nuovo allegato \"%(filename)s\""
 
@@ -2584,14 +2588,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"La ricerca {{{\"%s\"}}} non è valida. Consultare AiutoSuRicerche per "
-"ulteriori informazioni."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
@@ -3036,6 +3032,12 @@
 msgid "Login and try again."
 msgstr "Eseguire l'accesso e riprovare."
 
+#~ msgid "XML RPC error: %s"
+#~ msgstr "Errore XML RPC: %s"
+
+#~ msgid "Low-level communication error: %s"
+#~ msgstr "Errore di comunicazione a basso livello: %s"
+
 #~ msgid "New Page or New Attachment"
 #~ msgstr "Nuova pagina o nuovo allegato"
 
--- a/MoinMoin/i18n/ja.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/ja.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-05-22 02:06+0900\n"
 "Last-Translator: MasatakeIwasaki\n"
 "Language-Team: Japanese <moin-devel@lists.sourceforge.net>\n"
@@ -580,6 +580,10 @@
 msgstr ""
 "パスワードが入力されていません。ユーザ名とパスワードを入力してください。"
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr "ログインしてください。"
 
@@ -640,7 +644,8 @@
 msgstr "このボタンをクリックしてOpenIDを検証してください:"
 
 msgid "Anonymous sessions need to be enabled for OpenID login."
-msgstr "OpenIDによるログインを行うためには匿名セッションを有効にする必要があります。"
+msgstr ""
+"OpenIDによるログインを行うためには匿名セッションを有効にする必要があります。"
 
 msgid "Failed to resolve OpenID."
 msgstr "OpenIDの解決に失敗しました。"
@@ -654,7 +659,9 @@
 msgid ""
 "If you do not have an account yet, you can still log in with your OpenID and "
 "create one during login."
-msgstr "まだアカウントを持っていない場合、OpenIDによってログインした状態で作成することができます。"
+msgstr ""
+"まだアカウントを持っていない場合、OpenIDによってログインした状態で作成するこ"
+"とができます。"
 
 msgid "Failed to connect to database."
 msgstr "データベースの接続に失敗しました。"
@@ -1000,7 +1007,9 @@
 #, python-format
 msgid ""
 "Sorry, can not save page because \"%(content)s\" is not allowed in this wiki."
-msgstr "このwikiでは\"%(content)s\"は許可されていません。ページを保存できませんでした。"
+msgstr ""
+"このwikiでは\"%(content)s\"は許可されていません。ページを保存できませんでし"
+"た。"
 
 msgid "Notification"
 msgstr "メールで通知"
@@ -1065,7 +1074,9 @@
 msgid ""
 "You can now change the settings of the selected user account; log out to get "
 "back to your account."
-msgstr "選択されたユーザの設定変更することができます。あなたのアカウントに戻すにはログアウトしてください。"
+msgstr ""
+"選択されたユーザの設定変更することができます。あなたのアカウントに戻すにはロ"
+"グアウトしてください。"
 
 msgid "You are the only user."
 msgstr "あなたは唯一のユーザです。"
@@ -1245,7 +1256,8 @@
 "\"%(sitename)s\"\n"
 "におけるwikiページの変更通知を希望したユーザにお送りしています。\n"
 "\n"
-"%(editor)sさんによって\"%(oldname)s\"が\"%(pagename)s\"に名称変更変更されました。\n"
+"%(editor)sさんによって\"%(oldname)s\"が\"%(pagename)s\"に名称変更変更されまし"
+"た。\n"
 "\n"
 
 #, python-format
@@ -1281,7 +1293,8 @@
 msgstr ""
 "Wikiユーザ様\n"
 "\n"
-"あなたはWikiページ \\\"%(page_name)s\\\" に対する変更の通知を購読しています。\n"
+"あなたはWikiページ \\\"%(page_name)s\\\" に対する変更の通知を購読していま"
+"す。\n"
 "%(editor)s によりページに添付ファイルが追加されました。\n"
 "詳細は以下を参照してください。:\n"
 "\n"
@@ -1330,14 +1343,6 @@
 "添付ファイル: %(attach)s\n"
 "ページリンク: %(page)s\n"
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr "XML-RPC エラー: %s"
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr "低レベル通信エラー: %s"
-
 msgid "Attachment link"
 msgstr "添付ファイルへのリンク"
 
@@ -1431,13 +1436,24 @@
 "\n"
 "(!) For more help, see HelpOnEditing or SyntaxReference.\n"
 msgstr ""
-" 強調:: <<Verbatim('')>>''イタリック''<<Verbatim('')>>、<<Verbatim(''')>>'''ボールド'''<<Verbatim(''')>>、<<Verbatim(''''')>>'''''ボールドイタリック'''''<<Verbatim(''''')>>、<<Verbatim('')>>''混合 ''<<Verbatim(''')>>'''''ボールド'''<<Verbatim(''')>>とイタリック''<<Verbatim('')>>、<<Verbatim(----)>> 水平線。\n"
-" 見出し:: <<Verbatim(=)>> タイトル1 <<Verbatim(=)>>、<<Verbatim(==)>> タイトル2 <<Verbatim(==)>>、<<Verbatim(===)>> タイトル3 <<Verbatim(===)>>、<<Verbatim(====)>> タイトル4 <<Verbatim(====)>>、<<Verbatim(=====)>> タイトル5 <<Verbatim(=====)>>。\n"
-" リスト:: 半角スペースに続けて: * 小丸、1., a., A., i., I. 番号付アイテム、1.#n nから番号開始、半角スペースのみでインデント。\n"
-" リンク:: <<Verbatim(JoinCapitalizedWords)>>、<<Verbatim([[ターゲット|リンクテキスト]])>>。\n"
-" 表:: || セルテキスト |||| 2列にわたるセルテキスト ||、表やタイトルのあとには空白を入力しないでください。\n"
+" 強調:: <<Verbatim('')>>''イタリック''<<Verbatim('')>>、<<Verbatim(''')"
+">>'''ボールド'''<<Verbatim(''')>>、<<Verbatim(''''')>>'''''ボールドイタリッ"
+"ク'''''<<Verbatim(''''')>>、<<Verbatim('')>>''混合 ''<<Verbatim(''')"
+">>'''''ボールド'''<<Verbatim(''')>>とイタリック''<<Verbatim('')>>、<<Verbatim"
+"(----)>> 水平線。\n"
+" 見出し:: <<Verbatim(=)>> タイトル1 <<Verbatim(=)>>、<<Verbatim(==)>> タイト"
+"ル2 <<Verbatim(==)>>、<<Verbatim(===)>> タイトル3 <<Verbatim(===)>>、"
+"<<Verbatim(====)>> タイトル4 <<Verbatim(====)>>、<<Verbatim(=====)>> タイトル"
+"5 <<Verbatim(=====)>>。\n"
+" リスト:: 半角スペースに続けて: * 小丸、1., a., A., i., I. 番号付アイテム、1."
+"#n nから番号開始、半角スペースのみでインデント。\n"
+" リンク:: <<Verbatim(JoinCapitalizedWords)>>、<<Verbatim([[ターゲット|リンク"
+"テキスト]])>>。\n"
+" 表:: || セルテキスト |||| 2列にわたるセルテキスト ||、表やタイトルのあとには"
+"空白を入力しないでください。\n"
 "\n"
-"(!) 詳細はHelpOnEditingや [\"シンタックスリファレンス\"]を参照してください。\n"
+"(!) 詳細はHelpOnEditingや [\"シンタックスリファレンス\"]を参照してくださ"
+"い。\n"
 
 msgid ""
 "{{{\n"
@@ -1473,7 +1489,8 @@
 "リスト: * 小丸; 1., a. 番号付アイテム\n"
 "}}}\n"
 "(!) 詳細は\n"
-"[[http://docutils.sourceforge.net/docs/user/rst/quickref.html|reStructuredText Quick Reference]].\n"
+"[[http://docutils.sourceforge.net/docs/user/rst/quickref.html|"
+"reStructuredText Quick Reference]].\n"
 "を参照してください。\n"
 
 msgid ""
@@ -1492,13 +1509,24 @@
 "\n"
 "(!) For more help, see HelpOnEditing or HelpOnCreoleSyntax.\n"
 msgstr ""
-" 強調:: <<Verbatim('')>>''イタリック''<<Verbatim('')>>、<<Verbatim(''')>>'''ボールド'''<<Verbatim(''')>>、<<Verbatim(''''')>>'''''ボールドイタリック'''''<<Verbatim(''''')>>、<<Verbatim('')>>''混合 ''<<Verbatim(''')>>'''''ボールド'''<<Verbatim(''')>>とイタリック''<<Verbatim('')>>、<<Verbatim(----)>> 水平線。\n"
-" 見出し:: <<Verbatim(=)>> タイトル1 <<Verbatim(=)>>、<<Verbatim(==)>> タイトル2 <<Verbatim(==)>>、<<Verbatim(===)>> タイトル3 <<Verbatim(===)>>、<<Verbatim(====)>> タイトル4 <<Verbatim(====)>>、<<Verbatim(=====)>> タイトル5 <<Verbatim(=====)>>。\n"
-" リスト:: 半角スペースに続けて: * 小丸、1., a., A., i., I. 番号付アイテム、1.#n nから番号開始、半角スペースのみでインデント。\n"
-" リンク:: <<Verbatim(JoinCapitalizedWords)>>、<<Verbatim([[ターゲット|リンクテキスト]])>>。\n"
-" 表:: || セルテキスト |||| 2列にわたるセルテキスト ||、表やタイトルのあとには空白を入力しないでください。\n"
+" 強調:: <<Verbatim('')>>''イタリック''<<Verbatim('')>>、<<Verbatim(''')"
+">>'''ボールド'''<<Verbatim(''')>>、<<Verbatim(''''')>>'''''ボールドイタリッ"
+"ク'''''<<Verbatim(''''')>>、<<Verbatim('')>>''混合 ''<<Verbatim(''')"
+">>'''''ボールド'''<<Verbatim(''')>>とイタリック''<<Verbatim('')>>、<<Verbatim"
+"(----)>> 水平線。\n"
+" 見出し:: <<Verbatim(=)>> タイトル1 <<Verbatim(=)>>、<<Verbatim(==)>> タイト"
+"ル2 <<Verbatim(==)>>、<<Verbatim(===)>> タイトル3 <<Verbatim(===)>>、"
+"<<Verbatim(====)>> タイトル4 <<Verbatim(====)>>、<<Verbatim(=====)>> タイトル"
+"5 <<Verbatim(=====)>>。\n"
+" リスト:: 半角スペースに続けて: * 小丸、1., a., A., i., I. 番号付アイテム、1."
+"#n nから番号開始、半角スペースのみでインデント。\n"
+" リンク:: <<Verbatim(JoinCapitalizedWords)>>、<<Verbatim([[ターゲット|リンク"
+"テキスト]])>>。\n"
+" 表:: || セルテキスト |||| 2列にわたるセルテキスト ||、表やタイトルのあとには"
+"空白を入力しないでください。\n"
 "\n"
-"(!) 詳細はHelpOnEditingや [\"シンタックスリファレンス\"]を参照してください。\n"
+"(!) 詳細はHelpOnEditingや [\"シンタックスリファレンス\"]を参照してくださ"
+"い。\n"
 
 msgid "UnSubscribe"
 msgstr "購読中止"
@@ -1793,6 +1821,14 @@
 "ださい。"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"検索条件 {{{\"%s\"}}} が不適切です。詳細は HelpOnSearching を参照してくださ"
+"い。"
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "添付ファイル\"%(filename)s\"のアップロード"
 
@@ -1800,19 +1836,25 @@
 msgid ""
 "%(extension_name)s %(extension_type)s: Required argument %(argument_name)s "
 "missing."
-msgstr "%(extension_name)s %(extension_type)s: 必要な引数 %(argument_name)s が指定されていません。"
+msgstr ""
+"%(extension_name)s %(extension_type)s: 必要な引数 %(argument_name)s が指定さ"
+"れていません。"
 
 #, python-format
 msgid ""
 "%(extension_name)s %(extension_type)s: Invalid %(argument_name)s=%"
 "(argument_value)s!"
-msgstr "%(extension_name)s %(extension_type)s: 引数が不正です %(argument_name)s=%(argument_value)s!"
+msgstr ""
+"%(extension_name)s %(extension_type)s: 引数が不正です %(argument_name)s=%"
+"(argument_value)s!"
 
 #, python-format
 msgid ""
 "Current configuration does not allow embedding of the file %(file)s because "
 "of its mimetype %(mimetype)s."
-msgstr "現在の設定はMIMEタイプが %(mimetype)s であるファイル %(file)s の埋め込みを許可していません。"
+msgstr ""
+"現在の設定はMIMEタイプが %(mimetype)s であるファイル %(file)s の埋め込みを許"
+"可していません。"
 
 msgid "Embedded"
 msgstr "埋め込み"
@@ -2302,7 +2344,9 @@
 msgstr "正規表現で記述した購読を停止することはできません。"
 
 msgid "Edit the subscription regular expressions in your settings."
-msgstr "[\"ユーザプレファレンス\"]にて、購読対象を指定する正規表現を編集してください。"
+msgstr ""
+"[\"ユーザプレファレンス\"]にて、購読対象を指定する正規表現を編集してくださ"
+"い。"
 
 msgid "You need to be subscribed to unsubscribe."
 msgstr "購読していないページの購読を止めることはできません。"
@@ -2365,7 +2409,8 @@
 "empty, we derive the page name from the file name."
 msgstr ""
 "下記のページ名のコンテンツをアップロードすることができます。\n"
-"もしページ名を変更すれば、別のページのコンテンツをアップロードすることもできます。\n"
+"もしページ名を変更すれば、別のページのコンテンツをアップロードすることもでき"
+"ます。\n"
 "ページ名が空の場合、ファイル名からページ名を決定します。"
 
 msgid "File to load page content from"
@@ -2389,7 +2434,9 @@
 msgid ""
 "Add your email address or Jabber ID in your user settings to use "
 "subscriptions."
-msgstr "購読を利用するには、[\"ユーザプレファレンス\"]にてメールアドレスまたはJabber IDを登録してください。"
+msgstr ""
+"購読を利用するには、[\"ユーザプレファレンス\"]にてメールアドレスまたはJabber "
+"IDを登録してください。"
 
 msgid "You are already subscribed to this page."
 msgstr "このページは既に購読済みです。"
@@ -2519,14 +2566,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"検索条件 {{{\"%s\"}}} が不適切です。詳細は HelpOnSearching を参照してくださ"
-"い。"
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
@@ -2679,7 +2718,8 @@
 "\n"
 "=== パスワード初期化 ===\n"
 "もしすでにパスワード回復トークンを通知するメールを受け取っている場合、\n"
-"ユーザ名、パスワード回復トークン、新しいパスワード(2回)を以下に入力してください。"
+"ユーザ名、パスワード回復トークン、新しいパスワード(2回)を以下に入力してくださ"
+"い。"
 
 #, python-format
 msgid "Local Site Map for \"%s\""
@@ -2799,7 +2839,9 @@
 msgid ""
 "Attachment '%(pagename)s/%(filename)s' moved to '%(new_pagename)s/%"
 "(new_filename)s'."
-msgstr "添付ファイル'%(pagename)s/%(filename)s'は'%(new_pagename)s/%(new_filename)s'に移動しました。"
+msgstr ""
+"添付ファイル'%(pagename)s/%(filename)s'は'%(new_pagename)s/%(new_filename)"
+"s'に移動しました。"
 
 msgid "Nothing changed"
 msgstr "何も変更されませんでした。"
@@ -2953,6 +2995,12 @@
 msgid "Login and try again."
 msgstr "ログインして、もう一度試してみてください。"
 
+#~ msgid "XML RPC error: %s"
+#~ msgstr "XML-RPC エラー: %s"
+
+#~ msgid "Low-level communication error: %s"
+#~ msgstr "低レベル通信エラー: %s"
+
 #~ msgid "New Page or New Attachment"
 #~ msgstr "新しいページまたは添付ファイル"
 
--- a/MoinMoin/i18n/ko.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/ko.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-03-12 15:01+0900\n"
 "Last-Translator: Seungik Lee <seungiklee@gmail.com>\n"
 "Language-Team: Korean <moin-devel@lists.sourceforge.net>\n"
@@ -560,6 +560,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "비밀번호가 없습니다. 사용자 이름과 비밀번호를 다시 입력하세요."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "로그아웃 되었습니다."
@@ -1303,14 +1307,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "첨부"
@@ -1792,6 +1788,12 @@
 msgstr "{{{\"%s\"}}} 대신 좀 더 구체적인 단어를 이용해서 검색해주세요!"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "새 첨부 \"%(filename)s\"를(을) 업로드"
 
@@ -2470,12 +2472,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/ku.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/ku.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2006-12-08 18:50+0000\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
@@ -560,6 +560,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr ""
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Ji bo nîşandana vî rûpelî têra xwe destûra te tuneye."
@@ -1274,14 +1278,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "[%d heb pêvek]"
@@ -1711,6 +1707,12 @@
 msgstr ""
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr ""
 
@@ -2368,12 +2370,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/lt.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/lt.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-12-01 00:00+0200\n"
 "Last-Translator: Aurelijus Sudzius <ruledbyfate@gmail.com>\n"
 "Language-Team: Lithuanian <ruledbyfate@gmail.com>\n"
@@ -581,6 +581,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Trūkstamas slaptažodis. Prašome įvesti vartotojo vardą ir slaptažodį."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Jūs dabar atsijungęs."
@@ -1327,14 +1331,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Priedai"
@@ -1819,6 +1815,14 @@
 msgstr "Prašome naudoti labiau atrinktą paieškos raktą vietoje {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Jūsų paieškos užklausa {{{\"%s\"}}} yra netinkama. Prašome žiūrėti į "
+"PagalbaPaieškos dėl papildomos informacijos."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Įkelti naują priedą \"%(filename)s\""
 
@@ -2551,14 +2555,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Jūsų paieškos užklausa {{{\"%s\"}}} yra netinkama. Prašome žiūrėti į "
-"PagalbaPaieškos dėl papildomos informacijos."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/lv.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/lv.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-05-10 22:31+0200\n"
 "Last-Translator: Radomirs Cirskis <nad2000 AT gmail DOT NO SPAM com>\n"
 "Language-Team: Latvian <nad2000 AT gmail DOT NO SPAM com>\n"
@@ -584,6 +584,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Trūkst paroles. Lūdzu, ievadiet vārdu un paroli."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Jūs esat atslēgts(-a)."
@@ -1328,14 +1332,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Piesaistes"
@@ -1818,6 +1814,14 @@
 msgstr "Lūdzu, norādiet konkrētāku meklējamo terminu {{{\"%s\"}}} vietā"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Vaicājums {{{\"%s\"}}} ir nederīgs. Informācija par meklēšanu atrodama lapā "
+"MeklēšanasPalīdzība."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Augšuplādēt jaunu piesaisti \"%(filename)s\""
 
@@ -2532,14 +2536,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Vaicājums {{{\"%s\"}}} ir nederīgs. Informācija par meklēšanu atrodama lapā "
-"MeklēšanasPalīdzība."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/mk.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/mk.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: mk.moinmoin1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-03-30 16:24+0200\n"
 "Last-Translator: Novica Nakov\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -579,6 +579,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Лозинката не е внесена. Внесете корисничко име и лозинка."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr "Треба да се пријавите."
 
@@ -1337,14 +1341,6 @@
 "Врска за прилог: %(attach)s\n"
 "Врска за страница: %(page)s\n"
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr "XML RPC грешка: %s"
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr "Комуникациска грешка од ниско ниво: %s"
-
 msgid "Attachment link"
 msgstr "Врска за прилог"
 
@@ -1815,6 +1811,14 @@
 msgstr "Наведете попрецизен израз за пребарување од {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Вашиот внес за пребарување {{{\"%s\"}}} не е важечки. За повеќе информации "
+"видете во ПомошЗаПребарување."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Товари нов прилог \"%(filename)s\""
 
@@ -2560,14 +2564,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Вашиот внес за пребарување {{{\"%s\"}}} не е важечки. За повеќе информации "
-"видете во ПомошЗаПребарување."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
@@ -3010,6 +3006,12 @@
 msgid "Login and try again."
 msgstr "Пријавете се и обидете се повторно."
 
+#~ msgid "XML RPC error: %s"
+#~ msgstr "XML RPC грешка: %s"
+
+#~ msgid "Low-level communication error: %s"
+#~ msgstr "Комуникациска грешка од ниско ниво: %s"
+
 #~ msgid "New Page or New Attachment"
 #~ msgstr "Нова страница или прилог"
 
--- a/MoinMoin/i18n/mn.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/mn.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2006-12-05 12:04+0800\n"
 "Last-Translator: Amgalanbaatar Delegdorj <d.amgalanbaatar@gmail.com>\n"
 "Language-Team: Mongolia <d.amgalanbaatar@gmail.com>\n"
@@ -582,6 +582,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Нууц үг алга байна. Хэрэглэгчийн нэр болон нууц үг оруулна уу."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Та логаут хийсэн байна."
@@ -1329,14 +1333,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Хавсралт"
@@ -1823,6 +1819,14 @@
 msgstr "{{{\"%s\"}}} -ийн оронд сонгогдсон хайлтын ухагдахуунаас хэрэглэнэ үү"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Таны {{{\"%s\"}}} хайлт хүчингүй. Нэмэлт мэдээлэл шаардлагатай бол "
+"ХайлтХийхТусламж -ийг үзнэ үү."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr " \"%(filename)s\" гэсэн файлыг шинээр хавсаргах"
 
@@ -2559,14 +2563,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Таны {{{\"%s\"}}} хайлт хүчингүй. Нэмэлт мэдээлэл шаардлагатай бол "
-"ХайлтХийхТусламж -ийг үзнэ үү."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/nb.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/nb.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2004-12-01 21:30+0200\n"
 "Last-Translator: Joerg Cassens <jmt@cassens.org>\n"
 "Language-Team: Norwegian <moinmoin-nb@cassens.org>\n"
@@ -572,6 +572,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Passordet mangler. Oppgi et passord."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Du er nå logget ut."
@@ -1332,14 +1336,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Nytt vedlegg"
@@ -1816,6 +1812,12 @@
 msgstr "Vennligst bruk et mer spesifikt søk enn {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Last opp nytt vedlegg \"%(filename)s\""
 
@@ -2480,12 +2482,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/nl.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/nl.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2005-03-13 17:43+0200\n"
 "Last-Translator: Sander Kromwijk <s.kromwijk@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -582,6 +582,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Geen wachtwoord. Geef een gebruikersnaam en wachtwoord op."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "U bent nu uitgelogd."
@@ -1325,14 +1329,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Bijlage"
@@ -1813,6 +1809,14 @@
 msgstr "Gebruik een specifiekere zoekterm dan {{{\"%s\"}}}!"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Uw zoekopdracht {{{\"%s\"}}} is ongeldig. Bekijk de HelpOnSearching voor "
+"meer informatie."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Verstuur een nieuwe bijlage \"%(filename)s\""
 
@@ -2549,14 +2553,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Uw zoekopdracht {{{\"%s\"}}} is ongeldig. Bekijk de HelpOnSearching voor "
-"meer informatie."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/pl.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/pl.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -10,9 +10,10 @@
 # MoinMoin pl system text translation
 #
 msgid ""
-msgstr "Project-Id-Version: 1.6\n"
+msgstr ""
+"Project-Id-Version: 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2006-02-09 11:25+0100\n"
 "Last-Translator: Radomir Dopieralski <mondev@sheep.art.pl>\n"
 "Language-Team: Polish <sergiusz-keyword-moinmoin.69c762@pawlowicz.name>\n"
@@ -35,7 +36,8 @@
 "Password recovery token: %s\n"
 "\n"
 "Password reset URL: %s/?action=recoverpass&name=%s&token=%s\n"
-msgstr "Identyfikator czytelnika: %s\n"
+msgstr ""
+"Identyfikator czytelnika: %s\n"
 "\n"
 "Kod do odzyskiwania hasła: %s\n"
 "\n"
@@ -47,7 +49,8 @@
 "If you lost your password, please go to the password reset URL below or\n"
 "go to the password recovery page again and enter your username and the\n"
 "recovery token.\n"
-msgstr "Ktoś zarządał wysłania twojego kodu odzyskiwania hasła.\n"
+msgstr ""
+"Ktoś zarządał wysłania twojego kodu odzyskiwania hasła.\n"
 "\n"
 "Jeśli musisz odzyskać hasło, udaj się pod poniższy adres lub\n"
 "wejdź na stronę odzyskiwania hasła i wprowadź swój identyfikator czytelnika\n"
@@ -67,7 +70,8 @@
 msgstr "Nie można zmieniać starych wersji!"
 
 msgid "The lock you held timed out. Be prepared for editing conflicts!"
-msgstr "Blokada tej strony wygasła, bądź przygotowany na ewentualne konflikty edycji!"
+msgstr ""
+"Blokada tej strony wygasła, bądź przygotowany na ewentualne konflikty edycji!"
 
 #, python-format
 msgid "Draft of \"%(pagename)s\""
@@ -97,12 +101,14 @@
 msgstr "Ktoś inny skasował tę stronę w czasie, kiedy ją modyfikowałeś!"
 
 msgid "Someone else changed this page while you were editing!"
-msgstr "Ktoś inny zmienił zawartość tej strony w czasie, kiedy ją modyfikowałeś!"
+msgstr ""
+"Ktoś inny zmienił zawartość tej strony w czasie, kiedy ją modyfikowałeś!"
 
 msgid ""
 "Someone else saved this page while you were editing!\n"
 "Please review the page and save then. Do not save this page as it is!"
-msgstr "Ktoś inny zapisał tę stronę w czasie, kiedy ją modyfikowałeś!\n"
+msgstr ""
+"Ktoś inny zapisał tę stronę w czasie, kiedy ją modyfikowałeś!\n"
 "Przejrzyj tę stronę i wtedy zapisz. Nie zapisuj jej takiej jak teraz!"
 
 msgid "[Content loaded from draft]"
@@ -127,12 +133,13 @@
 "(page_rev)d by using the load draft button - in case you lost your last edit "
 "somehow without saving it.''' A draft gets saved for you when you do a "
 "preview, cancel an edit or unsuccessfully save."
-msgstr "'''<<BR>>Twój brudnopis oparty na wersji %(draft_rev)d (saved %"
+msgstr ""
+"'''<<BR>>Twój brudnopis oparty na wersji %(draft_rev)d (saved %"
 "(draft_timestamp_str)s) może być wczytany zamiast aktualnej wersji %"
-"(page_rev)d przez wciśnięcie przycisku \"Wczytaj brudnopis\" - na wypadek, gdybyś "
-"utracił swoje ostatnie zmiany bez ich zapisu.''' Brudnopisy są zapisywane "
-"automatycznie, gdy używasz podglądu, anulujesz zmiany, albo zapis się nie "
-"powiedzie."
+"(page_rev)d przez wciśnięcie przycisku \"Wczytaj brudnopis\" - na wypadek, "
+"gdybyś utracił swoje ostatnie zmiany bez ich zapisu.''' Brudnopisy są "
+"zapisywane automatycznie, gdy używasz podglądu, anulujesz zmiany, albo zapis "
+"się nie powiedzie."
 
 #, python-format
 msgid "Describe %s here."
@@ -153,7 +160,8 @@
 "(license_link)s.\n"
 "If you don't want that, hit '''%(cancel_button_text)s''' to cancel your "
 "changes."
-msgstr "Klikając w '''%(save_button_text)s''' umieszczasz swoje zmiany pod %"
+msgstr ""
+"Klikając w '''%(save_button_text)s''' umieszczasz swoje zmiany pod %"
 "(license_link)s.\n"
 "Jeżeli tego nie chcesz, kliknij '''%(cancel_button_text)s''' aby zrezygnować "
 "z wprowadzenia zmian."
@@ -227,7 +235,8 @@
 msgstr "Za dużo argumentów"
 
 msgid "Cannot have arguments without name following named arguments"
-msgstr "Niedopuszczalne są argumenty bez nazwy występujące za argumentami nazwanymi"
+msgstr ""
+"Niedopuszczalne są argumenty bez nazwy występujące za argumentami nazwanymi"
 
 #, python-format
 msgid "Argument \"%s\" is required"
@@ -268,7 +277,8 @@
 "'''A page with the name {{{'%s'}}} already exists.'''\n"
 "\n"
 "Try a different name."
-msgstr "'''Strona o nazwie {{{'%s'}}} już istnieje.'''\n"
+msgstr ""
+"'''Strona o nazwie {{{'%s'}}} już istnieje.'''\n"
 "\n"
 "Spróbuj innej nazwy."
 
@@ -290,7 +300,8 @@
 msgstr "Nie możesz kasować niniejszej strony."
 
 msgid "Thank you for your changes. Your attention to detail is appreciated."
-msgstr "Dziękujemy za Twe zmiany. Twoja troska poświęcona detalom jest nieoceniona."
+msgstr ""
+"Dziękujemy za Twe zmiany. Twoja troska poświęcona detalom jest nieoceniona."
 
 #, python-format
 msgid "Page \"%s\" was successfully deleted!"
@@ -307,7 +318,8 @@
 msgid ""
 "Unable to determine current page revision from the 'current' file. The page %"
 "s is damaged and cannot be edited right now."
-msgstr "Nie można ustalić aktualnej wersji strony dla aktualnego pliku. Strona %s "
+msgstr ""
+"Nie można ustalić aktualnej wersji strony dla aktualnego pliku. Strona %s "
 "jest uszkodzona i nie może być teraz edytowana."
 
 #, python-format
@@ -316,7 +328,8 @@
 
 #, python-format
 msgid "An I/O error occurred while saving page %s (errno=%d)"
-msgstr "Błąd wejścia/wyjścia wystąpił w czasie zapisywania strony %s (errno=%d)"
+msgstr ""
+"Błąd wejścia/wyjścia wystąpił w czasie zapisywania strony %s (errno=%d)"
 
 msgid "You are not allowed to edit this page!"
 msgstr "Nie możesz zmieniać zawartości tej strony!"
@@ -335,7 +348,8 @@
 
 msgid ""
 "You can't change ACLs on this page since you have no admin rights on it!"
-msgstr "Nie możesz zmieniać ACL tej strony, ponieważ nie masz praw administratora!"
+msgstr ""
+"Nie możesz zmieniać ACL tej strony, ponieważ nie masz praw administratora!"
 
 msgid "Notifications sent to:"
 msgstr "Powiadomienia wysłane do:"
@@ -344,7 +358,8 @@
 msgid ""
 "The lock of %(owner)s timed out %(mins_ago)d minute(s) ago, and you were "
 "granted the lock for this page."
-msgstr "Blokada założona przez %(owner)s wygasła %(mins_ago)d minut temu, i już "
+msgstr ""
+"Blokada założona przez %(owner)s wygasła %(mins_ago)d minut temu, i już "
 "możesz śmiało edytować tę stronę."
 
 #, python-format
@@ -356,7 +371,8 @@
 msgid ""
 "Other users will be ''warned'' until %(bumptime)s that you are editing this "
 "page."
-msgstr "Inni czytelnicy będą ostrzeżeni że edytujesz tę stronę do %(bumptime)s ."
+msgstr ""
+"Inni czytelnicy będą ostrzeżeni że edytujesz tę stronę do %(bumptime)s ."
 
 msgid "Use the Preview button to extend the locking period."
 msgstr "Użyj przycisku podglądu aby przedłużyć czas blokady."
@@ -365,7 +381,8 @@
 msgid ""
 "This page is currently ''locked'' for editing by %(owner)s until %(timestamp)"
 "s, i.e. for %(mins_valid)d minute(s)."
-msgstr "Ta strona jest obecnie ''zablokowana'' w celu edycji przez %(owner)s do %"
+msgstr ""
+"Ta strona jest obecnie ''zablokowana'' w celu edycji przez %(owner)s do %"
 "(timestamp)s, to jest przez %(mins_valid)d minut."
 
 #, python-format
@@ -376,7 +393,8 @@
 "(mins_valid)d minute(s),\n"
 "to avoid editing conflicts.'''<<BR>>\n"
 "To leave the editor, press the Cancel button."
-msgstr "Ta strona została otwarta do edycji albo ostatnio podglądana %(timestamp)s "
+msgstr ""
+"Ta strona została otwarta do edycji albo ostatnio podglądana %(timestamp)s "
 "przez %(owner)s.<<BR>>\n"
 "'''Powinieneś się ''powstrzymać od edycji'' tej strony przez minimum "
 "następne %(mins_valid)d minut,\n"
@@ -393,7 +411,8 @@
 msgid ""
 "The remote wiki uses a different InterWiki name (%(remotename)s) internally "
 "than you specified (%(localname)s)."
-msgstr "Zdalne wiki używa wewnętrznie innej nazwy InterWiki (%(remotename)s) niżta, "
+msgstr ""
+"Zdalne wiki używa wewnętrznie innej nazwy InterWiki (%(remotename)s) niżta, "
 "którą podałeś (%(localname)s).Zdalne wiki używa wewnętrznie innej nazwy "
 "InterWiki (%(remotename)s) niż ta wpisana przez ciebie (%(localname)s)."
 
@@ -405,7 +424,8 @@
 msgstr "Nie wybrano żadnego wystroju"
 
 msgid "Installing theme files is only supported for standalone type servers."
-msgstr "Instalacja plików wystroju jest wspierana tylko dla serwerów typu standalone."
+msgstr ""
+"Instalacja plików wystroju jest wspierana tylko dla serwerów typu standalone."
 
 #, python-format
 msgid "Installation of '%(filename)s' failed."
@@ -440,7 +460,8 @@
 msgid ""
 "The backed up content of this page is deprecated and will not be included in "
 "search results!"
-msgstr "Kopia zapasowa zawartości tej strony jest nieważna i nie będzie włączona do "
+msgstr ""
+"Kopia zapasowa zawartości tej strony jest nieważna i nie będzie włączona do "
 "rezultatów przeszukiwania"
 
 #, python-format
@@ -477,7 +498,8 @@
 msgid ""
 "Results %(bs)s%(hitsFrom)d - %(hitsTo)d%(be)s of %(aboutHits)s %(bs)s%(hits)d"
 "%(be)s results out of about %(pages)d pages."
-msgstr "Wyniki %(bs)s%(hitsFrom)d - %(hitsTo)d%(be)s z %(aboutHits)s %(bs)s%(hits)d%"
+msgstr ""
+"Wyniki %(bs)s%(hitsFrom)d - %(hitsTo)d%(be)s z %(aboutHits)s %(bs)s%(hits)d%"
 "(be)s wyników z około %(pages)d stron."
 
 msgid "seconds"
@@ -559,6 +581,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Brak hasła. Podaj identyfikator i hasło."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr "Musisz się zalogować."
 
@@ -566,14 +592,16 @@
 msgid ""
 "If you do not have an account, <a href=\"%(userprefslink)s\">you can create "
 "one now</a>. <a href=\"%(sendmypasswordlink)s\">Forgot your password?</a>"
-msgstr "Jeśli nie masz jeszcze hasła, <a href=\"%(userprefslink)s\">możesz je "
+msgstr ""
+"Jeśli nie masz jeszcze hasła, <a href=\"%(userprefslink)s\">możesz je "
 "założyć teraz</a>. <a href=\"%(sendmypasswordlink)s\">Zapomniane hasło?</a>"
 
 msgid ""
 "Please choose an account name now.\n"
 "If you choose an existing account name you will be asked for the\n"
 "password and be able to associate the account with your OpenID."
-msgstr "Proszę teraz wybrać identyfikator czytelnika.\n"
+msgstr ""
+"Proszę teraz wybrać identyfikator czytelnika.\n"
 "Jeśli wybrany zastanie istniejący identyfikator, potrzebne będzie\n"
 "hasło aby połączyć go z kontem OpenID."
 
@@ -585,9 +613,10 @@
 "taken. If it is your username, enter your password below to associate\n"
 "the username with your OpenID. Otherwise, please choose a different\n"
 "username and leave the password field blank."
-msgstr "Wybrany identyfikator jest już zajęty."
-"Jeśli należy do ciebie, wpisz swoje hasło aby połączyć go z kontem OpenID."
-"W przeciwnym wypadku, proszę wybrać inny identyfikator i zostawić pole hasła puste."
+msgstr ""
+"Wybrany identyfikator jest już zajęty.Jeśli należy do ciebie, wpisz swoje "
+"hasło aby połączyć go z kontem OpenID.W przeciwnym wypadku, proszę wybrać "
+"inny identyfikator i zostawić pole hasła puste."
 
 msgid "Associate this name"
 msgstr "Połącz ten identyfikator"
@@ -629,8 +658,9 @@
 msgid ""
 "If you do not have an account yet, you can still log in with your OpenID and "
 "create one during login."
-msgstr "Jeśli nie posiadasz jeszcze konta, możesz i tak zalogować się przy pomocy OpenID"
-"I stworzyć konto podczas logowania."
+msgstr ""
+"Jeśli nie posiadasz jeszcze konta, możesz i tak zalogować się przy pomocy "
+"OpenIDI stworzyć konto podczas logowania."
 
 msgid "Failed to connect to database."
 msgstr "Niepowodzenie przy łączeniu się z bazą danych."
@@ -845,7 +875,8 @@
 
 #, python-format
 msgid "Connection to mailserver '%(server)s' failed: %(reason)s"
-msgstr "Awaria połączenia z serwerem poczty elektronicznej '%(server)s' z powodu: %"
+msgstr ""
+"Awaria połączenia z serwerem poczty elektronicznej '%(server)s' z powodu: %"
 "(reason)s"
 
 msgid "Mail not sent"
@@ -856,11 +887,13 @@
 
 msgid ""
 "Rendering of reStructured text is not possible, please install Docutils."
-msgstr "Przetwarzanie tekstu w formacie reStructured jest niemożliwe, proszę "
+msgstr ""
+"Przetwarzanie tekstu w formacie reStructured jest niemożliwe, proszę "
 "doinstalować pakiet \"docutils\"."
 
 msgid "**Maximum number of allowed includes exceeded**"
-msgstr "**Przekroczona maksymalna dozwolona liczba dyrektyw włączających zawartość "
+msgstr ""
+"**Przekroczona maksymalna dozwolona liczba dyrektyw włączających zawartość "
 "innych stron**"
 
 #, python-format
@@ -975,7 +1008,8 @@
 #, python-format
 msgid ""
 "Sorry, can not save page because \"%(content)s\" is not allowed in this wiki."
-msgstr "Niestety, strona nie została zachowana ze względu na to, że \"%(content)s\" "
+msgstr ""
+"Niestety, strona nie została zachowana ze względu na to, że \"%(content)s\" "
 "nie są dozwolone w tym wiki."
 
 msgid "Notification"
@@ -999,8 +1033,9 @@
 msgid ""
 "Before you can be notified, you need to provide a way to contact you in the "
 "general preferences."
-msgstr "Zanim zaczniesz otrzymywać powiadomienia, musisz najpierw podać w ustawieniach"
-"jakiś sposób na kontaktowanie się z tobą."
+msgstr ""
+"Zanim zaczniesz otrzymywać powiadomienia, musisz najpierw podać w "
+"ustawieniachjakiś sposób na kontaktowanie się z tobą."
 
 msgid "Subscribed events"
 msgstr "Subskrybowane zdarzenia"
@@ -1042,15 +1077,17 @@
 msgid ""
 "You can now change the settings of the selected user account; log out to get "
 "back to your account."
-msgstr "Możesz zmieniać ustawienia wybranego czytelnika; wyloguj się, aby wrócić"
-"do swojego konta."
+msgstr ""
+"Możesz zmieniać ustawienia wybranego czytelnika; wyloguj się, aby wrócićdo "
+"swojego konta."
 
 msgid "You are the only user."
 msgstr "Jesteś jedynym czytelnikiem."
 
 msgid ""
 "As a superuser, you can temporarily assume the identity of another user."
-msgstr "Jako nadczytelnik możesz czasowo przyjmować osobowość innego czytelnika."
+msgstr ""
+"Jako nadczytelnik możesz czasowo przyjmować osobowość innego czytelnika."
 
 msgid "Select User"
 msgstr "Wybierz czytelnika"
@@ -1093,7 +1130,8 @@
 "Invalid user name {{{'%s'}}}.\n"
 "Name may contain any Unicode alpha numeric character, with optional one\n"
 "space between words. Group page name is not allowed."
-msgstr "Nieprawidłowy identyfikator czytelnika {{{'%s'}}}.\n"
+msgstr ""
+"Nieprawidłowy identyfikator czytelnika {{{'%s'}}}.\n"
 "Identyfikator może zawierać alfanumeryczne znaki unikodu, z opcjonalnie\n"
 "jedną spacją pomiędzy słowami. Grupowa nazwa strony jest niedozwolona."
 
@@ -1106,7 +1144,8 @@
 msgid ""
 "Please provide your email address. If you lose your login information, you "
 "can get it by email."
-msgstr "Lepiej podaj swój adres poczty elektronicznej. Jeśli nie podasz, a zapomnisz "
+msgstr ""
+"Lepiej podaj swój adres poczty elektronicznej. Jeśli nie podasz, a zapomnisz "
 "identyfikatora albo hasła, nie dostaniesz podpowiedzi pocztą."
 
 msgid "This email already belongs to somebody else."
@@ -1172,7 +1211,8 @@
 "change notification.\n"
 "\n"
 "The \"%(pagename)s\" page has been changed by %(editor)s:\n"
-msgstr "Drogi czytelniku wiki,\n"
+msgstr ""
+"Drogi czytelniku wiki,\n"
 "\n"
 "Zasubskrybowałeś stronę lub kategorię wiki na \"%(sitename)s\" w celu "
 "otrzymywania informacji o zmianach.\n"
@@ -1194,7 +1234,8 @@
 "\n"
 "The page \"%(pagename)s\" has been deleted by %(editor)s:\n"
 "\n"
-msgstr "Drogi czytelniku wiki,\n"
+msgstr ""
+"Drogi czytelniku wiki,\n"
 "\n"
 "Zasubskrybowałeś stronę lub kategorię wiki na \"%(sitename)s\" w celu "
 "otrzymywania informacji o zmianach.\n"
@@ -1210,12 +1251,14 @@
 "\n"
 "The page \"%(pagename)s\" has been renamed from \"%(oldname)s\" by %(editor)"
 "s:\n"
-msgstr "Drogi czytelniku wiki,\n"
+msgstr ""
+"Drogi czytelniku wiki,\n"
 "\n"
 "Zasubskrybowałeś stronę lub kategorię wiki na \"%(sitename)s\" w celu "
 "otrzymywania informacji o zmianach.\n"
 "\n"
-"Strona \"%(pagename)s\" ma zmienioną nazwę z \"%(oldname)s\" przez %(editor)s:\n"
+"Strona \"%(pagename)s\" ma zmienioną nazwę z \"%(oldname)s\" przez %(editor)"
+"s:\n"
 
 #, python-format
 msgid "New user account created on %(sitename)s"
@@ -1227,7 +1270,8 @@
 "\n"
 "    User name: %(username)s\n"
 "    Email address: %(useremail)s"
-msgstr "Drogi nadczytelniku, zostało właśnie utworzone nowe konto czytelnika.\n"
+msgstr ""
+"Drogi nadczytelniku, zostało właśnie utworzone nowe konto czytelnika.\n"
 "\n"
 "    Identyfikator: %(username)s\n"
 "    Adres e-mail: %(useremail)s"
@@ -1246,11 +1290,11 @@
 "\n"
 "Attachment name: %(attach_name)s\n"
 "Attachment size: %(attach_size)s\n"
-msgstr "Drogi czytelniku wiki,\n"
+msgstr ""
+"Drogi czytelniku wiki,\n"
 "\n"
 "Zasubskrybowałeś powiadomienia o zmianie strony wiki \"%(page_name)s\"."
-"Został do tej strony dodany przez %(editor)s załącznik. Szczegóły:"
-"\n"
+"Został do tej strony dodany przez %(editor)s załącznik. Szczegóły:\n"
 "Nazwa załącznika: %(attach_name)s\n"
 "Wielkość załącznika: %(attach_size)s\n"
 
@@ -1283,7 +1327,8 @@
 
 #, python-format
 msgid "[%(sitename)s] %(trivial)sUpdate of \"%(pagename)s\" by %(username)s"
-msgstr "[%(sitename)s] %(trivial)sAktualizacja strony \"%(pagename)s\" dokonana "
+msgstr ""
+"[%(sitename)s] %(trivial)sAktualizacja strony \"%(pagename)s\" dokonana "
 "przez %(username)s"
 
 msgid "Trivial "
@@ -1293,17 +1338,10 @@
 msgid ""
 "Attachment link: %(attach)s\n"
 "Page link: %(page)s\n"
-msgstr "Adres załącznika: %(attach)s\n"
+msgstr ""
+"Adres załącznika: %(attach)s\n"
 "Adres strony: %(page)s\n"
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr "Błąd XML RPC: %s"
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr "Niskopoziomowy błąd komunikacji: %s"
-
 msgid "Attachment link"
 msgstr "Adres załącznika"
 
@@ -1323,7 +1361,8 @@
 msgstr "Musisz podać plik wyjściowy!"
 
 msgid "No pages specified using --pages or --search, assuming full package."
-msgstr "Nie podano stron dla --pages lub --search, zakładam że chodzi o pełen pakiet."
+msgstr ""
+"Nie podano stron dla --pages lub --search, zakładam że chodzi o pełen pakiet."
 
 msgid "Output file already exists! Cowardly refusing to continue!"
 msgstr "Plik wyjściowy już istnieje! Tchórzliwie odmawiam kontynuacji!"
@@ -1362,7 +1401,8 @@
 msgid ""
 "green=view\n"
 "red=edit"
-msgstr "zielony=podgląd\n"
+msgstr ""
+"zielony=podgląd\n"
 "czerwony=edycja"
 
 msgid "date"
@@ -1393,19 +1433,17 @@
 "white space allowed after tables or titles.\n"
 "\n"
 "(!) For more help, see HelpOnEditing or SyntaxReference.\n"
-msgstr " Wyróżnienie:: <<Verbatim('')>>''kursywa''<<Verbatim('')>>; <<Verbatim(''')"
+msgstr ""
+" Wyróżnienie:: <<Verbatim('')>>''kursywa''<<Verbatim('')>>; <<Verbatim(''')"
 ">>'''pogrubienie'''<<Verbatim(''')>>; <<Verbatim(''''')>>'''''pogrubienie "
 "kursywa'''''<<Verbatim(''''')>>; <<Verbatim('')>>''mix ''<<Verbatim(''')"
 ">>'''''pogrubienia'''<<Verbatim(''')>> i kursywy''<<Verbatim('')>>; "
 "<<Verbatim(----)>> pozioma linia.\n"
-" Nagłówki:: = Tytuł 1 =; == Tytuł "
-"2 ==; === Tytuł 3 ===; "
-"==== Tytuł 4 ====; ===== Tytuł 5 "
-"=====.\n"
+" Nagłówki:: = Tytuł 1 =; == Tytuł 2 ==; === Tytuł 3 ===; ==== Tytuł 4 ====; "
+"===== Tytuł 5 =====.\n"
 " Listy:: spacja i jeden ze: * znaków; 1., a., A., i., I. numerowane pozycje; "
 "1.#n rozpoczyna numerowanie od n; sama spacja robi wcięcie.\n"
-" Odnośniki:: <<Verbatim(PołączSłowa)>>; <<Verbatim([cel|tekst"
-"odnośnika])>>.\n"
+" Odnośniki:: <<Verbatim(PołączSłowa)>>; <<Verbatim([cel|tekstodnośnika])>>.\n"
 " Tabele:: || tekst komórki |||| tekst komórki na dwa pola ||;    "
 "niedopuszczalna jest spacja po tabelach lub tytułach.\n"
 "\n"
@@ -1429,7 +1467,8 @@
 "(!) For more help, see the\n"
 "[[http://docutils.sourceforge.net/docs/user/rst/quickref.html|"
 "reStructuredText Quick Reference]].\n"
-msgstr "Wyróżnienie: <i>*italic*</i> <b>**bold**</b> ``maszynowy``<br/>\n"
+msgstr ""
+"Wyróżnienie: <i>*italic*</i> <b>**bold**</b> ``maszynowy``<br/>\n"
 "<br/><pre>\n"
 "Nagłowki: Nagłówek 1  Nagłówek 2  Nagłówek 3\n"
 "          ==========  ----------  ~~~~~~~~~~\n"
@@ -1463,21 +1502,19 @@
 " Tables:: |= header text | cell text | more cell text |;\n"
 "\n"
 "(!) For more help, see HelpOnEditing or HelpOnCreoleSyntax.\n"
-msgstr " Wyróżnienie:: <<Verbatim(//)>>''kursywa''<<Verbatim(//)>>; <<Verbatim(**)"
+msgstr ""
+" Wyróżnienie:: <<Verbatim(//)>>''kursywa''<<Verbatim(//)>>; <<Verbatim(**)"
 ">>'''pogrubienie'''<<Verbatim(**)>>; <<Verbatim(**//)>>'''''pogrubienie "
 "kursywa'''''<<Verbatim(//**)>>; <<Verbatim(//)>>''mix ''<<Verbatim(**)"
-">>'''''pogrubienia'''<<Verbatim(**)>> i kursywy''<<Verbatim(//)>>; "
-"<<Verbatim(----)>> pozioma linia.\n"
-" Nagłówki:: = Tytuł 1 =; == Tytuł "
-"2 ==; === Tytuł 3 ===;   "
-"==== Tytuł 4 ====; ===== Tytuł 5 "
-"=====.\n"
-" Listy:: * punkty; ** podpunkty; # numeracja; ## numerowane podpunkty."
-" Odnośniki::  <<Verbatim([[cel|tekst odnośnika]]"
-")>>.\n"
-" Tabele:: | tekst komórki |= nagłówek =|;"
-"\n"
-"(!) Aby uzyskać więcej pomocy, obejrzyj HelpOnEditing lub HelpOnCreoleSyntax.\n"
+">>'''''pogrubienia'''<<Verbatim(**)>> i kursywy''<<Verbatim(//)>>; <<Verbatim"
+"(----)>> pozioma linia.\n"
+" Nagłówki:: = Tytuł 1 =; == Tytuł 2 ==; === Tytuł 3 ===;   ==== Tytuł 4 "
+"====; ===== Tytuł 5 =====.\n"
+" Listy:: * punkty; ** podpunkty; # numeracja; ## numerowane podpunkty. "
+"Odnośniki::  <<Verbatim([[cel|tekst odnośnika]])>>.\n"
+" Tabele:: | tekst komórki |= nagłówek =|;\n"
+"(!) Aby uzyskać więcej pomocy, obejrzyj HelpOnEditing lub "
+"HelpOnCreoleSyntax.\n"
 
 msgid "UnSubscribe"
 msgstr "Zrezygnuj z subskrybcji"
@@ -1770,6 +1807,14 @@
 msgstr "Spróbuj bardziej selektywnego sposobu poszukiwań zamiast {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Twoje zapytanie {{{\"%s\"}}} jest niewłaściwe. Zobacz na HelpOnSearching by "
+"uzyskać pomoc."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Wgraj nowy załącznik \"%(filename)s\""
 
@@ -1777,22 +1822,25 @@
 msgid ""
 "%(extension_name)s %(extension_type)s: Required argument %(argument_name)s "
 "missing."
-msgstr "%(extension_name)s %(extension_type)s: Brak wymaganego argumentu "
-"%(argument_name)s."
+msgstr ""
+"%(extension_name)s %(extension_type)s: Brak wymaganego argumentu %"
+"(argument_name)s."
 
 #, python-format
 msgid ""
 "%(extension_name)s %(extension_type)s: Invalid %(argument_name)s=%"
 "(argument_value)s!"
-msgstr "%(extension_name)s %(extension_type)s: Niewłaściwy %(argument_name)s=%"
+msgstr ""
+"%(extension_name)s %(extension_type)s: Niewłaściwy %(argument_name)s=%"
 "(argument_value)s!"
 
 #, python-format
 msgid ""
 "Current configuration does not allow embedding of the file %(file)s because "
 "of its mimetype %(mimetype)s."
-msgstr "Obecna konfiguracja nie zezwala na wstawienie pliku %(file)s z powodu"
-"jego typu MIME %(mimetype)s."
+msgstr ""
+"Obecna konfiguracja nie zezwala na wstawienie pliku %(file)s z powodujego "
+"typu MIME %(mimetype)s."
 
 msgid "Embedded"
 msgstr "Osadzony"
@@ -1840,7 +1888,8 @@
 "You were viewing the current revision of this page when you called the "
 "revert action. If you want to revert to an older revision, first view that "
 "older revision and then call revert to this (older) revision again."
-msgstr "Oglądałeś aktualną wersję tej strony, kiedy wywołałeś akcjęprzywracania. "
+msgstr ""
+"Oglądałeś aktualną wersję tej strony, kiedy wywołałeś akcjęprzywracania. "
 "Jeśli chcesz przywrócić starszą wersjęm najpierw zobacza następnie wywołaj "
 "ponownie przywracanie do tej (straszej) wersji."
 
@@ -1864,7 +1913,8 @@
 "Please enter your password of your account at the remote wiki below. "
 "<<BR>> /!\\ You should trust both wikis because the password could be read "
 "by the particular administrators."
-msgstr "Podaj poniżej hasło do swojego konta na zdalnej stronie Wiki. <<BR>> /!\\ "
+msgstr ""
+"Podaj poniżej hasło do swojego konta na zdalnej stronie Wiki. <<BR>> /!\\ "
 "Powinieneś ufać obu wiki, ponieważ hasło może być przeczytane przez "
 "poszczególnych administratorów."
 
@@ -1877,13 +1927,15 @@
 msgid ""
 "Please set an interwikiname in your wikiconfig (see HelpOnConfiguration) to "
 "be able to use this action."
-msgstr "Proszę ustawić interwikiname w twojej konfiguracji wiki (zobacz "
+msgstr ""
+"Proszę ustawić interwikiname w twojej konfiguracji wiki (zobacz "
 "HelpOnConfiguration), bymóc używać tej akcji."
 
 msgid ""
 "Incorrect parameters. Please supply at least the ''remoteWiki'' parameter. "
 "Refer to HelpOnSynchronisation for help."
-msgstr "Niepoprawne parametry. Podaj przynajmniej parametr ''remoteWiki''.Zobacz "
+msgstr ""
+"Niepoprawne parametry. Podaj przynajmniej parametr ''remoteWiki''.Zobacz "
 "HelpOnSynchronisation, by uzyskać pomoc."
 
 msgid "The ''remoteWiki'' is unknown."
@@ -1902,8 +1954,9 @@
 msgid ""
 "Got a list of %s local and %s remote pages. This results in %s pages to "
 "process."
-msgstr "Otrzymano listę %s lokalnych i %s zdalnych stron. W wyniku tego trzeba przetworzyć %s"
-"stron."
+msgstr ""
+"Otrzymano listę %s lokalnych i %s zdalnych stron. W wyniku tego trzeba "
+"przetworzyć %sstron."
 
 #, python-format
 msgid "After filtering: %s pages"
@@ -1911,7 +1964,8 @@
 
 #, python-format
 msgid "Skipped page %s because of no write access to local page."
-msgstr "Pominięto stronę %s z powodu braku uprawnień do zapisu na stronie lokalnej."
+msgstr ""
+"Pominięto stronę %s z powodu braku uprawnień do zapisu na stronie lokalnej."
 
 #, python-format
 msgid "Deleted page %s locally."
@@ -1933,21 +1987,24 @@
 msgid ""
 "The item %s cannot be merged automatically but was changed in both wikis. "
 "Please delete it in one of both wikis and try again."
-msgstr "Obiekt %s nie może zostać scalony automatycznie ale zmienił się w obu wiki. "
+msgstr ""
+"Obiekt %s nie może zostać scalony automatycznie ale zmienił się w obu wiki. "
 "Usuń go w jednej z nich i spróbuj ponownie."
 
 #, python-format
 msgid ""
 "The item %s has different mime types in both wikis and cannot be merged. "
 "Please delete it in one of both wikis or unify the mime type, and try again."
-msgstr "Obeikt %s ma inne typy MIME w obu wiki i nie może zostać scalony. Usuń go w "
+msgstr ""
+"Obeikt %s ma inne typy MIME w obu wiki i nie może zostać scalony. Usuń go w "
 "jednej z wiki lub ujednolić typy MIME i spróbuj ponownie."
 
 #, python-format
 msgid ""
 "The item %s was renamed locally. This is not implemented yet. Therefore the "
 "full synchronisation history is lost for this page."
-msgstr "Nazwa %s została zmieniona lokalnie. Ta funkcja nie jest jeszcze "
+msgstr ""
+"Nazwa %s została zmieniona lokalnie. Ta funkcja nie jest jeszcze "
 "zaimplementowana. W związku z tym pełna historia synchronizacji została "
 "utracona dla tej strony."
 
@@ -1963,25 +2020,29 @@
 msgid ""
 "The page %s could not be synced. The remote page was renamed. This is not "
 "supported yet. You may want to delete one of the pages to get it synced."
-msgstr "Strona %s nie może być zsynchronizowana. Zdalna strona zmieniła nazwę. Ten "
+msgstr ""
+"Strona %s nie może być zsynchronizowana. Zdalna strona zmieniła nazwę. Ten "
 "przypadek nie jest jeszcze obsługiwany. Możesz usunąć jedną ze stron, by je "
 "zsynchronizować."
 
 #, python-format
 msgid "Skipped page %s because of a locally or remotely unresolved conflict."
-msgstr "Pominięto stronę %s z powodu lokalnego lub zdalnego nierozwiązanego konfliktu"
+msgstr ""
+"Pominięto stronę %s z powodu lokalnego lub zdalnego nierozwiązanego konfliktu"
 
 #, python-format
 msgid ""
 "This is the first synchronisation between the local and the remote wiki for "
 "the page %s."
-msgstr "To jest pierwsza synchronizacja pomiędzy lokalną i zdalną wiki dla strony %s."
+msgstr ""
+"To jest pierwsza synchronizacja pomiędzy lokalną i zdalną wiki dla strony %s."
 
 #, python-format
 msgid ""
 "The page %s could not be merged because you are not allowed to modify the "
 "page in the remote wiki."
-msgstr "Strona %s nie może być scalona, ponieważ nie masz pozwolenia na modyfikację "
+msgstr ""
+"Strona %s nie może być scalona, ponieważ nie masz pozwolenia na modyfikację "
 "zdalnej strony wiki."
 
 #, python-format
@@ -2002,7 +2063,8 @@
 "never allow you to enter your password here.\n"
 "\n"
 "Once you have logged in, simply reload this page."
-msgstr "Musisz udać się do wiki swojego dostawcy OpenID\n"
+msgstr ""
+"Musisz udać się do wiki swojego dostawcy OpenID\n"
 "i zalogować się zanim będzie można używać twojego OpenID.\n"
 "MoinMoin nigdy nie zezwoli ci na wpisanie tutaj twojego hasła.\n"
 "\n"
@@ -2022,7 +2084,8 @@
 "told that you control the identity URL %s. (If you are using a delegated\n"
 "identity, the site will take care of reversing the\n"
 "delegation on its own.)"
-msgstr "\n"
+msgstr ""
+"\n"
 "Jeśli zaakceptujesz, strona reprezentowana przez zaufany adres\n"
 "poniżej zostanie powiadomiona że kontrolujesz adres %s. (Jeśli używasz\n"
 "przeniesionej tożsamości, strona sama zajmie się odwróceniem przeniesienia.)"
@@ -2054,7 +2117,8 @@
 "we cannot serve an OpenID for you. Please create your homepage first\n"
 "and then reload this page or click the button below to cancel this\n"
 "verification."
-msgstr "\n"
+msgstr ""
+"\n"
 "Niestety nie masz jeszcze strony domowej, zatem\n"
 "nie możemy obsługiwać dla ciebie OpenID. Proszę najpierw stworzyć\n"
 "stronę domową i odświerzyć tę stronę -- lub nacisnąć przycisk \"Anuluj\"\n"
@@ -2108,12 +2172,14 @@
 msgid ""
 "Restored Backup: %(filename)s to target dir: %(targetdir)s.\n"
 "Files: %(filecount)d, Directories: %(dircount)d"
-msgstr "Odtworzony Backup: %(filename)s do katalogu docelowego: %(targetdir)s.\n"
+msgstr ""
+"Odtworzony Backup: %(filename)s do katalogu docelowego: %(targetdir)s.\n"
 "Plików: %(filecount)d, Katalogów: %(dircount)d"
 
 #, python-format
 msgid "Restoring backup: %(filename)s to target dir: %(targetdir)s failed."
-msgstr "Odtwarzanie backupu: %(filename)s do katalogu docelowego: %(targetdir)s nie "
+msgstr ""
+"Odtwarzanie backupu: %(filename)s do katalogu docelowego: %(targetdir)s nie "
 "powiodło się."
 
 msgid "Wiki Backup / Restore"
@@ -2135,7 +2201,8 @@
 "Please make sure your wiki configuration backup_* values are correct and "
 "complete.\n"
 "\n"
-msgstr "Wskazówki:\n"
+msgstr ""
+"Wskazówki:\n"
 " * By przywrócić kopię zapasową:\n"
 "  * Przwrócenie kopii zapasowej nadpisze istniejące dane, bądź ostrożny.\n"
 "  * Zmień nazwę na <siteid>.tar.<compression> (usuń --date--time--UTC "
@@ -2215,7 +2282,8 @@
 "||<<NewPage(HomepagePrivatePageTemplate,private page,%(username)s)>>||%"
 "(username)s only||\n"
 "\n"
-msgstr "Tutaj możesz utworzyć dodatkowe podstrony swojej już istniejącej strony "
+msgstr ""
+"Tutaj możesz utworzyć dodatkowe podstrony swojej już istniejącej strony "
 "domowej.\n"
 "Możesz wybrać jak otwarte mają być te strony dla innych czytelników i "
 "twórców,\n"
@@ -2262,7 +2330,8 @@
 msgstr "Nie można usunąć subskrybcji wyrażenia regularnego!"
 
 msgid "Edit the subscription regular expressions in your settings."
-msgstr "Edytuj subskrybcję za pomocą wyrażeń regularnych w swoich "
+msgstr ""
+"Edytuj subskrybcję za pomocą wyrażeń regularnych w swoich "
 "PreferencjeCzytelnika."
 
 msgid "You need to be subscribed to unsubscribe."
@@ -2324,10 +2393,10 @@
 "You can upload content for the page named below. If you change the page "
 "name, you can also upload content for another page. If the page name is "
 "empty, we derive the page name from the file name."
-msgstr "Możeć wgrać zwartość strony podanej poniżej. Jeśli zmienisz nazwę "
-"strony, możesz także wgrać zwartość do innej strony. Jeśli nazwa strony "
-"jest pusta, nazwiemy stronę tak samo jak plik."
-
+msgstr ""
+"Możeć wgrać zwartość strony podanej poniżej. Jeśli zmienisz nazwę strony, "
+"możesz także wgrać zwartość do innej strony. Jeśli nazwa strony jest pusta, "
+"nazwiemy stronę tak samo jak plik."
 
 msgid "File to load page content from"
 msgstr "Plik z którego wgrać zawartość"
@@ -2342,7 +2411,8 @@
 msgstr "Nie możesz subskrybować strony, której nie możesz przeczytać."
 
 msgid "This wiki is not enabled for mail/Jabber processing."
-msgstr "W tym wiki nie uruchomiono przetwarzania poczty elektronicznej ani Jabbera.\n"
+msgstr ""
+"W tym wiki nie uruchomiono przetwarzania poczty elektronicznej ani Jabbera.\n"
 "Skontaktuj się z właścicielem, który może te opcje włączyć."
 
 msgid "You must log in to use subscriptions."
@@ -2351,7 +2421,8 @@
 msgid ""
 "Add your email address or Jabber ID in your user settings to use "
 "subscriptions."
-msgstr "Wpisz swój adres poczty elektronicznej lub identyfikator Jabbera w "
+msgstr ""
+"Wpisz swój adres poczty elektronicznej lub identyfikator Jabbera w "
 "PreferencjeCzytelnika aby korzystać z subskrybcji."
 
 msgid "You are already subscribed to this page."
@@ -2463,7 +2534,8 @@
 msgid ""
 "/!\\ The modification date you entered was not recognized and is therefore "
 "not considered for the search results!"
-msgstr "/!\\ Data modyfikacji, którą wprowadziłeś, nie została rozpoznana i w "
+msgstr ""
+"/!\\ Data modyfikacji, którą wprowadziłeś, nie została rozpoznana i w "
 "związku z tym nie będzie uwzględniona w wynikach wyszukiwania!"
 
 #, python-format
@@ -2480,16 +2552,10 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr "Twoje zapytanie {{{\"%s\"}}} jest niewłaściwe. Zobacz na HelpOnSearching by "
-"uzyskać pomoc."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
-msgstr "Twoje zapytanie {{{\"%s\"}}} nie dałoz żadnych wyników. Zmień niektóre "
+msgstr ""
+"Twoje zapytanie {{{\"%s\"}}} nie dałoz żadnych wyników. Zmień niektóre "
 "warunki i zobacz HelpOnSearching, by uzyskać więcej informacji.%s"
 
 msgid "(!) Consider performing a"
@@ -2501,14 +2567,16 @@
 msgid ""
 "(!) You're performing a title search that might not include all related "
 "results of your search query in this wiki. <<BR>>"
-msgstr "(!) Wykonujesz wyszukiwanie tytułów, które może nie uwzględnić wszystkich "
+msgstr ""
+"(!) Wykonujesz wyszukiwanie tytułów, które może nie uwzględnić wszystkich "
 "wyników odnoszących się do twojego zapytania w tym wiki. <<BR>>"
 
 msgid "Click here to perform a full-text search with your search terms!"
 msgstr "Kliknij aby poszukać strony metodą pełnotekstową z twoimi warunkami!"
 
 msgid "User account created! You can use this account to login now..."
-msgstr "Konto czytelnika utworzone! Możesz teraz użyć tego konta żeby się "
+msgstr ""
+"Konto czytelnika utworzone! Możesz teraz użyć tego konta żeby się "
 "zalogować..."
 
 msgid "TextCha (required)"
@@ -2543,7 +2611,8 @@
 msgid ""
 "The following %(badwords)d words could not be found in the dictionary of %"
 "(totalwords)d words%(localwords)s and are highlighted below:"
-msgstr "Następujące %(badwords)d wyrazy nie zostały odnalezione w słowniku z %"
+msgstr ""
+"Następujące %(badwords)d wyrazy nie zostały odnalezione w słowniku z %"
 "(totalwords)d words%(localwords)s i zostały podświetlone poniżej:"
 
 msgid "Add checked words to dictionary"
@@ -2567,11 +2636,13 @@
 msgid ""
 "This wiki is not enabled for mail processing.\n"
 "Contact the owner of the wiki, who can enable email."
-msgstr "W tym wiki nie uruchomiono przetwarzania poczty elektronicznej.\n"
+msgstr ""
+"W tym wiki nie uruchomiono przetwarzania poczty elektronicznej.\n"
 "Skontaktuj się z właścicielem, który może tę opcję włączyć."
 
 msgid "Please provide a valid email address or a username!"
-msgstr "Podaj prawidłowy adres poczty elektronicznej lub identyfikator użytkownika!"
+msgstr ""
+"Podaj prawidłowy adres poczty elektronicznej lub identyfikator użytkownika!"
 
 msgid "Mail me my account data"
 msgstr "Prześlij do mnie moje dane"
@@ -2601,7 +2672,8 @@
 "\n"
 "== Password reset ==\n"
 "Enter a new password below."
-msgstr "\n"
+msgstr ""
+"\n"
 "== Ustawianie hasła ==\n"
 "Podaj nowe hasło poniżej."
 
@@ -2616,7 +2688,8 @@
 "You will receive an email containing a recovery token that can be\n"
 "used to change your password. The email will also contain further\n"
 "instructions."
-msgstr "\n"
+msgstr ""
+"\n"
 "== Odzyskiwanie zapomnianego hasła ==\n"
 "Jesli zapomnisz hasła, podaj adres e-mail lub identyfikator czytelnika\n"
 "i kliknij na '''Wyślij dane konta'''.\n"
@@ -2628,9 +2701,10 @@
 "=== Password reset ===\n"
 "If you already have received the email with the recovery token, enter your\n"
 "username, the recovery token and a new password (twice) below."
-msgstr "\n"
-"=== Ustawianie hasła ==="
-"Jeśli już masz wiadomość zawierającą kod odzyskiwania hasła, wprowadź\n"
+msgstr ""
+"\n"
+"=== Ustawianie hasła ===Jeśli już masz wiadomość zawierającą kod "
+"odzyskiwania hasła, wprowadź\n"
 "swój identyfikator czytelnika, kod oraz nowe hasło (dwukrotnie)."
 
 #, python-format
@@ -2654,7 +2728,8 @@
 msgid ""
 "There are <a href=\"%(link)s\">%(count)s attachment(s)</a> stored for this "
 "page."
-msgstr "Istnieje <a href=\"%(link)s\">%(count)s załącznik(ów)</a> do tej strony."
+msgstr ""
+"Istnieje <a href=\"%(link)s\">%(count)s załącznik(ów)</a> do tej strony."
 
 msgid "Filename of attachment not specified!"
 msgstr "Nie została podana nazwa pliku załącznika!"
@@ -2668,7 +2743,8 @@
 "as shown below in the list of files. \n"
 "Do '''NOT''' use the URL of the {{{[get]}}} link, \n"
 "since this is subject to change and can break easily."
-msgstr "Aby odnieść się do załącznika na stronie, użyj '''{{{attachment:"
+msgstr ""
+"Aby odnieść się do załącznika na stronie, użyj '''{{{attachment:"
 "filename}}}''', \n"
 "jak pokazano poniżej na liście plików. \n"
 "'''NIGDY''' nie używaj URLa {{{[get]}}}, ponieważ odnośnik może się "
@@ -2726,13 +2802,15 @@
 msgid ""
 "No file content. Delete non ASCII characters from the file name and try "
 "again."
-msgstr "W pliku nie ma nic. Skasuj wszystkie dziwne znaczki i spróbuj ponownie."
+msgstr ""
+"W pliku nie ma nic. Skasuj wszystkie dziwne znaczki i spróbuj ponownie."
 
 #, python-format
 msgid ""
 "Attachment '%(target)s' (remote name '%(filename)s') with %(bytes)d bytes "
 "saved."
-msgstr "Załącznik '%(target)s' (nazwa zdalna '%(filename)s') o wielkości %(bytes)d "
+msgstr ""
+"Załącznik '%(target)s' (nazwa zdalna '%(filename)s') o wielkości %(bytes)d "
 "bajtów zapisany."
 
 msgid "You are not allowed to save a drawing on this page."
@@ -2747,15 +2825,19 @@
 
 #, python-format
 msgid ""
-"Attachment '%(pagename)s/%(filename)s' moved to '%(new_pagename)s/%(new_filename)s'."
-msgstr "Załącznik '%(pagename)s/%(filename)s' przeniesiono na stronę '%(new_pagename)s/%(new_filename)s'."
+"Attachment '%(pagename)s/%(filename)s' moved to '%(new_pagename)s/%"
+"(new_filename)s'."
+msgstr ""
+"Załącznik '%(pagename)s/%(filename)s' przeniesiono na stronę '%(new_pagename)"
+"s/%(new_filename)s'."
 
 msgid "Nothing changed"
 msgstr "Nic nie uległo zmianie"
 
 #, python-format
 msgid "Page '%(new_pagename)s' does not exist or you don't have enough rights."
-msgstr "Strona '%(new_pagename)s' nie istnieje lub nie masz wymaganych uprawnień."
+msgstr ""
+"Strona '%(new_pagename)s' nie istnieje lub nie masz wymaganych uprawnień."
 
 msgid "Move aborted!"
 msgstr "Ruch przerwany!"
@@ -2802,14 +2884,16 @@
 msgid ""
 "Attachment '%(filename)s' could not be unzipped because the resulting files "
 "would be too large (%(space)d kB missing)."
-msgstr "Załącznik '%(filename)s' nie mógł zostać rozpakowany, ponieważ powstałe "
+msgstr ""
+"Załącznik '%(filename)s' nie mógł zostać rozpakowany, ponieważ powstałe "
 "pliki byłyby zbyt duże (zabrakło %(space)d kB)."
 
 #, python-format
 msgid ""
 "Attachment '%(filename)s' could not be unzipped because the resulting files "
 "would be too many (%(count)d missing)."
-msgstr "Załącznik '%(filename)s' nie mógł zostać rozpakowany, ponieważ powstałoby "
+msgstr ""
+"Załącznik '%(filename)s' nie mógł zostać rozpakowany, ponieważ powstałoby "
 "zbyt wiele plików (zabrakło %(count)d)."
 
 #, python-format
@@ -2820,7 +2904,8 @@
 msgid ""
 "Attachment '%(filename)s' not unzipped because the files are too big, .zip "
 "files only, exist already or reside in folders."
-msgstr "Nie rozpakowano załącznika '%(filename)s', ponieważ pliki są zbyt duże, "
+msgstr ""
+"Nie rozpakowano załącznika '%(filename)s', ponieważ pliki są zbyt duże, "
 "tylko typu .zip, już istnieją, albo znajdują się w podkatalogach."
 
 #, python-format
@@ -2859,7 +2944,8 @@
 
 #, python-format
 msgid "Exactly one page like \"%s\" found, redirecting to page."
-msgstr "Dokładnie jedna strona typu \"%s\" została znaleziona, przekazuję Cię na tę "
+msgstr ""
+"Dokładnie jedna strona typu \"%s\" została znaleziona, przekazuję Cię na tę "
 "stronę."
 
 #, python-format
@@ -2900,6 +2986,12 @@
 msgid "Login and try again."
 msgstr "Zaloguj się i spróbuj ponownie."
 
+#~ msgid "XML RPC error: %s"
+#~ msgstr "Błąd XML RPC: %s"
+
+#~ msgid "Low-level communication error: %s"
+#~ msgstr "Niskopoziomowy błąd komunikacji: %s"
+
 #~ msgid "New Page or New Attachment"
 #~ msgstr "Nowa strona lub załącznik"
 
--- a/MoinMoin/i18n/pt-br.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/pt-br.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-11-20 23:40+0000\n"
 "Last-Translator: Evandro Villa Verde <evandro.villaverde.hackerteen@gmail."
 "com>\n"
@@ -581,6 +581,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Senha não foi informada. Por favor, informe o nome do usuário e senha."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Você não está mais logado."
@@ -1326,14 +1330,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Anexos"
@@ -1819,6 +1815,14 @@
 msgstr "Por favor, use um termo de busca mais preciso ao invés de {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Seu texto de busca {{{\"%s\"}}} é inválido. Por favor veja HelpOnSearching "
+"para mais informações."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Enviar novo anexo \"%(filename)s\""
 
@@ -2555,14 +2559,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Seu texto de busca {{{\"%s\"}}} é inválido. Por favor veja HelpOnSearching "
-"para mais informações."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/pt.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/pt.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-01-05 22:27+0000\n"
 "Last-Translator: Rita Farinha <rita.farinha@intraneia.com>\n"
 "Language-Team: Portuguese <moin-devel@lists.sourceforge.net>\n"
@@ -588,6 +588,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Senha em falta. Por favor, insira o nome de utilizador e a senha."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Saiu do sistema."
@@ -1333,14 +1337,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Anexos"
@@ -1828,6 +1824,14 @@
 "Por favor, utilize um termo de pesquisa mais específico que {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"A sua pesquisa {{{\"%s\"}}} é inválida. Por favor, consulte a página de "
+"AjudaNaPesquisa para mais informações."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Enviar novo anexo \"%(filename)s\""
 
@@ -2564,14 +2568,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"A sua pesquisa {{{\"%s\"}}} é inválida. Por favor, consulte a página de "
-"AjudaNaPesquisa para mais informações."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/ro.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/ro.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2005-08-18 14:19+EET\n"
 "Last-Translator: Ovidiu Sabou <ovidiu.sabou@gmail.com>\n"
 "Language-Team: Romanian <ovidiu.sabou@gmail.com>\n"
@@ -28,7 +28,7 @@
 msgid "<unknown>"
 msgstr "<necunoscut>"
 
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Login Name: %s\n"
 "\n"
@@ -36,11 +36,11 @@
 "\n"
 "Password reset URL: %s/?action=recoverpass&name=%s&token=%s\n"
 msgstr ""
-"Nume de înregistrare: %s\n"
+"Nume utilizator: %s\n"
 "\n"
-"Parola de înregistrare: %s\n"
+"Codul de recuperare al parolei: %s\n"
 "\n"
-"URL de înregistrare: %s/%s?action=login\n"
+"URL de reconfigurare a parolei: %s/?action=recoverpass&name=%s&token=%s\n"
 
 msgid ""
 "Somebody has requested to email you a password recovery token.\n"
@@ -55,7 +55,7 @@
 msgstr "[%(sitename)s] Datele contului wiki al dumneavoastră"
 
 msgid "You are not allowed to edit this page."
-msgstr "Nu aveţi dreptul să editaţi această pagină."
+msgstr "Nu aveţi dreptul de a edita această pagină."
 
 msgid "Page is immutable!"
 msgstr "Pagina este imuabilă!"
@@ -68,9 +68,9 @@
 "Blocarea înfiinţată de dumneavoastră a expirat, pregătiţi-vă pentru "
 "conflicte de editare!"
 
-#, fuzzy, python-format
+#, python-format
 msgid "Draft of \"%(pagename)s\""
-msgstr "Previzionarea \"%(pagename)s\""
+msgstr "Ciorna paginii \"%(pagename)s\""
 
 #, python-format
 msgid "Edit \"%(pagename)s\""
@@ -99,20 +99,16 @@
 msgid "Someone else changed this page while you were editing!"
 msgstr "Cineva a modificat această pagină în timp ce aţi editat-o!"
 
-#, fuzzy
 msgid ""
 "Someone else saved this page while you were editing!\n"
 "Please review the page and save then. Do not save this page as it is!"
 msgstr ""
 "Cineva a salvat această pagină în timp ce aţi editat-o!\n"
-"Vă rugăm să revedeţi pagina şi să o salvaţi apoi. Nu salvaţi pagina în acest "
-"stadiu!\n"
-"Uitaţi-vă la modificările paginii %(difflink)s pentru a vedea ce s-a "
-"schimbat."
-
-#, fuzzy
+"Vă rugăm să evaluaţi pagina şi să o salvaţi apoi. Nu salvaţi pagina în acest "
+"stadiu!"
+
 msgid "[Content loaded from draft]"
-msgstr "[Conţinutul paginii noi a fost încărcat din %s]"
+msgstr "[Conţinutul paginii noi a fost încărcat din ciornă]"
 
 #, python-format
 msgid "[Content of new page loaded from %s]"
@@ -235,9 +231,9 @@
 msgid "Argument \"%s\" is required"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "No argument named \"%s\""
-msgstr "Nici o pagină de genul \"%s\"!"
+msgstr "Niciun argument numit \"%s\"!"
 
 #, python-format
 msgid "Expected \"=\" to follow \"%(token)s\""
@@ -259,13 +255,11 @@
 msgid "Edit was cancelled."
 msgstr "Editarea a fost anulată"
 
-#, fuzzy
 msgid "You can't copy to an empty pagename."
-msgstr "Nu puteţi salva pagini goale."
-
-#, fuzzy
+msgstr "Nu puteţi salva cu nume de pagină gol."
+
 msgid "You are not allowed to copy this page!"
-msgstr "Nu aveţi permisiunea de a edita această pagină!"
+msgstr "Nu aveţi permisiunea de a copia această pagină!"
 
 #, python-format
 msgid ""
@@ -277,27 +271,23 @@
 "\n"
 "Încercaţi un nume diferit."
 
-#, fuzzy, python-format
+#, python-format
 msgid "Could not copy page because of file system error: %s."
-msgstr "Nu s-a putut redenumi pagina datorită erorii de sistem de fişiere: %s."
-
-#, fuzzy
+msgstr ""
+"Nu s-a putut copia pagina datorită erorii cauzate de sistemul de fişiere: %s."
+
 msgid "You are not allowed to rename this page!"
-msgstr ""
-"Nu aveţi permisiunea de a modifica această pagină la o stare anterioară"
-
-#, fuzzy
+msgstr "Nu aveţi permisiunea de a redenumi această pagină!"
+
 msgid "You can't rename to an empty pagename."
-msgstr "Nu puteţi salva pagini goale."
+msgstr "Nu puteţi redenumi într-un nume vid."
 
 #, python-format
 msgid "Could not rename page because of file system error: %s."
 msgstr "Nu s-a putut redenumi pagina datorită erorii de sistem de fişiere: %s."
 
-#, fuzzy
 msgid "You are not allowed to delete this page!"
-msgstr ""
-"Nu aveţi permisiunea de a modifica această pagină la o stare anterioară"
+msgstr "Nu aveţi permisiunea de a şterge această pagină!"
 
 msgid "Thank you for your changes. Your attention to detail is appreciated."
 msgstr ""
@@ -446,9 +436,9 @@
 msgid "Unknown function %(func)s in line %(lineno)i."
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "The file %s was not found in the package."
-msgstr "Fişierul %s nu este un fişier pachet MoinMoin."
+msgstr "Fişierul %s nu a fost găsit în pachet."
 
 #, python-format
 msgid "Invalid highlighting regular expression \"%(regex)s\": %(error)s"
@@ -497,28 +487,24 @@
 "%(be)s results out of about %(pages)d pages."
 msgstr ""
 
-#, fuzzy
 msgid "seconds"
-msgstr "%.2f secunde"
-
-#, fuzzy
+msgstr "secunde"
+
 msgid "Previous"
-msgstr "Previzionare"
-
-#, fuzzy
+msgstr "Precedent"
+
 msgid "Next"
-msgstr "Text"
-
-#, fuzzy
+msgstr "Următor"
+
 msgid "rev"
-msgstr "revenire"
+msgstr "rev"
 
 msgid "current"
-msgstr ""
-
-#, fuzzy, python-format
+msgstr "curent"
+
+#, python-format
 msgid "last modified: %s"
-msgstr "modificat ultima oară la %(time)s"
+msgstr "modificat ultima oară: %s"
 
 msgid "match"
 msgstr "potrivire"
@@ -550,13 +536,11 @@
 msgid "Login"
 msgstr "Login"
 
-#, fuzzy
 msgid "Username"
-msgstr "Utilizator"
-
-#, fuzzy
+msgstr "Nume utilizator"
+
 msgid "Member of Groups"
-msgstr "Număr de pagini"
+msgstr "Membru în grupurile"
 
 msgid "Email"
 msgstr "Email"
@@ -567,28 +551,27 @@
 msgid "Action"
 msgstr "Acţiune"
 
-#, fuzzy
 msgid "Enable user"
-msgstr "Activat"
-
-#, fuzzy
+msgstr "Activare utilizator"
+
 msgid "disabled"
-msgstr "Dezactivat"
-
-#, fuzzy
+msgstr "dezactivat"
+
 msgid "Disable user"
-msgstr "Dezactivat"
-
-#, fuzzy
+msgstr "Dezactivare utilizator"
+
 msgid "Mail account data"
-msgstr "Trimitere prin email datele contului"
+msgstr "Datele contului de email"
 
 msgid "Missing password. Please enter user name and password."
 msgstr "Parola lipseşte. Introduceti nume şi parolă"
 
-#, fuzzy
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
-msgstr "Prăjitura(cookie) a fost ştearsă. Acum sunteţi neînregistrat(ă)."
+msgstr "Trebuie să vă înregistraţi."
 
 #, python-format
 msgid ""
@@ -1340,14 +1323,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Ataşamente"
@@ -1824,6 +1799,12 @@
 msgstr "Folosiţi un termen de căutare mai selectiv în loc de {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Trimitere ataşament nou \"%(filename)s\""
 
@@ -2503,12 +2484,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
@@ -2580,20 +2555,17 @@
 msgid "No spelling errors found!"
 msgstr "Nu a fost găsită nici o greşeală de ortografie!"
 
-#, fuzzy
 msgid "You can't save spelling words."
 msgstr ""
-"Nu aveţi permisiunea de a verifica ortografia pe o pagină pe care nu o "
-"puteţi citi."
+"Nu aveţi permisiunea de a salva cuvinte folosite la verificarea ortografiei."
 
 msgid "You can't check spelling on a page you can't read."
 msgstr ""
 "Nu aveţi permisiunea de a verifica ortografia pe o pagină pe care nu o "
 "puteţi citi."
 
-#, fuzzy
 msgid "You are now logged out."
-msgstr "Prăjitura(cookie) a fost ştearsă. Acum sunteţi neînregistrat(ă)."
+msgstr "Acum sunteţi neînregistrat(ă)."
 
 msgid "If this account exists an email was sent."
 msgstr ""
@@ -2605,9 +2577,8 @@
 "Acest wiki nu permite procesare poştei electronice.\n"
 "Contactaţi deţinătorul wiki-ului, care poate activa email."
 
-#, fuzzy
 msgid "Please provide a valid email address or a username!"
-msgstr "Introduceţi o adresă de email validă!"
+msgstr "Introduceţi o adresă validă de email sau un nume de utilizator!"
 
 msgid "Mail me my account data"
 msgstr "Trimitere prin email datele contului"
@@ -2615,17 +2586,14 @@
 msgid "Recovery token"
 msgstr ""
 
-#, fuzzy
 msgid "New password"
-msgstr "Parolă"
-
-#, fuzzy
+msgstr "Parolă nouă"
+
 msgid "New password (repeat)"
-msgstr "Repetare parolă"
-
-#, fuzzy
+msgstr "Repetare parolă nouă"
+
 msgid "Reset my password"
-msgstr "Parolă"
+msgstr "Resetare parolă"
 
 msgid "Your password has been changed, you can log in now."
 msgstr ""
@@ -2633,20 +2601,20 @@
 msgid "Your token is invalid!"
 msgstr ""
 
-#, fuzzy
 msgid "Password reset"
-msgstr "Repetare parolă"
-
-#, fuzzy
+msgstr "Resetare parolă"
+
 msgid ""
 "\n"
 "== Password reset ==\n"
 "Enter a new password below."
-msgstr "Parola lipseşte. Introduceti nume şi parolă"
-
-#, fuzzy
+msgstr ""
+"\n"
+"== Resetare parolă ==\n"
+"Introduceţi noua parolă mai jos."
+
 msgid "Lost password"
-msgstr "Parolă"
+msgstr "Parolă pierdută"
 
 msgid ""
 "\n"
@@ -2669,15 +2637,14 @@
 msgid "Local Site Map for \"%s\""
 msgstr "Harta Locală a Sitului \"%s\""
 
-#, fuzzy
 msgid "Pages"
-msgstr "Pagină"
+msgstr "Pagini"
 
 msgid "Select Author"
-msgstr ""
+msgstr "Selectare Autor"
 
 msgid "Revert all!"
-msgstr ""
+msgstr "Revenire totală!"
 
 #, python-format
 msgid "[%d attachments]"
@@ -2747,17 +2714,17 @@
 msgid "You are not allowed to attach a file to this page."
 msgstr "Nu aveţi permisiunea de a ataşa un fişier la această pagină"
 
-#, fuzzy, python-format
+#, python-format
 msgid "Unsupported AttachFile sub-action: %s"
-msgstr "Este nepermisă acţiunea de trimitere date: %s"
+msgstr "Sub-acţiunea AttachFile este nepermisă: %s"
 
 #, python-format
 msgid "Attachments for \"%(pagename)s\""
 msgstr "Ataşamente pentru \"%(pagename)s\""
 
-#, fuzzy
 msgid "You are not allowed to overwrite a file attachment of this page."
-msgstr "Nu aveţi permisiunea de a viziona ataşamentele de pe această pagină."
+msgstr ""
+"Nu aveţi permisiunea de a suprascrie un ataşament de pe această pagină."
 
 msgid ""
 "No file content. Delete non ASCII characters from the file name and try "
@@ -2780,56 +2747,55 @@
 msgid "You are not allowed to delete attachments on this page."
 msgstr "Nu aveţi permisiunea de a şterge ataşamentele de pe această pagină."
 
-#, fuzzy, python-format
+#, python-format
 msgid "Attachment '%(new_pagename)s/%(new_filename)s' already exists."
-msgstr "Ataşamentul '%(filename)s' a fost instalat."
-
-#, fuzzy, python-format
+msgstr "Ataşamentul '%(new_pagename)s/%(new_filename)s' există deja."
+
+#, python-format
 msgid ""
 "Attachment '%(pagename)s/%(filename)s' moved to '%(new_pagename)s/%"
 "(new_filename)s'."
-msgstr "Ataşamentul '%(filename)s' nu există!"
+msgstr ""
+"Ataşamentul '%(pagename)s/%(filename)s' a fost mutat la '%(new_pagename)s/%"
+"(new_filename)s'."
 
 msgid "Nothing changed"
-msgstr ""
+msgstr "Nu s-a modificat nimic"
 
 #, python-format
 msgid "Page '%(new_pagename)s' does not exist or you don't have enough rights."
 msgstr ""
 
 msgid "Move aborted!"
+msgstr "Mutare anulată!"
+
+msgid "Please use the interactive user interface to move attachments!"
 msgstr ""
-
-#, fuzzy
-msgid "Please use the interactive user interface to move attachments!"
-msgstr "Folosiţi interfaţa interactivă cu utilizatorul pentru a şterge pagini!"
-
-#, fuzzy
+"Vă rugăm să folosiţi interfaţa interactivă pentru mutarea ataşamentelor!"
+
 msgid "You are not allowed to move attachments from this page."
-msgstr "Nu aveţi permisiunea de a obţine ataşamentele de pe această pagină."
-
-#, fuzzy
+msgstr "Nu aveţi permisiunea de a muta ataşamentele de pe această pagină."
+
 msgid "Move aborted because new page name is empty."
-msgstr "Nu puteţi salva pagini goale."
-
-#, fuzzy, python-format
+msgstr "Mutarea a fost anulată deoarece noua denumire a paginii este vidă."
+
+#, python-format
 msgid "Please use a valid filename for attachment '%(filename)s'."
-msgstr "Trimiterea ataşamentului '%(filename)s'."
-
-#, fuzzy
+msgstr ""
+"Vă rugăm să folosiţi un nume valid de vişier pentru ataşamentul '%(filename)"
+"s'."
+
 msgid "Move aborted because new attachment name is empty."
-msgstr "Nu puteţi salva pagini goale."
+msgstr "Mutarea a fost anulată deoarece noul nume al ataşamentului este vid."
 
 msgid "Move"
-msgstr ""
-
-#, fuzzy
+msgstr "Mutare"
+
 msgid "New page name"
-msgstr "Nume nou"
-
-#, fuzzy
+msgstr "Nume pagină nouă"
+
 msgid "New attachment name"
-msgstr "Ataşament Nou"
+msgstr "Nume ataşament nou"
 
 msgid "You are not allowed to get attachments from this page."
 msgstr "Nu aveţi permisiunea de a obţine ataşamentele de pe această pagină."
@@ -2873,9 +2839,9 @@
 "prea mari, sunt doar fişiere .zip, există deja sau sunt poziţionate în "
 "directoare."
 
-#, fuzzy, python-format
+#, python-format
 msgid "The file %(filename)s is not a .zip file."
-msgstr "Fişierul %(target)s nu este un fişier .zip."
+msgstr "Fişierul %(filename)s nu este un fişier .zip."
 
 #, python-format
 msgid "Attachment '%(filename)s'"
@@ -2927,32 +2893,31 @@
 msgid "Inlined image: %(url)s"
 msgstr ""
 
-#, fuzzy, python-format
+#, python-format
 msgid "Create new drawing \"%(filename)s (opens in new window)\""
-msgstr "Creare desen nou \"%(filename)s\""
-
-#, fuzzy, python-format
+msgstr "Creare desen nou \"%(filename)s (se deschide în fereastră nouă)\""
+
+#, python-format
 msgid "Edit drawing %(filename)s (opens in new window)"
-msgstr "Editare desen %(filename)s"
-
-#, fuzzy, python-format
+msgstr "Editare desen %(filename)s (se deschide în fereastră nouă)"
+
+#, python-format
 msgid "Clickable drawing: %(filename)s"
-msgstr "Editare desen %(filename)s"
+msgstr "Desen clicabil: %(filename)s"
 
 msgid "Toggle line numbers"
-msgstr ""
+msgstr "Comutare numerotare linii"
 
 #, python-format
 msgid "Unknown action %(action_name)s."
-msgstr ""
-
-#, fuzzy, python-format
+msgstr "Acţiune necunoscută %(action_name)s."
+
+#, python-format
 msgid "You are not allowed to do %(action_name)s on this page."
-msgstr "Nu aveţi permisiunea de a salva un desen pe această pagină."
-
-#, fuzzy
+msgstr "Nu aveţi permisiunea de %(action_name)s pe această pagină."
+
 msgid "Login and try again."
-msgstr " %s şi încercaţi din nou."
+msgstr "Înregistraţi-vă şi încercaţi din nou."
 
 #, fuzzy
 #~ msgid "New Page or New Attachment"
--- a/MoinMoin/i18n/ru.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/ru.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2006-06-26 21:43-0800\n"
 "Last-Translator: Mike Rovner <mrovner@hotmail.com>\n"
 "Language-Team: Russian <moin-devel@lists.sourceforge.net>\n"
@@ -52,7 +52,8 @@
 "Кто-то запросил отправку вам строки сброса пароля.\n"
 "\n"
 "Если вы забыли ваш пароль, пожалуйста, пройдите по ссылке ниже или\n"
-"снова посетите страницу восстановления пароля и введите ваше имя пользователя и\n"
+"снова посетите страницу восстановления пароля и введите ваше имя "
+"пользователя и\n"
 "строку сброса пароля.\n"
 
 #, python-format
@@ -586,6 +587,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Отсутствует пароль. Пожалуйста, введите имя пользователя и пароль"
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr "Вам необходимо войти в систему."
 
@@ -594,8 +599,9 @@
 "If you do not have an account, <a href=\"%(userprefslink)s\">you can create "
 "one now</a>. <a href=\"%(sendmypasswordlink)s\">Forgot your password?</a>"
 msgstr ""
-"Если у вас нет учетной записи, <a href=\"%(userprefslink)s\">вы можете создать его "
-"сейчас</a>. <a href=\"%(sendmypasswordlink)s\">Забыли ваш пароль?</a>"
+"Если у вас нет учетной записи, <a href=\"%(userprefslink)s\">вы можете "
+"создать его сейчас</a>. <a href=\"%(sendmypasswordlink)s\">Забыли ваш пароль?"
+"</a>"
 
 msgid ""
 "Please choose an account name now.\n"
@@ -617,8 +623,8 @@
 msgstr ""
 "Выбранное вами имя пользователя уже используется\n"
 "Если это ваше имя, введите пароль для него чтобы связать его с OpenID.\n"
-"В ином случае, пожалуйста, выберите другое имя пользователя и оставьте "
-"поле пароля пустым."
+"В ином случае, пожалуйста, выберите другое имя пользователя и оставьте поле "
+"пароля пустым."
 
 msgid "Associate this name"
 msgstr "Связать это имя"
@@ -661,8 +667,8 @@
 "If you do not have an account yet, you can still log in with your OpenID and "
 "create one during login."
 msgstr ""
-"Если у вас до сих пор не заведена учетная запись, вы все-равно можете войти по "
-"вашему OpenID и создать учетную запись во время входа."
+"Если у вас до сих пор не заведена учетная запись, вы все-равно можете войти "
+"по вашему OpenID и создать учетную запись во время входа."
 
 msgid "Failed to connect to database."
 msgstr "Ошибка при соединении с базой данных."
@@ -1031,14 +1037,15 @@
 "Before you can be notified, you need to provide a way to contact you in the "
 "general preferences."
 msgstr ""
-"Прежде чем вы сможете получать уведомления, вам необходимо предоставить ваши контакты "
-"в общих настройках."
+"Прежде чем вы сможете получать уведомления, вам необходимо предоставить ваши "
+"контакты в общих настройках."
 
 msgid "Subscribed events"
 msgstr "Подписанные события"
 
 msgid "Subscribed wiki pages<<BR>>(one regex per line)"
-msgstr "Подписанные вики-страницы<<BR>(по одному регулярному выражению в строчке)"
+msgstr ""
+"Подписанные вики-страницы<<BR>(по одному регулярному выражению в строчке)"
 
 msgid "Save"
 msgstr "Записать"
@@ -1075,8 +1082,8 @@
 "You can now change the settings of the selected user account; log out to get "
 "back to your account."
 msgstr ""
-"Вы можете изменить настройки выбранной учетной записи; выйдите чтобы получить вашу "
-"учетную запись обратно."
+"Вы можете изменить настройки выбранной учетной записи; выйдите чтобы "
+"получить вашу учетную запись обратно."
 
 msgid "You are the only user."
 msgstr "Вы единственный пользователь."
@@ -1084,14 +1091,14 @@
 msgid ""
 "As a superuser, you can temporarily assume the identity of another user."
 msgstr ""
-"Вы можете временно становиться другим пользователем, будучи суперпользователем."
+"Вы можете временно становиться другим пользователем, будучи "
+"суперпользователем."
 
 msgid "Select User"
 msgstr "Выберите пользователя"
 
 msgid "OpenID settings"
-msgstr ""
-"Настройки OpenID"
+msgstr "Настройки OpenID"
 
 msgid "Cannot remove all OpenIDs."
 msgstr "Не могу удалить все OpenID."
@@ -1212,7 +1219,8 @@
 msgstr ""
 "Дорогой пользователь Wiki,\n"
 "\n"
-"Вы подписаны на уведомления об изменениях страницы или категории на \"%(sitename)s\".\n"
+"Вы подписаны на уведомления об изменениях страницы или категории на \"%"
+"(sitename)s\".\n"
 "\n"
 "Страница \"%(pagename)s\" была изменена %(editor)s:\n"
 
@@ -1234,7 +1242,8 @@
 msgstr ""
 "Дорогой пользователь Wiki,\n"
 "\n"
-"Вы подписаны на уведомления об изменениях страницы или категории на \"%(sitename)s\".\n"
+"Вы подписаны на уведомления об изменениях страницы или категории на \"%"
+"(sitename)s\".\n"
 "\n"
 "Страница \"%(pagename)s\" была удалена %(editor)s:\n"
 "\n"
@@ -1251,7 +1260,8 @@
 msgstr ""
 "Дорогой пользователь Wiki,\n"
 "\n"
-"Вы подписаны на уведомления об изменениях страницы или категории на \"%(sitename)s\".\n"
+"Вы подписаны на уведомления об изменениях страницы или категории на \"%"
+"(sitename)s\".\n"
 "\n"
 "Страница \"%(pagename)s\" была переименована из \"%(oldname)s\" %(editor)s:\n"
 "\n"
@@ -1267,7 +1277,8 @@
 "    User name: %(username)s\n"
 "    Email address: %(useremail)s"
 msgstr ""
-"Дорогой суперюзер, только что был добавлен новый пользователь. Детали произошедшего:\n"
+"Дорогой суперюзер, только что был добавлен новый пользователь. Детали "
+"произошедшего:\n"
 "\n"
 "    Имя пользователя: %(username)s\n"
 "    Адрес электропочты: %(useremail)s"
@@ -1289,9 +1300,9 @@
 msgstr ""
 "Дорогой пользователь вики,\n"
 "\n"
-"Вы подписаны на уведомление об изменениях вики-странички \"%(page_name)s\" "
-"К этой странице пользователем %(editor)s было добавлено вложение. "
-"Доступна следующая детальная информация:\n"
+"Вы подписаны на уведомление об изменениях вики-странички \"%(page_name)s\" К "
+"этой странице пользователем %(editor)s было добавлено вложение. Доступна "
+"следующая детальная информация:\n"
 "\n"
 "Имя вложения: %(attach_name)s\n"
 "Размер вложения: %(attach_size)s\n"
@@ -1338,14 +1349,6 @@
 "Ссылка на вложение: %(attach)s\n"
 "Ссылка на страницу: %(page)s\n"
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr "Ошибка XML RPC: %s"
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr "Ошибка низкоуровневой коммуникации: %s"
-
 msgid "Attachment link"
 msgstr "Ссылка на вложение"
 
@@ -1826,6 +1829,14 @@
 msgstr "Пожалуйста уточните термин поискового запроса, вместо {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Ваш поисковый запрос {{{\"%s\"}}} неправильный. Пожалуйста обратитесь к "
+"ПомощьВПоиске для дальнейшей информации."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Загрузить новое вложение \"%(filename)s\""
 
@@ -1834,8 +1845,8 @@
 "%(extension_name)s %(extension_type)s: Required argument %(argument_name)s "
 "missing."
 msgstr ""
-"%(extension_name)s %(extension_type)s: Отсутствует необходимый аргумент "
-"%(argument_name)s."
+"%(extension_name)s %(extension_type)s: Отсутствует необходимый аргумент %"
+"(argument_name)s."
 
 #, python-format
 msgid ""
@@ -1850,8 +1861,8 @@
 "Current configuration does not allow embedding of the file %(file)s because "
 "of its mimetype %(mimetype)s."
 msgstr ""
-"Текующая конфигурация не позволяет встраивать файл %(file)s из-за его MIME-типа "
-"%(mimetype)s."
+"Текующая конфигурация не позволяет встраивать файл %(file)s из-за его MIME-"
+"типа %(mimetype)s."
 
 msgid "Embedded"
 msgstr "Встроенный"
@@ -2098,8 +2109,10 @@
 msgstr ""
 "\n"
 "Если вы согласитесь, этот сайт, будучи представленным этим trust root будет\n"
-"считать, что вы контролируете идентификационный URL: %s. (Если вы используете\n"
-"делегированнную идентификацию, этот сайт сам позаботиться о разрешении делегации.)"
+"считать, что вы контролируете идентификационный URL: %s. (Если вы "
+"используете\n"
+"делегированнную идентификацию, этот сайт сам позаботиться о разрешении "
+"делегации.)"
 
 msgid "Trust root"
 msgstr "Trust root"
@@ -2341,8 +2354,7 @@
 msgstr "Не могу удалить подписку по регулярному выражению!"
 
 msgid "Edit the subscription regular expressions in your settings."
-msgstr ""
-"Отредактируйте регулярные выражения подписки в ваших настройках."
+msgstr "Отредактируйте регулярные выражения подписки в ваших настройках."
 
 msgid "You need to be subscribed to unsubscribe."
 msgstr "Вы должны быть подписаны, чтобы отписаться."
@@ -2404,8 +2416,8 @@
 "name, you can also upload content for another page. If the page name is "
 "empty, we derive the page name from the file name."
 msgstr ""
-"Ниже вы можете загрузить содержание для этой страницы. Если вы измените "
-"имя этой страницы, вы также сможете загрузить содержание для другой страницы. "
+"Ниже вы можете загрузить содержание для этой страницы. Если вы измените имя "
+"этой страницы, вы также сможете загрузить содержание для другой страницы. "
 "Если имя страницы не указано, оно будет дедуцировано из имени файла."
 
 msgid "File to load page content from"
@@ -2430,8 +2442,8 @@
 "Add your email address or Jabber ID in your user settings to use "
 "subscriptions."
 msgstr ""
-"Чтобы воспользоваться подпиской, добавьте адрес вашей электронной "
-"почты или Jabber ID в ваших настройках."
+"Чтобы воспользоваться подпиской, добавьте адрес вашей электронной почты или "
+"Jabber ID в ваших настройках."
 
 msgid "You are already subscribed to this page."
 msgstr "Вы уже подписаны на эту страницу."
@@ -2560,14 +2572,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Ваш поисковый запрос {{{\"%s\"}}} неправильный. Пожалуйста обратитесь к "
-"ПомощьВПоиске для дальнейшей информации."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
@@ -2646,8 +2650,8 @@
 
 msgid "If this account exists an email was sent."
 msgstr ""
-"Если учетная запись с этим именем пользователя существует, то сообщение "
-"было отправлено"
+"Если учетная запись с этим именем пользователя существует, то сообщение было "
+"отправлено"
 
 msgid ""
 "This wiki is not enabled for mail processing.\n"
@@ -2706,10 +2710,13 @@
 msgstr ""
 "\n"
 "== Восстановление забытого пароля ==\n"
-"Если вы забыли ваш пароль, введите адрес вашей электронной почты или имя пользователя\n"
+"Если вы забыли ваш пароль, введите адрес вашей электронной почты или имя "
+"пользователя\n"
 "и кликните по '''Отправить мне данные моей учетной записи'''.\n"
-"Вы получите почтовое сообщение, содержащее строку восстановления, которая может\n"
-"быть использована для смены вашего пароля. Сообщение также будет содержать дальнейшие\n"
+"Вы получите почтовое сообщение, содержащее строку восстановления, которая "
+"может\n"
+"быть использована для смены вашего пароля. Сообщение также будет содержать "
+"дальнейшие\n"
 "инструкции."
 
 msgid ""
@@ -2843,7 +2850,8 @@
 msgid ""
 "Attachment '%(pagename)s/%(filename)s' moved to '%(new_pagename)s/%"
 "(new_filename)s'."
-msgstr "Вложение '%(pagename)s/%(filename)s' перемещено на %(new_pagename)s/%"
+msgstr ""
+"Вложение '%(pagename)s/%(filename)s' перемещено на %(new_pagename)s/%"
 "(new_filename)s'."
 
 msgid "Nothing changed"
@@ -2851,7 +2859,8 @@
 
 #, python-format
 msgid "Page '%(new_pagename)s' does not exist or you don't have enough rights."
-msgstr "Страница '%(new_pagename)s' не существует или у вас нет достаточных прав."
+msgstr ""
+"Страница '%(new_pagename)s' не существует или у вас нет достаточных прав."
 
 msgid "Move aborted!"
 msgstr "Перемещение отменено!"
@@ -2997,6 +3006,12 @@
 msgid "Login and try again."
 msgstr "Войдите и повторите еще раз."
 
+#~ msgid "XML RPC error: %s"
+#~ msgstr "Ошибка XML RPC: %s"
+
+#~ msgid "Low-level communication error: %s"
+#~ msgstr "Ошибка низкоуровневой коммуникации: %s"
+
 #~ msgid "New Page or New Attachment"
 #~ msgstr "Новая страница или вложение"
 
--- a/MoinMoin/i18n/sl.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/sl.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
-"PO-Revision-Date: 2008-05-19 21:20+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
+"PO-Revision-Date: 2008-05-23 03:00+0200\n"
 "Last-Translator: Mark Martinec <Mark.Martinec@ijs.si>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -189,7 +189,8 @@
 
 #, python-format
 msgid "Argument \"%s\" must be a boolean value, not \"%s\""
-msgstr "Argument \"%s\" mora biti boolovega tipa (resnično/neresnično) in ne \"%s\""
+msgstr ""
+"Argument \"%s\" mora biti boolovega tipa (resnično/neresnično) in ne \"%s\""
 
 #, python-format
 msgid "Argument must be a boolean value, not \"%s\""
@@ -418,7 +419,9 @@
 msgstr "Ime teme (izgleda) ni nastavljeno."
 
 msgid "Installing theme files is only supported for standalone type servers."
-msgstr "Namestitev datotek teme (izgleda) je podprto le za samostoječi tip strežnikov."
+msgstr ""
+"Namestitev datotek teme (izgleda) je podprto le za samostoječi tip "
+"strežnikov."
 
 #, python-format
 msgid "Installation of '%(filename)s' failed."
@@ -448,13 +451,13 @@
 
 #, python-format
 msgid "Invalid highlighting regular expression \"%(regex)s\": %(error)s"
-msgstr "Neveljaven regularni izraz za poudarjanje besedila \"%(regex)s\": %(error)s"
+msgstr ""
+"Neveljaven regularni izraz za poudarjanje besedila \"%(regex)s\": %(error)s"
 
 msgid ""
 "The backed up content of this page is deprecated and will not be included in "
 "search results!"
-msgstr ""
-"Vsebina varnostne kopije je zastarela in ne bo upoštevana pri iskanju!"
+msgstr "Vsebina varnostne kopije je zastarela in ne bo upoštevana pri iskanju!"
 
 #, python-format
 msgid "Revision %(rev)d as of %(date)s"
@@ -573,6 +576,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Manjka geslo. Prosimo vnesite uporabniško ime in geslo."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr "Treba se je prijaviti."
 
@@ -581,8 +588,8 @@
 "If you do not have an account, <a href=\"%(userprefslink)s\">you can create "
 "one now</a>. <a href=\"%(sendmypasswordlink)s\">Forgot your password?</a>"
 msgstr ""
-"Če ga še nimate, lahko <a href=\"%(userprefslink)s\">ustvarite uporabniški račun"
-"</a>. <a href=\"%(sendmypasswordlink)s\">Ste pozabili geslo?</a>"
+"Če ga še nimate, lahko <a href=\"%(userprefslink)s\">ustvarite uporabniški "
+"račun</a>. <a href=\"%(sendmypasswordlink)s\">Ste pozabili geslo?</a>"
 
 msgid ""
 "Please choose an account name now.\n"
@@ -647,8 +654,8 @@
 "If you do not have an account yet, you can still log in with your OpenID and "
 "create one during login."
 msgstr ""
-"Tudi če še nimate uporabniškega računa se lahko prijavite s svojim OpenID "
-"in ustvarite račun med postopkom prijave."
+"Tudi če še nimate uporabniškega računa se lahko prijavite s svojim OpenID in "
+"ustvarite račun med postopkom prijave."
 
 msgid "Failed to connect to database."
 msgstr "Neuspešna priključitev na podatkovno bazo."
@@ -770,7 +777,7 @@
 msgstr "Izgled za tiskanje"
 
 msgid "Delete Cache"
-msgstr "Izprazni shrambo"
+msgstr "Počisti shrambo"
 
 msgid "Rename Page"
 msgstr "Preimenuj stran"
@@ -797,7 +804,7 @@
 msgstr "Odstrani spam"
 
 msgid "Revert to this revision"
-msgstr "Povrni v stanje različice %(rev)d."
+msgstr "Povrni v to različico"
 
 msgid "Package Pages"
 msgstr "Spakiraj v ZIP"
@@ -840,7 +847,7 @@
 msgstr "Označevanje viki"
 
 msgid "DeleteCache"
-msgstr "IzprazniShrambo"
+msgstr "PočistiShrambo"
 
 #, python-format
 msgid "(cached %s)"
@@ -995,7 +1002,7 @@
 "tem vikiju."
 
 msgid "Notification"
-msgstr "Obvestilo"
+msgstr "Obvestila"
 
 msgid "Notification settings saved!"
 msgstr "Nastavitev obvestil shranjena!"
@@ -1060,8 +1067,8 @@
 "You can now change the settings of the selected user account; log out to get "
 "back to your account."
 msgstr ""
-"Sedaj lahko spremenite nastavitve izbranega uporabniškega računa. "
-"Za vrnitev na svoj uporabniški račun se odjavite."
+"Sedaj lahko spremenite nastavitve izbranega uporabniškega računa. Za vrnitev "
+"na svoj uporabniški račun se odjavite."
 
 msgid "You are the only user."
 msgstr "Ste edini uporabnik."
@@ -1069,7 +1076,8 @@
 msgid ""
 "As a superuser, you can temporarily assume the identity of another user."
 msgstr ""
-"Kot administrator (superuser) lahko začasno prevzamete identiteto drugega uporabnika."
+"Kot administrator (superuser) lahko začasno prevzamete identiteto drugega "
+"uporabnika."
 
 msgid "Select User"
 msgstr "Izberi uporabnika"
@@ -1221,8 +1229,8 @@
 msgstr ""
 "Dragi uporabnik vikija,\n"
 "\n"
-"Naročeni ste na obvestila o spremembah viki strani na "
-"strežniku \"%(sitename)s\".\n"
+"Naročeni ste na obvestila o spremembah viki strani na strežniku \"%(sitename)"
+"s\".\n"
 "\n"
 "Stran \"%(pagename)s\" je zbrisal %(editor)s:\n"
 "\n"
@@ -1239,8 +1247,8 @@
 msgstr ""
 "Dragi uporabnik vikija,\n"
 "\n"
-"Naročeni ste na obvestila o spremembah viki strani na "
-"strežniku \"%(sitename)s\".\n"
+"Naročeni ste na obvestila o spremembah viki strani na strežniku \"%(sitename)"
+"s\".\n"
 "\n"
 "Stran \"%(pagename)s\" je %(editor)s preimenoval iz \"%(oldname)s\":\n"
 "\n"
@@ -1256,7 +1264,8 @@
 "    User name: %(username)s\n"
 "    Email address: %(useremail)s"
 msgstr ""
-"Dragi administrator, pravkar je bil narejen nov uporabniški račun. Tule so podrobnosti:\n"
+"Dragi administrator, pravkar je bil narejen nov uporabniški račun. Tule so "
+"podrobnosti:\n"
 "\n"
 "    Uporabniško ime: %(username)s\n"
 "    E-poštni naslov: %(useremail)s"
@@ -1278,8 +1287,8 @@
 msgstr ""
 "Dragi uporabnik vikija,\n"
 "\n"
-"Naročeni ste na obvestila o spremembah za stran \"%(page_name)s\". "
-"Strani je %(editor)s dodal priponko. Podrobnosti:\n"
+"Naročeni ste na obvestila o spremembah za stran \"%(page_name)s\". Strani je "
+"%(editor)s dodal priponko. Podrobnosti:\n"
 "\n"
 "Ime priponke: %(attach_name)s\n"
 "Velikost priponke: %(attach_size)s\n"
@@ -1328,14 +1337,6 @@
 "Povezava na priponko: %(attach)s\n"
 "Povezava na stran: %(page)s\n"
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr "Napaka pri XML RPC: %s"
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr "Nizkonivojska komunikacijska napaka: %s"
-
 msgid "Attachment link"
 msgstr "Povezava na priponko"
 
@@ -1355,7 +1356,9 @@
 msgstr "Navesti je treba izhodno datoteko!"
 
 msgid "No pages specified using --pages or --search, assuming full package."
-msgstr "Nobena stran ni bila navedena s --pages ali --search opcijo, predpostavljam celotni paket."
+msgstr ""
+"Nobena stran ni bila navedena s --pages ali --search opcijo, predpostavljam "
+"celotni paket."
 
 msgid "Output file already exists! Cowardly refusing to continue!"
 msgstr "Izhodna datoteka že obstaja! Za vsak primer ukaz ne bo izvršen!"
@@ -1432,13 +1435,13 @@
 "kurziva'''''<<Verbatim(''''')>>; <<Verbatim('')>>''mešano ''<<Verbatim(''')"
 ">>'''''polkrepko'''<<Verbatim(''')>> in kurziva''<<Verbatim('')>>; <<Verbatim"
 "(----)>> horizontalna črta.\n"
-" Naslovi:: = Naslov 1 =; == N-2 ==; === N-3 ===; ==== N-4 ====; "
-"===== N-5 =====.\n"
+" Naslovi:: = Naslov 1 =; == N-2 ==; === N-3 ===; ==== N-4 ====; ===== N-5 "
+"=====.\n"
 " Seznami:: presledek in en znak izmed: * pike; 1., a., A., i., I. "
 "oštevilčene alineje; 1.#n začni številčenje z n; en presledek zamakne "
 "besedilo.\n"
-" Povezave:: <<Verbatim(SkupajPisaneKapitaliziraneBesede)>>; "
-"<<Verbatim([[povezava|besedilo]])>>.\n"
+" Povezave:: <<Verbatim(SkupajPisaneKapitaliziraneBesede)>>; <<Verbatim"
+"([[povezava|besedilo]])>>.\n"
 " Tabele:: || besedilo celice |||| besedilo celice prek dveh stolpcev ||;    "
 "na koncu vrstic z naslovi ali elementi tabele presledki niso dovoljeni.\n"
 "\n"
@@ -1503,12 +1506,14 @@
 ">>'''''polkrepko'''<<Verbatim(**)>> in kurziva''<<Verbatim(//)>>;\n"
 " Vodoravna črta:: <<Verbatim(----)>>\n"
 " Nova vrsta:: <<Verbatim(\\\\)>>\n"
-" Naslovi:: = Naslov-1 =; == N-2 ==; === N-3 ===; ==== N-4 ====; "
-"===== N-5 =====.\n"
+" Naslovi:: = Naslov-1 =; == N-2 ==; === N-3 ===; ==== N-4 ====; ===== N-5 "
+"=====.\n"
 " Seznami:: * točke; ** podtočke; # oštevilčene alineje; ## oštevilčene "
 "podalineje.\n"
-" Povezave:: <<Verbatim([[povezava]])>>; <<Verbatim([[povezava|besedilo]])>>.\n"
-" Tabele:: |= besedilo naslova | besedilo celice | besedilo naslednje celice |;\n"
+" Povezave:: <<Verbatim([[povezava]])>>; <<Verbatim([[povezava|besedilo]])"
+">>.\n"
+" Tabele:: |= besedilo naslova | besedilo celice | besedilo naslednje celice "
+"|;\n"
 "\n"
 "(!) Več o tem: HelpOnEditing, HelpOnCreoleSyntax.\n"
 
@@ -1526,7 +1531,7 @@
 msgstr "Po prijavi skoči na zadnjo obiskano stran"
 
 msgid "Show comment sections"
-msgstr "Prikaži sekcijo s komentarji"
+msgstr "Prikaži razdelke z opombami"
 
 msgid "Show question mark for non-existing pagelinks"
 msgstr "Označi neobstoječe povezave z vprašajem"
@@ -1565,7 +1570,7 @@
 msgstr "URL uporabnikovega CSS stila"
 
 msgid "(Leave it empty for disabling user CSS)"
-msgstr "(prazno polje izklopi upor. CSS)"
+msgstr "(prazno polje izklopi uporabnikov CSS)"
 
 msgid "Editor size"
 msgstr "Velikost področja za urejanje"
@@ -1804,6 +1809,14 @@
 msgstr "Uporabite selektivnejše iskalno geslo namesto {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Iskalni izraz {{{\"%s\"}}} ni veljaven. Več informacij o iskanju: "
+"HelpOnSearching."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Naloži novo priponko \"%(filename)s\" na strežnik"
 
@@ -1827,8 +1840,8 @@
 "Current configuration does not allow embedding of the file %(file)s because "
 "of its mimetype %(mimetype)s."
 msgstr ""
-"Trenutne nastavitve ne dovoljujejo neposrednega vključevanja datoteke %(file)s "
-"zaradi njenega tipa MIME %(mimetype)s."
+"Trenutne nastavitve ne dovoljujejo neposrednega vključevanja datoteke %(file)"
+"s zaradi njenega tipa MIME %(mimetype)s."
 
 msgid "Embedded"
 msgstr "Vgrajen"
@@ -1904,8 +1917,8 @@
 "<<BR>> /!\\ You should trust both wikis because the password could be read "
 "by the particular administrators."
 msgstr ""
-"Spodaj vnesite svoje geslo na oddaljenem vikiju. <<BR>> /!\\ Oba vikija morata "
-"biti zaupanja vredna, saj lahko geslo prebere administrator enega ali "
+"Spodaj vnesite svoje geslo na oddaljenem vikiju. <<BR>> /!\\ Oba vikija "
+"morata biti zaupanja vredna, saj lahko geslo prebere administrator enega ali "
 "drugega vikija."
 
 msgid "Operation was canceled."
@@ -1955,7 +1968,8 @@
 #, python-format
 msgid "Skipped page %s because of no write access to local page."
 msgstr ""
-"Stran %s preskočena zaradi pomankanja pravic za pisalni dostop do lokalne strani."
+"Stran %s preskočena zaradi pomankanja pravic za pisalni dostop do lokalne "
+"strani."
 
 #, python-format
 msgid "Deleted page %s locally."
@@ -2078,7 +2092,8 @@
 "delegation on its own.)"
 msgstr ""
 "\n"
-"Če se strinjate, bo sporočeno strežniku ki ga predstavlja koren drevesa zaupanj,\n"
+"Če se strinjate, bo sporočeno strežniku ki ga predstavlja koren drevesa "
+"zaupanj,\n"
 "da nadzorujete identiteto URL-ja %s. (Če uporabljate delegirano identiteto,\n"
 "bo strežnik samodejno poskrbel za povratno delegiranje.)"
 
@@ -2165,7 +2180,8 @@
 "Restored Backup: %(filename)s to target dir: %(targetdir)s.\n"
 "Files: %(filecount)d, Directories: %(dircount)d"
 msgstr ""
-"Povrnjeno iz varnostne kopije %(filename)s v datotečni imenik: %(targetdir)s.\n"
+"Povrnjeno iz varnostne kopije %(filename)s v datotečni imenik: %(targetdir)"
+"s.\n"
 "Datotek: %(filecount)d, Imenikov: %(dircount)d"
 
 #, python-format
@@ -2385,8 +2401,8 @@
 "empty, we derive the page name from the file name."
 msgstr ""
 "Naložite lahko vsebino spodaj imenovane strani. Če spremenite ime strani "
-"lahko naložite tudi vsebino kakšne druge strani. Če je ime strani prazno, "
-"se ime strani določi iz imena datoteke."
+"lahko naložite tudi vsebino kakšne druge strani. Če je ime strani prazno, se "
+"ime strani določi iz imena datoteke."
 
 msgid "File to load page content from"
 msgstr "Datoteka iz katere bo naložena vsebina strani"
@@ -2410,8 +2426,8 @@
 "Add your email address or Jabber ID in your user settings to use "
 "subscriptions."
 msgstr ""
-"Vpišite svoj e-poštni naslov ali Jabber naslov v uporabniško nastavitveno stran, "
-"če se želite naročiti na obvestila."
+"Vpišite svoj e-poštni naslov ali Jabber naslov v uporabniško nastavitveno "
+"stran, če se želite naročiti na obvestila."
 
 msgid "You are already subscribed to this page."
 msgstr "Na obvestila o spremembah te strani ste že naročeni."
@@ -2540,14 +2556,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Iskalni izraz {{{\"%s\"}}} ni veljaven. Več informacij o iskanju: "
-"HelpOnSearching."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
@@ -2699,7 +2707,8 @@
 msgstr ""
 "\n"
 "=== Nastavitev gesla na začetno stanje ===\n"
-"Spodaj vnesite žeton za rešitev gesla, ki ste ga prejeli v e-poštnem sporočilu,\n"
+"Spodaj vnesite žeton za rešitev gesla, ki ste ga prejeli v e-poštnem "
+"sporočilu,\n"
 "svoje uporabniško ime in novo geslo (dvakrat) ."
 
 #, python-format
@@ -2790,7 +2799,8 @@
 msgstr "Priponke na strani \"%(pagename)s\""
 
 msgid "You are not allowed to overwrite a file attachment of this page."
-msgstr "Datotečne priponke na tej strani vam ni dovoljeno prepisati z novo vsebino."
+msgstr ""
+"Datotečne priponke na tej strani vam ni dovoljeno prepisati z novo vsebino."
 
 msgid ""
 "No file content. Delete non ASCII characters from the file name and try "
@@ -2822,8 +2832,8 @@
 "Attachment '%(pagename)s/%(filename)s' moved to '%(new_pagename)s/%"
 "(new_filename)s'."
 msgstr ""
-"Priponka '%(pagename)s/%(filename)s' je bila prestavljena v '%(new_pagename)s/%"
-"(new_filename)s'."
+"Priponka '%(pagename)s/%(filename)s' je bila prestavljena v '%(new_pagename)"
+"s/%(new_filename)s'."
 
 msgid "Nothing changed"
 msgstr "Ni spremembe"
@@ -2978,3 +2988,9 @@
 
 msgid "Login and try again."
 msgstr "Prijavite se in poskusite ponovno."
+
+#~ msgid "XML RPC error: %s"
+#~ msgstr "Napaka pri XML RPC: %s"
+
+#~ msgid "Low-level communication error: %s"
+#~ msgstr "Nizkonivojska komunikacijska napaka: %s"
--- a/MoinMoin/i18n/sr.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/sr.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-05-12 15:58-0400\n"
 "Last-Translator: Igor Miletic <grejigl-gnomeprevod@yahoo.ca>\n"
 "Language-Team: Serbian <fedora-trans-sr@redhat.com>\n"
@@ -583,6 +583,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Недостаје лозинка. Упишите корисничко име и лозинку."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr "Морате се пријавити."
 
@@ -1339,14 +1343,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Прилози"
@@ -1830,6 +1826,14 @@
 msgstr "Користите пробрљивији израз за претрагу уместо {{{„%s“}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Ваш упит претраге {{{„%s“}}} је неправилан. Обратите се на HelpOnSearching "
+"за више података."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Додај нови прилог „%(filename)s“"
 
@@ -2564,14 +2568,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Ваш упит претраге {{{„%s“}}} је неправилан. Обратите се на HelpOnSearching "
-"за више података."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/sv.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/sv.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-05-19 16:30+0200\n"
 "Last-Translator: thomas@marquart.se\n"
 "Language-Team: Swedish <moin-user@lists.sourceforge.net>\n"
@@ -36,8 +36,7 @@
 "\n"
 "Password reset URL: %s/?action=recoverpass&name=%s&token=%s\n"
 msgstr ""
-"Användarnamn: %s"
-"\n"
+"Användarnamn: %s\n"
 "Token för att återställa lösenord: %s\n"
 "\n"
 "URL för att återställa lösenord: %s/?action=recoverpass&name=%s&token=%s\n"
@@ -48,10 +47,13 @@
 "If you lost your password, please go to the password reset URL below or\n"
 "go to the password recovery page again and enter your username and the\n"
 "recovery token.\n"
-msgstr "Någon har bett att skicka en token för att återställa lösenordet till dig.\n"
+msgstr ""
+"Någon har bett att skicka en token för att återställa lösenordet till dig.\n"
 "\n"
-"Om du har glömt ditt lösenord, var god besök URL:en nedanför för att återställa den eller\n"
-"gå tillbaka till till återställningssidan och skriv in ditt användarnamn och\n"
+"Om du har glömt ditt lösenord, var god besök URL:en nedanför för att "
+"återställa den eller\n"
+"gå tillbaka till till återställningssidan och skriv in ditt användarnamn "
+"och\n"
 "token för återställning.\n"
 
 #, python-format
@@ -576,6 +578,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Lösenord saknas. Var god ange användarnamn och lösenord."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 msgid "You need to log in."
 msgstr "Du måste logga in."
 
@@ -1326,14 +1332,6 @@
 "Länk till bilagan: %(attach)s\n"
 "Länk till sidan: %(page)s\n"
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr "XML RPC fel: %s"
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr "Kommunikationsfel på låg nivå: %s"
-
 msgid "Attachment link"
 msgstr "Länk till bilaga"
 
@@ -1801,6 +1799,14 @@
 msgstr "Var god använd en mer specifik sökterm än {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Din sökningsförfrågan {{{\"%s\"}}} är ogiltig. Var god se HelpOnSearching "
+"för mer information."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Ladda upp ny bilaga \"%(filename)s\""
 
@@ -1989,8 +1995,9 @@
 msgid ""
 "The item %s was renamed locally. This is not implemented yet. Therefore the "
 "full synchronisation history is lost for this page."
-msgstr "%s har döpts om lokalt. Detta är inte implemenerat ännu. Därför "
-"har hela synkronisationshistoria till denna sida förlorats."
+msgstr ""
+"%s har döpts om lokalt. Detta är inte implemenerat ännu. Därför har hela "
+"synkronisationshistoria till denna sida förlorats."
 
 #, python-format
 msgid "Synchronising page %s with remote page %s ..."
@@ -2005,26 +2012,29 @@
 "The page %s could not be synced. The remote page was renamed. This is not "
 "supported yet. You may want to delete one of the pages to get it synced."
 msgstr ""
-"Sidan %s kunde inte synkroniseras. Den har döpts om på avlägsna sidan. Detta stöds inte "
-"ännu. Du vill nog ta bort en av de två sidor för att synkronisera."
+"Sidan %s kunde inte synkroniseras. Den har döpts om på avlägsna sidan. Detta "
+"stöds inte ännu. Du vill nog ta bort en av de två sidor för att synkronisera."
 
 #, python-format
 msgid "Skipped page %s because of a locally or remotely unresolved conflict."
-msgstr "Hoppade över sidan %s pga en olöst konflikt på avlägsna sidan eller lokalt."
+msgstr ""
+"Hoppade över sidan %s pga en olöst konflikt på avlägsna sidan eller lokalt."
 
 #, python-format
 msgid ""
 "This is the first synchronisation between the local and the remote wiki for "
 "the page %s."
 msgstr ""
-"Detta är den första synkroniseringen för sidan %s mellan den lokala och den avlägsna wikin."
+"Detta är den första synkroniseringen för sidan %s mellan den lokala och den "
+"avlägsna wikin."
 
 #, python-format
 msgid ""
 "The page %s could not be merged because you are not allowed to modify the "
 "page in the remote wiki."
 msgstr ""
-"Sidan %s kunde inte förenas för att du får inte ändra den i den avlägsna wikin."
+"Sidan %s kunde inte förenas för att du får inte ändra den i den avlägsna "
+"wikin."
 
 #, python-format
 msgid "Page %s successfully merged."
@@ -2067,8 +2077,10 @@
 "delegation on its own.)"
 msgstr ""
 "\n"
-"Om du godkänner, kommer sidan som representeras av förtroende-roten nedanför att\n"
-"få veta att du har makt över identitets-URL:en %s. (Om du änvänder en ombudsidentitet\n"
+"Om du godkänner, kommer sidan som representeras av förtroende-roten nedanför "
+"att\n"
+"få veta att du har makt över identitets-URL:en %s. (Om du änvänder en "
+"ombudsidentitet\n"
 "kommer sidan själv se till att ombudet löses upp.)"
 
 msgid "Trust root"
@@ -2225,8 +2237,7 @@
 
 #, python-format
 msgid "You are not allowed to use action %(actionname)s on this page!"
-msgstr ""
-"Du får inte använda åtgärden %(actionname)s på den här sidan!"
+msgstr "Du får inte använda åtgärden %(actionname)s på den här sidan!"
 
 #, python-format
 msgid "Please use the interactive user interface to use action %(actionname)s!"
@@ -2375,8 +2386,8 @@
 "empty, we derive the page name from the file name."
 msgstr ""
 "Du kan ladda upp innehåll för sidan som anges nedan. Om du döper om sidan "
-"kan du även ladda upp innehåll för en annan sida. Om sidnamnet är tom bestäms"
-"den utgående från filens namn."
+"kan du även ladda upp innehåll för en annan sida. Om sidnamnet är tom "
+"bestämsden utgående från filens namn."
 
 msgid "File to load page content from"
 msgstr "Fil för att ladda sidinnehåll ifrån"
@@ -2512,8 +2523,9 @@
 msgid ""
 "/!\\ The modification date you entered was not recognized and is therefore "
 "not considered for the search results!"
-msgstr "/!\\ Ändringsdatumet som du skrev in kändes inte igen och tas därför "
-"inte hänsyn till i sökresultaten!"
+msgstr ""
+"/!\\ Ändringsdatumet som du skrev in kändes inte igen och tas därför inte "
+"hänsyn till i sökresultaten!"
 
 #, python-format
 msgid "Title Search: \"%s\""
@@ -2529,18 +2541,11 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Din sökningsförfrågan {{{\"%s\"}}} är ogiltig. Var god se HelpOnSearching "
-"för mer information."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
-msgstr "Din sökningsförfrågan {{{\"%s\"}}} ledde inte till några resultat. Var "
-"god ändra vissa termer och se HelpOnSearching för mer information.%s"
+msgstr ""
+"Din sökningsförfrågan {{{\"%s\"}}} ledde inte till några resultat. Var god "
+"ändra vissa termer och se HelpOnSearching för mer information.%s"
 
 msgid "(!) Consider performing a"
 msgstr "(!) Överväg utföra en"
@@ -2968,6 +2973,12 @@
 msgid "Login and try again."
 msgstr "Logga in och försök igen."
 
+#~ msgid "XML RPC error: %s"
+#~ msgstr "XML RPC fel: %s"
+
+#~ msgid "Low-level communication error: %s"
+#~ msgstr "Kommunikationsfel på låg nivå: %s"
+
 #~ msgid "New Page or New Attachment"
 #~ msgstr "Ny sida eller ny bilaga"
 
--- a/MoinMoin/i18n/tr.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/tr.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin-1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-04-25 16:26+0300\n"
 "Last-Translator: Ekrem SEREN <ekrem.seren@parduslinux.org>\n"
 "Language-Team: Türkçe\n"
@@ -594,6 +594,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Parola eksik. Lütfen kullanıcı adı ve parolayı girin."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Çıkış yaptınız."
@@ -1344,14 +1348,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Ekler"
@@ -1825,6 +1821,14 @@
 msgstr "{{{\"%s\"}}} yerine daha seçici bir arama tümcesi kullanınız."
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"{{{\"%s\"}}} arama sorgunuz geçersiz. Lütfen yardım için HelpOnSearching "
+"sayfasına bakın."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Yeni ek dosya gönder \"%(filename)s\""
 
@@ -2549,14 +2553,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"{{{\"%s\"}}} arama sorgunuz geçersiz. Lütfen yardım için HelpOnSearching "
-"sayfasına bakın."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/uk.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/uk.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2007-11-10 16:50+0300\n"
 "Last-Translator: Maxim V. Dziumanenko <dziumanenko@softprom.kiev.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -580,6 +580,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Відсутній пароль. Введіть ім'я користувача й пароль."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Ви вийшли."
@@ -1321,14 +1325,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Вкладення"
@@ -1809,6 +1805,14 @@
 msgstr "Уточніть що шукати замість {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+"Запит пошуку {{{\"%s\"}}} є некоректним. Додаткову інформацію шукайте на "
+"сторінці ДовідкаПошук."
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Відвантажити нове вкладення \"%(filename)s\""
 
@@ -2525,14 +2529,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-"Запит пошуку {{{\"%s\"}}} є некоректним. Додаткову інформацію шукайте на "
-"сторінці ДовідкаПошук."
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/vi.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/vi.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2004-11-19 21:03+0800\n"
 "Last-Translator: Nam T. Nguyen <nnt@nntsoft.com>\n"
 "Language-Team: Vietnamese <moin-devel@lists.sourceforge.net>\n"
@@ -574,6 +574,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "Thiếu mật khẩu. Vui lòng nhập tên người dùng và mật khẩu."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "Bạn đã thoát ra khỏi hệ thống."
@@ -1328,14 +1332,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "Gửi kèm file mới"
@@ -1816,6 +1812,12 @@
 msgstr "Vui lòng dùng từ khoá tìm kiếm khác thay cho {{{\"%s\"}}}"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr ""
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "Tải lên file \"%(filename)s\""
 
@@ -2481,12 +2483,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr ""
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/zh-tw.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/zh-tw.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2008-03-24 23:30+0800\n"
 "Last-Translator: Rux Li <rux.li3@gmail.com>\n"
 "Language-Team: Chinese/Taiwan <moin-devel@lists.sourceforge.net>\n"
@@ -561,6 +561,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "沒輸入密碼!請輸入名稱及密碼。"
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "你已經登出了。"
@@ -1290,14 +1294,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "附件"
@@ -1775,6 +1771,12 @@
 msgstr "{{{\"%s\"}}} 找到太多資料,請輸入更精確的關鍵字!"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr "你個查詢 {{{\"%s\"}}} 並不合法。詳情請參見 HelpOnSearching。"
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "上傳新附件 \"%(filename)s\""
 
@@ -2472,12 +2474,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr "你個查詢 {{{\"%s\"}}} 並不合法。詳情請參見 HelpOnSearching。"
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/i18n/zh.MoinMoin.po	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/i18n/zh.MoinMoin.po	Thu Jun 05 11:31:57 2008 +0200
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 23:52+0200\n"
+"POT-Creation-Date: 2008-06-01 19:16+0200\n"
 "PO-Revision-Date: 2004-12-05 22:41+0100\n"
 "Last-Translator: Jun Hu <j.hu@tue.nl>\n"
 "Language-Team: Chinese <moin-devel@lists.sourceforge.net>\n"
@@ -556,6 +556,10 @@
 msgid "Missing password. Please enter user name and password."
 msgstr "需要密码, 请输入用户名和密码."
 
+#, python-format
+msgid "LDAP server %(server)s failed."
+msgstr ""
+
 #, fuzzy
 msgid "You need to log in."
 msgstr "您已登出."
@@ -1294,14 +1298,6 @@
 "Page link: %(page)s\n"
 msgstr ""
 
-#, python-format
-msgid "XML RPC error: %s"
-msgstr ""
-
-#, python-format
-msgid "Low-level communication error: %s"
-msgstr ""
-
 #, fuzzy
 msgid "Attachment link"
 msgstr "附件"
@@ -1783,6 +1779,12 @@
 msgstr "请输入比{{{\"%s\"}}}更精确的关键字!!"
 
 #, python-format
+msgid ""
+"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
+"for more information."
+msgstr "您的查询 {{{\"%s\"}}}无效。详情参阅HelpOnSearching。"
+
+#, python-format
 msgid "Upload new attachment \"%(filename)s\""
 msgstr "上载新附件\"%(filename)s\""
 
@@ -2482,12 +2484,6 @@
 
 #, python-format
 msgid ""
-"Your search query {{{\"%s\"}}} is invalid. Please refer to HelpOnSearching "
-"for more information."
-msgstr "您的查询 {{{\"%s\"}}}无效。详情参阅HelpOnSearching。"
-
-#, python-format
-msgid ""
 "Your search query {{{\"%s\"}}} didn't return any results. Please change some "
 "terms and refer to HelpOnSearching for more information.%s"
 msgstr ""
--- a/MoinMoin/parser/text_csv.py	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/parser/text_csv.py	Thu Jun 05 11:31:57 2008 +0200
@@ -54,17 +54,8 @@
         formatter = request.formatter
 
         # workaround csv.reader deficiency by encoding to utf-8
-        data = raw.encode('utf-8').split('\n')
-
-        # workaraound to remove empty lines in front of the csv table
-        # if this is not done this parser shows only an empty line
-        count = 0
-        for txt in data:
-            if not txt:
-                count += 1
-            else:
-                data = data[count:]
-                break
+        # removes empty lines in front of the csv table
+        data = raw.encode('utf-8').lstrip('\n').split('\n')
 
         delimiter = ';'
         # Previous versions of this parser have used only the delimiter ";" (by default).
--- a/MoinMoin/search/Xapian.py	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/search/Xapian.py	Thu Jun 05 11:31:57 2008 +0200
@@ -87,6 +87,7 @@
 
     dot_re = re.compile(r"[-_/,.]")
     mail_re = re.compile(r"[-_/,.]|(@)")
+    alpha_num_re = re.compile(r"\d+|\D+")
 
     # XXX limit stuff above to xapdoc.MAX_KEY_LEN
     # WORD_RE = re.compile('\\w{1,%i}' % MAX_KEY_LEN, re.U)
@@ -104,46 +105,49 @@
                 # lang is not stemmable or not available
                 pass
 
+    def raw_tokenize_word(self, word, pos):
+        """ try to further tokenize some word starting at pos """
+        if self.wikiword_re.match(word):
+            yield (word, pos)
+            # if it is a CamelCaseWord, we additionally try to tokenize Camel, Case and Word
+            for m in re.finditer(self.singleword_re, word):
+                for w, p in self.raw_tokenize_word(m.group(), pos + m.start()):
+                    yield (w, p)
+        else:
+            # if we have Foo42, yield Foo and 42
+            for m in re.finditer(self.alpha_num_re, word):
+                yield (m.group(), pos + m.start())
+
     def raw_tokenize(self, value):
-        """ Yield a stream of lower cased raw and stemmed words from a string.
+        """ Yield a stream of words from a string.
 
         @param value: string to split, must be an unicode object or a list of
                       unicode objects
         """
-        def enc(uc):
-            """ 'encode' unicode results into whatever xapian wants """
-            lower = uc.lower()
-            return lower
-
         if isinstance(value, list): # used for page links
             for v in value:
-                yield (enc(v), 0)
+                yield (v, 0)
         else:
             tokenstream = re.finditer(self.token_re, value)
             for m in tokenstream:
                 if m.group("acronym"):
-                    yield (enc(m.group("acronym").replace('.', '')),
-                            m.start())
+                    yield (m.group("acronym").replace('.', ''), m.start())
                 elif m.group("company"):
-                    yield (enc(m.group("company")), m.start())
+                    yield (m.group("company"), m.start())
                 elif m.group("email"):
                     displ = 0
                     for word in self.mail_re.split(m.group("email")):
                         if word:
-                            yield (enc(word), m.start() + displ)
+                            yield (word, m.start() + displ)
                             displ += len(word) + 1
                 elif m.group("hostname"):
                     displ = 0
                     for word in self.dot_re.split(m.group("hostname")):
-                        yield (enc(word), m.start() + displ)
+                        yield (word, m.start() + displ)
                         displ += len(word) + 1
                 elif m.group("word"):
-                    word = m.group("word")
-                    yield (enc(word), m.start())
-                    # if it is a CamelCaseWord, we additionally yield Camel, Case and Word
-                    if self.wikiword_re.match(word):
-                        for sm in re.finditer(self.singleword_re, word):
-                            yield (enc(sm.group()), m.start() + sm.start())
+                    for word, pos in self.raw_tokenize_word(m.group("word"), m.start()):
+                        yield word, pos
 
     def tokenize(self, value, flat_stemming=True):
         """ Yield a stream of lower cased raw and stemmed words from a string.
@@ -155,6 +159,7 @@
                                 yield both at once as a tuple (False)
         """
         for word, pos in self.raw_tokenize(value):
+            word = word.lower() # transform it into what xapian wants
             if flat_stemming:
                 yield (word, pos)
                 if self.stemmer:
@@ -362,10 +367,10 @@
                 xrev = xapdoc.SortKey('revision', '0')
                 title = " ".join(os.path.join(fs_rootpage, filename).split("/"))
                 xtitle = xapdoc.Keyword('title', title)
-                xmimetype = xapdoc.Keyword('mimetype', mimetype)
+                xmimetypes = [xapdoc.Keyword('mimetype', mt) for mt in [mimetype, ] + mimetype.split('/')]
                 xcontent = xapdoc.TextField('content', file_content)
                 doc = xapdoc.Document(textFields=(xcontent, ),
-                                      keywords=(xtitle, xitemid, xmimetype, ),
+                                      keywords=xmimetypes + [xtitle, xitemid, ],
                                       sortFields=(xpname, xattachment,
                                           xmtime, xwname, xrev, ),
                                      )
@@ -491,14 +496,16 @@
             xmtime = xapdoc.SortKey('mtime', str(mtime))
             xrev = xapdoc.SortKey('revision', revision)
             xtitle = xapdoc.TextField('title', pagename, True) # prefixed
+            mimetype = 'text/%s' % page.pi['format']  # XXX improve this
             xkeywords = [xapdoc.Keyword('itemid', itemid),
                     xapdoc.Keyword('lang', language),
                     xapdoc.Keyword('stem_lang', stem_language),
                     xapdoc.Keyword('fulltitle', pagename),
                     xapdoc.Keyword('revision', revision),
                     xapdoc.Keyword('author', author),
-                    xapdoc.Keyword('mimetype', 'text/%s' % page.pi['format']), # XXX improve this
-                ]
+                ] + \
+                [xapdoc.Keyword('mimetype', mt) for mt in [mimetype, ] + mimetype.split('/')]
+
             for pagelink in page.getPageLinks(request):
                 xkeywords.append(xapdoc.Keyword('linkto', pagelink))
             for category in categories:
@@ -556,7 +563,7 @@
                 xlanguage = xapdoc.Keyword('lang', language)
                 xstem_language = xapdoc.Keyword('stem_lang', stem_language)
                 mimetype, att_content = self.contentfilter(filename)
-                xmimetype = xapdoc.Keyword('mimetype', mimetype)
+                xmimetypes = [xapdoc.Keyword('mimetype', mt) for mt in [mimetype, ] + mimetype.split('/')]
                 xcontent = xapdoc.TextField('content', att_content)
                 xtitle_txt = xapdoc.TextField('title',
                         '%s/%s' % (pagename, att), True)
@@ -564,9 +571,9 @@
                 xdomains = [xapdoc.Keyword('domain', domain)
                         for domain in domains]
                 doc = xapdoc.Document(textFields=(xcontent, xtitle_txt),
-                                      keywords=xdomains + [xatt_itemid,
+                                      keywords=xdomains + xmimetypes + [xatt_itemid,
                                           xtitle, xlanguage, xstem_language,
-                                          xmimetype, xfulltitle, ],
+                                          xfulltitle, ],
                                       sortFields=(xpname, xattachment, xmtime,
                                           xwname, xrev, ),
                                      )
--- a/MoinMoin/session.py	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/session.py	Thu Jun 05 11:31:57 2008 +0200
@@ -322,7 +322,7 @@
 
     def _set_cookie(self, request, cookie_string, expires):
         """ Set cookie, raw helper. """
-        lifetime = expires - time.time()
+        lifetime = int(expires - time.time())
         cookie = self._make_cookie(request, self.cookie_name, cookie_string,
                                    lifetime, expires)
         # Set cookie
--- a/MoinMoin/version.py	Thu Jun 05 11:18:40 2008 +0200
+++ b/MoinMoin/version.py	Thu Jun 05 11:31:57 2008 +0200
@@ -15,8 +15,8 @@
     patchlevel = 'release'
 
 project = "MoinMoin"
-release = '1.7.0rc1'
-release_short = '170' # used for url_prefix_static
+release = '1.8.0alpha'
+release_short = '180' # used for url_prefix_static
 revision = patchlevel
 
 def update():
--- a/contrib/auth_externalcookie/wikiconfig.py	Thu Jun 05 11:18:40 2008 +0200
+++ b/contrib/auth_externalcookie/wikiconfig.py	Thu Jun 05 11:31:57 2008 +0200
@@ -64,9 +64,9 @@
         return user, try_next
 
 class FarmConfig(DefaultConfig):
-    from MoinMoin.auth import MoinLogin
+    from MoinMoin.auth import MoinAuth
     # use ExternalCookie, also allow the usual moin login
-    auth = [ExternalCookie(), MoinLogin()]
+    auth = [ExternalCookie(), MoinAuth()]
 
     # ... (rest of your config follows here) ...
 
--- a/docs/README.migration	Thu Jun 05 11:18:40 2008 +0200
+++ b/docs/README.migration	Thu Jun 05 11:31:57 2008 +0200
@@ -1,7 +1,8 @@
 Post 1.5.3 new style migration
 ==============================
 
-First you have to do all steps described in the sections below or it won't work.
+If you are migrating from a moin version older than 1.5.3, you first you have
+to do all steps described in the sections below or it won't work.
 
 After you have switched to new style migration, the procedure will be the same
 with every moin upgrade, simply follow these steps:
--- a/moin.spec	Thu Jun 05 11:18:40 2008 +0200
+++ b/moin.spec	Thu Jun 05 11:31:57 2008 +0200
@@ -1,6 +1,6 @@
 %define name moin
-%define version 1.7.0
-%define release 0.3.rc1
+%define version 1.8.0
+%define release 0.0.alpha
 #Upgrade Path Example:
 #     moin-1.3-0.1.beta1
 #         Patched
--- a/wiki/config/more_samples/auth_session_wikiconfig_snippet	Thu Jun 05 11:18:40 2008 +0200
+++ b/wiki/config/more_samples/auth_session_wikiconfig_snippet	Thu Jun 05 11:31:57 2008 +0200
@@ -4,7 +4,7 @@
 
     # authentication methods used (default shown, see also other snippets):
     #from MoinMoin import auth as authmodule
-    #auth = [authmodule.MoinLogin()]
+    #auth = [authmodule.MoinAuth()]
 
     # auth methods that get a user into "Trusted" group:
     #auth_methods_trusted = ['http', 'xmlrpc_applytoken']
Binary file wiki/underlay.tar has changed