coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-11 11:25:57 +03:00
Code Issues Projects Releases Wiki Activity

Fix localization and layout

Browse Source
This commit is contained in:
1024jp 2015-08-27 00:42:10 +09:00
parent 5e1a96b387
commit fdd9eeb9ef
11 changed files with 69 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@ develop
### Fixes
- Fix an issue where the command-line tool could rarely not be installed from Integration pane.
- Add some missing localized strings in Japanese.
- [beta] Fix an issue where the strings that were inserted via script or tools could be styled wrong.
- [beta] Fix an issue where the bug report template was not syntax highlighted.

5
CotEditor/Base.lproj/DocumentInspectorView.xib
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14F19a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
@ -480,6 +480,7 @@
<constraint firstItem="agR-rr-ESl" firstAttribute="leading" secondItem="ZBi-EJ-Lzu" secondAttribute="leading" constant="12" id="6zf-Tp-wlW"/>
<constraint firstItem="HX1-lW-KZj" firstAttribute="leading" secondItem="ZBi-EJ-Lzu" secondAttribute="leading" constant="8" id="77O-Jm-oKC"/>
<constraint firstItem="pho-Pk-A5q" firstAttribute="trailing" secondItem="mSH-7o-XWe" secondAttribute="trailing" id="8OW-iW-FfY"/>
<constraint firstItem="WuM-BH-qGJ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ZBi-EJ-Lzu" secondAttribute="leading" constant="12" id="8vp-bm-vpM"/>
<constraint firstItem="alZ-aH-yTj" firstAttribute="top" secondItem="m5u-NY-ZWA" secondAttribute="bottom" constant="4" id="9iA-L7-2p0"/>
<constraint firstItem="wTX-Dy-Att" firstAttribute="top" secondItem="1HX-hx-Kjq" secondAttribute="bottom" constant="6" id="B2O-BC-yHY"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="V35-jz-vW5" secondAttribute="trailing" constant="8" id="BMw-nf-QNT"/>
@ -489,10 +490,12 @@
<constraint firstItem="c3K-vK-uPf" firstAttribute="leading" secondItem="7Fd-u2-ZLc" secondAttribute="trailing" constant="8" symbolic="YES" id="Emq-Zy-Mpd"/>
<constraint firstItem="HPb-13-RfP" firstAttribute="top" secondItem="mka-w0-T2n" secondAttribute="bottom" constant="6" id="Eyx-nY-pPQ"/>
<constraint firstItem="OCj-Md-duY" firstAttribute="top" secondItem="UmS-5X-1Cm" secondAttribute="bottom" constant="6" id="Hs5-Vz-h92"/>
<constraint firstItem="mka-w0-T2n" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ZBi-EJ-Lzu" secondAttribute="leading" constant="12" id="IFW-FL-sUU"/>
<constraint firstItem="HS1-NO-xbQ" firstAttribute="top" secondItem="wTX-Dy-Att" secondAttribute="bottom" constant="6" id="IKx-nj-mrP"/>
<constraint firstItem="26O-Xv-RC8" firstAttribute="top" secondItem="wTX-Dy-Att" secondAttribute="top" id="Igu-e4-nXa"/>
<constraint firstItem="pho-Pk-A5q" firstAttribute="trailing" secondItem="mka-w0-T2n" secondAttribute="trailing" id="Iip-dF-b3p"/>
<constraint firstItem="HS1-NO-xbQ" firstAttribute="baseline" secondItem="Xne-Da-H6h" secondAttribute="baseline" id="IvM-oW-TsZ"/>
<constraint firstItem="l0D-jC-n40" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ZBi-EJ-Lzu" secondAttribute="leading" constant="12" id="JL0-g1-LmN"/>
<constraint firstItem="2ZU-Mi-aJz" firstAttribute="baseline" secondItem="mSH-7o-XWe" secondAttribute="baseline" id="K1C-pW-ErJ"/>
<constraint firstItem="OCj-Md-duY" firstAttribute="leading" secondItem="ZBi-EJ-Lzu" secondAttribute="leading" constant="12" id="K6D-xj-4wK"/>
<constraint firstItem="2ZU-Mi-aJz" firstAttribute="leading" secondItem="mSH-7o-XWe" secondAttribute="trailing" constant="8" symbolic="YES" id="KVY-7R-TQb"/>

