diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
| commit | f1e92aca00a4859047e83fab76220767b9a2f814 (patch) | |
| tree | 8aaa9d6853c6a8e0e8fc568c6f981cbd889b0cc3 /data | |
| parent | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (diff) | |
| parent | 99771a1fb50286fdb0b511f425312503e657eddc (diff) | |
| download | manaplus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.gz manaplus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.bz2 manaplus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.xz manaplus-f1e92aca00a4859047e83fab76220767b9a2f814.zip | |
Merge branch 'master' into strippedstripped1.1.10.2
Conflicts:
packaging/debian/watch
Diffstat (limited to 'data')
| -rw-r--r-- | data/help/es/team.txt | 19 | ||||
| -rw-r--r-- | data/help/fr/team.txt | 19 | ||||
| -rw-r--r-- | data/help/ru/team.txt | 18 | ||||
| -rw-r--r-- | data/help/team.txt | 19 |
4 files changed, 40 insertions, 35 deletions
diff --git a/data/help/es/team.txt b/data/help/es/team.txt index bb43341ee..494b5221c 100644 --- a/data/help/es/team.txt +++ b/data/help/es/team.txt @@ -13,15 +13,16 @@ ##9Mihail Barer (Necromonger) <> ##3== Traductores == -##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) -##9Andrei Karas (4144) <akaras inbox ru> (ru) -##9Bernard Hugonnet (Nard) <> (fr) -##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) -##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) -##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) -##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) -##9Nelson Martell (nelson6e65) <nelson6eeduardo65 gmail com> (es) +##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) +##9Andrei Karas (4144) <akaras inbox ru> (ru) +##9Bernard Hugonnet (Nard) <> (fr) +##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) +##9Mihail Barer (Necromonger) <> (ru) +##9Petr Varkoček (pitriss) <> (cs) +##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) +##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) +##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) +##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es) ##9alastrim ##9GonzoDark diff --git a/data/help/fr/team.txt b/data/help/fr/team.txt index 6222f48bb..ca93d3edd 100644 --- a/data/help/fr/team.txt +++ b/data/help/fr/team.txt @@ -13,15 +13,16 @@ ##9Mihail Barer (Necromonger) <> ##3== traducteurs == -##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) -##9Andrei Karas (4144) <akaras inbox ru> (ru) -##9Bernard Hugonnet (Nard) <> (fr) -##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) -##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) -##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) -##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) -##9Nelson Martell (nelson6e65) <nelson6eeduardo65 gmail com> (es) +##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) +##9Andrei Karas (4144) <akaras inbox ru> (ru) +##9Bernard Hugonnet (Nard) <> (fr) +##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) +##9Mihail Barer (Necromonger) <> (ru) +##9Petr Varkoček (pitriss) <> (cs) +##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) +##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) +##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) +##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es) ##9alastrim ##9GonzoDark diff --git a/data/help/ru/team.txt b/data/help/ru/team.txt index 0c8470fd1..5b2bea822 100644 --- a/data/help/ru/team.txt +++ b/data/help/ru/team.txt @@ -13,15 +13,17 @@ ##9Mihail Barer (Necromonger) <> ##3== Переводчики == -##9Aline Ferraz de Souza (Freya) <freya.df gmail com> -##9Bernard Hugonnet (Nard) <> -##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> -##9Mihail Barer (Necromonger) <> -##9Yohann Ferreira (Bertram) <bertram cegetel net> -##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> +##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) +##9Andrei Karas (4144) <akaras inbox ru> (ru) +##9Bernard Hugonnet (Nard) <> (fr) +##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) +##9Mihail Barer (Necromonger) <> (ru) +##9Petr Varkoček (pitriss) <> (cs) +##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) +##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) +##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) +##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es) ##9alastrim -##9GonzoDark -##9nelson6e65 ##3== Художники == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> diff --git a/data/help/team.txt b/data/help/team.txt index d940a1694..4f2c85826 100644 --- a/data/help/team.txt +++ b/data/help/team.txt @@ -13,15 +13,16 @@ ##9Mihail Barer (Necromonger) <> ##3== Translators == -##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) -##9Andrei Karas (4144) <akaras inbox ru> (ru) -##9Bernard Hugonnet (Nard) <> (fr) -##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) -##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) -##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) -##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) -##9Nelson Martell (nelson6e65) <nelson6eeduardo65 gmail com> (es) +##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) +##9Andrei Karas (4144) <akaras inbox ru> (ru) +##9Bernard Hugonnet (Nard) <> (fr) +##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) +##9Mihail Barer (Necromonger) <> (ru) +##9Petr Varkoček (pitriss) <> (cs) +##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) +##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) +##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) +##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es) ##9alastrim ##9GonzoDark |