[Winmerge-svn] SF.net SVN: winmerge:[7611] branches/R2_14
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <chr...@us...> - 2013-03-17 19:25:09
|
Revision: 7611 http://sourceforge.net/p/winmerge/code/7611 Author: christianlist Date: 2013-03-17 19:25:06 +0000 (Sun, 17 Mar 2013) Log Message: ----------- [patches:#3029] Some sentences are wrong in russian translation for WinMerge 2.14.0 Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/Languages/Russian.po Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-11 03:14:06 UTC (rev 7610) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2013-03-17 19:25:06 UTC (rev 7611) @@ -10,6 +10,7 @@ - Basque (patches:#3024) - Spanish (patches:#3027) - Italian (patches:#3028) + - Russian (patches:#3029) WinMerge 2.14.0 - 2013-02-02 (r7596) Bugfix: Shell extension uses unquoted program path (patches:#3023) Modified: branches/R2_14/Src/Languages/Russian.po =================================================================== --- branches/R2_14/Src/Languages/Russian.po 2013-03-11 03:14:06 UTC (rev 7610) +++ branches/R2_14/Src/Languages/Russian.po 2013-03-17 19:25:06 UTC (rev 7611) @@ -811,7 +811,7 @@ #: Merge.rc:408 #, c-format msgid "&View Whitespace" -msgstr "\xCF\xEE\xEA\xE0\xE7\xFB&\xE2\xE0\xF2\xFC \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5" +msgstr "\xCF\xEE\xEA\xE0\xE7\xFB&\xE2\xE0\xF2\xFC \xEF\xF0\xEE\xE1\xE5\xEB\xFB" #: Merge.rc:409 #, c-format @@ -1326,7 +1326,7 @@ #: Merge.rc:783 #, c-format msgid "Enable multiple compare windows for" -msgstr "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEE\xEA\xED\xE0 \xEC\xED\xEE\xE6\xE5\xF1\xF2\xE2\xE5\xED\xED\xEE\xE3\xEE \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xE4\xEB\xFF" +msgstr "\xD0\xE0\xE7\xF0\xE5\xF8\xE8\xF2\xFC \xED\xE5\xF1\xEA\xEE\xEB\xFC\xEA\xEE \xEE\xEA\xEE\xED \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xE4\xEB\xFF" #: Merge.rc:785 #: Merge.rc:1601 @@ -1679,7 +1679,7 @@ #: Merge.rc:1039 #, c-format msgid "W&hitespaces" -msgstr "\xCD\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5" +msgstr "\xCF\xF0\xEE\xE1\xE5\xEB\xFB" #: Merge.rc:1040 #, c-format @@ -1826,22 +1826,22 @@ #: Merge.rc:1154 #, c-format msgid "Whitespace" -msgstr "\xCD\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5" +msgstr "\xCF\xF0\xEE\xE1\xE5\xEB\xFB" #: Merge.rc:1155 #, c-format msgid "&Compare" -msgstr "\xD3\xF7\xE8\xF2\xFB\xE2\xE0\xF2\xFC &\xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5" +msgstr "\xD3\xF7\xE8\xF2\xFB\xE2\xE0\xF2\xFC &\xEF\xF0\xEE\xE1\xE5\xEB\xFB" #: Merge.rc:1156 #, c-format msgid "&Ignore change" -msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE8\xE7\xEC\xE5\xED\xE5\xED\xED\xFB\xE5 \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5" +msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC &\xF1\xEC\xE5\xED\xF3" #: Merge.rc:1157 #, c-format msgid "I&gnore all" -msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC &\xE2\xF1\xE5 \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5" +msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC &\xE2\xF1\xE5 \xEF\xF0\xEE\xE1\xE5\xEB\xFB" #: Merge.rc:1158 #, c-format @@ -2470,7 +2470,7 @@ #: Merge.rc:1550 #, c-format msgid "Whitespace:" -msgstr "\xCD\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5:" +msgstr "\xCF\xF0\xEE\xE1\xE5\xEB\xFB:" #: Merge.rc:1551 #, c-format @@ -2516,7 +2516,7 @@ #: Merge.rc:1600 #, c-format msgid "Create backup files in:" -msgstr "\xD1\xEE\xE7\xE4\xE0\xF2\xFC \xF0\xE5\xE7\xE5\xF0\xE2\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB \xE2:" +msgstr "\xD1\xEE\xE7\xE4\xE0\xF2\xFC \xF0\xE5\xE7\xE5\xF0\xE2\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB \xE4\xEB\xFF:" #: Merge.rc:1605 #, c-format @@ -3243,7 +3243,7 @@ #: Merge.rc:1946 #, c-format msgid "Syntax" -msgstr "" +msgstr "\xD1\xE8\xED\xF2\xE0\xEA\xF1\xE8\xF1" #: Merge.rc:1948 #, c-format @@ -3999,12 +3999,12 @@ #: Merge.rc:2191 #, c-format msgid "Break at whitespace" -msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xEC" +msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xEF\xF0\xEE\xE1\xE5\xEB\xE0\xEC" #: Merge.rc:2192 #, c-format msgid "Break at whitespace or punctuation" -msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xEC \xE8 \xE7\xED\xE0\xEA\xE0\xEC \xEF\xF3\xED\xEA\xF2\xF3\xE0\xF6\xE8\xE8" +msgstr "\xD0\xE0\xE7\xE1\xE8\xE2\xE0\xF2\xFC \xEF\xEE \xEF\xF0\xEE\xE1\xE5\xEB\xE0\xEC \xE8 \xE7\xED\xE0\xEA\xE0\xEC \xEF\xF3\xED\xEA\xF2\xF3\xE0\xF6\xE8\xE8" #: Merge.rc:2198 #: Merge.rc:2200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |