Commits

Slava Bacherikov  committed c23c288

L10n images to russian.

  • Participants
  • Parent commits 49c5a1c

Comments (0)

Files changed (21)

File ru/figs/bad-merge-1.dot

 digraph bad_merge_1 {
-	ancestor [label="1: ancestor"];
-	left [label="2: my change"];
-	right [label="3: your change"];
-	bad [label="4: bad merge"];
-	new [label="5: new change"];
+	ancestor [label="1: Предок"];
+	left [label="2: моё изменение"];
+	right [label="3: твоё изменение"];
+	bad [label="4: неудачное слияние"];
+	new [label="5: новое изменение"];
 
 	ancestor -> left;
 	ancestor -> right;

File ru/figs/bad-merge-2.dot

 digraph bad_merge_2 {
-	ancestor [label="1: ancestor",color=grey,fontcolor=grey];
-	left [label="2: my change",color=grey,fontcolor=grey];
-	right [label="3: your change",color=grey,fontcolor=grey];
-	bad [label="4: bad merge",color=grey,fontcolor=grey];
-	new [label="5: new change",color=grey,fontcolor=grey];
+	ancestor [label="1: предок",color=grey,fontcolor=grey];
+	left [label="2: моё изменени",color=grey,fontcolor=grey];
+	right [label="3: твоё изменение",color=grey,fontcolor=grey];
+	bad [label="4: неудачное слияние",color=grey,fontcolor=grey];
+	new [label="5: новое изменение",color=grey,fontcolor=grey];
 
-	bak_left [label="6: backout 1 of\nbad merge",shape=box];
+	bak_left [label="6: откат 1\n неудачного слияния",shape=box];
 
 	ancestor -> left [color=grey];
 	ancestor -> right [color=grey];
 	bad -> new [color=grey];
 
 	bad -> bak_left;
-	left -> bak_left [style=dotted,label="--parent=2"];
+	left -> bak_left [style=dotted,label="--источник=2"];
 }

File ru/figs/bad-merge-3.dot

 digraph bad_merge_3 {
-	ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"];
-	left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"];
-	right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"];
-	bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"];
-	new [label="5: new change",color="#bbbbbb",fontcolor="#bbbbbb"];
+	ancestor [label="1: предок",color="#bbbbbb",fontcolor="#bbbbbb"];
+	left [label="2: моё изменен",color="#bbbbbb",fontcolor="#bbbbbb"];
+	right [label="3: твоё изменение",color="#bbbbbb",fontcolor="#bbbbbb"];
+	bad [label="4: неудачное слияние",color="#bbbbbb",fontcolor="#bbbbbb"];
+	new [label="5: новое изменение",color="#bbbbbb",fontcolor="#bbbbbb"];
 
-	bak_left [label="6: backout 1 of\nbad merge",color=grey,shape=box];
-	bak_right [label="8: backout 2 of\nbad merge",shape=box];
+	bak_left [label="6: откат 1\n неудачного слияния",color=grey,shape=box];
+	bak_right [label="8: откат 2\n неудачного слияния",shape=box];
 
 	ancestor -> left [color="#bbbbbb"];
 	ancestor -> right [color="#bbbbbb"];
 	bad -> new [color="#bbbbbb"];
 
 	bad -> bak_left [color=grey];
-	left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
+	left -> bak_left [style=dotted,label="--источник=2",color=grey,fontcolor=grey];
 
 	bad -> bak_right;
-	right -> bak_right [style=dotted,label="--parent=3"];
+	right -> bak_right [style=dotted,label="--источник=3"];
 }

File ru/figs/bad-merge-4.dot

 digraph bad_merge_4 {
-	ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"];
-	left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"];
-	right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"];
-	bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"];
-	new [label="5: new change",color="#bbbbbb",fontcolor="#bbbbbb"];
+	ancestor [label="1: предок",color="#bbbbbb",fontcolor="#bbbbbb"];
+	left [label="2: моё изменен",color="#bbbbbb",fontcolor="#bbbbbb"];
+	right [label="3: твоё изменение",color="#bbbbbb",fontcolor="#bbbbbb"];
+	bad [label="4: неудачное слияние",color="#bbbbbb",fontcolor="#bbbbbb"];
+	new [label="5: новое изменение",color="#bbbbbb",fontcolor="#bbbbbb"];
 
-	bak_left [label="6: backout 1 of\nbad merge",color=grey,fontcolor=grey,shape=box];
-	bak_right [label="7: backout 2 of\nbad merge",color=grey,fontcolor=grey,shape=box];
-	good [label="8: merge\nof backouts",shape=box];
+	bak_left [label="6: откат 1\n неудачного слияния",color=grey,fontcolor=grey,shape=box];
+	bak_right [label="7: откат 2\n неудачного слияния",color=grey,fontcolor=grey,shape=box];
+	good [label="8: слияние\n окатов",shape=box];
 
 	ancestor -> left [color="#bbbbbb"];
 	ancestor -> right [color="#bbbbbb"];
 	bad -> new [color="#bbbbbb"];
 
 	bad -> bak_left [color=grey];
-	left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
+	left -> bak_left [style=dotted,label="--источник=2",color=grey,fontcolor=grey];
 
 	bad -> bak_right [color=grey];
-	right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey];
+	right -> bak_right [style=dotted,label="--источник=3",color=grey,fontcolor=grey];
 
 	bak_left -> good;
 	bak_right -> good;

File ru/figs/bad-merge-5.dot

 digraph bad_merge_5 {
-	ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"];
-	left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"];
-	right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"];
-	bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"];
-	new [label="5: new change",color=grey,fontcolor=grey];
+	ancestor [label="1: предок",color="#bbbbbb",fontcolor="#bbbbbb"];
+	left [label="2: моё изменен",color="#bbbbbb",fontcolor="#bbbbbb"];
+	right [label="3: твоё изменение",color="#bbbbbb",fontcolor="#bbbbbb"];
+	bad [label="4: неудачное слияние",color="#bbbbbb",fontcolor="#bbbbbb"];
+	new [label="5: новое изменение",color="#bbbbbb",fontcolor="#bbbbbb"];
 
-	bak_left [label="6: backout 1 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
-	bak_right [label="7: backout 2 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
-	good [label="8: merge\nof backouts",color=grey,fontcolor=grey,shape=box];
-	last [label="9: merge with\nnew change",shape=box];
+	bak_left [label="6: откат 1\n неудачного слияния",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
+	bak_right [label="7: откат 1\n неудачного слияния",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
+	good [label="8: слияние\n окатов",color=grey,fontcolor=grey,shape=box];
+	last [label="9: слияние с\nновым изменением",shape=box];
 
 	ancestor -> left [color="#bbbbbb"];
 	ancestor -> right [color="#bbbbbb"];
 	bad -> new [color="#bbbbbb"];
 
 	bad -> bak_left [color="#bbbbbb"];
-	left -> bak_left [style=dotted,label="--parent=2",color="#bbbbbb",fontcolor="#bbbbbb"];
+	left -> bak_left [style=dotted,label="--источник=2",color="#bbbbbb",fontcolor="#bbbbbb"];
 
 	bad -> bak_right [color="#bbbbbb"];
-	right -> bak_right [style=dotted,label="--parent=3",color="#bbbbbb",fontcolor="#bbbbbb"];
+	right -> bak_right [style=dotted,label="--источник=3",color="#bbbbbb",fontcolor="#bbbbbb"];
 
 	bak_left -> good [color=grey];
 	bak_right -> good [color=grey];

File ru/figs/filelog.svg

Old
Old image
New
New image

File ru/figs/mq-stack.svg

Old
Old image
New
New image

File ru/figs/revlog.svg

Old
Old image
New
New image

File ru/figs/tour-history.svg

Old
Old image
New
New image

File ru/figs/tour-merge-conflict.svg

Old
Old image
New
New image

File ru/figs/tour-merge-merge.svg

Old
Old image
New
New image

File ru/figs/tour-merge-sep-repos.svg

Old
Old image
New
New image

File ru/figs/undo-manual-merge.dot

 digraph undo_manual {
-	"first change" -> "second change";
-	"second change" -> "third change";
-	backout [label="back out\nsecond change", shape=box];
-	"second change" -> backout;
-	"third change" -> "manual\nmerge";
-	backout -> "manual\nmerge";
+	"первое изменение" -> "второе изменение";
+	"второе изменение" -> "третье изменение";
+	backout [label="отменить\nвторое изменению", shape=box];
+	"второе изменение" -> backout;
+	"третье изменение" -> "ручное\nслияние";
+	backout -> "ручное\nслияние";
 }

File ru/figs/undo-manual.dot

 digraph undo_manual {
-	"first change" -> "second change";
-	"second change" -> "third change";
-	backout [label="back out\nsecond change", shape=box];
-	"second change" -> backout;
+	"первое изменение" -> "второе изменение";
+	"второе изменение" -> "третье изменение";
+	backout [label="отменить\nвторое изменению", shape=box];
+	"второе изменение" -> backout;
 }

File ru/figs/undo-non-tip.dot

 digraph undo_non_tip {
-	"first change" -> "second change";
-	"second change" -> "third change";
-	backout [label="back out\nsecond change", shape=box];
-	"second change" -> backout;
-	merge [label="automated\nmerge", shape=box];
-	"third change" -> merge;
+	"первое изменение" -> "второе изменение";
+	"второе изменение" -> "третье изменение";
+	backout [label="отменить\nвторое изменение", shape=box];
+	"второе изменение" -> backout;
+	merge [label="автоматическое\nслияние", shape=box];
+	"третье изменение" -> merge;
 	backout -> merge;
 }

File ru/figs/undo-simple.dot

 digraph undo_simple {
-	"first change" -> "second change";
-	"second change" -> "back out\nsecond change";
+	"первое изменение" -> "второе изменение";
+	"второе изменение" -> "назад к \nпервому изменению";
 }

File ru/figs/wdir-after-commit.svg

Old
Old image
New
New image

File ru/figs/wdir-branch.svg

Old
Old image
New
New image

File ru/figs/wdir-merge.svg

Old
Old image
New
New image

File ru/figs/wdir-pre-branch.svg

Old
Old image
New
New image

File ru/figs/wdir.svg

Old
Old image
New
New image