60
CotEditor/Base.lproj/GeneralPane.xib
View File

@ -14,11 +14,11 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView horizontalHuggingPriority="750" verticalCompressionResistancePriority="250" id="743" userLabel="General Pane">
<rect key="frame" x="0.0" y="0.0" width="568" height="399"/>
<rect key="frame" x="0.0" y="0.0" width="540" height="413"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button translatesAutoresizingMaskIntoConstraints="NO" id="2739">
<rect key="frame" x="170" y="337" width="284" height="18"/>
<rect key="frame" x="170" y="351" width="284" height="18"/>
<buttonCell key="cell" type="check" title="Inline script menu items into context menu" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3309">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -28,7 +28,7 @@
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="1036">
<rect key="frame" x="170" y="361" width="256" height="18"/>
<rect key="frame" x="170" y="375" width="256" height="18"/>
<buttonCell key="cell" type="check" title="Share find text with other applications" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3307">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -38,7 +38,7 @@
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="1030">
<rect key="frame" x="170" y="313" width="271" height="18"/>
<rect key="frame" x="170" y="327" width="271" height="18"/>
<buttonCell key="cell" type="check" title="Count each line ending as one character" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3306">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -48,7 +48,7 @@
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="594">
<rect key="frame" x="170" y="231" width="221" height="18"/>
<rect key="frame" x="170" y="245" width="221" height="18"/>
<buttonCell key="cell" type="check" title="When CotEditor becomes active" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3299">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -58,7 +58,7 @@
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="106">
<rect key="frame" x="170" y="255" width="85" height="18"/>
<rect key="frame" x="170" y="269" width="85" height="18"/>
<buttonCell key="cell" type="check" title="On launch" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3298">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -68,7 +68,7 @@
</connections>
</button>
<button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3422">
<rect key="frame" x="170" y="92" width="221" height="18"/>
<rect key="frame" x="170" y="106" width="221" height="18"/>
<buttonCell key="cell" type="check" title="Automatically check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3423">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -83,7 +83,7 @@
</connections>
</button>
<textField hidden="YES" horizontalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="m9P-m9-cpw">
<rect key="frame" x="47" y="93" width="119" height="17"/>
<rect key="frame" x="47" y="107" width="119" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Software Updates:" usesSingleLineMode="YES" id="geU-63-sAC">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@ -98,7 +98,7 @@
</connections>
</textField>
<textField horizontalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="bTW-FZ-qkl">
<rect key="frame" x="18" y="256" width="148" height="17"/>
<rect key="frame" x="18" y="270" width="148" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Open a new document:" usesSingleLineMode="YES" id="zDW-aW-9G8">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@ -106,7 +106,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="jQj-mP-yhk">
<rect key="frame" x="88" y="362" width="78" height="17"/>
<rect key="frame" x="88" y="376" width="78" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Application:" usesSingleLineMode="YES" id="lzy-Ei-xlT">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@ -114,7 +114,7 @@
</textFieldCell>
</textField>
<button translatesAutoresizingMaskIntoConstraints="NO" id="596">
<rect key="frame" x="170" y="289" width="188" height="18"/>
<rect key="frame" x="170" y="303" width="188" height="18"/>
<buttonCell key="cell" type="check" title="Check spelling as you type" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3300">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -123,20 +123,10 @@
<binding destination="26" name="value" keyPath="values.checkSpellingAsType" id="597"/>
</connections>
</button>
<button horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="1832">
<rect key="frame" x="525" y="17" width="25" height="25"/>
<buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="3308">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="openHelpAnchor:" target="-1" id="chy-NR-7O2"/>
</connections>
</button>
<matrix verticalHuggingPriority="750" allowsEmptySelection="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iBP-bG-qE5">
<rect key="frame" x="172" y="128" width="376" height="64"/>
<rect key="frame" x="172" y="142" width="348" height="64"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<size key="cellSize" width="376" height="20"/>
<size key="cellSize" width="348" height="20"/>
<size key="intercellSpacing" width="4" height="2"/>
<buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="9ML-3o-nUc">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@ -163,7 +153,7 @@
</connections>
</matrix>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="o08-Ku-C4x">
<rect key="frame" x="18" y="196" width="322" height="17"/>
<rect key="frame" x="18" y="210" width="322" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="When document is modified by another application:" usesSingleLineMode="YES" id="x4n-2n-I3p">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@ -171,7 +161,7 @@
</textFieldCell>
</textField>
<button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0GW-6U-afs">
<rect key="frame" x="170" y="68" width="147" height="18"/>
<rect key="frame" x="170" y="82" width="147" height="18"/>
<buttonCell key="cell" type="check" title="Include pre-releases" bezelStyle="regularSquare" imagePosition="left" inset="2" id="4aT-ka-sbv">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -186,11 +176,9 @@
</connections>
</button>
<textField hidden="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5j1-wb-DHR">
<rect key="frame" x="188" y="38" width="344" height="28"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="chR-VY-cuI">
<rect key="frame" x="188" y="52" width="334" height="28"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Regardless of this setting, new pre-releases are always included while using a pre-release." id="chR-VY-cuI">
<font key="font" metaFont="smallSystem"/>
<string key="title">Regardless of this setting, new pre-releases are always included
while using a pre-release.</string>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@ -202,6 +190,16 @@ while using a pre-release.</string>
</binding>
</connections>
</textField>
<button horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="1832">
<rect key="frame" x="497" y="17" width="25" height="25"/>
<buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="3308">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="openHelpAnchor:" target="-1" id="chy-NR-7O2"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="iBP-bG-qE5" secondAttribute="trailing" constant="20" symbolic="YES" id="2Qh-fm-o8R"/>
@ -231,7 +229,7 @@ while using a pre-release.</string>
<constraint firstItem="5j1-wb-DHR" firstAttribute="top" secondItem="0GW-6U-afs" secondAttribute="bottom" constant="4" id="UxS-ur-cKL"/>
<constraint firstItem="5j1-wb-DHR" firstAttribute="leading" secondItem="0GW-6U-afs" secondAttribute="leading" constant="18" id="XaT-G0-S0O"/>
<constraint firstItem="3422" firstAttribute="top" secondItem="iBP-bG-qE5" secondAttribute="bottom" constant="20" id="cN9-Bx-fZ9"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="5j1-wb-DHR" secondAttribute="trailing" constant="20" symbolic="YES" id="epK-cz-mbh"/>
<constraint firstAttribute="trailing" secondItem="5j1-wb-DHR" secondAttribute="trailing" constant="20" symbolic="YES" id="epK-cz-mbh"/>
<constraint firstItem="1030" firstAttribute="top" secondItem="2739" secondAttribute="bottom" constant="10" id="gbD-2O-xNi"/>
<constraint firstItem="bTW-FZ-qkl" firstAttribute="leading" secondItem="743" secondAttribute="leading" priority="750" constant="20" symbolic="YES" id="i53-pI-uqV"/>
<constraint firstItem="m9P-m9-cpw" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="743" secondAttribute="leading" constant="20" symbolic="YES" id="jUr-eF-2JP"/>
@ -240,7 +238,7 @@ while using a pre-release.</string>
<constraint firstItem="o08-Ku-C4x" firstAttribute="top" secondItem="594" secondAttribute="bottom" constant="20" id="t7Y-xG-Bi3"/>
<constraint firstItem="1030" firstAttribute="leading" secondItem="jQj-mP-yhk" secondAttribute="trailing" constant="8" symbolic="YES" id="xMj-aT-Iab"/>
</constraints>
<point key="canvasLocation" x="363" y="303.5"/>
<point key="canvasLocation" x="318" y="303.5"/>
</customView>
<userDefaultsController representsSharedInstance="YES" id="26" userLabel="Shared User Defaults Controller"/>
</objects>

