Skip to content

Commit adb3487

Browse files
narknark
committed
Fix french localization in Preferences
1 parent 1d2ba44 commit adb3487

File tree

11 files changed

+344
-357
lines changed

11 files changed

+344
-357
lines changed

‎Sources/WCChatController.m‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,9 @@ - (void)themeDidChange:(NSDictionary *)theme {
11431143
NSColor *textColor, *backgroundColor, *timestampColor, *eventColor, *urlColor;
11441144
NSFont *font;
11451145
BOOL reload = NO;
1146+
1147+
if (theme == nil)
1148+
return;
11461149

11471150
font = WIFontFromString ([theme objectForKey:WCThemesChatFont]);
11481151
textColor = WIColorFromString([theme objectForKey:WCThemesChatTextColor]);
@@ -1152,7 +1155,7 @@ - (void)themeDidChange:(NSDictionary *)theme {
11521155
eventColor = WIColorFromString([theme objectForKey:WCThemesChatEventsColor]);
11531156

11541157
// Cocoa UI reload
1155-
if(![[_setTopicTextView font] isEqualTo:font]) {
1158+
if(font && ![[_setTopicTextView font] isEqualTo:font]) {
11561159
[_chatInputTextField setFont:font];
11571160
[_setTopicTextView setFont:font];
11581161

‎WiredClient.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2344,7 +2344,7 @@
23442344
CODE_SIGN_IDENTITY = "Developer ID Application";
23452345
CODE_SIGN_STYLE = Manual;
23462346
COMBINE_HIDPI_IMAGES = YES;
2347-
CURRENT_PROJECT_VERSION = 51;
2347+
CURRENT_PROJECT_VERSION = 53;
23482348
DEVELOPMENT_TEAM = 7KTXA5Y36K;
23492349
ENABLE_HARDENED_RUNTIME = YES;
23502350
FRAMEWORK_SEARCH_PATHS = (
@@ -2598,7 +2598,7 @@
25982598
CODE_SIGN_IDENTITY = "Developer ID Application";
25992599
CODE_SIGN_STYLE = Manual;
26002600
COMBINE_HIDPI_IMAGES = YES;
2601-
CURRENT_PROJECT_VERSION = 51;
2601+
CURRENT_PROJECT_VERSION = 53;
26022602
DEVELOPMENT_TEAM = 7KTXA5Y36K;
26032603
ENABLE_HARDENED_RUNTIME = YES;
26042604
FRAMEWORK_SEARCH_PATHS = (
@@ -2700,7 +2700,7 @@
27002700
ALWAYS_SEARCH_USER_PATHS = NO;
27012701
CODE_SIGN_ENTITLEMENTS = "Wired Client.entitlements";
27022702
CODE_SIGN_IDENTITY = "-";
2703-
CURRENT_PROJECT_VERSION = 51;
2703+
CURRENT_PROJECT_VERSION = 53;
27042704
ENABLE_HARDENED_RUNTIME = YES;
27052705
FRAMEWORK_SEARCH_PATHS = (
27062706
"$(inherited)",

‎WiredClient.xcodeproj/xcuserdata/nark.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<key>Localize Nibs.xcscheme_^#shared#^_</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>25</integer>
10+
<integer>23</integer>
1111
</dict>
1212
<key>Localize Strings.xcscheme_^#shared#^_</key>
1313
<dict>
1414
<key>orderHint</key>
15-
<integer>23</integer>
15+
<integer>25</integer>
1616
</dict>
1717
<key>Neo.xcscheme_^#shared#^_</key>
1818
<dict>

‎de.lproj/Administration.xib‎

Lines changed: 86 additions & 99 deletions
Large diffs are not rendered by default.

‎de.lproj/MainMenu.xib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<menuItem isSeparatorItem="YES" id="446">
9696
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
9797
</menuItem>
98-
<menuItem title="Server-Info" keyEquivalent="I" id="646">
98+
<menuItem title="Server Info" keyEquivalent="I" id="646">
9999
<connections>
100100
<action selector="serverInfo:" target="248" id="853"/>
101101
</connections>

‎de.lproj/Preferences.xib‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@
747747
<autoresizingMask key="autoresizingMask"/>
748748
<tabViewItems>
749749
<tabViewItem label="Einstellungen" identifier="1" id="2490">
750-
<view key="view" id="2508">
750+
<view key="view" ambiguous="YES" id="2508">
751751
<rect key="frame" x="10" y="29" width="476" height="207"/>
752752
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
753753
<subviews>
@@ -1061,7 +1061,7 @@
10611061
</view>
10621062
</tabViewItem>
10631063
<tabViewItem label="Verlauf" identifier="" id="3552">
1064-
<view key="view" ambiguous="YES" id="3553">
1064+
<view key="view" id="3553">
10651065
<rect key="frame" x="10" y="25" width="476" height="211"/>
10661066
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
10671067
<subviews>
@@ -1367,10 +1367,10 @@
13671367
</connections>
13681368
</button>
13691369
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2644">
1370-
<rect key="frame" x="162" y="88" width="246" height="14"/>
1370+
<rect key="frame" x="162" y="86" width="285" height="14"/>
13711371
<autoresizingMask key="autoresizingMask"/>
1372-
<textFieldCell key="cell" controlSize="small" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" title="Wahltaste kehrt Verhalten vorübergehend um." id="2655">
1373-
<font key="font" metaFont="message" size="11"/>
1372+
<textFieldCell key="cell" controlSize="small" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" title="⌥ Wahl-/Alttaste kehrt Verhalten vorübergehend um." id="2655">
1373+
<font key="font" metaFont="smallSystem"/>
13741374
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
13751375
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
13761376
</textFieldCell>
@@ -1383,16 +1383,16 @@
13831383
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
13841384
<subviews>
13851385
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3349">
1386-
<rect key="frame" x="69" y="77" width="168" height="16"/>
1386+
<rect key="frame" x="52" y="77" width="197" height="16"/>
13871387
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
1388-
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Verbindungsversuchs-Zeit:" id="3350">
1388+
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Zeitüberschreitung Verbindung:" id="3350">
13891389
<font key="font" metaFont="system"/>
13901390
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
13911391
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
13921392
</textFieldCell>
13931393
</textField>
13941394
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3351">
1395-
<rect key="frame" x="242" y="75" width="64" height="21"/>
1395+
<rect key="frame" x="254" y="75" width="64" height="21"/>
13961396
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
13971397
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3352">
13981398
<numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#,##0.###" negativeFormat="#,##0.###" numberStyle="decimal" paddingCharacter="*" minimumIntegerDigits="1" maximumIntegerDigits="309" maximumFractionDigits="3" decimalSeparator="." groupingSeparator="," currencyDecimalSeparator="." plusSign="+" minusSign="-" notANumberSymbol="NaN" perMillSymbol="‰" percentSymbol="%" exponentSymbol="E" positivePrefix="" positiveSuffix="" negativePrefix="-" negativeSuffix="" id="3353">
@@ -1408,7 +1408,7 @@
14081408
</connections>
14091409
</textField>
14101410
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3354">
1411-
<rect key="frame" x="311" y="77" width="65" height="16"/>
1411+
<rect key="frame" x="323" y="77" width="65" height="16"/>
14121412
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
14131413
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Sekunden" id="3355">
14141414
<font key="font" metaFont="system"/>
@@ -1417,7 +1417,7 @@
14171417
</textFieldCell>
14181418
</textField>
14191419
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3360">
1420-
<rect key="frame" x="63" y="47" width="174" height="16"/>
1420+
<rect key="frame" x="52" y="47" width="197" height="16"/>
14211421
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
14221422
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Zeitüberschreitung &quot;Lesen&quot;:" id="3368">
14231423
<font key="font" metaFont="system"/>
@@ -1426,7 +1426,7 @@
14261426
</textFieldCell>
14271427
</textField>
14281428
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3362">
1429-
<rect key="frame" x="311" y="47" width="65" height="16"/>
1429+
<rect key="frame" x="323" y="47" width="65" height="16"/>
14301430
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
14311431
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Sekunden" id="3365">
14321432
<font key="font" metaFont="system"/>
@@ -1466,7 +1466,7 @@
14661466
</connections>
14671467
</popUpButton>
14681468
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3385">
1469-
<rect key="frame" x="240" y="19" width="22" height="18"/>
1469+
<rect key="frame" x="252" y="19" width="22" height="18"/>
14701470
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
14711471
<buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="3386">
14721472
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -1477,7 +1477,7 @@
14771477
</connections>
14781478
</button>
14791479
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3387">
1480-
<rect key="frame" x="74" y="20" width="163" height="16"/>
1480+
<rect key="frame" x="86" y="20" width="163" height="16"/>
14811481
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
14821482
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Komprimierung aktivieren:" id="3388">
14831483
<font key="font" metaFont="system"/>
@@ -1486,7 +1486,7 @@
14861486
</textFieldCell>
14871487
</textField>
14881488
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3397">
1489-
<rect key="frame" x="242" y="45" width="64" height="21"/>
1489+
<rect key="frame" x="254" y="45" width="64" height="21"/>
14901490
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
14911491
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3398">
14921492
<numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#,##0.###" negativeFormat="#,##0.###" numberStyle="decimal" paddingCharacter="*" minimumIntegerDigits="1" maximumIntegerDigits="309" maximumFractionDigits="3" decimalSeparator="." groupingSeparator="," currencyDecimalSeparator="." plusSign="+" minusSign="-" notANumberSymbol="NaN" perMillSymbol="‰" percentSymbol="%" exponentSymbol="E" positivePrefix="" positiveSuffix="" negativePrefix="-" negativeSuffix="" id="3399">

‎en.lproj/Administration.xib‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ DQ
376376
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
377377
<clipView key="contentView" id="z8z-8q-HbN">
378378
<rect key="frame" x="1" y="1" width="264" height="70"/>
379-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
379+
<autoresizingMask key="autoresizingMask"/>
380380
<subviews>
381381
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" id="428">
382382
<rect key="frame" x="0.0" y="0.0" width="264" height="70"/>
@@ -489,7 +489,7 @@ DQ
489489
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
490490
<clipView key="contentView" id="laL-QY-xQ6">
491491
<rect key="frame" x="1" y="0.0" width="516" height="71"/>
492-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
492+
<autoresizingMask key="autoresizingMask"/>
493493
<subviews>
494494
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="20" headerView="439" id="442">
495495
<rect key="frame" x="0.0" y="0.0" width="516" height="46"/>
@@ -591,11 +591,11 @@ DQ
591591
<rect key="frame" x="-1" y="-1" width="854" height="549"/>
592592
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
593593
<clipView key="contentView" id="CbS-0n-aei">
594-
<rect key="frame" x="1" y="1" width="836" height="547"/>
594+
<rect key="frame" x="1" y="1" width="852" height="547"/>
595595
<autoresizingMask key="autoresizingMask"/>
596596
<subviews>
597597
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" rowHeight="46" id="338" customClass="WITableView">
598-
<rect key="frame" x="0.0" y="0.0" width="836" height="547"/>
598+
<rect key="frame" x="0.0" y="0.0" width="852" height="547"/>
599599
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
600600
<size key="intercellSpacing" width="3" height="2"/>
601601
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -620,7 +620,7 @@ DQ
620620
</textFieldCell>
621621
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
622622
</tableColumn>
623-
<tableColumn identifier="Status" editable="NO" width="641" minWidth="10" maxWidth="1000" id="341">
623+
<tableColumn identifier="Status" editable="NO" width="657" minWidth="10" maxWidth="1000" id="341">
624624
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
625625
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
626626
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -641,7 +641,7 @@ DQ
641641
</tableView>
642642
</subviews>
643643
</clipView>
644-
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="339">
644+
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="339">
645645
<rect key="frame" x="-100" y="-100" width="766" height="15"/>
646646
<autoresizingMask key="autoresizingMask"/>
647647
</scroller>
@@ -1527,7 +1527,7 @@ Gw
15271527
<tabViewItem label="Settings" identifier="" id="564">
15281528
<view key="view" id="613">
15291529
<rect key="frame" x="10" y="33" width="453" height="391"/>
1530-
<autoresizingMask key="autoresizingMask"/>
1530+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
15311531
<subviews>
15321532
<popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="615">
15331533
<rect key="frame" x="54" y="353" width="188" height="22"/>
@@ -1558,15 +1558,15 @@ Gw
15581558
<scrollView focusRingType="none" fixedFrame="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="614">
15591559
<rect key="frame" x="17" y="17" width="419" height="332"/>
15601560
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1561-
<clipView key="contentView" ambiguous="YES" id="ywi-Nv-tzs">
1561+
<clipView key="contentView" id="ywi-Nv-tzs">
15621562
<rect key="frame" x="1" y="0.0" width="417" height="331"/>
1563-
<autoresizingMask key="autoresizingMask"/>
1563+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
15641564
<subviews>
15651565
<outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" autosaveColumns="NO" rowHeight="15" headerView="622" indentationPerLevel="16" outlineTableColumn="627" id="623" customClass="WIOutlineView">
15661566
<rect key="frame" x="0.0" y="0.0" width="417" height="306"/>
15671567
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
15681568
<size key="intercellSpacing" width="3" height="2"/>
1569-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
1569+
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
15701570
<tableViewGridLines key="gridStyleMask" vertical="YES" horizontal="YES"/>
15711571
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
15721572
<tableColumns>

0 commit comments

Comments
 (0)