Slava Bacherikov avatar Slava Bacherikov committed c23c288

L10n images to russian.

Comments (0)

Files changed (21)

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;

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"];
 }

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"];
 }

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;

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];
Add a comment to this file

ru/figs/filelog.svg

Old
Old image
New
New image
          sodipodi:role="line"
          id="tspan3218"
          x="98.496666"
-         y="373.96353">Working directory</tspan></text>
+         y="373.96353">Рабочий каталог</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan3230"
          x="391.39197"
-         y="373.96353">Repository</tspan></text>
+         y="373.96353">Репозиторий</tspan></text>
   </g>
 </svg>
Add a comment to this file

ru/figs/mq-stack.svg

Old
Old image
New
New image
          id="tspan4087"
          x="195.86807"
          y="173.17117"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">present in series,</tspan><tspan
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">присудствует в серии,</tspan><tspan
          sodipodi:role="line"
          x="195.86807"
          y="188.17117"
          id="tspan4089"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">but not applied</tspan></text>
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">но не принят</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
          id="tspan4093"
          x="195.0712"
          y="288.91745"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">patches applied,</tspan><tspan
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">принятые патчи</tspan><tspan
          sodipodi:role="line"
          x="195.0712"
          y="303.91745"
          id="tspan4111"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">changesets present</tspan></text>
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">представленные в ченжсете</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
          id="tspan4097"
          x="195.0712"
          y="229.28813"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">topmost</tspan><tspan
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">самый верхний</tspan><tspan
          sodipodi:role="line"
          x="195.0712"
          y="244.28813"
          id="tspan4109"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">applied patch</tspan></text>
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">принятый патч</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
Add a comment to this file

ru/figs/revlog.svg

Old
Old image
New
New image
            y="464.8139"
            x="308.89639"
            sodipodi:role="line"
-           id="tspan2905">Second parent</tspan></text>
+           id="tspan2905">Второй родитель</tspan></text>
       <text
          id="text2907"
          y="485.50256"
            y="328.38538"
            x="197.82495"
            sodipodi:role="line"
-           id="tspan2942">Revision hash</tspan></text>
+           id="tspan2942">Хеш ревизии</tspan></text>
       <text
          id="text2944"
          y="349.07404"
            x="196.71785"
            sodipodi:role="line"
            id="tspan2956"
-           style="fill:black;fill-opacity:1">Revision data (delta or snapshot)</tspan></text>
+           style="fill:black;fill-opacity:1">Данные ревизии (дельта или снапшот)</tspan></text>
     </g>
     <g
        id="g5529"
                y="464.82358"
                x="197.82495"
                sodipodi:role="line"
-               id="tspan3521">First parent</tspan></text>
+               id="tspan3521">Первый родитель</tspan></text>
           <text
              id="text3523"
              y="485.51224"
                y="464.8139"
                x="308.89639"
                sodipodi:role="line"
-               id="tspan3533">Second parent</tspan></text>
+               id="tspan3533">Второй родитель</tspan></text>
           <text
              id="text3535"
              y="485.50256"
              id="tspan3545"
              sodipodi:role="line"
              x="197.82495"
-             y="328.38538">Revision hash</tspan></text>
+             y="328.38538">Хеш ревизии</tspan></text>
         <text
            xml:space="preserve"
            style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
              id="tspan3561"
              sodipodi:role="line"
              x="196.71785"
-             y="380.17593">Revision data (delta or snapshot)</tspan></text>
+             y="380.17593">Данные ревизии (дельта или снапшот)</tspan></text>
       </g>
     </g>
     <g
              id="tspan3579"
              sodipodi:role="line"
              x="197.82495"
-             y="464.82358">First parent</tspan></text>
+             y="464.82358">Первый родитель</tspan></text>
         <text
            xml:space="preserve"
            style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
              id="tspan3591"
              sodipodi:role="line"
              x="308.89639"
