Updated russian translation + fixed the conflicts with prior pull requests #457

Merged
rickdsanchez merged 2 commits from update-russian-translation into master 2013-08-29 04:06:57 +02:00
Showing only changes of commit 6b9914fe46 - Show all commits

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS><TS version="2.0" language="ru" sourcelanguage="en">
<TS version="2.0" language="ru_RU" sourcelanguage="en">
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
@ -1122,7 +1121,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
<source>version ?</source> <source>version ?</source>
<translation>версия ?</translation> <translation>версия ?</translation>
</message> </message>
<message utf8="true"> <message encoding="UTF-8">
<location filename="../bitmessageqt/about.py" line="60"/> <location filename="../bitmessageqt/about.py" line="60"/>
<source>Copyright © 2013 Jonathan Warren</source> <source>Copyright © 2013 Jonathan Warren</source>
<translation>Копирайт © 2013 Джонатан Уоррен</translation> <translation>Копирайт © 2013 Джонатан Уоррен</translation>
@ -1545,7 +1544,7 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
</message> </message>
<message> <message>
<location filename="../bitmessageqt/settings.py" line="351"/> <location filename="../bitmessageqt/settings.py" line="351"/>
<source>Français</source> <source>Fran&#xc3;&#xa7;ais</source>
<comment>fr</comment> <comment>fr</comment>
<translation>Francais</translation> <translation>Francais</translation>
</message> </message>
@ -1557,13 +1556,13 @@ The &apos;Random Number&apos; option is selected by default but deterministic ad
</message> </message>
<message> <message>
<location filename="../bitmessageqt/settings.py" line="353"/> <location filename="../bitmessageqt/settings.py" line="353"/>
<source>Español</source> <source>Espa&#xc3;&#xb1;ol</source>
<comment>es</comment> <comment>es</comment>
<translation>Espanol</translation> <translation>Espanol</translation>
</message> </message>
<message> <message>
<location filename="../bitmessageqt/settings.py" line="354"/> <location filename="../bitmessageqt/settings.py" line="354"/>
<source>Русский</source> <source>&#xd0;&#xa0;&#xd1;&#x83;&#xd1;&#x81;&#xd1;&#x81;&#xd0;&#xba;&#xd0;&#xb8;&#xd0;&#xb9;</source>
<comment>ru</comment> <comment>ru</comment>
<translation>Русский</translation> <translation>Русский</translation>
</message> </message>