i18n: fix strings
- fix typos
- use placeholder title values to prevent export of some dev-strings
- bump sources strings
- update tx config to reflect the merge of audio and video account
settings (formerly AccAudio and AccVideo, now AccMedia)
Change-Id: Ia397c74d4d29fd27688a8dd099644b353b8fc456
Tuleap: #500
diff --git a/ui/Base.lproj/AccAdvanced.xib b/ui/Base.lproj/AccAdvanced.xib
index 5360645..6eee32a 100644
--- a/ui/Base.lproj/AccAdvanced.xib
+++ b/ui/Base.lproj/AccAdvanced.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccAdvancedVC">
@@ -159,7 +159,7 @@
<matrix verticalHuggingPriority="750" fixedFrame="YES" allowsEmptySelection="NO" autorecalculatesCellSize="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2yz-X7-dVm">
<rect key="frame" x="64" y="283" width="320" height="38"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- <size key="cellSize" width="216" height="18"/>
+ <size key="cellSize" width="212" height="18"/>
<size key="intercellSpacing" width="4" height="2"/>
<buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="fB0-X8-GXk">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
diff --git a/ui/Base.lproj/AccAudio.strings b/ui/Base.lproj/AccAudio.strings
deleted file mode 100644
index d1ae715..0000000
--- a/ui/Base.lproj/AccAudio.strings
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/* Class = "NSButtonCell"; title = "Play"; ObjectID = "8jq-XH-nJV"; */
-"8jq-XH-nJV.title" = "Play";
-
-/* Class = "NSButtonCell"; title = "Down"; ObjectID = "Bbz-hd-1CE"; */
-"Bbz-hd-1CE.title" = "Down";
-
-/* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
-"KkI-i1-mfY.title" = "Enable ringtones";
-
-/* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
-"MbZ-7X-K5I.title" = "Up";
-
-/* Class = "NSTableColumn"; headerCell.title = "Codecs"; ObjectID = "PGV-RF-f13"; */
-"PGV-RF-f13.headerCell.title" = "Codecs";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "PYp-JZ-g1v"; */
-"PYp-JZ-g1v.title" = "Text Cell";
-
-/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "RBO-p6-Wej"; */
-"RBO-p6-Wej.title" = "Text";
-
-/* Class = "NSTextFieldCell"; title = "Ringtones"; ObjectID = "aMg-uJ-Krx"; */
-"aMg-uJ-Krx.title" = "Ringtones";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "bZK-L6-HSm"; */
-"bZK-L6-HSm.title" = "Text Cell";
-
-/* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "biN-bX-qM1"; */
-"biN-bX-qM1.title" = "Codecs";
-
-/* Class = "NSTableColumn"; headerCell.title = "Frequency"; ObjectID = "hjc-hd-CQe"; */
-"hjc-hd-CQe.headerCell.title" = "Frequency";
-
-/* Class = "NSTableColumn"; headerCell.title = "Bitrate"; ObjectID = "sd4-Co-8hS"; */
-"sd4-Co-8hS.headerCell.title" = "Bitrate";
-
-/* Class = "NSTableColumn"; headerCell.title = "Enabled"; ObjectID = "txE-JZ-54H"; */
-"txE-JZ-54H.headerCell.title" = "Enabled";
diff --git a/ui/Base.lproj/AccMedia.strings b/ui/Base.lproj/AccMedia.strings
new file mode 100644
index 0000000..9989c24
--- /dev/null
+++ b/ui/Base.lproj/AccMedia.strings
@@ -0,0 +1,45 @@
+
+/* Class = "NSButtonCell"; title = "Down"; ObjectID = "Bbz-hd-1CE"; */
+"Bbz-hd-1CE.title" = "Down";
+
+/* Class = "NSButtonCell"; title = "Up"; ObjectID = "CO7-VF-04Q"; */
+"CO7-VF-04Q.title" = "Up";
+
+/* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
+"KkI-i1-mfY.title" = "Enable ringtones";
+
+/* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
+"MbZ-7X-K5I.title" = "Up";
+
+/* Class = "NSButtonCell"; title = "Video"; ObjectID = "OSC-eG-2kt"; */
+"OSC-eG-2kt.title" = "Video";
+
+/* Class = "NSTextFieldCell"; title = "Ringtones"; ObjectID = "aMg-uJ-Krx"; */
+"aMg-uJ-Krx.title" = "Ringtones";
+
+/* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "biN-bX-qM1"; */
+"biN-bX-qM1.title" = "Codecs";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Frequency"; ObjectID = "dwG-Ro-bIS"; */
+"dwG-Ro-bIS.placeholderString" = "Frequency";
+
+/* Class = "NSTextFieldCell"; title = "details"; ObjectID = "dwG-Ro-bIS"; */
+"dwG-Ro-bIS.title" = "details";
+
+/* Class = "NSTextFieldCell"; title = "Audio"; ObjectID = "gzX-Wc-S6g"; */
+"gzX-Wc-S6g.title" = "Audio";
+
+/* Class = "NSButtonCell"; title = "Down"; ObjectID = "gza-RF-yKF"; */
+"gza-RF-yKF.title" = "Down";
+
+/* Class = "NSButtonCell"; title = "Play"; ObjectID = "hHf-uc-NlW"; */
+"hHf-uc-NlW.title" = "Play";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "pvl-9U-X4l"; */
+"pvl-9U-X4l.placeholderString" = "Name";
+
+/* Class = "NSTextFieldCell"; title = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)"; ObjectID = "rRr-la-G9L"; */
+"rRr-la-G9L.title" = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "rU5-XQ-Ixc"; */
+"rU5-XQ-Ixc.placeholderString" = "Name";
diff --git a/ui/Base.lproj/AccMedia.xib b/ui/Base.lproj/AccMedia.xib
index 8fdde84..a7e904b 100644
--- a/ui/Base.lproj/AccMedia.xib
+++ b/ui/Base.lproj/AccMedia.xib
@@ -82,7 +82,7 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="s2y-pc-JzP">
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" id="s2y-pc-JzP">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -180,7 +180,7 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="9GC-2s-75b">
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" id="9GC-2s-75b">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
diff --git a/ui/Base.lproj/AccRing.strings b/ui/Base.lproj/AccRing.strings
index 1da66c9..6bb91e5 100644
--- a/ui/Base.lproj/AccRing.strings
+++ b/ui/Base.lproj/AccRing.strings
@@ -1,6 +1,6 @@
-/* Class = "NSTextFieldCell"; title = "This will be displayed to unknow peers"; ObjectID = "0Yt-xC-OWa"; */
-"0Yt-xC-OWa.title" = "This will be displayed to unknow peers";
+/* Class = "NSTextFieldCell"; title = "This will be displayed to unknown peers"; ObjectID = "0Yt-xC-OWa"; */
+"0Yt-xC-OWa.title" = "This will be displayed to unknown peers";
/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "1Sx-Et-CDM"; */
"1Sx-Et-CDM.title" = "Account";
diff --git a/ui/Base.lproj/AccRing.xib b/ui/Base.lproj/AccRing.xib
index 13959b0..4ba5347 100644
--- a/ui/Base.lproj/AccRing.xib
+++ b/ui/Base.lproj/AccRing.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccRingVC">
@@ -188,7 +188,7 @@
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EVi-Oa-N9k">
<rect key="frame" x="295" y="401" width="243" height="14"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="This will be displayed to unknow peers" id="0Yt-xC-OWa">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="This will be displayed to unknown peers" id="0Yt-xC-OWa">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
diff --git a/ui/Base.lproj/AccSecurity.strings b/ui/Base.lproj/AccSecurity.strings
index 79cdda5..73ff862 100644
--- a/ui/Base.lproj/AccSecurity.strings
+++ b/ui/Base.lproj/AccSecurity.strings
@@ -8,14 +8,14 @@
/* Class = "NSButtonCell"; title = "Use custom cipher list"; ObjectID = "2e5-zS-ghg"; */
"2e5-zS-ghg.title" = "Use custom cipher list";
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "5LC-T6-hpk"; */
-"5LC-T6-hpk.title" = "Text Cell";
+/* Class = "NSTextFieldCell"; placeholderString = "cipher cell"; ObjectID = "5LC-T6-hpk"; */
+"5LC-T6-hpk.placeholderString" = "cipher cell";
/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "7c2-kF-dcs"; */
"7c2-kF-dcs.placeholderString" = "Password...";
-/* Class = "NSTextFieldCell"; title = "Negociation timeout"; ObjectID = "9Q3-1W-Lh3"; */
-"9Q3-1W-Lh3.title" = "Negociation timeout";
+/* Class = "NSTextFieldCell"; title = "Negotiation timeout"; ObjectID = "9Q3-1W-Lh3"; */
+"9Q3-1W-Lh3.title" = "Negotiation timeout";
/* Class = "NSButtonCell"; title = "Fallback on RTP"; ObjectID = "Ig9-B1-7N3"; */
"Ig9-B1-7N3.title" = "Fallback on RTP";
@@ -32,9 +32,6 @@
/* Class = "NSButtonCell"; title = "Use SRTP"; ObjectID = "YtQ-hx-hih"; */
"YtQ-hx-hih.title" = "Use SRTP";
-/* Class = "NSMenu"; title = "tlsmethodlist"; ObjectID = "hOG-SW-CBI"; */
-"hOG-SW-CBI.title" = "tlsmethodlist";
-
/* Class = "NSButtonCell"; title = "Use TLS transport"; ObjectID = "oTT-gO-fqM"; */
"oTT-gO-fqM.title" = "Use TLS transport";
diff --git a/ui/Base.lproj/AccSecurity.xib b/ui/Base.lproj/AccSecurity.xib
index 6f99e2a..0fe148e 100644
--- a/ui/Base.lproj/AccSecurity.xib
+++ b/ui/Base.lproj/AccSecurity.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccSecurityVC">
@@ -89,7 +89,7 @@
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="XAT-9Y-9e0">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
- <menu key="menu" title="tlsmethodlist" id="hOG-SW-CBI">
+ <menu key="menu" id="hOG-SW-CBI">
<connections>
<outlet property="delegate" destination="-2" id="ri6-UD-0cj"/>
</connections>
@@ -132,7 +132,7 @@
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9Nq-Sf-LSO">
<rect key="frame" x="215" y="12" width="129" height="17"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Negociation timeout" id="9Q3-1W-Lh3">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Negotiation timeout" id="9Q3-1W-Lh3">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -269,11 +269,11 @@
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rf5-DP-g8u">
<rect key="frame" x="230" y="113" width="287" height="149"/>
<clipView key="contentView" ambiguous="YES" id="5qx-CS-RZZ">
- <rect key="frame" x="1" y="17" width="285" height="131"/>
+ <rect key="frame" x="1" y="0.0" width="285" height="148"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" headerView="d0e-h3-O5f" indentationPerLevel="16" outlineTableColumn="n3A-3A-ad2" id="J53-ev-CMr">
- <rect key="frame" x="0.0" y="0.0" width="285" height="131"/>
+ <rect key="frame" x="0.0" y="0.0" width="285" height="125"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -300,7 +300,7 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="5LC-T6-hpk">
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" placeholderString="cipher cell" id="5LC-T6-hpk">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -316,15 +316,15 @@
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="IPW-7g-Ykq">
- <rect key="frame" x="1" y="1" width="0.0" height="16"/>
+ <rect key="frame" x="1" y="7" width="0.0" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="P9Y-fn-MnT">
- <rect key="frame" x="-15" y="17" width="16" height="0.0"/>
+ <rect key="frame" x="-15" y="23" width="16" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<tableHeaderView key="headerView" id="d0e-h3-O5f">
- <rect key="frame" x="0.0" y="0.0" width="285" height="17"/>
+ <rect key="frame" x="0.0" y="0.0" width="285" height="23"/>
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
diff --git a/ui/Base.lproj/AccVideo.strings b/ui/Base.lproj/AccVideo.strings
deleted file mode 100644
index faba9a0..0000000
--- a/ui/Base.lproj/AccVideo.strings
+++ /dev/null
@@ -1,33 +0,0 @@
-
-/* Class = "NSTableColumn"; headerCell.title = "Codecs"; ObjectID = "DSk-Vi-l91"; */
-"DSk-Vi-l91.headerCell.title" = "Codecs";
-
-/* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "DlW-RF-2xv"; */
-"DlW-RF-2xv.title" = "Codecs";
-
-/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "DmR-7J-s8s"; */
-"DmR-7J-s8s.title" = "Text";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "HcP-F1-RiZ"; */
-"HcP-F1-RiZ.title" = "Text Cell";
-
-/* Class = "NSTableColumn"; headerCell.title = "Frequency"; ObjectID = "WAr-DG-2aa"; */
-"WAr-DG-2aa.headerCell.title" = "Frequency";
-
-/* Class = "NSButtonCell"; title = "Down"; ObjectID = "YYh-3p-JG5"; */
-"YYh-3p-JG5.title" = "Down";
-
-/* Class = "NSButtonCell"; title = "Enable video"; ObjectID = "ZYO-6G-DC2"; */
-"ZYO-6G-DC2.title" = "Enable video";
-
-/* Class = "NSButtonCell"; title = "Up"; ObjectID = "ZYZ-Vd-MXi"; */
-"ZYZ-Vd-MXi.title" = "Up";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "dRe-pp-ok2"; */
-"dRe-pp-ok2.title" = "Text Cell";
-
-/* Class = "NSTableColumn"; headerCell.title = "Enabled"; ObjectID = "eGS-FS-4hO"; */
-"eGS-FS-4hO.headerCell.title" = "Enabled";
-
-/* Class = "NSTableColumn"; headerCell.title = "Bitrate"; ObjectID = "jvv-dK-jMu"; */
-"jvv-dK-jMu.headerCell.title" = "Bitrate";
diff --git a/ui/Base.lproj/Accounts.strings b/ui/Base.lproj/Accounts.strings
index 04718df..620aaa5 100644
--- a/ui/Base.lproj/Accounts.strings
+++ b/ui/Base.lproj/Accounts.strings
@@ -5,38 +5,29 @@
/* Class = "NSButtonCell"; title = "Down"; ObjectID = "6Co-ei-tUA"; */
"6Co-ei-tUA.title" = "Down";
-/* Class = "NSTableColumn"; headerCell.title = "Status"; ObjectID = "GB3-Dr-Fey"; */
-"GB3-Dr-Fey.headerCell.title" = "Status";
-
-/* Class = "NSTabViewItem"; label = "Video"; ObjectID = "GIU-kn-D57"; */
-"GIU-kn-D57.label" = "Video";
-
/* Class = "NSButtonCell"; title = "Up"; ObjectID = "HoA-BH-xam"; */
"HoA-BH-xam.title" = "Up";
+/* Class = "NSTextFieldCell"; placeholderString = "Type"; ObjectID = "KoR-IH-uuI"; */
+"KoR-IH-uuI.placeholderString" = "Type";
+
/* Class = "NSTextFieldCell"; title = "Create Account"; ObjectID = "OZ9-qH-dYW"; */
"OZ9-qH-dYW.title" = "Create Account";
-/* Class = "NSTableColumn"; headerCell.title = "Accounts"; ObjectID = "Ppv-dQ-Azf"; */
-"Ppv-dQ-Azf.headerCell.title" = "Accounts";
-
/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "RT7-u6-bhe"; */
"RT7-u6-bhe.label" = "Advanced";
/* Class = "NSTabViewItem"; label = "Security"; ObjectID = "Vp5-yV-ScC"; */
"Vp5-yV-ScC.label" = "Security";
-/* Class = "NSTableColumn"; headerCell.title = "Enabled"; ObjectID = "Ybc-ak-pA6"; */
-"Ybc-ak-pA6.headerCell.title" = "Enabled";
+/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "ZDh-Jh-hfW"; */
+"ZDh-Jh-hfW.placeholderString" = "Name";
-/* Class = "NSTabViewItem"; label = "Audio"; ObjectID = "hiU-GG-6Eg"; */
-"hiU-GG-6Eg.label" = "Audio";
+/* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
+"eEz-Lm-SOj.placeholderString" = "Status";
-/* Class = "NSTextFieldCell"; title = "State"; ObjectID = "ntA-Li-XNQ"; */
-"ntA-Li-XNQ.title" = "State";
-
-/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "qIw-uf-vBM"; */
-"qIw-uf-vBM.title" = "Text";
+/* Class = "NSTabViewItem"; label = "Media"; ObjectID = "lxr-my-vH8"; */
+"lxr-my-vH8.label" = "Media";
/* Class = "NSTabViewItem"; label = "General"; ObjectID = "tPR-Ac-N5Y"; */
"tPR-Ac-N5Y.label" = "General";
diff --git a/ui/Base.lproj/Accounts.xib b/ui/Base.lproj/Accounts.xib
index cc7f819..f5be086 100644
--- a/ui/Base.lproj/Accounts.xib
+++ b/ui/Base.lproj/Accounts.xib
@@ -82,7 +82,7 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="cy4-WY-oWA">
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" id="cy4-WY-oWA">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
diff --git a/ui/Base.lproj/AudioPrefs.strings b/ui/Base.lproj/AudioPrefs.strings
index 24f2a45..f2615d0 100644
--- a/ui/Base.lproj/AudioPrefs.strings
+++ b/ui/Base.lproj/AudioPrefs.strings
@@ -8,9 +8,6 @@
/* Class = "NSTextFieldCell"; title = "Audio devices"; ObjectID = "B0r-wh-wc3"; */
"B0r-wh-wc3.title" = "Audio devices";
-/* Class = "NSMenu"; title = "outputlist"; ObjectID = "eao-Bf-buc"; */
-"eao-Bf-buc.title" = "outputlist";
-
/* Class = "NSButtonCell"; title = "Always recording"; ObjectID = "jeD-Nk-KHA"; */
"jeD-Nk-KHA.title" = "Always recording";
@@ -20,8 +17,5 @@
/* Class = "NSButtonCell"; title = "Mute DTMF"; ObjectID = "pAA-Iv-EmI"; */
"pAA-Iv-EmI.title" = "Mute DTMF";
-/* Class = "NSMenu"; title = "inputlist"; ObjectID = "szZ-RR-Ewo"; */
-"szZ-RR-Ewo.title" = "inputlist";
-
/* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
"x1o-rT-jy6.title" = "Input";
diff --git a/ui/Base.lproj/AudioPrefs.xib b/ui/Base.lproj/AudioPrefs.xib
index 57c923c..b7af8bb 100644
--- a/ui/Base.lproj/AudioPrefs.xib
+++ b/ui/Base.lproj/AudioPrefs.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AudioPrefsVC">
@@ -17,7 +17,7 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="deY-JV-Rfe">
- <rect key="frame" x="0.0" y="-5" width="465" height="255"/>
+ <rect key="frame" x="0.0" y="0.0" width="465" height="255"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ftI-JV-7cE">
@@ -71,7 +71,7 @@
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="4Fp-hR-KdJ">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
- <menu key="menu" title="outputlist" id="eao-Bf-buc">
+ <menu key="menu" id="eao-Bf-buc">
<connections>
<outlet property="delegate" destination="-2" id="dXz-O7-2jP"/>
</connections>
@@ -121,7 +121,7 @@
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="3mj-4K-xif">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
- <menu key="menu" title="inputlist" id="szZ-RR-Ewo">
+ <menu key="menu" id="szZ-RR-Ewo">
<connections>
<outlet property="delegate" destination="-2" id="g3C-Tc-BTO"/>
</connections>
diff --git a/ui/Base.lproj/Broker.strings b/ui/Base.lproj/Broker.strings
index 1822dc7..880ffe6 100644
--- a/ui/Base.lproj/Broker.strings
+++ b/ui/Base.lproj/Broker.strings
@@ -1,12 +1,9 @@
-/* Class = "NSTextFieldCell"; title = "Display Role"; ObjectID = "1Rl-Yq-z7r"; */
-"1Rl-Yq-z7r.title" = "Display Role";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "3lU-Go-v0h"; */
-"3lU-Go-v0h.title" = "Text Cell";
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "1Rl-Yq-z7r"; */
+"1Rl-Yq-z7r.placeholderString" = "Display Role";
/* Class = "NSSearchFieldCell"; placeholderString = "Search or enter number"; ObjectID = "5vh-ub-Dsq"; */
"5vh-ub-Dsq.placeholderString" = "Search or enter number";
-/* Class = "NSTextFieldCell"; title = "details"; ObjectID = "sQW-4V-hwv"; */
-"sQW-4V-hwv.title" = "details";
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "sQW-4V-hwv"; */
+"sQW-4V-hwv.placeholderString" = "details";
diff --git a/ui/Base.lproj/Broker.xib b/ui/Base.lproj/Broker.xib
index 7ec8a29..8c40ef4 100644
--- a/ui/Base.lproj/Broker.xib
+++ b/ui/Base.lproj/Broker.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="BrokerVC">
@@ -46,7 +46,7 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="3lU-Go-v0h">
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="3lU-Go-v0h">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -59,7 +59,7 @@
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="bsM-kY-9k6">
<rect key="frame" x="57" y="31" width="189" height="23"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Display Role" id="1Rl-Yq-z7r">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Display Role" id="1Rl-Yq-z7r">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -71,7 +71,7 @@
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="eaV-2E-ENh">
<rect key="frame" x="57" y="10" width="189" height="20"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="details" id="sQW-4V-hwv">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="details" id="sQW-4V-hwv">
<font key="font" size="13" name="HelveticaNeue-Light"/>
<color key="textColor" red="0.0" green="0.23137254901960785" blue="0.30588235294117649" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
diff --git a/ui/Base.lproj/CertificateWindow.xib b/ui/Base.lproj/CertificateWindow.xib
index 107b06f..458dcce 100644
--- a/ui/Base.lproj/CertificateWindow.xib
+++ b/ui/Base.lproj/CertificateWindow.xib
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="13F1077" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="CertificateWC">
@@ -23,15 +22,15 @@
<subviews>
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oot-0X-jju">
<rect key="frame" x="20" y="54" width="561" height="135"/>
- <clipView key="contentView" misplaced="YES" id="rbk-gh-ueD">
- <rect key="frame" x="1" y="17" width="238" height="117"/>
+ <clipView key="contentView" ambiguous="YES" id="rbk-gh-ueD">
+ <rect key="frame" x="1" y="0.0" width="559" height="134"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" headerView="MKo-as-RdY" viewBased="YES" indentationPerLevel="16" outlineTableColumn="UEk-iW-QGt" id="GQE-up-gwL">
- <rect key="frame" x="0.0" y="0.0" width="238" height="117"/>
+ <rect key="frame" x="0.0" y="0.0" width="559" height="111"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn width="116" minWidth="40" maxWidth="1000" id="UEk-iW-QGt">
@@ -104,15 +103,15 @@
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="Gim-9c-e4f">
- <rect key="frame" x="1" y="119" width="223" height="15"/>
+ <rect key="frame" x="1" y="7" width="0.0" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="Gdk-7j-Chx">
- <rect key="frame" x="224" y="17" width="15" height="102"/>
+ <rect key="frame" x="-15" y="23" width="16" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<tableHeaderView key="headerView" id="MKo-as-RdY">
- <rect key="frame" x="0.0" y="0.0" width="238" height="17"/>
+ <rect key="frame" x="0.0" y="0.0" width="559" height="23"/>
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
diff --git a/ui/Base.lproj/Conversation.strings b/ui/Base.lproj/Conversation.strings
index 1b25a34..d8d262a 100644
--- a/ui/Base.lproj/Conversation.strings
+++ b/ui/Base.lproj/Conversation.strings
@@ -2,8 +2,8 @@
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FgV-iF-gGQ"; */
"FgV-iF-gGQ.title" = "Text Cell";
-/* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "HnC-1N-RmR"; */
-"HnC-1N-RmR.title" = "Title";
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "HnC-1N-RmR"; */
+"HnC-1N-RmR.placeholderString" = "Title";
/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
"Ilz-7v-2fr.placeholderString" = "Send a message";
diff --git a/ui/Base.lproj/Conversation.xib b/ui/Base.lproj/Conversation.xib
index 415517d..197efc2 100644
--- a/ui/Base.lproj/Conversation.xib
+++ b/ui/Base.lproj/Conversation.xib
@@ -255,7 +255,7 @@
<constraints>
<constraint firstAttribute="width" constant="400" id="209-bx-oHM"/>
</constraints>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" sendsActionOnEndEditing="YES" alignment="center" title="Title" id="HnC-1N-RmR">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" sendsActionOnEndEditing="YES" alignment="center" placeholderString="Title" id="HnC-1N-RmR">
<font key="font" metaFont="system" size="18"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
diff --git a/ui/Base.lproj/CurrentCall.strings b/ui/Base.lproj/CurrentCall.strings
index ec85d75..072a997 100644
--- a/ui/Base.lproj/CurrentCall.strings
+++ b/ui/Base.lproj/CurrentCall.strings
@@ -50,8 +50,8 @@
/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "oRa-pS-HN2"; */
"oRa-pS-HN2.ibShadowedToolTip" = "Record";
-/* Class = "NSTextFieldCell"; title = "Person name"; ObjectID = "osk-LS-0Qg"; */
-"osk-LS-0Qg.title" = "Person name";
+/* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "osk-LS-0Qg"; */
+"osk-LS-0Qg.placeholderString" = "Person name";
/* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
"qgD-3D-nD5.ibShadowedToolTip" = "Pick up";
@@ -62,8 +62,8 @@
/* Class = "NSTextFieldCell"; title = "Ignore"; ObjectID = "tjM-py-p4V"; */
"tjM-py-p4V.title" = "Ignore";
-/* Class = "NSTextFieldCell"; title = "State"; ObjectID = "ugy-uK-901"; */
-"ugy-uK-901.title" = "State";
+/* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "ugy-uK-901"; */
+"ugy-uK-901.placeholderString" = "State";
/* Class = "NSTextFieldCell"; title = "Answer"; ObjectID = "wRO-X4-7IU"; */
"wRO-X4-7IU.title" = "Answer";
@@ -71,5 +71,5 @@
/* Class = "NSTextFieldCell"; title = "wants to talk with you!"; ObjectID = "yZ6-1A-ZLT"; */
"yZ6-1A-ZLT.title" = "wants to talk with you!";
-/* Class = "NSTextFieldCell"; title = "Time"; ObjectID = "zsO-T7-9yi"; */
-"zsO-T7-9yi.title" = "Time";
+/* Class = "NSTextFieldCell"; placeholderString = "Time"; ObjectID = "zsO-T7-9yi"; */
+"zsO-T7-9yi.placeholderString" = "Time";
diff --git a/ui/Base.lproj/CurrentCall.xib b/ui/Base.lproj/CurrentCall.xib
index afc02da..2115b61 100644
--- a/ui/Base.lproj/CurrentCall.xib
+++ b/ui/Base.lproj/CurrentCall.xib
@@ -52,23 +52,12 @@
<customView translatesAutoresizingMaskIntoConstraints="NO" id="d0X-cW-Xgz">
<rect key="frame" x="20" y="438" width="635" height="71"/>
<subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kFD-FB-vig">
- <rect key="frame" x="76" y="39" width="36" height="17"/>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="29" id="pft-oc-ZNh"/>
- </constraints>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="State" id="ugy-uK-901">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cIU-M7-xpN">
<rect key="frame" x="513" y="23" width="104" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="9vz-kb-6L6"/>
</constraints>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Time" id="zsO-T7-9yi">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" placeholderString="Time" id="zsO-T7-9yi">
<font key="font" size="20" name="HelveticaNeue"/>
<color key="textColor" name="alternateSelectedControlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
@@ -82,7 +71,7 @@
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="81" id="gT7-Wu-XtU"/>
</constraints>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Person name" id="osk-LS-0Qg">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" placeholderString="Person name" id="osk-LS-0Qg">
<font key="font" metaFont="system"/>
<color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -124,6 +113,17 @@
<action selector="addToContact:" target="-2" id="OI1-7U-4T7"/>
</connections>
</button>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kFD-FB-vig">
+ <rect key="frame" x="76" y="39" width="36" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="29" id="pft-oc-ZNh"/>
+ </constraints>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="State" id="ugy-uK-901">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
</subviews>
<constraints>
<constraint firstItem="Zss-6A-bSy" firstAttribute="leading" secondItem="bg3-hB-nE8" secondAttribute="trailing" constant="8" id="6V0-Gq-SMw"/>
diff --git a/ui/Base.lproj/GeneralPrefs.xib b/ui/Base.lproj/GeneralPrefs.xib
index d49bd23..0677dda 100644
--- a/ui/Base.lproj/GeneralPrefs.xib
+++ b/ui/Base.lproj/GeneralPrefs.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="GeneralPrefsVC">
@@ -20,11 +20,11 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="c22-O7-iKe">
- <rect key="frame" x="0.0" y="0.0" width="546" height="333"/>
+ <rect key="frame" x="0.0" y="0.0" width="526" height="326"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kYQ-jU-skU">
- <rect key="frame" x="18" y="278" width="182" height="17"/>
+ <rect key="frame" x="18" y="264" width="182" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Desktop Notifications" id="xlz-zw-IJI">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -32,7 +32,7 @@
</textFieldCell>
</textField>
<button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Oth-up-2k2">
- <rect key="frame" x="204" y="276" width="147" height="18"/>
+ <rect key="frame" x="204" y="262" width="147" height="18"/>
<buttonCell key="cell" type="check" title="Enable Notifications" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uCL-ye-tsv">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -42,7 +42,7 @@
</connections>
</button>
<button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Is4-pD-LOT">
- <rect key="frame" x="204" y="241" width="294" height="18"/>
+ <rect key="frame" x="204" y="227" width="294" height="18"/>
<buttonCell key="cell" type="check" title="Bring Ring to foreground on incoming calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uYI-hA-JHk">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -51,19 +51,8 @@
<binding destination="Sz0-vm-i3t" name="value" keyPath="values.window_behaviour" id="ZSW-he-LAz"/>
</connections>
</button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fC0-ce-Yiz">
- <rect key="frame" x="38" y="173" width="54" height="17"/>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="JrN-bM-7Wz"/>
- </constraints>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="History" id="DSD-yl-noX">
- <font key="font" metaFont="systemBold"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
<button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DgD-2y-4g5">
- <rect key="frame" x="56" y="146" width="153" height="18"/>
+ <rect key="frame" x="56" y="139" width="153" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="149" id="nYR-y5-QxP"/>
</constraints>
@@ -76,14 +65,14 @@
</connections>
</button>
<stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QmA-ZI-ZL5">
- <rect key="frame" x="251" y="141" width="19" height="27"/>
+ <rect key="frame" x="251" y="134" width="19" height="27"/>
<stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" doubleValue="30" id="30B-YQ-Opa"/>
<connections>
<binding destination="Sz0-vm-i3t" name="value" keyPath="values.history_limit" id="c2j-mK-kYa"/>
</connections>
</stepper>
<textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tHZ-7Q-5iP">
- <rect key="frame" x="206" y="144" width="40" height="22"/>
+ <rect key="frame" x="206" y="137" width="40" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="Qal-Za-gWz"/>
</constraints>
@@ -101,7 +90,7 @@
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nah-Jm-ZYB">
- <rect key="frame" x="273" y="147" width="33" height="17"/>
+ <rect key="frame" x="273" y="140" width="33" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="29" id="08C-IP-5pg"/>
</constraints>
@@ -112,7 +101,7 @@
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="U84-le-Iy4">
- <rect key="frame" x="58" y="109" width="122" height="19"/>
+ <rect key="frame" x="58" y="102" width="122" height="19"/>
<buttonCell key="cell" type="roundRect" title="Clear History" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cd5-9L-Bbb">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="cellTitle"/>
@@ -121,8 +110,8 @@
<action selector="clearHistory:" target="-2" id="yN7-bB-7EY"/>
</connections>
</button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j3T-5j-Fom">
- <rect key="frame" x="38" y="303" width="94" height="17"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j3T-5j-Fom">
+ <rect key="frame" x="18" y="289" width="94" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Interruptions" id="Rzy-Gh-3wQ">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -130,7 +119,7 @@
</textFieldCell>
</textField>
<button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1Nr-L4-fcd">
- <rect key="frame" x="204" y="205" width="136" height="18"/>
+ <rect key="frame" x="204" y="191" width="136" height="18"/>
<buttonCell key="cell" type="check" title="Launch on Startup" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="O2C-xR-mHF">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -139,13 +128,13 @@
<action selector="toggleLaunchAtStartup:" target="-2" id="Rky-YK-2yk"/>
</connections>
</button>
- <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yVO-jk-ay3">
- <rect key="frame" x="20" y="20" width="506" height="82"/>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="yVO-jk-ay3">
+ <rect key="frame" x="0.0" y="20" width="526" height="75"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="diX-uH-Ce8">
- <rect key="frame" x="14" y="45" width="52" height="17"/>
+ <rect key="frame" x="18" y="47" width="52" height="17"/>
<constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="48" id="GgH-bV-Pic"/>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="48" id="eol-9K-zA2"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Update" id="r4u-t3-gBc">
<font key="font" metaFont="systemBold"/>
@@ -154,7 +143,7 @@
</textFieldCell>
</textField>
<button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MCd-PD-kd7">
- <rect key="frame" x="31" y="21" width="221" height="18"/>
+ <rect key="frame" x="54" y="21" width="221" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="217" id="rY9-iO-Gx2"/>
</constraints>
@@ -164,7 +153,7 @@
</buttonCell>
</button>
<popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RYP-3d-PCa" userLabel="Update interval">
- <rect key="frame" x="256" y="15" width="100" height="26"/>
+ <rect key="frame" x="279" y="15" width="100" height="26"/>
<popUpButtonCell key="cell" type="push" title="Monthly" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="2629800" imageScaling="proportionallyDown" inset="2" selectedItem="42E-UY-qlP" id="tTF-gp-Rti">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -180,11 +169,13 @@
</popUpButton>
</subviews>
<constraints>
+ <constraint firstAttribute="height" constant="75" id="1fz-dJ-nDo"/>
<constraint firstItem="RYP-3d-PCa" firstAttribute="leading" secondItem="MCd-PD-kd7" secondAttribute="trailing" constant="8" id="9c7-7m-udP"/>
+ <constraint firstItem="diX-uH-Ce8" firstAttribute="leading" secondItem="yVO-jk-ay3" secondAttribute="leading" constant="20" id="DWV-bf-QJe"/>
</constraints>
</customView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lIm-zX-RIV">
- <rect key="frame" x="18" y="242" width="182" height="17"/>
+ <rect key="frame" x="18" y="228" width="182" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="ECK-NM-TjK"/>
</constraints>
@@ -195,7 +186,7 @@
</textFieldCell>
</textField>
<textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Gyi-ID-Z3v">
- <rect key="frame" x="310" y="148" width="169" height="14"/>
+ <rect key="frame" x="310" y="141" width="169" height="14"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="165" id="wfZ-X2-WX8"/>
</constraints>
@@ -205,18 +196,35 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fC0-ce-Yiz">
+ <rect key="frame" x="18" y="168" width="399" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="48" id="JrN-bM-7Wz"/>
+ </constraints>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="History" id="DSD-yl-noX">
+ <font key="font" metaFont="systemBold"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
</subviews>
<constraints>
+ <constraint firstItem="fC0-ce-Yiz" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="2iV-DB-Zna"/>
<constraint firstItem="Is4-pD-LOT" firstAttribute="leading" secondItem="lIm-zX-RIV" secondAttribute="trailing" constant="8" id="Apx-HB-LIX"/>
<constraint firstItem="Gyi-ID-Z3v" firstAttribute="leading" secondItem="nah-Jm-ZYB" secondAttribute="trailing" constant="8" id="EYY-WC-fCM"/>
<constraint firstItem="Oth-up-2k2" firstAttribute="leading" secondItem="Is4-pD-LOT" secondAttribute="leading" id="Fdb-2p-ULe"/>
<constraint firstItem="nah-Jm-ZYB" firstAttribute="leading" secondItem="QmA-ZI-ZL5" secondAttribute="trailing" constant="8" id="JJi-0O-nUi"/>
<constraint firstItem="QmA-ZI-ZL5" firstAttribute="leading" secondItem="tHZ-7Q-5iP" secondAttribute="trailing" constant="8" id="YPs-UE-IFi"/>
<constraint firstItem="DgD-2y-4g5" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="58" id="aPM-dp-Eym"/>
+ <constraint firstAttribute="bottom" secondItem="yVO-jk-ay3" secondAttribute="bottom" constant="20" id="bAA-rc-QhB"/>
<constraint firstItem="tHZ-7Q-5iP" firstAttribute="leading" secondItem="DgD-2y-4g5" secondAttribute="trailing" constant="3" id="bV5-ZQ-94d"/>
<constraint firstItem="Oth-up-2k2" firstAttribute="leading" secondItem="1Nr-L4-fcd" secondAttribute="leading" id="csu-Ug-9sD"/>
+ <constraint firstItem="yVO-jk-ay3" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="qa3-OH-fvn"/>
+ <constraint firstItem="fC0-ce-Yiz" firstAttribute="top" secondItem="1Nr-L4-fcd" secondAttribute="bottom" constant="8" id="tQx-o6-feR"/>
+ <constraint firstItem="j3T-5j-Fom" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="twb-vI-7Ls"/>
+ <constraint firstAttribute="trailing" secondItem="yVO-jk-ay3" secondAttribute="trailing" id="wig-B4-OtV"/>
</constraints>
- <point key="canvasLocation" x="347" y="95.5"/>
+ <point key="canvasLocation" x="337" y="92"/>
</customView>
<userDefaultsController representsSharedInstance="YES" id="Sz0-vm-i3t"/>
<customObject id="VEJ-ic-3Ub" customClass="SUUpdater"/>
diff --git a/ui/Base.lproj/MainMenu.strings b/ui/Base.lproj/MainMenu.strings
index 85f2bf9..dd14573 100644
--- a/ui/Base.lproj/MainMenu.strings
+++ b/ui/Base.lproj/MainMenu.strings
@@ -199,3 +199,18 @@
/* Class = "NSMenuItem"; title = "Check for Update..."; ObjectID = "593"; */
"593.title" = "Check for Update...";
+
+/* Class = "NSMenuItem"; title = "Show"; ObjectID = "12w-Fz-Scs"; */
+"12w-Fz-Scs.title" = "Show";
+
+/* Class = "NSMenu"; title = "Show"; ObjectID = "1fJ-em-1ww"; */
+"1fJ-em-1ww.title" = "Show";
+
+/* Class = "NSMenuItem"; title = "Show recent"; ObjectID = "GTY-d8-NBf"; */
+"GTY-d8-NBf.title" = "Show recent";
+
+/* Class = "NSMenuItem"; title = "Show contacts"; ObjectID = "GU3-tt-2de"; */
+"GU3-tt-2de.title" = "Show contacts";
+
+/* Class = "NSMenuItem"; title = "Show call history"; ObjectID = "Oco-m7-LtS"; */
+"Oco-m7-LtS.title" = "Show call history";
diff --git a/ui/Base.lproj/PersonLinker.strings b/ui/Base.lproj/PersonLinker.strings
index 8aaf229..ff2fb84 100644
--- a/ui/Base.lproj/PersonLinker.strings
+++ b/ui/Base.lproj/PersonLinker.strings
@@ -1,12 +1,12 @@
-/* Class = "NSTextFieldCell"; title = "Display Role"; ObjectID = "Jcn-cg-rbR"; */
-"Jcn-cg-rbR.title" = "Display Role";
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Jcn-cg-rbR"; */
+"Jcn-cg-rbR.placeholderString" = "Display Role";
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "M4f-N4-msh"; */
"M4f-N4-msh.title" = "Text Cell";
-/* Class = "NSTextFieldCell"; title = "Contact Method"; ObjectID = "a9R-r5-K3w"; */
-"a9R-r5-K3w.title" = "Contact Method";
+/* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "a9R-r5-K3w"; */
+"a9R-r5-K3w.placeholderString" = "Contact Method";
/* Class = "NSTextFieldCell"; placeholderString = "Last name..."; ObjectID = "cGT-nu-sPa"; */
"cGT-nu-sPa.placeholderString" = "Last name...";
diff --git a/ui/Base.lproj/PersonLinker.xib b/ui/Base.lproj/PersonLinker.xib
index 3d7e09e..f3db2ca 100644
--- a/ui/Base.lproj/PersonLinker.xib
+++ b/ui/Base.lproj/PersonLinker.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="PersonLinkerVC">
@@ -25,8 +25,7 @@
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8pP-Sy-Vkd">
<rect key="frame" x="18" y="415" width="184" height="22"/>
- <animations/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" sendsActionOnEndEditing="YES" alignment="right" title="Contact Method" usesSingleLineMode="YES" id="a9R-r5-K3w">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" sendsActionOnEndEditing="YES" alignment="right" placeholderString="Contact Method" usesSingleLineMode="YES" id="a9R-r5-K3w">
<font key="font" size="18" name="HelveticaNeue-Thin"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -37,7 +36,6 @@
<subviews>
<searchField wantsLayer="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZJY-k3-gHh">
<rect key="frame" x="20" y="406" width="268" height="22"/>
- <animations/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" sendsSearchStringImmediately="YES" id="sS1-2Z-ZWi">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -50,7 +48,6 @@
</searchField>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cfj-u3-ErF">
<rect key="frame" x="9" y="24" width="291" height="30"/>
- <animations/>
<buttonCell key="cell" type="squareTextured" title="Add new contact" bezelStyle="texturedSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="had-9Y-eza">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -69,7 +66,6 @@
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="40" viewBased="YES" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="02n-X5-Zug" id="eKe-7i-c79">
<rect key="frame" x="0.0" y="0.0" width="308" height="337"/>
<autoresizingMask key="autoresizingMask"/>
- <animations/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="0.0" colorSpace="deviceWhite"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
@@ -93,8 +89,7 @@
<subviews>
<textField wantsLayer="YES" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="Vix-1z-ceH">
<rect key="frame" x="60" y="20" width="219" height="23"/>
- <animations/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Display Role" id="Jcn-cg-rbR">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Display Role" id="Jcn-cg-rbR">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -102,11 +97,9 @@
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="XdL-zf-7dn">
<rect key="frame" x="10" y="11" width="40" height="40"/>
- <animations/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="27s-no-TQR"/>
</imageView>
</subviews>
- <animations/>
<connections>
<outlet property="textField" destination="Vix-1z-ceH" id="Abp-mU-zH1"/>
</connections>
@@ -120,27 +113,21 @@
</connections>
</outlineView>
</subviews>
- <animations/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
- <animations/>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="4Sk-mY-PsD">
<rect key="frame" x="1" y="117" width="238" height="16"/>
<autoresizingMask key="autoresizingMask"/>
- <animations/>
</scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="awN-qf-qb2">
<rect key="frame" x="-16" y="0.0" width="16" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
- <animations/>
</scroller>
</scrollView>
</subviews>
- <animations/>
</customView>
<comboBox verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MFf-kv-pz3">
<rect key="frame" x="208" y="415" width="84" height="26"/>
- <animations/>
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" usesDataSource="YES" numberOfVisibleItems="5" id="Msw-lx-k0J">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -153,7 +140,6 @@
</connections>
</comboBox>
</subviews>
- <animations/>
<point key="canvasLocation" x="578" y="354"/>
</customView>
<customView wantsLayer="YES" id="6M0-sm-haN">
@@ -162,7 +148,6 @@
<subviews>
<textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m4N-gI-w8E">
<rect key="frame" x="12" y="112" width="245" height="27"/>
- <animations/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="First name..." drawsBackground="YES" id="vyb-95-XaF">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -175,7 +160,6 @@
</textField>
<textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j0A-7O-Bvj">
<rect key="frame" x="12" y="75" width="245" height="27"/>
- <animations/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Last name..." drawsBackground="YES" id="cGT-nu-sPa">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -188,7 +172,6 @@
</textField>
<textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GgO-mM-nnz">
<rect key="frame" x="24" y="186" width="221" height="30"/>
- <animations/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="New Contact" id="v7b-de-MVd">
<font key="font" metaFont="system" size="20"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -204,7 +187,6 @@
<textView ambiguous="YES" editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="TQq-By-akw">
<rect key="frame" x="0.0" y="0.0" width="217" height="32"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<size key="minSize" width="217" height="32"/>
<size key="maxSize" width="463" height="10000000"/>
@@ -221,24 +203,19 @@
<size key="maxSize" width="463" height="10000000"/>
</textView>
</subviews>
- <animations/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
- <animations/>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="XUh-Co-vZc">
<rect key="frame" x="-100" y="-100" width="87" height="18"/>
<autoresizingMask key="autoresizingMask"/>
- <animations/>
</scroller>
<scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="C83-CS-odD">
<rect key="frame" x="-16" y="0.0" width="16" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
- <animations/>
</scroller>
</scrollView>
<button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="N0T-7S-TCW">
<rect key="frame" x="12" y="38" width="245" height="30"/>
- <animations/>
<buttonCell key="cell" type="squareTextured" title="Create" bezelStyle="texturedSquare" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="qZc-Z2-TpP">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -258,7 +235,6 @@
<constraint firstItem="N0T-7S-TCW" firstAttribute="leading" secondItem="6M0-sm-haN" secondAttribute="leading" constant="12" id="xWn-BX-TdQ"/>
<constraint firstAttribute="centerX" secondItem="GgO-mM-nnz" secondAttribute="centerX" id="zLf-OH-9nF"/>
</constraints>
- <animations/>
<point key="canvasLocation" x="949.5" y="317"/>
</customView>
</objects>
diff --git a/ui/Base.lproj/PreferencesScreen.strings b/ui/Base.lproj/PreferencesScreen.strings
deleted file mode 100644
index faff796..0000000
--- a/ui/Base.lproj/PreferencesScreen.strings
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* Class = "NSTextFieldCell"; title = "placeholder"; ObjectID = "quz-UQ-8oJ"; */
-"quz-UQ-8oJ.title" = "placeholder";
diff --git a/ui/Base.lproj/PreferencesWindow.xib b/ui/Base.lproj/PreferencesWindow.xib
index e9d3741..dbba283 100644
--- a/ui/Base.lproj/PreferencesWindow.xib
+++ b/ui/Base.lproj/PreferencesWindow.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="PreferencesWC">
diff --git a/ui/Base.lproj/RingWindow.strings b/ui/Base.lproj/RingWindow.strings
index fc71ab7..b6a9a7e 100644
--- a/ui/Base.lproj/RingWindow.strings
+++ b/ui/Base.lproj/RingWindow.strings
@@ -8,14 +8,14 @@
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
"Ap7-26-S6b.title" = "Text Cell";
-/* Class = "NSTextFieldCell"; title = "details"; ObjectID = "BfK-c5-B1l"; */
-"BfK-c5-B1l.title" = "details";
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
+"BfK-c5-B1l.placeholderString" = "details";
/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
"F0z-JX-Cv5.title" = "Ring";
-/* Class = "NSTextFieldCell"; title = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
-"FlQ-Th-nfO.title" = "Contact Method";
+/* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
+"FlQ-Th-nfO.placeholderString" = "Contact Method";
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
"GAa-pQ-t4g.title" = "Text Cell";
@@ -23,8 +23,8 @@
/* Class = "NSBox"; title = "Box"; ObjectID = "Pav-Bw-GgK"; */
"Pav-Bw-GgK.title" = "Box";
-/* Class = "NSTextFieldCell"; title = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
-"Q1F-xo-N3e.title" = "Display Role";
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
+"Q1F-xo-N3e.placeholderString" = "Display Role";
/* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
"UKP-Et-CT0.placeholderString" = "date";
@@ -41,29 +41,29 @@
/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "bgk-oz-u7n"; */
"bgk-oz-u7n.placeholderString" = "Name";
-/* Class = "NSTextFieldCell"; title = "Category"; ObjectID = "d5o-nL-fRP"; */
-"d5o-nL-fRP.title" = "Category";
+/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
+"d5o-nL-fRP.placeholderString" = "Category";
/* Class = "NSTextFieldCell"; title = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user."; ObjectID = "eln-Vm-t0d"; */
"eln-Vm-t0d.title" = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.";
-/* Class = "NSTextFieldCell"; title = "Category"; ObjectID = "gaf-Za-tuc"; */
-"gaf-Za-tuc.title" = "Category";
+/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
+"gaf-Za-tuc.placeholderString" = "Category";
-/* Class = "NSTextFieldCell"; title = "details"; ObjectID = "isD-c6-X5Q"; */
-"isD-c6-X5Q.title" = "details";
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "isD-c6-X5Q"; */
+"isD-c6-X5Q.placeholderString" = "details";
-/* Class = "NSTextFieldCell"; title = "Call name"; ObjectID = "j0J-Xd-uth"; */
-"j0J-Xd-uth.title" = "Call name";
+/* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
+"j0J-Xd-uth.placeholderString" = "Call name";
-/* Class = "NSTextFieldCell"; title = "details"; ObjectID = "mK5-kV-YOO"; */
-"mK5-kV-YOO.title" = "details";
+/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
+"mK5-kV-YOO.placeholderString" = "details";
-/* Class = "NSTextFieldCell"; title = "n"; ObjectID = "sGB-x7-gig"; */
-"sGB-x7-gig.title" = "n";
+/* Class = "NSTextFieldCell"; placeholderString = "n"; ObjectID = "sGB-x7-gig"; */
+"sGB-x7-gig.placeholderString" = "n";
-/* Class = "NSTextFieldCell"; title = "Display Role"; ObjectID = "uSw-g5-kte"; */
-"uSw-g5-kte.title" = "Display Role";
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "uSw-g5-kte"; */
+"uSw-g5-kte.placeholderString" = "Display Role";
/* Class = "NSSearchFieldCell"; placeholderString = "Name, ringID"; ObjectID = "vvE-nM-kSl"; */
"vvE-nM-kSl.placeholderString" = "Name, ringID";
diff --git a/ui/Base.lproj/RingWindow.xib b/ui/Base.lproj/RingWindow.xib
index a67efbd..4c23f3d 100644
--- a/ui/Base.lproj/RingWindow.xib
+++ b/ui/Base.lproj/RingWindow.xib
@@ -155,7 +155,7 @@
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="epa-Ih-aKF">
<rect key="frame" x="57" y="31" width="225" height="23"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Display Role" id="uSw-g5-kte">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Display Role" id="uSw-g5-kte">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -171,7 +171,7 @@
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="epi-ZP-as5">
<rect key="frame" x="57" y="10" width="177" height="20"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="details" id="BfK-c5-B1l">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="details" id="BfK-c5-B1l">
<font key="font" size="13" name="HelveticaNeue-Light"/>
<color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -179,7 +179,7 @@
</textField>
<textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="MYe-rn-qOP">
<rect key="frame" x="35" y="6" width="16" height="17"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="n" drawsBackground="YES" id="sGB-x7-gig">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" placeholderString="n" drawsBackground="YES" id="sGB-x7-gig">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" red="0.98431372549019602" green="0.28627450980392155" blue="0.28235294117647058" alpha="0.90000000000000002" colorSpace="calibratedRGB"/>
@@ -249,7 +249,7 @@
<constraints>
<constraint firstAttribute="height" constant="23" id="Knk-h9-HbW"/>
</constraints>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Call name" id="j0J-Xd-uth">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Call name" id="j0J-Xd-uth">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -257,7 +257,7 @@
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="Sm2-al-NU0">
<rect key="frame" x="6" y="3" width="276" height="20"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="details" id="mK5-kV-YOO">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="details" id="mK5-kV-YOO">
<font key="font" size="13" name="HelveticaNeue-Light"/>
<color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -353,7 +353,7 @@
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="9c4-YB-v5K">
<rect key="frame" x="8" y="5" width="304.5" height="23"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Category" id="gaf-Za-tuc">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Category" id="gaf-Za-tuc">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -479,7 +479,7 @@
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="eGe-4R-pNq">
<rect key="frame" x="57" y="31" width="225" height="23"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Display Role" id="Q1F-xo-N3e">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Display Role" id="Q1F-xo-N3e">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -487,7 +487,7 @@
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="eXn-EJ-bSE">
<rect key="frame" x="57" y="9" width="225" height="17"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="details" id="isD-c6-X5Q">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="details" id="isD-c6-X5Q">
<font key="font" size="13" name="HelveticaNeue-Light"/>
<color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -546,7 +546,7 @@
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="ILI-pW-VaK">
<rect key="frame" x="7" y="-1" width="304.5" height="23"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Category" id="d5o-nL-fRP">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Category" id="d5o-nL-fRP">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -563,7 +563,7 @@
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="Gys-Du-oeQ">
<rect key="frame" x="7" y="1" width="304.5" height="25"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Contact Method" id="FlQ-Th-nfO">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Contact Method" id="FlQ-Th-nfO">
<font key="font" size="14" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
diff --git a/ui/Base.lproj/RingWizard.strings b/ui/Base.lproj/RingWizard.strings
index 83f0d56..6ecdc26 100644
--- a/ui/Base.lproj/RingWizard.strings
+++ b/ui/Base.lproj/RingWizard.strings
@@ -5,8 +5,8 @@
/* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "5Z7-Wi-530"; */
"5Z7-Wi-530.placeholderString" = "'Unknown' if empty...";
-/* Class = "NSTextFieldCell"; title = "Advanced security (optionnal)"; ObjectID = "Gnn-K9-PTH"; */
-"Gnn-K9-PTH.title" = "Advanced security (optionnal)";
+/* Class = "NSTextFieldCell"; title = "Advanced security (optional)"; ObjectID = "Gnn-K9-PTH"; */
+"Gnn-K9-PTH.title" = "Advanced security (optional)";
/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "Hsc-U9-2RV"; */
"Hsc-U9-2RV.placeholderString" = "Password...";
diff --git a/ui/Base.lproj/RingWizard.xib b/ui/Base.lproj/RingWizard.xib
index 42e144b..e017519 100644
--- a/ui/Base.lproj/RingWizard.xib
+++ b/ui/Base.lproj/RingWizard.xib
@@ -217,9 +217,12 @@
<constraint firstItem="Wk1-nk-8ES" firstAttribute="leading" secondItem="4EG-qH-WOF" secondAttribute="trailing" constant="8" id="Mfo-AY-j64"/>
</constraints>
</customView>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="K7H-z9-exz">
- <rect key="frame" x="18" y="155" width="199" height="17"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Advanced security (optionnal)" id="Gnn-K9-PTH">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="K7H-z9-exz">
+ <rect key="frame" x="18" y="155" width="191" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="187" id="Mjq-8r-RBl"/>
+ </constraints>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Advanced security (optional)" id="Gnn-K9-PTH">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -237,6 +240,7 @@
<constraints>
<constraint firstItem="fnL-AL-k3N" firstAttribute="leading" secondItem="t9K-II-jmt" secondAttribute="trailing" constant="8" id="HuI-1u-ggc"/>
<constraint firstItem="1Hn-6F-5Pq" firstAttribute="leading" secondItem="oIN-Fl-8Li" secondAttribute="trailing" constant="8" id="Xqa-pG-Igc"/>
+ <constraint firstItem="K7H-z9-exz" firstAttribute="leading" secondItem="ftV-Pr-W0i" secondAttribute="leading" constant="20" id="sN3-wt-20B"/>
</constraints>
<point key="canvasLocation" x="62.5" y="15"/>
</customView>
diff --git a/ui/Base.lproj/VideoPrefs.xib b/ui/Base.lproj/VideoPrefs.xib
index 431c54e..b2b7ff2 100644
--- a/ui/Base.lproj/VideoPrefs.xib
+++ b/ui/Base.lproj/VideoPrefs.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VideoPrefsVC">