-             y="464.8139">Second parent</tspan></text>
+             y="464.8139">Второй родитель</tspan></text>
         <text
            xml:space="preserve"
            style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
              id="tspan3603"
              sodipodi:role="line"
              x="197.82495"
-             y="328.38538">Revision hash</tspan></text>
+             y="328.38538">Хеш ревизии</tspan></text>
         <text
            xml:space="preserve"
            style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
              id="tspan3619"
              sodipodi:role="line"
              x="196.71785"
-             y="380.17593">Revision data (delta or snapshot)</tspan></text>
+             y="380.17593">Данные ревизии (дельта или снапшот)</tspan></text>
       </g>
     </g>
     <path
              id="tspan3405"
              sodipodi:role="line"
              x="197.82495"
-             y="464.82358">First parent</tspan></text>
+             y="464.82358">Первый родитель</tspan></text>
         <text
            xml:space="preserve"
            style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
              id="tspan3417"
              sodipodi:role="line"
              x="308.89639"
-             y="464.8139">Second parent</tspan></text>
+             y="464.8139">Второй родитель</tspan></text>
         <text
            xml:space="preserve"
            style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
              id="tspan3429"
              sodipodi:role="line"
              x="197.82495"
-             y="328.38538">Revision hash</tspan></text>
+             y="328.38538">Хеш ревизии</tspan></text>
         <text
            xml:space="preserve"
            style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
              id="tspan3445"
              sodipodi:role="line"
              x="196.71785"
-             y="380.17593">Revision data (delta or snapshot)</tspan></text>
+             y="380.17593">Данные ревизии (дельта или снапшот)</tspan></text>
       </g>
     </g>
     <g
              id="tspan3463"
              sodipodi:role="line"
              x="197.82495"
-             y="464.82358">First parent</tspan></text>
+             y="464.82358">Первый родитель</tspan></text>
         <text
            xml:space="preserve"
            style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
              id="tspan3475"
              sodipodi:role="line"
              x="308.89639"
-             y="464.8139">Second parent</tspan></text>
+             y="464.8139">Второй родитель</tspan></text>
         <text
            xml:space="preserve"
            style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
              id="tspan3487"
              sodipodi:role="line"
              x="197.82495"
-             y="328.38538">Revision hash</tspan></text>
+             y="328.38538">Хеш ревизии</tspan></text>
         <text
            xml:space="preserve"
            style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
              id="tspan3503"
              sodipodi:role="line"
              x="196.71785"
-             y="380.17593">Revision data (delta or snapshot)</tspan></text>
+             y="380.17593">Данные ревизии (дельта или хеш)</tspan></text>
       </g>
     </g>
     <rect
            y="464.82358"
            x="197.82495"
            sodipodi:role="line"
-           id="tspan5093">First parent</tspan></text>
+           id="tspan5093">Первый родитель</tspan></text>
       <text
          id="text5095"
          y="485.51224"
            y="464.8139"
            x="308.89639"
            sodipodi:role="line"
-           id="tspan5105">Second parent</tspan></text>
+           id="tspan5105">Второй родитель</tspan></text>
       <text
          id="text5107"
          y="485.50256"
            y="328.38538"
            x="197.82495"
            sodipodi:role="line"
-           id="tspan5117">Revision hash</tspan></text>
+           id="tspan5117">Хеш ревизии</tspan></text>
       <text
          id="text5119"
          y="349.07404"
            x="196.71785"
            sodipodi:role="line"
            id="tspan5133"
-           style="fill:black;fill-opacity:1">Revision data (delta or snapshot)</tspan></text>
+           style="fill:black;fill-opacity:1">Данные ревизии (дельта или снапшот)</tspan></text>
     </g>
     <path
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
          id="tspan5899"
          x="131.5625"
          y="100.79968"
-         style="text-align:end;text-anchor:end">Head revision</tspan><tspan
+         style="text-align:end;text-anchor:end">Верхняя ревизия</tspan><tspan
          sodipodi:role="line"
          x="131.5625"
          y="115.79968"
          id="tspan5901"