8
CotEditor/Base.lproj/LineHightPanel.xib
View File

@ -46,10 +46,10 @@
</binding>
</connections>
</textField>
<button verticalHuggingPriority="750" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="21" translatesAutoresizingMaskIntoConstraints="NO" id="EWf-Ij-TwQ">
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EWf-Ij-TwQ">
<rect key="frame" x="134" y="13" width="92" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="dTT-rc-lbI"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="dTT-rc-lbI"/>
</constraints>
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="KXU-GK-Xcv">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@ -62,10 +62,10 @@ DQ
<action selector="apply:" target="-2" id="JQa-fv-2PU"/>
</connections>
</button>
<button verticalHuggingPriority="750" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="21" translatesAutoresizingMaskIntoConstraints="NO" id="xfT-8b-5Y4">
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xfT-8b-5Y4">
<rect key="frame" x="42" y="13" width="92" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="1cw-xA-OL0"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="1cw-xA-OL0"/>
</constraints>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="0fI-Qj-jW1">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

5
CotEditor/Base.lproj/OpacityPanel.xib
View File

@ -32,8 +32,11 @@
<rect key="frame" x="23" y="49" width="195" height="15"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyDown" image="OpacityGuide" id="dfu-e3-y0k"/>
</imageView>
<button verticalHuggingPriority="750" placeholderIntrinsicWidth="120" placeholderIntrinsicHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="QKv-NS-b74" userLabel="Apply Button">
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QKv-NS-b74" userLabel="Apply Button">
<rect key="frame" x="95" y="14" width="130" height="28"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="O0t-iJ-mgN"/>
</constraints>
<buttonCell key="cell" type="push" title="Set as Default" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QFp-iC-k4v">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>

