Sat, 05 Sep 2015 13:08:44 +0200
Merged with remote changes.
.hgtags | file | annotate | diff | comparison | revisions | |
ChangeLog | file | annotate | diff | comparison | revisions | |
PluginColorString.py | file | annotate | diff | comparison | revisions | |
PluginColorString.zip | file | annotate | diff | comparison | revisions |
--- a/.hgtags Thu Aug 27 19:40:49 2015 +0200 +++ b/.hgtags Sat Sep 05 13:08:44 2015 +0200 @@ -9,4 +9,5 @@ a1e72b3e06ccd58337ec0349ebbd91cac6dd98d3 release_2.0.1 ffe2ec016dfb899c83805c21b4beb80844c238a5 release_2.1.0 8a7d311ecf9693cf8ffc6cf15495abee33a67b5e release_2.1.1 +ca045ea5f3994e8fb934c1e7c3089b4bfe31fb86 release_2.1.2 cf10856f55de4594e8be894fd8b912120487d666 release_2.2.0
--- a/ChangeLog Thu Aug 27 19:40:49 2015 +0200 +++ b/ChangeLog Sat Sep 05 13:08:44 2015 +0200 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 2.2.1: +- updated Russian translations + Version 2.2.0: - adaptation for the new plug-in tools menu handling
--- a/ColorString/i18n/colorstring_ru.ts Thu Aug 27 19:40:49 2015 +0200 +++ b/ColorString/i18n/colorstring_ru.ts Sat Sep 05 13:08:44 2015 +0200 @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="ru" sourcelanguage="en"> +<!DOCTYPE TS><TS version="2.0" language="ru_RU" sourcelanguage=""> <context> <name>ColorSelectionDialog</name> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="14"/> + <location filename="../ColorSelectionDialog.ui" line="14"/> <source>Color String</source> <translation>Цвет</translation> </message> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="23"/> + <location filename="../ColorSelectionDialog.ui" line="23"/> <source>Select Color Name:</source> - <translation>Название цвета:</translation> + <translation>Имя цвета:</translation> </message> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="30"/> + <location filename="../ColorSelectionDialog.ui" line="30"/> <source>Select a color by name</source> - <translation>Выберите цвет по названию</translation> + <translation>Выберите цвет по имени</translation> </message> </context> <context> @@ -28,27 +28,27 @@ <message> <location filename="../../PluginColorString.py" line="328"/> <source><p>The selected string <b>{0}</b> is not a valid color string. Aborting!</p></source> - <translation><p>Выбранная строка <b>{0}</b> не является правильной для определения цвета. Авост!</p></translation> + <translation><p>Выбранная строка <b>{0}</b> неприменима для определения цвета. Отмена!</p></translation> </message> <message> <location filename="../../PluginColorString.py" line="291"/> <source><p>The selected string <b>{0}</b> is not a valid color name. Aborting!</p></source> - <translation><p>Выбранная строка <b>{0}</b> не является правильным разванием цвета. Авост!</p></translation> + <translation><p>Выбранная строка <b>{0}</b> не действительна для названия цвета. Отмена!</p></translation> </message> <message> <location filename="../../PluginColorString.py" line="129"/> <source>Hex Color</source> - <translation type="unfinished"></translation> + <translation>Hex Color</translation> </message> <message> <location filename="../../PluginColorString.py" line="130"/> <source>Color Name</source> - <translation type="unfinished"></translation> + <translation>Color Name</translation> </message> <message> <location filename="../../PluginColorString.py" line="131"/> <source>RGBA Color</source> - <translation type="unfinished"></translation> + <translation>RGBA Color</translation> </message> </context> </TS>
--- a/PluginColorString.py Thu Aug 27 19:40:49 2015 +0200 +++ b/PluginColorString.py Sat Sep 05 13:08:44 2015 +0200 @@ -23,7 +23,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "2.2.0" +version = "2.2.1" className = "ColorStringPlugin" packageName = "ColorString" shortDescription = "Insert color as string"