mirror of
https://github.com/coteditor/CotEditor.git
synced 2024-09-11 11:25:57 +03:00
Display “UTF-8 with BOM” in encodings list table
This commit is contained in:
1024jp
parent
e8040511c6
commit
420b416a19
@ -8,6 +8,7 @@ Change Log
|
||||
### Improvements
|
||||
|
||||
- Remove the text encoding setting for opened documents; instead, the auto-detection is always performed when opening an existing file.
|
||||
- Improve the encodings list edit view.
|
||||
- Adjust the width of toolbar items.
|
||||
- [beta] Add menu item, toolbar item, and Touch Bar item to toggle visibility of indent guides in the current document.
|
||||
- [beta] Adjust the vertical position of the line ending symbol.
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="JC2-8h-XKM">
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="JC2-8h-XKM">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
@ -10,26 +10,25 @@
|
||||
<scene sceneID="VZ0-zu-Toz">
|
||||
<objects>
|
||||
<viewController showSeguePresentationStyle="single" id="JC2-8h-XKM" customClass="EncodingListViewController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" id="yF2-dV-tho">
|
||||
<rect key="frame" x="0.0" y="0.0" width="440" height="367"/>
|
||||
<view key="view" misplaced="YES" id="yF2-dV-tho">
|
||||
<rect key="frame" x="0.0" y="0.0" width="440" height="327"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LP8-0O-9z3">
|
||||
<rect key="frame" x="20" y="97" width="284" height="190"/>
|
||||
<rect key="frame" x="20" y="61" width="284" height="186"/>
|
||||
<clipView key="contentView" id="0qH-ED-MMi">
|
||||
<rect key="frame" x="1" y="1" width="282" height="188"/>
|
||||
<rect key="frame" x="1" y="1" width="282" height="184"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" autosaveColumns="NO" rowSizeStyle="automatic" usesAutomaticRowHeights="YES" viewBased="YES" id="sEh-f6-spz">
|
||||
<rect key="frame" x="0.0" y="0.0" width="282" height="188"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" autosaveColumns="NO" rowSizeStyle="automatic" usesAutomaticRowHeights="YES" viewBased="YES" id="sEh-f6-spz">
|
||||
<rect key="frame" x="0.0" y="0.0" width="282" height="184"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<size key="intercellSpacing" width="3" height="2"/>
|
||||
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
|
||||
<tableColumns>
|
||||
<tableColumn editable="NO" width="279" minWidth="40" maxWidth="1000" id="49c-uK-4Wa">
|
||||
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</tableHeaderCell>
|
||||
@ -46,7 +45,7 @@
|
||||
<subviews>
|
||||
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="A53-Gb-bA3" customClass="SeparatorTextField" customModule="CotEditor" customModuleProvider="target">
|
||||
<rect key="frame" x="4" y="0.0" width="271" height="16"/>
|
||||
<textFieldCell key="cell" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="Yzo-ia-Vea">
|
||||
<textFieldCell key="cell" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" sendsActionOnEndEditing="YES" title="ENCODING NAME" id="Yzo-ia-Vea">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
@ -119,32 +118,32 @@ DQ
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uwq-dp-HCe">
|
||||
<rect key="frame" x="307" y="263" width="118" height="27"/>
|
||||
<rect key="frame" x="307" y="223" width="118" height="27"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="108" id="UBd-i0-3Pw"/>
|
||||
</constraints>
|
||||
<buttonCell key="cell" type="push" title="Add Separator" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="3392">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
<font key="font" metaFont="message" size="11"/>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<action selector="addSeparator:" target="JC2-8h-XKM" id="zSd-ad-XXJ"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5od-lM-Mgb">
|
||||
<rect key="frame" x="307" y="235" width="118" height="27"/>
|
||||
<rect key="frame" x="307" y="195" width="118" height="27"/>
|
||||
<buttonCell key="cell" type="push" title="Delete Separator" bezelStyle="rounded" alignment="center" controlSize="small" enabled="NO" borderStyle="border" inset="2" id="3393">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
<font key="font" metaFont="message" size="11"/>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<action selector="deleteSeparator:" target="JC2-8h-XKM" id="fL3-Qg-c5n"/>
|
||||
</connections>
|
||||
</button>
|
||||
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="4Ji-oF-2Xz">
|
||||
<rect key="frame" x="18" y="295" width="404" height="28"/>
|
||||
<rect key="frame" x="18" y="255" width="404" height="28"/>
|
||||
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="3394">
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
<font key="font" metaFont="message" size="11"/>
|
||||
<string key="title">This list is for Auto-Detect and the file encoding menu.
|
||||
Auto-Detect tries these encodings from the top of the list.</string>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
@ -152,7 +151,7 @@ Auto-Detect tries these encodings from the top of the list.</string>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="4bX-CV-ACG">
|
||||
<rect key="frame" x="18" y="331" width="226" height="16"/>
|
||||
<rect key="frame" x="18" y="291" width="226" height="16"/>
|
||||
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Drag encodings to change the order." id="3395">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
@ -175,14 +174,6 @@ Auto-Detect tries these encodings from the top of the list.</string>
|
||||
<action selector="revertDefaultEncodings:" target="JC2-8h-XKM" id="C9P-M5-tIm"/>
|
||||
</connections>
|
||||
</button>
|
||||
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="EvH-HI-yPD">
|
||||
<rect key="frame" x="18" y="61" width="404" height="28"/>
|
||||
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="“Unicode (UTF-8) with BOM” will be automatically added to just after the normal “Unicode (UTF-8)”." id="jXZ-7k-86F">
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="4Ji-oF-2Xz" firstAttribute="top" secondItem="4bX-CV-ACG" secondAttribute="bottom" constant="8" symbolic="YES" id="0eW-DG-nod"/>
|
||||
@ -192,15 +183,12 @@ Auto-Detect tries these encodings from the top of the list.</string>
|
||||
<constraint firstItem="4bX-CV-ACG" firstAttribute="top" secondItem="yF2-dV-tho" secondAttribute="top" constant="20" symbolic="YES" id="BnC-er-DdV"/>
|
||||
<constraint firstItem="eQS-x1-ISf" firstAttribute="leading" secondItem="yF2-dV-tho" secondAttribute="leading" constant="20" symbolic="YES" id="Ebp-aM-VMp"/>
|
||||
<constraint firstItem="5od-lM-Mgb" firstAttribute="leading" secondItem="LP8-0O-9z3" secondAttribute="trailing" constant="8" symbolic="YES" id="EqP-OB-KYz"/>
|
||||
<constraint firstAttribute="trailing" secondItem="EvH-HI-yPD" secondAttribute="trailing" constant="20" symbolic="YES" id="HSQ-ra-0iJ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="4Ji-oF-2Xz" secondAttribute="trailing" constant="20" symbolic="YES" id="KDN-Uz-uqk"/>
|
||||
<constraint firstItem="EvH-HI-yPD" firstAttribute="top" secondItem="LP8-0O-9z3" secondAttribute="bottom" constant="8" symbolic="YES" id="O7B-nw-WJ7"/>
|
||||
<constraint firstItem="EvH-HI-yPD" firstAttribute="leading" secondItem="yF2-dV-tho" secondAttribute="leading" constant="20" symbolic="YES" id="OhI-xx-6Mq"/>
|
||||
<constraint firstItem="eQS-x1-ISf" firstAttribute="top" secondItem="EvH-HI-yPD" secondAttribute="bottom" constant="20" symbolic="YES" id="PYb-ez-Uoc"/>
|
||||
<constraint firstItem="4bX-CV-ACG" firstAttribute="leading" secondItem="yF2-dV-tho" secondAttribute="leading" constant="20" symbolic="YES" id="Pkk-ag-zdK"/>
|
||||
<constraint firstItem="4Ji-oF-2Xz" firstAttribute="leading" secondItem="yF2-dV-tho" secondAttribute="leading" constant="20" symbolic="YES" id="RZX-lb-I43"/>
|
||||
<constraint firstAttribute="bottom" secondItem="eZH-EP-XJr" secondAttribute="bottom" constant="20" symbolic="YES" id="SgC-Ld-7c5"/>
|
||||
<constraint firstAttribute="trailing" secondItem="5od-lM-Mgb" secondAttribute="trailing" constant="20" symbolic="YES" id="TOQ-HA-R6w"/>
|
||||
<constraint firstItem="aiv-GS-dcz" firstAttribute="top" secondItem="LP8-0O-9z3" secondAttribute="bottom" constant="20" symbolic="YES" id="YeC-pk-RtD"/>
|
||||
<constraint firstAttribute="trailing" secondItem="uwq-dp-HCe" secondAttribute="trailing" constant="20" symbolic="YES" id="aX1-ex-hVs"/>
|
||||
<constraint firstItem="aiv-GS-dcz" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="eQS-x1-ISf" secondAttribute="trailing" constant="12" symbolic="YES" id="hCD-Zg-tVW"/>
|
||||
<constraint firstItem="LP8-0O-9z3" firstAttribute="leading" secondItem="yF2-dV-tho" secondAttribute="leading" constant="20" symbolic="YES" id="hRd-0O-Sgy"/>
|
||||
|
||||
@ -20,12 +20,13 @@
|
||||
<p>To set the priority of encoding auto-detection:</p>
|
||||
<ol>
|
||||
<li>Choose CotEditor > Preferences.</li>
|
||||
<li>Click Format.</li>
|
||||
<li>In the File Encoding section, click Edit Encoding List.</li>
|
||||
<li>Move up the encodings you use frequently, and place UTF-16 right under them.<br />
|
||||
(As UTF-16 is able to encode most characters, you need to put it <strong>at the bottom of often-used encodings</strong>.)</li>
|
||||
<li>Select the Format pane.</li>
|
||||
<li>In the “priority of encodings” section, click the “Edit List” button.</li>
|
||||
<li>Move up the encodings you use frequently.<br />
|
||||
(Here, we recommend placing UTF-16 <strong>after</strong> other often-used encodings, as UTF-16 can encode most characters.)</li>
|
||||
</ol>
|
||||
<p>Though you can change the order of encodings, you cannot delete them. Just move down the encodings you don't use.</p>
|
||||
<p>Besides, “Unicode (UTF-8)” and “Unicode (UTF-8) with BOM” are always handled as a set. Because the BOM (byte order mark) will be taken into account when trying encoding data into UTF-8, there is no effect on the detection precision that the order of these two encodings are fixed.</p>
|
||||
|
||||
|
||||
<section id="cf">
|
||||
|
||||
@ -21,11 +21,12 @@
|
||||
<ol>
|
||||
<li>CotEditorメニューの「環境設定」を開きます。</li>
|
||||
<li>「フォーマット」タブをクリックします。</li>
|
||||
<li>「エンコーディング」の「リストを編集」ボタンをクリックします。</li>
|
||||
<li>エンコーディングの優先順位を指定します。よく使うエンコーディングを上に移動させ、その後にUTF-16を置きます。<br />
|
||||
（UTF-16ではほとんどの文字列が解釈されるため、「使うもののうちの一番下」に配置します）</li>
|
||||
<li>「エンコーディングの優先順位」の「リストを編集」ボタンをクリックします。</li>
|
||||
<li>よく使うエンコーディングを上に移動させエンコーディングの優先順位を指定します。<br />
|
||||
（UTF-16ではほとんどの文字列が解釈されるため、「使うもののうちの一番下」に配置することを推奨します。）</li>
|
||||
</ol>
|
||||
<p>エンコーディングの並び順は変更できますが、削除はできません。使用しないエンコーディングは下に移動させてください。</p>
|
||||
<p>なお、「Unicode（UTF-8）」と「Unicode（UTF-8）BOM」付きは必ずセットで配置されます。UTF-8の解釈を試すときは同時にBOM（byte order mark）の確認も行うので、この2つの順序が固定であることによる認識精度への影響はありません。</p>
|
||||
|
||||
|
||||
<section id="cf">
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
// ---------------------------------------------------------------------------
|
||||
//
|
||||
// © 2004-2007 nakamuxu
|
||||
// © 2014-2018 1024jp
|
||||
// © 2014-2020 1024jp
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
@ -62,24 +62,19 @@ final class EncodingListViewController: NSViewController, NSTableViewDelegate {
|
||||
|
||||
guard let textField = (rowView.view(atColumn: 0) as? NSTableCellView)?.textField else { return }
|
||||
|
||||
let cfEncoding = CFStringEncoding(self.encodings[row])
|
||||
let encoding = self.encodings[row]
|
||||
|
||||
// separator
|
||||
if cfEncoding == kCFStringEncodingInvalidId {
|
||||
textField.stringValue = String.separator
|
||||
return
|
||||
switch encoding {
|
||||
case kCFStringEncodingInvalidId:
|
||||
textField.stringValue = .separator
|
||||
|
||||
case .utf8:
|
||||
textField.attributedStringValue = [encoding.attributedName(),
|
||||
encoding.attributedName(withUTF8BOM: true)].joined(separator: .newLine)
|
||||
|
||||
default:
|
||||
textField.attributedStringValue = encoding.attributedName()
|
||||
}
|
||||
|
||||
// styled encoding name
|
||||
let encoding = String.Encoding(cfEncoding: cfEncoding)
|
||||
let encodingName = String.localizedName(of: encoding)
|
||||
let attrEncodingName = NSAttributedString(string: encodingName)
|
||||
|
||||
let ianaName = (CFStringConvertEncodingToIANACharSetName(cfEncoding) as String?) ?? "-"
|
||||
let attrIanaName = NSAttributedString(string: " : " + ianaName,
|
||||
attributes: [.foregroundColor: NSColor.disabledControlTextColor])
|
||||
|
||||
textField.attributedStringValue = attrEncodingName + attrIanaName
|
||||
}
|
||||
|
||||
|
||||
@ -87,9 +82,8 @@ final class EncodingListViewController: NSViewController, NSTableViewDelegate {
|
||||
func tableViewSelectionDidChange(_ notification: Notification) {
|
||||
|
||||
// update enability of "Delete Separator" button
|
||||
self.deleteSeparatorButton?.isEnabled = self.tableView!.selectedRowIndexes.contains { index in
|
||||
self.encodings[index] == kCFStringEncodingInvalidId
|
||||
}
|
||||
self.deleteSeparatorButton?.isEnabled = self.tableView!.selectedRowIndexes
|
||||
.contains { self.encodings[$0] == kCFStringEncodingInvalidId }
|
||||
}
|
||||
|
||||
|
||||
@ -110,7 +104,6 @@ final class EncodingListViewController: NSViewController, NSTableViewDelegate {
|
||||
@IBAction func revertDefaultEncodings(_ sender: Any?) {
|
||||
|
||||
self.encodings = UserDefaults.standard.registeredValue(for: .encodingList)
|
||||
self.tableView?.reloadData()
|
||||
}
|
||||
|
||||
|
||||
@ -142,7 +135,7 @@ final class EncodingListViewController: NSViewController, NSTableViewDelegate {
|
||||
|
||||
let indexes = IndexSet(integer: rowIndex)
|
||||
|
||||
NSAnimationContext.runAnimationGroup({ context in
|
||||
NSAnimationContext.runAnimationGroup({ _ in
|
||||
// update UI
|
||||
tableView.insertRows(at: indexes, withAnimation: .effectGap)
|
||||
}, completionHandler: { [weak self] in
|
||||
@ -158,14 +151,12 @@ final class EncodingListViewController: NSViewController, NSTableViewDelegate {
|
||||
private func deleteSeparators(at rowIndexes: IndexSet) {
|
||||
|
||||
// pick only separators up
|
||||
let toDeleteIndexes = rowIndexes.filteredIndexSet { index in
|
||||
self.encodings[index] == kCFStringEncodingInvalidId
|
||||
}
|
||||
let toDeleteIndexes = rowIndexes.filteredIndexSet { self.encodings[$0] == kCFStringEncodingInvalidId }
|
||||
|
||||
guard !toDeleteIndexes.isEmpty else { return }
|
||||
guard let tableView = self.tableView else { return assertionFailure() }
|
||||
|
||||
NSAnimationContext.runAnimationGroup({ context in
|
||||
NSAnimationContext.runAnimationGroup({ _ in
|
||||
// update UI
|
||||
tableView.removeRows(at: toDeleteIndexes, withAnimation: [.slideUp, .effectFade])
|
||||
}, completionHandler: { [weak self] in
|
||||
@ -175,3 +166,36 @@ final class EncodingListViewController: NSViewController, NSTableViewDelegate {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
// MARK: - Private Extensions
|
||||
|
||||
private extension CFStringEncoding {
|
||||
|
||||
static let utf8: CFStringEncoding = CFStringBuiltInEncodings.UTF8.rawValue
|
||||
|
||||
|
||||
/// Return encoding name with style.
|
||||
///
|
||||
/// This funciton is designed __only for__ the encoding list table.
|
||||
///
|
||||
/// - Parameter withUTF8BOM: True when needing to attach " with BOM" to the name if the encoding is .utf8.
|
||||
/// - Returns: A styled encoding name.
|
||||
func attributedName(withUTF8BOM: Bool = false) -> NSAttributedString {
|
||||
|
||||
assert(!withUTF8BOM || self == .utf8)
|
||||
|
||||
// styled encoding name
|
||||
let encoding = String.Encoding(cfEncoding: self)
|
||||
let encodingName = String.localizedName(of: encoding, withUTF8BOM: withUTF8BOM)
|
||||
let attrEncodingName = NSAttributedString(string: encodingName)
|
||||
|
||||
let ianaName = (CFStringConvertEncodingToIANACharSetName(self) as String?) ?? "-"
|
||||
let attrIanaName = NSAttributedString(string: " : " + ianaName,
|
||||
attributes: [.foregroundColor: NSColor.disabledControlTextColor])
|
||||
|
||||
return attrEncodingName + attrIanaName
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -238,8 +238,7 @@ private extension NSColor {
|
||||
|
||||
@available(macOS 10.15, *)
|
||||
static let statusBarLabelColor = NSColor(name: "statusBarLabelColor") { appearance in
|
||||
|
||||
appearance.isDark ? NSColor.secondaryLabelColor : NSColor.labelColor.withAlphaComponent(0.6)
|
||||
appearance.isDark ? .secondaryLabelColor : NSColor.labelColor.withAlphaComponent(0.6)
|
||||
}
|
||||
|
||||
|
||||
@ -247,10 +246,10 @@ private extension NSColor {
|
||||
static func statusBarLabelColor(appearance: NSAppearance) -> NSColor {
|
||||
|
||||
guard #available(macOS 10.15, *) else {
|
||||
return appearance.isDark ? Self.secondaryLabelColor : Self.labelColor.withAlphaComponent(0.6)
|
||||
return appearance.isDark ? .secondaryLabelColor : NSColor.labelColor.withAlphaComponent(0.6)
|
||||
}
|
||||
|
||||
return NSColor.statusBarLabelColor
|
||||
return .statusBarLabelColor
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
© 2015-2016 1024jp
|
||||
© 2015-2020 1024jp
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
@ -36,9 +36,6 @@
|
||||
/* Class = "NSButtonCell"; title = "Delete Separator"; ObjectID = "3393"; */
|
||||
"3393.title" = "Separator löschen";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "“Unicode (UTF-8) with BOM” will be automatically added to just after the normal “Unicode (UTF-8)”."; ObjectID = "jXZ-7k-86F"; */
|
||||
"jXZ-7k-86F.title" = "„Unicode (UTF-8) mit BOM“ wird automatisch direkt nach dem normalen „Unicode (UTF-8)“ hinzugefügt.";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Restore Defaults"; ObjectID = "3396"; */
|
||||
"3396.title" = "Auf Standard zurücksetzen";
|
||||
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "3390"; */
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
Localized by Aurélien Roy
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
© 2015-2019 CotEditor Project
|
||||
© 2015-2020 CotEditor Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
@ -36,9 +36,6 @@
|
||||
/* Class = "NSButtonCell"; title = "Delete Separator"; ObjectID = "3393"; */
|
||||
"3393.title" = "Supprimer le séparateur";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "“Unicode (UTF-8) with BOM” will be automatically added to just after the normal “Unicode (UTF-8)”."; ObjectID = "jXZ-7k-86F"; */
|
||||
"jXZ-7k-86F.title" = "“Unicode（UTF-8）avec BOM” sera automatiquement ajouté juste après “Unicode（UTF-8)”.";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Restore Defaults"; ObjectID = "3396"; */
|
||||
"3396.title" = "Restaurer les paramètres par défaut";
|
||||
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "3390"; */
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
© 2016 CotEditor Project
|
||||
© 2016-2020 CotEditor Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
@ -37,9 +37,6 @@
|
||||
/* Class = "NSButtonCell"; title = "Delete Separator"; ObjectID = "3393"; */
|
||||
"3393.title" = "Elimina separatore";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "“Unicode (UTF-8) with BOM” will be automatically added to just after the normal “Unicode (UTF-8)”."; ObjectID = "jXZ-7k-86F"; */
|
||||
"jXZ-7k-86F.title" = "“Unicode (UTF-8) con BOM” sarà aggiunto automaticamente subito dopo il normale “Unicode (UTF-8)”.";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Restore Defaults"; ObjectID = "3396"; */
|
||||
"3396.title" = "Ripristina default";
|
||||
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "3390"; */
|
||||
|
||||
@ -36,9 +36,6 @@
|
||||
/* Class = "NSButtonCell"; title = "Delete Separator"; ObjectID = "3393"; */
|
||||
"3393.title" = "区切り線を削除";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "“Unicode (UTF-8) with BOM” will be automatically added to just after the normal “Unicode (UTF-8)”."; ObjectID = "jXZ-7k-86F"; */
|
||||
"jXZ-7k-86F.title" = "“Unicode（UTF-8）BOM付き”は“Unicode（UTF-8）”の次に自動的に追加されます。";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Restore Defaults"; ObjectID = "3396"; */
|
||||
"3396.title" = "デフォルトに戻す";
|
||||
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "3390"; */
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
//
|
||||
// ------------------------------------------------------------------------------
|
||||
//
|
||||
// © 2018 CotEditor Project
|
||||
// © 2018-2020 CotEditor Project
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
@ -35,9 +35,6 @@
|
||||
/* Class = "NSButtonCell"; title = "Delete Separator"; ObjectID = "3393"; */
|
||||
"3393.title" = "Apagar Separador";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "“Unicode (UTF-8) with BOM” will be automatically added to just after the normal “Unicode (UTF-8)”."; ObjectID = "jXZ-7k-86F"; */
|
||||
"jXZ-7k-86F.title" = "“Unicode (UTF-8) com BOM” será adicionado automaticamente logo após “Unicode (UTF-8)”.";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Restore Defaults"; ObjectID = "3396"; */
|
||||
"3396.title" = "Restaurar Padrões";
|
||||
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "3390"; */
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
© 2014-2016 CotEditor Project
|
||||
© 2014-2020 CotEditor Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
@ -37,9 +37,6 @@
|
||||
/* Class = "NSButtonCell"; title = "Delete Separator"; ObjectID = "3393"; */
|
||||
"3393.title" = "删除分隔线";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "“Unicode (UTF-8) with BOM” will be automatically added to just after the normal “Unicode (UTF-8)”."; ObjectID = "jXZ-7k-86F"; */
|
||||
"jXZ-7k-86F.title" = "将会自动在普通的 “Unicode (UTF-8)” 后加入 “Unicode (UTF-8) with BOM”";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Restore Defaults"; ObjectID = "3396"; */
|
||||
"3396.title" = "恢复默认";
|
||||
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "3390"; */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user