-         style="text-align:end;text-anchor:end">(no children)</tspan></text>
+         style="text-align:end;text-anchor:end">(без детей)</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          id="tspan5905"
          x="131.5625"
          y="207.04968"
-         style="text-align:end;text-anchor:end">Merge revision</tspan><tspan
+         style="text-align:end;text-anchor:end">Ревизия слияния</tspan><tspan
          sodipodi:role="line"
          x="131.5625"
          y="222.04968"
          id="tspan5907"
-         style="text-align:end;text-anchor:end">(two parents)</tspan></text>
+         style="text-align:end;text-anchor:end">(два родителя)</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          id="tspan5911"
          x="131.92578"
          y="451.58093"
-         style="text-align:end;text-anchor:end">Branches</tspan><tspan
+         style="text-align:end;text-anchor:end">Ветки</tspan><tspan
          sodipodi:role="line"
          x="131.92578"
          y="466.58093"
          id="tspan5913"
-         style="text-align:end;text-anchor:end">(two revisions,</tspan><tspan
+         style="text-align:end;text-anchor:end">(две ревизии,</tspan><tspan
          sodipodi:role="line"
          x="131.92578"
          y="481.58093"
          id="tspan5915"
-         style="text-align:end;text-anchor:end">same parent)</tspan></text>
+         style="text-align:end;text-anchor:end">один родитель)</tspan></text>
     <path
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline"
        d="M 111.71875,433.61218 L 154.7268,368.52294"
          sodipodi:role="line"
          id="tspan5929"
          x="131.5625"
-         y="536.73718">First revision</tspan><tspan
+         y="536.73718">Первая ревизия</tspan><tspan
          sodipodi:role="line"
          x="131.5625"
          y="551.73718"
-         id="tspan5931">(both parents null)</tspan></text>
+         id="tspan5931">(без родителей)</tspan></text>
     <rect
        style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect2830"
Add a comment to this file

ru/figs/tour-history.svg

Old
Old image
New
New image
          sodipodi:role="line"
          id="tspan1904"
          x="244.60992"
-         y="305.245">(newest)</tspan></text>
+         y="305.245">(новее)</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times"
          sodipodi:role="line"
          id="tspan1908"
          x="244.60992"
-         y="492.745">(oldest)</tspan></text>
+         y="492.745">(старше)</tspan></text>
     <rect
        style="opacity:1;fill:#d2e1e4;fill-opacity:1;stroke:#b1cbd0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1907"
          x="335.14285"
          y="387.21933"
          id="tspan3020"
-         style="text-align:end;text-anchor:end">revision</tspan><tspan
+         style="text-align:end;text-anchor:end">номер</tspan><tspan
          sodipodi:role="line"
          x="335.14285"
          y="402.21933"
          id="tspan3014"
-         style="text-align:end;text-anchor:end">number</tspan></text>
+         style="text-align:end;text-anchor:end">ревизии</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times"
          sodipodi:role="line"
          id="tspan2996"
          x="368.71429"
-         y="387.21933">changeset</tspan><tspan
+         y="387.21933">идентификатор</tspan><tspan
          sodipodi:role="line"
          x="368.71429"
          y="402.21933"
-         id="tspan2998">identifier</tspan></text>
+         id="tspan2998">ченжсета</tspan></text>
   </g>
 </svg>
Add a comment to this file

ru/figs/tour-merge-conflict.svg

Old
Old image
New
New image
          sodipodi:role="line"
          id="tspan1907"
          x="302.42859"
-         y="515.08905">Base version</tspan></text>
+         y="515.08905">Начальная версия</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan1919"
          x="45.57143"
-         y="374.1619">Our changes</tspan></text>
+         y="374.1619">Наши изменения</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan1923"
          x="385.71429"
-         y="374.1619">Their changes</tspan></text>
+         y="374.1619">Их изменения</tspan></text>
   </g>
 </svg>
Add a comment to this file

ru/figs/tour-merge-merge.svg

