From 2bd2f0738e16188e2a4114c674ffac1fa82349e4 Mon Sep 17 00:00:00 2001
From: Oleg Chashko <62497891+Oleg-Chashko@users.noreply.github.com>
Date: Sun, 17 Oct 2021 20:45:25 +0200
Subject: [PATCH] fix: macOS gui with Russian l10n does not fit lines of text.
 (Fixes #1963) (#1973)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixed: #1963

* Fixed: (✕) -> Changed to (No Group) & (None)

* Fixed: Удалённое управление -> Удалённый доступ

* Удаленное управление -> Удалённый доступ
---
 macosx/ru.lproj/AddMagnetWindow.xib | 67 ++++++++++++++---------------
 macosx/ru.lproj/AddWindow.xib       | 26 +++++------
 macosx/ru.lproj/Localizable.strings |  6 +--
 macosx/ru.lproj/PrefsWindow.xib     |  2 +-
 po/ru.po                            |  2 +-
 5 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/macosx/ru.lproj/AddMagnetWindow.xib b/macosx/ru.lproj/AddMagnetWindow.xib
index e97f85da2..0cff847d7 100644
--- a/macosx/ru.lproj/AddMagnetWindow.xib
+++ b/macosx/ru.lproj/AddMagnetWindow.xib
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
-        <capability name="box content view" minToolsVersion="7.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -28,25 +27,25 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" frameAutosaveName="AddMagnetWindow" animationBehavior="default" tabbingMode="disallowed" id="1" userLabel="Window">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" frameAutosaveName="AddMagnetWindow" animationBehavior="default" tabbingMode="disallowed" id="1" userLabel="Window">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/>
             <rect key="contentRect" x="173" y="705" width="428" height="232"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
             <view key="contentView" verticalHuggingPriority="750" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="428" height="232"/>
+                <rect key="frame" x="0.0" y="0.0" width="428" height="226"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView translatesAutoresizingMaskIntoConstraints="NO" id="3">
-                        <rect key="frame" x="20" y="195" width="16" height="16"/>
+                        <rect key="frame" x="20" y="190" width="16" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="16" id="1zx-Cs-Swd"/>
                             <constraint firstAttribute="height" constant="16" id="TGc-Go-KGZ"/>
                         </constraints>
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="Magnet" id="8"/>
                     </imageView>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="5">
-                        <rect key="frame" x="18" y="165" width="392" height="22"/>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5">
+                        <rect key="frame" x="18" y="161" width="392" height="21"/>
                         <constraints>
                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="370" id="5E7-V5-l02"/>
                         </constraints>
@@ -57,14 +56,14 @@
                         </textFieldCell>
                     </textField>
                     <button translatesAutoresizingMaskIntoConstraints="NO" id="17">
-                        <rect key="frame" x="18" y="21" width="144" height="18"/>
+                        <rect key="frame" x="18" y="21" width="148" height="18"/>
                         <buttonCell key="cell" type="check" title="Начать скачивание" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="18">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19">
-                        <rect key="frame" x="311" y="12" width="103" height="32"/>
+                        <rect key="frame" x="318" y="12" width="97" height="32"/>
                         <buttonCell key="cell" type="push" title="Добавить" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="20">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -77,7 +76,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="21">
-                        <rect key="frame" x="208" y="12" width="103" height="32"/>
+                        <rect key="frame" x="223" y="12" width="97" height="32"/>
                         <buttonCell key="cell" type="push" title="Отменить" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="22">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -89,8 +88,8 @@ Gw
                             <action selector="cancelAdd:" target="-2" id="32"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="100">
-                        <rect key="frame" x="42" y="195" width="108" height="17"/>
+                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="100">
+                        <rect key="frame" x="42" y="190" width="109" height="16"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Magnet-ссылка" id="101">
                             <font key="font" metaFont="systemBold"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -98,35 +97,35 @@ Gw
                         </textFieldCell>
                     </textField>
                     <box borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="102">
-                        <rect key="frame" x="17" y="56" width="394" height="103"/>
+                        <rect key="frame" x="17" y="55" width="394" height="100"/>
                         <view key="contentView" id="xWJ-qu-F1m">
-                            <rect key="frame" x="1" y="1" width="392" height="101"/>
+                            <rect key="frame" x="3" y="3" width="388" height="94"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="33">
-                                    <rect key="frame" x="93" y="36" width="135" height="26"/>
-                                    <popUpButtonCell key="cell" type="push" title="✕" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="2zq-5y-smI" id="34">
+                                    <rect key="frame" x="90" y="32" width="137" height="25"/>
+                                    <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="2zq-5y-smI" id="34">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="menu"/>
                                         <menu key="menu" title="OtherViews" id="35">
                                             <items>
-                                                <menuItem title="✕" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
+                                                <menuItem title="None" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
                                                     <modifierMask key="keyEquivalentModifierMask"/>
                                                 </menuItem>
                                             </items>
                                         </menu>
                                     </popUpButtonCell>
                                 </popUpButton>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="10">
-                                    <rect key="frame" x="12" y="71" width="85" height="17"/>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="10">
+                                    <rect key="frame" x="10" y="67" width="85" height="16"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Скачивать в:" id="15">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="84">
-                                    <rect key="frame" x="12" y="15" width="77" height="17"/>
+                                <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="84">
+                                    <rect key="frame" x="10" y="13" width="77" height="16"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Приоритет:" id="91">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -134,7 +133,7 @@ Gw
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="85">
-                                    <rect key="frame" x="93" y="9" width="135" height="26"/>
+                                    <rect key="frame" x="90" y="6" width="137" height="25"/>
                                     <popUpButtonCell key="cell" type="push" title="Высокий" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="90" id="86">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="menu"/>
@@ -156,8 +155,8 @@ Gw
                                         <action selector="changePriority:" target="-2" id="98"/>
                                     </connections>
                                 </popUpButton>
-                                <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="40">
-                                    <rect key="frame" x="12" y="42" width="77" height="17"/>
+                                <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="40">
+                                    <rect key="frame" x="10" y="39" width="77" height="16"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Группа:" id="41">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -165,13 +164,13 @@ Gw
                                     </textFieldCell>
                                 </textField>
                                 <box horizontalHuggingPriority="249" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="103">
-                                    <rect key="frame" x="100" y="62" width="194" height="30"/>
+                                    <rect key="frame" x="98" y="58" width="194" height="30"/>
                                     <view key="contentView" id="29A-0C-qoo">
-                                        <rect key="frame" x="1" y="1" width="192" height="28"/>
+                                        <rect key="frame" x="3" y="3" width="188" height="24"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="12">
-                                                <rect key="frame" x="30" y="8" width="154" height="14"/>
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="12">
+                                                <rect key="frame" x="28" y="6" width="154" height="14"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="DBq-4X-8Uk"/>
                                                 </constraints>
@@ -182,7 +181,7 @@ Gw
                                                 </textFieldCell>
                                             </textField>
                                             <imageView translatesAutoresizingMaskIntoConstraints="NO" id="11">
-                                                <rect key="frame" x="10" y="7" width="16" height="16"/>
+                                                <rect key="frame" x="8" y="5" width="16" height="16"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="16" id="46x-pe-IRn"/>
                                                     <constraint firstAttribute="width" constant="16" id="xF7-UN-BfS"/>
@@ -203,7 +202,7 @@ Gw
                                     </constraints>
                                 </box>
                                 <button horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9">
-                                    <rect key="frame" x="294" y="63" width="89" height="28"/>
+                                    <rect key="frame" x="291" y="59" width="91" height="27"/>
                                     <buttonCell key="cell" type="push" title="Изменить…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="16">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="smallSystem"/>
@@ -272,13 +271,13 @@ Gw
             <connections>
                 <outlet property="delegate" destination="-2" id="61"/>
             </connections>
-            <point key="canvasLocation" x="291" y="356"/>
+            <point key="canvasLocation" x="185" y="355"/>
         </window>
     </objects>
     <resources>
         <image name="GroupsNoneTemplate" width="16" height="16"/>
         <image name="Magnet" width="32" height="32"/>
-        <image name="NSApplicationIcon" width="128" height="128"/>
+        <image name="NSApplicationIcon" width="32" height="32"/>
         <image name="PriorityHighTemplate" width="12" height="12"/>
         <image name="PriorityLowTemplate" width="12" height="12"/>
         <image name="PriorityNormalTemplate" width="12" height="12"/>
diff --git a/macosx/ru.lproj/AddWindow.xib b/macosx/ru.lproj/AddWindow.xib
index 238bc6ad4..069cd7ea2 100644
--- a/macosx/ru.lproj/AddWindow.xib
+++ b/macosx/ru.lproj/AddWindow.xib
@@ -162,9 +162,9 @@ Gw
                         </scroller>
                     </scrollView>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="102">
-                        <rect key="frame" x="371" y="190" width="42" height="17"/>
+                        <rect key="frame" x="338" y="190" width="74" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                        <buttonCell key="cell" type="roundRect" title="Ни один" bezelStyle="roundedRect" alignment="center" controlSize="small" enabled="NO" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="105">
+                        <buttonCell key="cell" type="roundRect" title="Ни одного" bezelStyle="roundedRect" alignment="center" controlSize="small" enabled="NO" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="105">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="smallSystem"/>
                         </buttonCell>
@@ -173,7 +173,7 @@ Gw
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="103">
-                        <rect key="frame" x="321" y="190" width="42" height="17"/>
+                        <rect key="frame" x="288" y="190" width="42" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <buttonCell key="cell" type="roundRect" title="Все" bezelStyle="roundedRect" alignment="center" controlSize="small" enabled="NO" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="104">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -199,7 +199,7 @@ Gw
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="85">
-                                    <rect key="frame" x="253" y="15" width="125" height="26"/>
+                                    <rect key="frame" x="244" y="15" width="140" height="26"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" id="86">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -223,7 +223,7 @@ Gw
                                     </connections>
                                 </popUpButton>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="40">
-                                    <rect key="frame" x="194" y="49" width="57" height="17"/>
+                                    <rect key="frame" x="187" y="49" width="57" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Группа:" id="41">
                                         <font key="font" metaFont="system"/>
@@ -232,7 +232,7 @@ Gw
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="33">
-                                    <rect key="frame" x="253" y="43" width="125" height="26"/>
+                                    <rect key="frame" x="244" y="43" width="140" height="26"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" id="34">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -241,11 +241,11 @@ Gw
                                     </popUpButtonCell>
                                 </popUpButton>
                                 <progressIndicator wantsLayer="YES" verticalHuggingPriority="750" fixedFrame="YES" maxValue="1" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="68">
-                                    <rect key="frame" x="18" y="27" width="150" height="12"/>
+                                    <rect key="frame" x="15" y="27" width="146" height="12"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 </progressIndicator>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="84">
-                                    <rect key="frame" x="169" y="21" width="82" height="17"/>
+                                    <rect key="frame" x="162" y="21" width="82" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Приоритет:" id="91">
                                         <font key="font" metaFont="system"/>
@@ -254,7 +254,7 @@ Gw
                                     </textFieldCell>
                                 </textField>
                                 <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="65">
-                                    <rect key="frame" x="12" y="39" width="162" height="32"/>
+                                    <rect key="frame" x="7" y="39" width="162" height="32"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <buttonCell key="cell" type="push" title="Проверить данные" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="66">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -265,7 +265,7 @@ Gw
                                     </connections>
                                 </button>
                                 <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9">
-                                    <rect key="frame" x="302" y="72" width="78" height="28"/>
+                                    <rect key="frame" x="293" y="72" width="92" height="28"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                     <buttonCell key="cell" type="push" title="Изменить..." bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="16">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -276,7 +276,7 @@ Gw
                                     </connections>
                                 </button>
                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="10">
-                                    <rect key="frame" x="15" y="79" width="88" height="17"/>
+                                    <rect key="frame" x="12" y="79" width="88" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Скачивать в:" id="15">
                                         <font key="font" metaFont="system"/>
@@ -285,7 +285,7 @@ Gw
                                     </textFieldCell>
                                 </textField>
                                 <box autoresizesSubviews="NO" fixedFrame="YES" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="101">
-                                    <rect key="frame" x="105" y="71" width="197" height="30"/>
+                                    <rect key="frame" x="97" y="71" width="197" height="30"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                     <view key="contentView" id="GRU-h4-OU6">
                                         <rect key="frame" x="3" y="3" width="191" height="24"/>
@@ -328,7 +328,7 @@ Gw
             <connections>
                 <outlet property="delegate" destination="-2" id="61"/>
             </connections>
-            <point key="canvasLocation" x="140" y="139"/>
+            <point key="canvasLocation" x="139.5" y="139"/>
         </window>
         <customObject id="53" userLabel="File Outline Controller" customClass="FileOutlineController">
             <connections>
diff --git a/macosx/ru.lproj/Localizable.strings b/macosx/ru.lproj/Localizable.strings
index efd200eaa..05f9d625b 100644
--- a/macosx/ru.lproj/Localizable.strings
+++ b/macosx/ru.lproj/Localizable.strings
@@ -585,7 +585,7 @@
 "Next announce in %@" = "Следующий анонс через %@";
 
 /* Group table row */
-"No Group" = "✕";
+"No Group" = "No Group";
 
 /* Inspector -> selected torrents */
 "No Torrents Selected" = "Ни один торрент не выбран";
@@ -593,7 +593,7 @@
 /* Groups -> Button
    Groups -> Menu
    inspector -> check all */
-"None" = "✕";
+"None" = "None";
 
 /* Donation beg -> button */
 "Nope" = "Нет";
@@ -779,7 +779,7 @@
 "remaining time unknown" = "оставшееся время неизвестно";
 
 /* Preferences -> toolbar item title */
-"Remote" = "Удаленное управление";
+"Remote" = "Удалённый доступ";
 
 /* Removal confirm panel -> button
    Remove completed confirm panel -> button
diff --git a/macosx/ru.lproj/PrefsWindow.xib b/macosx/ru.lproj/PrefsWindow.xib
index d351e843e..162b089a8 100644
--- a/macosx/ru.lproj/PrefsWindow.xib
+++ b/macosx/ru.lproj/PrefsWindow.xib
@@ -2093,7 +2093,7 @@
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1483">
                     <rect key="frame" x="62" y="403" width="252" height="18"/>
                     <autoresizingMask key="autoresizingMask"/>
-                    <buttonCell key="cell" type="check" title="Включить удаленное управление" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="1502">
+                    <buttonCell key="cell" type="check" title="Включить удалённый доступ" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="1502">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
diff --git a/po/ru.po b/po/ru.po
index bb95059d2..c84a68df7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1894,7 +1894,7 @@ msgstr "Сеть"
 
 #: ../gtk/tr-prefs.c:1286
 msgid "Remote"
-msgstr "Удалённое управление"
+msgstr "Удалённый доступ"
 
 #: ../gtk/tr-window.c:136
 msgid "Torrent"