12
CotEditor/Base.lproj/PrintPanelAccessory.xib
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14F25a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
@ -56,7 +56,7 @@
<binding destination="-2" name="selectedIndex" keyPath="invisibleCharsMode" id="UkP-Ba-QDG"/>
</connections>
</popUpButton>
<textField horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="423">
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="423">
<rect key="frame" x="47" y="203" width="65" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Invisibles:" usesSingleLineMode="YES" id="718">
<font key="font" metaFont="system"/>
@ -84,7 +84,7 @@
<binding destination="-2" name="selectedIndex" keyPath="lineNumberMode" id="T1v-IJ-jYl"/>
</connections>
</popUpButton>
<textField horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="415">
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="415">
<rect key="frame" x="18" y="234" width="94" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Line Numbers:" usesSingleLineMode="YES" id="716">
<font key="font" metaFont="system"/>
@ -317,7 +317,7 @@
<binding destination="-2" name="enabled" keyPath="printsFooter" id="eSk-6s-EvS"/>
</connections>
</popUpButton>
<textField horizontalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6jK-7i-UaO">
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6jK-7i-UaO">
<rect key="frame" x="70" y="266" width="42" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Color:" usesSingleLineMode="YES" id="eXI-55-yQO">
<font key="font" metaFont="system"/>
@ -327,6 +327,7 @@
</textField>
</subviews>
<constraints>
<constraint firstItem="423" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="196" secondAttribute="leading" constant="20" symbolic="YES" id="6fw-3B-Mqw"/>
<constraint firstItem="423" firstAttribute="trailing" secondItem="257" secondAttribute="trailing" id="74O-xm-e3g"/>
<constraint firstItem="8wl-aM-d8K" firstAttribute="centerY" secondItem="257" secondAttribute="centerY" id="8r2-bi-5x5"/>
<constraint firstItem="303" firstAttribute="leading" secondItem="196" secondAttribute="leading" constant="20" symbolic="YES" id="9mq-sZ-rxb"/>
@ -338,7 +339,7 @@
<constraint firstItem="8wl-aM-d8K" firstAttribute="centerY" secondItem="305" secondAttribute="centerY" id="H1z-kp-hhI"/>
<constraint firstItem="321" firstAttribute="leading" secondItem="296" secondAttribute="trailing" constant="8" symbolic="YES" id="Kl0-Q7-Dgr"/>
<constraint firstItem="313" firstAttribute="centerY" secondItem="ff5-dQ-geo" secondAttribute="centerY" id="M3y-5l-LG0"/>
<constraint firstItem="415" firstAttribute="leading" secondItem="196" secondAttribute="leading" constant="20" symbolic="YES" id="MKj-9x-PWP"/>
<constraint firstItem="415" firstAttribute="leading" secondItem="196" secondAttribute="leading" priority="750" constant="20" symbolic="YES" id="MKj-9x-PWP"/>
<constraint firstItem="585" firstAttribute="baseline" secondItem="6jK-7i-UaO" secondAttribute="baseline" id="MLb-XP-yQc"/>
<constraint firstItem="ErI-yf-OgH" firstAttribute="leading" secondItem="198" secondAttribute="trailing" constant="8" symbolic="YES" id="NCN-Zb-A0L"/>
<constraint firstItem="305" firstAttribute="top" secondItem="198" secondAttribute="bottom" constant="10" symbolic="YES" id="PRA-Wf-g9H"/>
@ -347,6 +348,7 @@
<constraint firstItem="313" firstAttribute="centerY" secondItem="295" secondAttribute="centerY" id="THZ-8C-rvC"/>
<constraint firstItem="305" firstAttribute="width" secondItem="198" secondAttribute="width" id="Tbu-Bb-8SV"/>
<constraint firstItem="305" firstAttribute="width" secondItem="313" secondAttribute="width" id="XsD-IU-YaB"/>
<constraint firstItem="6jK-7i-UaO" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="196" secondAttribute="leading" constant="20" symbolic="YES" id="a3k-5V-adI"/>
<constraint firstItem="256" firstAttribute="centerY" secondItem="198" secondAttribute="centerY" id="bC2-7Q-elr"/>
<constraint firstItem="295" firstAttribute="top" secondItem="304" secondAttribute="bottom" constant="8" symbolic="YES" id="cAH-jN-Wut"/>
<constraint firstItem="423" firstAttribute="trailing" secondItem="256" secondAttribute="trailing" id="chF-nn-ONk"/>