Old
Old image
New
New image
          sodipodi:role="line"
          id="tspan2812"
          x="246"
-         y="162.63338">working directory</tspan><tspan
+         y="162.63338">рабочий каталог</tspan><tspan
          sodipodi:role="line"
          x="246"
          y="177.63338"
-         id="tspan2814">during merge</tspan></text>
+         id="tspan2814">во время слияния</tspan></text>
     <rect
        style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect2816"
          id="tspan2931"
          x="90.323105"
          y="120.21933"
-         style="font-weight:bold">Working directory during merge</tspan></text>
+         style="font-weight:bold">Рабочий каталог во время слияния</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          id="tspan2939"
          x="435.35226"
          y="120.21933"
-         style="font-weight:bold">Repository after merge committed</tspan></text>
+         style="font-weight:bold">Репозиторий после комита слияния</tspan></text>
   </g>
 </svg>
Add a comment to this file

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

Old
Old image
New
New image
          id="tspan2935"
          x="300.54352"
          y="252.12723"
-         style="text-align:center;text-anchor:middle">newest changes</tspan><tspan
+         style="text-align:center;text-anchor:middle">новйшие изменения</tspan><tspan
          sodipodi:role="line"
          x="300.54352"
          y="267.12723"
          style="text-align:center;text-anchor:middle"
-         id="tspan3132">differ</tspan></text>
+         id="tspan3132">различаются</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          x="262.15436"
          y="398.37112"
          id="tspan3013"
-         style="text-align:start;text-anchor:start">common history</tspan></text>
+         style="text-align:start;text-anchor:start">общая история</tspan></text>
     <g
        id="g3107"
        transform="translate(0,0.855744)">
          id="tspan1951"
          x="480.71429"
          y="250.91507"
-         style="text-align:start;text-anchor:start">head revision</tspan><tspan
+         style="text-align:start;text-anchor:start">верхняя ревизия</tspan><tspan
          sodipodi:role="line"
          x="480.71429"
          y="265.91507"
          id="tspan1953"
-         style="text-align:start;text-anchor:start">(has no children)</tspan></text>
+         style="text-align:start;text-anchor:start">(без детей)</tspan></text>
   </g>
 </svg>

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слияние";
 }

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;
 }

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;
 }

ru/figs/undo-simple.dot

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

ru/figs/wdir-after-commit.svg

Old
Old image
New
New image
          sodipodi:role="line"
          id="tspan6104"
          x="327.66046"
-         y="231.36218">History in repository</tspan></text>
+         y="231.36218">История в репозитарии</tspan></text>
     <rect
        y="245.94225"
        x="557.28418"
          sodipodi:role="line"
          id="tspan6120"
          x="576.63208"
-         y="270.479">First parent</tspan></text>
+         y="270.479">Первый родитель</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan6124"
          x="576.07544"
-         y="364.49615">Second parent</tspan></text>
+         y="364.49615">Второй родитель</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan6197"
          x="556.61743"
-         y="231.36218">Parents of working directory</tspan></text>
+         y="231.36218">Родители рабочего каталога</tspan></text>
     <path
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 576.82542,297.63008 L 483.02528,287.95831"
          id="tspan6575"
          x="316.86407"
          y="275.6496"
-         style="text-align:end;text-anchor:end">New</tspan><tspan
+         style="text-align:end;text-anchor:end">Новый</tspan><tspan
          sodipodi:role="line"
          x="316.86407"
          y="290.6496"
          id="tspan6577"
-         style="text-align:end;text-anchor:end">changeset</tspan></text>
+         style="text-align:end;text-anchor:end">ченжсет</tspan></text>
   </g>
 </svg>
Add a comment to this file

ru/figs/wdir-branch.svg

Old
Old image
New
New image
          sodipodi:role="line"
          id="tspan6120"
          x="466.63208"
-         y="270.479">First parent</tspan></text>
+         y="270.479">Первый родитель</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan6124"
          x="466.07544"
