Prepare to merge 5.4 from releases back into dev

This commit is contained in:
Morgan Hardwood
2018-03-20 13:54:02 +01:00
parent a5e8eb9c8a
commit 2efdfba293
6 changed files with 37 additions and 41 deletions

View File

@@ -517,9 +517,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.5681835"
inkscape:cx="427.50017"
inkscape:cy="87.101745"
inkscape:zoom="1.4142136"
inkscape:cx="366.55779"
inkscape:cy="87.326779"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -902,7 +902,7 @@
y="2.2370076"
x="283.85016"
id="tspan3664"
sodipodi:role="line">. 4</tspan></text>
sodipodi:role="line">. 5</tspan></text>
<rect
style="fill:#2a2a2a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26458338;enable-background:new"
id="rect1167"
@@ -910,6 +910,23 @@
height="9.4604874"
x="153.45833"
y="279.20517" />
<g
style="fill:#ffffff;enable-background:new"
transform="matrix(0.24804687,0,0,0.2480469,-16.632726,273.1232)"
id="g1249">
<text
transform="skewX(3)"
id="text1247"
y="49.720543"
x="596.36224"
style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:sans-serif;text-align:end;letter-spacing:-1.06666672px;word-spacing:0px;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.06666565px;line-height:110.00000238%;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Bold';text-align:end;letter-spacing:-1.06666672px;text-anchor:end;fill:#ffffff;stroke-width:1.06666672px"
y="49.720543"
x="595.29559"
sodipodi:role="line"
id="tspan1245">Development</tspan></text>
</g>
<g
id="g3712"
transform="matrix(0.24804687,0,0,0.2480469,58.508951,273.1232)"
@@ -925,7 +942,7 @@
sodipodi:role="line"
x="595.29559"
y="49.720543"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.06666565px;line-height:110.00000238%;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Bold';text-align:end;letter-spacing:-1.06666672px;text-anchor:end;fill:#ffffff;stroke-width:1.06666672px">Release Candidate 3</tspan></text>
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.06666565px;line-height:110.00000238%;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Bold';text-align:end;letter-spacing:-1.06666672px;text-anchor:end;fill:#ffffff;stroke-width:1.06666672px">Release Candidate 1</tspan></text>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 76 KiB

View File

@@ -2243,3 +2243,4 @@ ZOOMPANEL_ZOOMFITCROPSCREEN;Přizpůsobit ořez obrazovce\nZkratka: <b>f</b>
ZOOMPANEL_ZOOMFITSCREEN;Přizpůsobit celý obrázek obrazovce\nZkratka: <b>Alt</b>-<b>f</b>
ZOOMPANEL_ZOOMIN;Přiblížit\nZkratka: <b>+</b>
ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: <b>-</b>