1
CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html
View File

@ -119,6 +119,7 @@
<li>Fix an issue where line numbers were not drawn completely on OS X 10.8 when scroll bars are set as always shown.</li>
<li>Fix an issue where the command-line tool could rarely not be installed from Integration pane.</li>
<li>Fix an issue where some legatured characters were drawn at a wrong position when the line height for composite font is fixed.</li>
<li>Add some missing localized strings in Japanese.</li>
<li>Improve general stability.</li>
</ul>
</section>

1
CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html
View File

@ -117,6 +117,7 @@
<li>OS X 10.8 で、スクロールバーを常に表示する設定にしているときに行番号表示が乱れることがあった不具合を修正</li>
<li>連携ペインでのコマンドラインツールのインストールが稀にできないことがあった不具合を修正</li>
<li>行高を固定しているとき、リガチャ文字が誤った場所に描画されることがあった不具合を修正</li>
<li>日本語のローカライズが一部抜けていた不具合を修正</li>
<li>全般的な安定性を向上</li>
</ul>
</section>

4
CotEditor/Sources/CEGeneralPaneController.m
View File

@ -58,7 +58,7 @@
#ifdef APPSTORE
// cut down height for updater checkbox
NSRect frame = [[self view] frame];
frame.size.height -= 82;
frame.size.height -= 96;
[[self view] setFrame:frame];
// cut down x-position of visible labels
@ -71,7 +71,7 @@
} else {
// cut down height for pre-release note
NSRect frame = [[self view] frame];
frame.size.height -= 18;
frame.size.height -= 32;
[[self view] setFrame:frame];
}
#endif

20
CotEditor/ja.lproj/PrintPanelAccessory.strings
View File