-         y="364.49615">Second parent</tspan></text>
+         y="364.49615">Второй родитель</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan6197"
          x="446.61743"
-         y="231.36218">Parents of working directory</tspan></text>
+         y="231.36218">Родители рабочего каталога</tspan></text>
     <path
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
        d="M 466.82542,300.21999 L 377.00207,294.39744"
          sodipodi:role="line"
          id="tspan2839"
          x="109.45568"
-         y="231.4554">Pre-existing head</tspan></text>
+         y="231.4554">Ранее существовашая голова</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan2843"
          x="237.54184"
-         y="231.4554">Newly created head (and tip)</tspan></text>
+         y="231.4554">Только что созданная голова (и tip)</tspan></text>
     <path
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
        d="M 148.05048,235.87482 L 149.94915,265.86962"
Add a comment to this file

ru/figs/wdir-merge.svg

Old
Old image
New
New image
          sodipodi:role="line"
          id="tspan6120"
          x="466.63208"
-         y="270.479">First parent (unchanged)</tspan></text>
+         y="270.479">Первый родитель (не изменился)</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan6124"
          x="466.07544"
-         y="364.49615">Second parent</tspan></text>
+         y="364.49615">Второй родитель</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan6197"
          x="446.61743"
-         y="231.36218">Parents of working directory</tspan></text>
+         y="231.36218">Родители рабочего каталога</tspan></text>
     <path
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
        d="M 466.82542,300.21999 L 377.00207,294.39744"
          sodipodi:role="line"
          id="tspan2839"
          x="109.45568"
-         y="231.4554">Pre-existing head</tspan></text>
+         y="231.4554">Ранее существовашая голова</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan2843"
          x="237.54184"
-         y="231.4554">Newly created head (and tip)</tspan></text>
+         y="231.4554">Вновь созданная голова (and tip)</tspan></text>
     <path
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
        d="M 148.05048,235.87482 L 149.94915,265.86962"
Add a comment to this file

ru/figs/wdir-pre-branch.svg

Old
Old image
New
New image
          sodipodi:role="line"
          id="tspan6104"
          x="19.660461"
-         y="231.36218">History in repository</tspan></text>
+         y="231.36218">История в репозитарии</tspan></text>
     <rect
        y="245.94225"
        x="249.28412"
          sodipodi:role="line"
          id="tspan6120"
          x="268.63208"
-         y="270.479">First parent</tspan></text>
+         y="270.479">Первый родитель</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan6124"
          x="268.07544"
-         y="364.49615">Second parent</tspan></text>
+         y="364.49615">Второй родитель</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
          sodipodi:role="line"
          id="tspan6197"
          x="248.61746"
-         y="231.36218">Parents of working directory</tspan></text>
+         y="231.36218">Родители рабочего каталога</tspan></text>
     <path
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
        d="M 268.82543,318.06163 L 175.02528,336.72225"
Add a comment to this file

ru/figs/wdir.svg

Old
Old image
New
New image
          sodipodi:role="line"
          id="tspan6104"
          x="93.660484"
-         y="231.36218">History in repository</tspan></text>
+         y="231.36218">История в репозитарии</tspan></text>
     <g
        id="g6416">
       <rect
            y="270.479"
            x="342.63208"
            id="tspan6120"
-           sodipodi:role="line">First parent</tspan></text>
+           sodipodi:role="line">Первый родитель</tspan></text>
       <text
          id="text6122"
          y="364.49615"
            y="364.49615"
            x="342.07544"
            id="tspan6124"
-           sodipodi:role="line">Second parent</tspan></text>
+           sodipodi:role="line">Второй родитель</tspan></text>
     </g>
     <text
        xml:space="preserve"
          sodipodi:role="line"
          id="tspan6197"
          x="322.61746"
-         y="231.36218">Parents of working directory</tspan></text>
+         y="231.36218">Родители рабочего каталога</tspan></text>
     <path
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
        d="M 342.82543,299.89384 L 249.02528,293.36123"
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.