Cocoa GUI: Fix and update subscription texts

Signed-off-by: Maxime Gervais <[email protected]>
a-j-albert · Aug 17, 2020 · fd24fca · fd24fca
1 parent 90362a6
commit fd24fca
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/Source/GUI/Cocoa/English.lproj/Subscribe.strings b/Source/GUI/Cocoa/English.lproj/Subscribe.strings
@@ -20,8 +20,8 @@
 /* Class = "NSWindow"; title = "\b"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "\b";
 
-/* Class = "NSTextFieldCell"; title = "Purchase will be applied to your iTunes account on confirmation.\nIf a subscription is already active one year will be added to your current subscription end date."; ObjectID = "RPE-po-2rg"; */
-"RPE-po-2rg.title" = "Purchase will be applied to your iTunes account on confirmation.\nIf a subscription is already active one year will be added to your current subscription end date.";
+/* Class = "NSTextFieldCell"; title = "Purchase will be applied to your iTunes account on confirmation.\nFor a renewable subscription, if a subscription is already active one year will be added to your current subscription end date."; ObjectID = "RPE-po-2rg"; */
+"RPE-po-2rg.title" = "Purchase will be applied to your iTunes account on confirmation.\nFor a renewable subscription, if a subscription is already active one year will be added to your current subscription end date.";
 
 /* Class = "NSTextFieldCell"; title = "• Select default view"; ObjectID = "TBA-9I-zit"; */
 "TBA-9I-zit.title" = "• Select default view";

diff --git a/Source/GUI/Cocoa/English.lproj/Subscribe.xib b/Source/GUI/Cocoa/English.lproj/Subscribe.xib
@@ -33,6 +33,28 @@ CA
                 <rect key="frame" x="0.0" y="0.0" width="480" height="582"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
+                    <button verticalHuggingPriority="750" id="fj7-zs-kBH">
+                        <rect key="frame" x="14" y="138" width="455" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="Lifetime subscription for %PRICE%" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3Bg-Z8-JwL">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="subscribeLifetime:" target="-2" id="h4X-gX-yhz"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" id="icC-99-GTH">
+                        <rect key="frame" x="14" y="127" width="455" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="bevel" title="Restore lifetime subscription" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="mhh-gg-9x5">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="restore:" target="-2" id="XaG-5S-BTl"/>
+                        </connections>
+                    </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Moo-5g-Bey">
                         <rect key="frame" x="18" y="534" width="444" height="28"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -91,7 +113,7 @@ CA
                         <textFieldCell key="cell" selectable="YES" id="RPE-po-2rg">
                             <font key="font" metaFont="system"/>
                             <string key="title">Purchase will be applied to your iTunes account on confirmation.
-If a subscription is already active one year will be added to your current subscription end date.</string>
+For a renewable subscription, if a subscription is already active one year will be added to your current subscription end date.</string>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -151,28 +173,6 @@ CA
                             </subviews>
                         </view>
                     </box>
-                    <button verticalHuggingPriority="750" id="fj7-zs-kBH">
-                        <rect key="frame" x="14" y="138" width="455" height="32"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="push" title="Lifetime subscription for %PRICE%" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3Bg-Z8-JwL">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="subscribeLifetime:" target="-2" id="h4X-gX-yhz"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" id="icC-99-GTH">
-                        <rect key="frame" x="14" y="127" width="455" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="bevel" title="Restore lifetime subscription" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="mhh-gg-9x5">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="restore:" target="-2" id="XaG-5S-BTl"/>
-                        </connections>
-                    </button>
                 </subviews>
             </view>
             <connections>

diff --git a/Source/GUI/Cocoa/_i18n/stringsdb.txt b/Source/GUI/Cocoa/_i18n/stringsdb.txt
@@ -259,11 +259,11 @@ Subscribe.strings/JL5-kL-wBR.title=csv/Subscribe_Button//Subscribe %PRICE% for o
 Subscribe.strings/3Bg-Z8-JwL.title=csv/Lifetime_Subscribe_Button//Lifetime subscription for %PRICE%
 Subscribe.strings/JYE-X2-6VN.title=txt/SupportUs//Support us by subscribing and get exclusive features.
 Subscribe.strings/QvC-M9-y7g.title=skip/QvC-M9-y7g.title//\b
-Subscribe.strings/RPE-po-2rg.title=skip/RPE-po-2rg.title// A %PRICE% purchase will be applied to your iTunes account on confirmation.\nIf a subscription is already active one year will be added to your current subscription end date.
+Subscribe.strings/RPE-po-2rg.title=skip/RPE-po-2rg.title//Purchase will be applied to your iTunes account on confirmation.\nFor a renewable subscription, if a subscription is already active one year will be added to your current subscription end date.
 Subscribe.strings/TBA-9I-zit.title=txt/SelectViewFeature//• Select default view
 Subscribe.strings/bw4-n3-mi1.title=skip/bw4-n3-mi1.title//\b
 Subscribe.strings/dbk-rc-jAB.title=txt/MoreFeature//• More to come
-Subscribe.strings/mhh-gg-9x5.title=csv/RestoreLifetimeSubscription/Restore lifetime subscription
+Subscribe.strings/mhh-gg-9x5.title=csv/RestoreLifetimeSubscription//Restore lifetime subscription
 TreeView.strings/41r-Rp-xrS.title=skip/41r-Rp-xrS.title//Text Cell
 TreeView.strings/LRh-qX-GDO.headerCell.title=txt/Field//Field
 TreeView.strings/LqZ-Y9-Pg4.title=skip/LqZ-Y9-Pg4.title//Text Cell