@ -25,8 +25,8 @@
*/
/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "721"; */
"721.title" = "カラー：";
/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "eXI-55-yQO"; */
"eXI-55-yQO.title" = "カラー：";
/* Class = "NSMenuItem"; title = "Black and White"; ObjectID = "590"; */
"590.title" = "白黒";
/* Class = "NSMenuItem"; title = "Same as document's setting"; ObjectID = "589"; */
@ -54,8 +54,8 @@
/* Class = "NSButtonCell"; title = "Print header"; ObjectID = "708"; */
"708.title" = "ヘッダをプリント";
/* Class = "NSTextFieldCell"; title = "Primary:"; ObjectID = "256"; */
"256.title" = "主ヘッダ：";
/* Class = "NSTextFieldCell"; title = "Primary:"; ObjectID = "706"; */
"706.title" = "主ヘッダ：";
/* Class = "NSMenuItem"; title = "None"; ObjectID = "393"; */
"393.title" = "なし";
@ -76,8 +76,8 @@
"Aru-Gd-J0D.ibShadowedToolTips[2]" = "右揃え"; /* Align Right */
/* Class = "NSTextFieldCell"; title = "Secodnary:"; ObjectID = "257"; */
"257.title" = "副ヘッダ：";
/* Class = "NSTextFieldCell"; title = "Secodnary:"; ObjectID = "707"; */
"707.title" = "副ヘッダ：";
/* Class = "NSMenuItem"; title = "None"; ObjectID = "395"; */
"395.title" = "なし";
@ -102,8 +102,8 @@
/* Class = "NSButtonCell"; title = "Print footer"; ObjectID = "713"; */
"713.title" = "フッタをプリント";
/* Class = "NSTextFieldCell"; title = "Primary:"; ObjectID = "295"; */
"295.title" = "主フッタ：";
/* Class = "NSTextFieldCell"; title = "Primary:"; ObjectID = "711"; */
"711.title" = "主フッタ：";
/* Class = "NSMenuItem"; title = "None"; ObjectID = "397"; */
"397.title" = "なし";
@ -124,8 +124,8 @@
"njJ-Ab-dUQ.ibShadowedToolTips[2]" = "右揃え"; /* Align Right */
/* Class = "NSTextFieldCell"; title = "Secodnary:"; ObjectID = "296"; */
"296.title" = "副フッタ：";
/* Class = "NSTextFieldCell"; title = "Secodnary:"; ObjectID = "712"; */
"712.title" = "副フッタ：";
/* Class = "NSMenuItem"; title = "None"; ObjectID = "399"; */
"399.title" = "なし";

12
CotEditor/zh-Hans.lproj/PrintPanelAccessory.strings
View File

@ -56,7 +56,7 @@
/* Class = "NSButtonCell"; title = "Print header"; ObjectID = "708"; */
"708.title" = "打印页眉";
/* Class = "NSTextFieldCell"; title = "Primary:"; ObjectID = "256"; */
/* Class = "NSTextFieldCell"; title = "Primary:"; ObjectID = "706"; */
"706.title" = "主:";
/* Class = "NSMenuItem"; title = "None"; ObjectID = "393"; */
@ -79,8 +79,8 @@
/* Class = "NSTextFieldCell"; title = "Secodnary:"; ObjectID = "257"; */
"712.title" = "次:";
/* Class = "NSTextFieldCell"; title = "Secodnary:"; ObjectID = "707"; */
"707.title" = "次:";
/* Class = "NSMenuItem"; title = "None"; ObjectID = "395"; */
"395.title" = "无";
@ -105,7 +105,7 @@
/* Class = "NSButtonCell"; title = "Print footer"; ObjectID = "713"; */
"713.title" = "打印页脚";
/* Class = "NSTextFieldCell"; title = "Primary:"; ObjectID = "295"; */
/* Class = "NSTextFieldCell"; title = "Primary:"; ObjectID = "711"; */
"711.title" = "主:";
/* Class = "NSMenuItem"; title = "None"; ObjectID = "397"; */
@ -127,8 +127,8 @@
"njJ-Ab-dUQ.ibShadowedToolTips[2]" = "右对齐"; /* Align Right */
/* Class = "NSTextFieldCell"; title = "Secodnary:"; ObjectID = "296"; */
"707.title" = "次:";
/* Class = "NSTextFieldCell"; title = "Secodnary:"; ObjectID = "712"; */
"712.title" = "次:";
/* Class = "NSMenuItem"; title = "None"; ObjectID = "399"; */
"399.title" = "无";