Can show subreddit name behind title.

Bugfix: Saving preferences reloads from start instead of current position

RedditBar/AppDelegate.h

@@ -59,6 +59,6 @@
 -(void)reloadListHasSubredditsCallback:(NSArray *)items;
 -(void)reloadListHasFrontpageCallback:(NSArray *)items;
 
--(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length;
+-(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length printSubs:(Boolean)showSubreddits;
 
 @end

RedditBar/AppDelegate.m

@@ -42,10 +42,10 @@
     [statusItem setMenu:statusMenu];
     [statusItem setToolTip:NSLocalizedString(@"RedditBar", @"Main Menuitem Tooltip")];
     [statusItem setHighlightMode:YES];
-    lastFullName = nil;
     currentState = [[StateModel alloc] init];
     [self defaultPreferences];
     [self loadPreferences];
+    lastFullName = nil;
     [self reloadListWithOptions];
 }
 
@@ -55,6 +55,7 @@
     [appDefaults setValue:@"" forKey:@"modhash"];
     [appDefaults setValue:[NSNumber numberWithBool:YES] forKey:@"subscriptions"];
     [appDefaults setValue:[NSNumber numberWithInt:10] forKey:@"length"];
+    [appDefaults setValue:[NSNumber numberWithBool:YES] forKey:@"showSubs"];
     [store registerDefaults:appDefaults];
 }
 
@@ -65,6 +66,7 @@
     [store setBool:currentState.useSubscriptions forKey:@"subscriptions"];
     [store setObject:currentState.subreddits forKey:@"subreddits"];
     [store setInteger:currentState.length forKey:@"length"];
+    [store setBool:currentState.showSubreddit forKey:@"showSubs"];
     [store synchronize];
 }
 
@@ -76,6 +78,7 @@
     [currentState setUseSubscriptions:[store boolForKey:@"subscriptions"]];
     [currentState setSubreddits:[store arrayForKey:@"subreddits"]];
     [currentState setLength:[store integerForKey:@"length"]];
+    [currentState setShowSubreddit:[store boolForKey:@"showSubs"]];
 }
 
 -(void)reloadListNotAuthenticatedCallback {
@@ -228,13 +231,15 @@
     [application orderFrontStandardAboutPanel:self];
 }
 
--(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length {
+-(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length printSubs:(Boolean)showSubreddits {
     currentState.username = name;
     currentState.modhash = modhash;
     currentState.useSubscriptions = subscriptions;
     currentState.subreddits = [subreddits componentsSeparatedByString: @"\n"];
     currentState.length = length;
+    currentState.showSubreddit = showSubreddits;
     [self savePreferences];
+    lastFullName = nil; // reload from start
     [self reloadListWithOptions];
 }
 

RedditBar/Base.lproj/Prefs.strings

@@ -8,9 +8,6 @@
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
 "32T-3T-EcY.title" = "Cut";
 
-/* Class = "NSTextFieldCell"; title = "Subreddits:"; ObjectID = "Cmr-7n-CaG"; */
-"Cmr-7n-CaG.title" = "Subreddits:";
-
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
 "FNJ-RL-DXT.title" = "Items:";
 
@@ -41,11 +38,11 @@
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "m11-YF-fEa"; */
 "m11-YF-fEa.title" = "Password:";
 
+/* Class = "NSButtonCell"; title = "Show Subreddit after Title"; ObjectID = "nFK-xi-2F3"; */
+"nFK-xi-2F3.title" = "Show Subreddit after Title";
+
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "qSu-ha-DhM"; */
 "qSu-ha-DhM.title" = "Select All";
 
-/* Class = "NSButtonCell"; title = "Subscriptions"; ObjectID = "vW5-Cp-Bm1"; */
-"vW5-Cp-Bm1.title" = "Subscriptions";
-
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
 "wSY-To-FDI.title" = "Copy";

RedditBar/Base.lproj/Prefs.xib

@@ -12,6 +12,7 @@
                 <outlet property="lengthStepper" destination="jxz-fQ-M1L" id="NK5-G4-9UJ"/>
                 <outlet property="password" destination="ARP-lb-J16" id="EDd-om-ciF"/>
                 <outlet property="progress" destination="vz0-tR-n1f" id="t06-dO-WKY"/>
+                <outlet property="showSubreddit" destination="fRR-M9-szp" id="bGR-ej-R9R"/>
                 <outlet property="subreddits" destination="EhP-FS-8dT" id="td1-kv-jQm"/>
                 <outlet property="subscriptions" destination="vW5-Cp-Bm1" id="gja-K0-7Uh"/>
                 <outlet property="username" destination="0mi-88-o94" id="4bB-K2-q5m"/>
@@ -57,7 +58,7 @@
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qFP-pd-32c">
-                        <rect key="frame" x="18" y="52" width="96" height="17"/>
+                        <rect key="frame" x="18" y="104" width="96" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Items:" id="FNJ-RL-DXT">
                             <font key="font" metaFont="system"/>
@@ -102,30 +103,21 @@ Gw
                             <action selector="performClose:" target="1" id="A62-EW-ZrT"/>
                         </connections>
                     </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="R9P-ZH-hHZ">
-                        <rect key="frame" x="18" y="235" width="96" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Subreddits:" id="Cmr-7n-CaG">
-                            <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>
                     <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="8ew-wY-1Yh">
-                        <rect key="frame" x="20" y="79" width="300" height="150"/>
+                        <rect key="frame" x="20" y="129" width="300" height="100"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <clipView key="contentView" copiesOnScroll="NO" id="ENU-Jw-8fO">
-                            <rect key="frame" x="1" y="1" width="298" height="148"/>
+                            <rect key="frame" x="1" y="1" width="298" height="98"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <textView editable="NO" importsGraphics="NO" richText="NO" findStyle="panel" allowsUndo="YES" verticallyResizable="YES" allowsNonContiguousLayout="YES" id="EhP-FS-8dT">
-                                    <rect key="frame" x="0.0" y="0.0" width="298" height="148"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="298" height="98"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                    <size key="minSize" width="298" height="148"/>
+                                    <size key="minSize" width="298" height="98"/>
                                     <size key="maxSize" width="463" height="10000000"/>
                                     <color key="insertionPointColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                    <size key="minSize" width="298" height="148"/>
+                                    <size key="minSize" width="298" height="98"/>
                                     <size key="maxSize" width="463" height="10000000"/>
                                 </textView>
                             </subviews>
@@ -136,14 +128,14 @@ Gw
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="z7j-r6-B6f">
-                            <rect key="frame" x="283" y="1" width="16" height="148"/>
+                            <rect key="frame" x="283" y="1" width="16" height="98"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
                     <button id="XZM-90-hQ8">
-                        <rect key="frame" x="118" y="234" width="204" height="18"/>
+                        <rect key="frame" x="18" y="236" width="280" height="25"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="check" title="Subscriptions" bezelStyle="regularSquare" imagePosition="overlaps" alignment="right" state="on" inset="2" id="vW5-Cp-Bm1">
+                        <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="vW5-Cp-Bm1">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
@@ -152,7 +144,7 @@ Gw
                         </connections>
                     </button>
                     <textField verticalHuggingPriority="750" id="MAv-jO-hIv">
-                        <rect key="frame" x="120" y="49" width="57" height="22"/>
+                        <rect key="frame" x="120" y="99" width="57" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="10" drawsBackground="YES" id="0SD-Tf-uZS">
                             <font key="font" metaFont="system"/>
@@ -165,7 +157,7 @@ Gw
                         </connections>
                     </textField>
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="jxz-fQ-M1L">
-                        <rect key="frame" x="182" y="46" width="19" height="27"/>
+                        <rect key="frame" x="182" y="96" width="19" height="27"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="Gba-jV-Ouh"/>
                         <connections>
@@ -173,9 +165,17 @@ Gw
                         </connections>
                     </stepper>
                     <progressIndicator canDrawConcurrently="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="vz0-tR-n1f">
-                        <rect key="frame" x="267" y="49" width="16" height="16"/>
+                        <rect key="frame" x="304" y="240" width="16" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     </progressIndicator>
+                    <button id="fRR-M9-szp">
+                        <rect key="frame" x="18" y="75" width="304" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="Show Subreddit after Title" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="nFK-xi-2F3">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                    </button>
                 </subviews>
             </view>
         </window>

RedditBar/PrefController.h

@@ -40,6 +40,7 @@
 @property (atomic, retain) IBOutlet NSTextField *lengthField;
 @property (atomic, retain) IBOutlet NSStepper *lengthStepper;
 @property (atomic, retain) IBOutlet NSProgressIndicator *progress;
+@property (weak) IBOutlet NSButton *showSubreddit;
 @property (atomic, retain) NSObject *parent;
 @property (atomic, retain) StateModel *state;
 @property (atomic) NSInteger length;

RedditBar/PrefController.m

@@ -34,7 +34,7 @@
 NSString *modhashSetLiteral = @"__MODHASH__IS__SET__";
 NSString *subredditCharacters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_\n";
 
-@synthesize username, password, subscriptions, subreddits, win, parent, state, lengthFormat, lengthField, lengthStepper, length, progress;
+@synthesize username, password, subscriptions, subreddits, win, parent, state, lengthFormat, lengthField, lengthStepper, length, progress, showSubreddit;
 
 -(Boolean)isValidList:(NSString *)input {
     NSCharacterSet *invalidChars = [[NSCharacterSet characterSetWithCharactersInString:subredditCharacters] invertedSet];
@@ -63,6 +63,7 @@ NSString *subredditCharacters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRST
     [lengthStepper setIntegerValue:length];
     [lengthField setIntegerValue:length];
     [progress setUsesThreadedAnimation:YES];
+    [showSubreddit setState:[NSNumber numberWithBool:state.showSubreddit].integerValue];
 }
 
 -(IBAction)buttonSave:(id)sender {
@@ -118,17 +119,24 @@ NSString *subredditCharacters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRST
             return;
         }
     }
+    Boolean print;
+    if (showSubreddit.state != 0)
+        print = TRUE;
+    else
+        print = FALSE;
     
     AppDelegate *app = (AppDelegate *)parent;
-    [app prefReturnName:username.stringValue Modhash:modhash subscriptions:subs subreddits:subreddits.textStorage.string length:length];
+    [app prefReturnName:username.stringValue Modhash:modhash subscriptions:subs subreddits:subreddits.textStorage.string length:length printSubs:print];
     [win performClose:self];
 }
 
 -(IBAction)toggleSubs:(id)sender {
     if (subscriptions.state != 0) {
         [subreddits setEditable:FALSE];
+        [subscriptions setTitle:NSLocalizedString(@"Use Subscriptions", @"Pref Checkbox State 1")];
     } else {
         [subreddits setEditable:TRUE];
+        [subscriptions setTitle:NSLocalizedString(@"Use Subreddits list", @"Pref Checkbox State 0")];
     }
 }
 

RedditBar/Reddit.m

@@ -31,8 +31,9 @@
 
 @implementation Reddit
 
-NSInteger maxTitleLength = 50;
+NSInteger maxTitleLength = 60;
 NSString *replaceTextForTitle = @"...";
+NSString *subredditFormat = @" [r/%@]";
 #define AUTHOR @"xythobuz"
 
 @synthesize username, modhash, password, version, appName, author, length, subreddits;
@@ -99,7 +100,7 @@ NSString *replaceTextForTitle = @"...";
     }
 }
 
--(NSArray *)convertJSONToItemArray:(NSData *)data {
+-(NSArray *)convertJSONToItemArray:(NSData *)data ShowSubs:(Boolean)showSubs {
     NSError *error;
     NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
     NSDictionary *dat = [json valueForKey:@"data"];
@@ -121,9 +122,16 @@ NSString *replaceTextForTitle = @"...";
         if (!isSelf) {
             comments = [NSString stringWithFormat:@"http://www.reddit.com%@", [current valueForKey:@"permalink"]];
         }
-        if ([name length] > maxTitleLength) {
-            name = [NSString stringWithFormat:@"%@%@", [name substringToIndex:(maxTitleLength - [replaceTextForTitle length])], replaceTextForTitle];
-        }
+        NSString *subreddit = [NSString stringWithFormat:subredditFormat, [current valueForKey:@"subreddit"]];
+        NSInteger maxLen = maxTitleLength;
+        if ([subreddit length] >= maxTitleLength)
+            showSubs = FALSE;
+        if (showSubs)
+            maxLen -= [subreddit length];
+        if ([name length] > maxLen)
+            name = [NSString stringWithFormat:@"%@%@", [name substringToIndex:(maxLen - [replaceTextForTitle length])], replaceTextForTitle];
+        if (showSubs)
+            name = [NSString stringWithFormat:@"%@%@", name, subreddit];
         RedditItem *r = [RedditItem itemWithName:name Link:link Comments:comments Self:isSelf];
         [r setFullName:[current valueForKey:@"title"]];
         [array insertObject:r atIndex:i];
@@ -140,6 +148,7 @@ NSString *replaceTextForTitle = @"...";
     NSHTTPURLResponse *response;
     
     NSString *after = ((AppDelegate *)parent).lastFullName;
+    Boolean showSubreddits = ((AppDelegate *)parent).currentState.showSubreddit;
     NSString *url;
     if (after == nil)
         url = [NSString stringWithFormat:@"hot.json?limit=%ld", (long)length];
@@ -150,7 +159,7 @@ NSString *replaceTextForTitle = @"...";
     if ((data == nil) || ([response statusCode] != 200)) {
         [parent performSelectorOnMainThread:@selector(reloadListHasFrontpageCallback:) withObject:nil waitUntilDone:false];
     } else {
-        [parent performSelectorOnMainThread:@selector(reloadListHasFrontpageCallback:) withObject:[self convertJSONToItemArray:data] waitUntilDone:false];
+        [parent performSelectorOnMainThread:@selector(reloadListHasFrontpageCallback:) withObject:[self convertJSONToItemArray:data ShowSubs:showSubreddits] waitUntilDone:false];
     }
 }
 
@@ -164,6 +173,7 @@ NSString *replaceTextForTitle = @"...";
     }
     
     NSString *after = ((AppDelegate *)parent).lastFullName;
+    Boolean showSubreddits = ((AppDelegate *)parent).currentState.showSubreddit;
     NSString *url;
     if (after == nil)
         url = [NSString stringWithFormat:@"%@/hot.json?limit=%ld", subs, (long)length];
@@ -175,7 +185,7 @@ NSString *replaceTextForTitle = @"...";
     if ((data == nil) || ([response statusCode] != 200)) {
         [parent performSelectorOnMainThread:@selector(reloadListHasSubredditsCallback:) withObject:nil waitUntilDone:false];
     } else {
-        [parent performSelectorOnMainThread:@selector(reloadListHasSubredditsCallback:) withObject:[self convertJSONToItemArray:data] waitUntilDone:false];
+        [parent performSelectorOnMainThread:@selector(reloadListHasSubredditsCallback:) withObject:[self convertJSONToItemArray:data ShowSubs:showSubreddits] waitUntilDone:false];
     }
 }
 

RedditBar/RedditBar-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>175</string>
+	<string>185</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

RedditBar/StateModel.h

@@ -35,5 +35,6 @@
 @property (atomic) Boolean useSubscriptions;
 @property (atomic, retain) NSArray *subreddits;
 @property (atomic) NSInteger length;
+@property (atomic) Boolean showSubreddit;
 
 @end

RedditBar/StateModel.m

@@ -30,6 +30,6 @@
 
 @implementation StateModel
 
-@synthesize username, modhash, useSubscriptions, subreddits;
+@synthesize username, modhash, useSubscriptions, subreddits, showSubreddit;
 
 @end

RedditBar/de.lproj/Localizable.strings

@@ -40,6 +40,12 @@
 /* Pref Error */
 "Subreddit List Invalid!" = "Ungültige Subreddit-liste";
 
+/* Pref Checkbox State 0 */
+"Use Subreddits list" = "Zeige Subreddit Liste";
+
+/* Pref Checkbox State 1 */
+"Use Subscriptions" = "Zeige Abbonements";
+
 /* Pref API Error */
 "Wrong Username or Password!" = "Falscher Nutzername oder falsches Passwort!";
 

RedditBar/de.lproj/Prefs.strings

@@ -7,9 +7,6 @@
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
 "32T-3T-EcY.title" = "Ausschneiden";
 
-/* Class = "NSTextFieldCell"; title = "Subreddits:"; ObjectID = "Cmr-7n-CaG"; */
-"Cmr-7n-CaG.title" = "Subreddits:";
-
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
 "FNJ-RL-DXT.title" = "Länge:";
 
@@ -40,12 +37,12 @@
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "m11-YF-fEa"; */
 "m11-YF-fEa.title" = "Passwort:";
 
+/* Class = "NSButtonCell"; title = "Show Subreddit after Title"; ObjectID = "nFK-xi-2F3"; */
+"nFK-xi-2F3.title" = "Zeige Subreddit hinter Titel";
+
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "qSu-ha-DhM"; */
 "qSu-ha-DhM.title" = "Alle auswählen";
 
-/* Class = "NSButtonCell"; title = "Subscriptions"; ObjectID = "vW5-Cp-Bm1"; */
-"vW5-Cp-Bm1.title" = "Abbonements";
-
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
 "wSY-To-FDI.title" = "Kopieren";
 

RedditBar/en.lproj/Prefs.strings

@@ -7,9 +7,6 @@
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
 "32T-3T-EcY.title" = "Cut";
 
-/* Class = "NSTextFieldCell"; title = "Subreddits:"; ObjectID = "Cmr-7n-CaG"; */
-"Cmr-7n-CaG.title" = "Subreddits:";
-
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
 "FNJ-RL-DXT.title" = "Items:";
 
@@ -40,12 +37,12 @@
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "m11-YF-fEa"; */
 "m11-YF-fEa.title" = "Password:";
 
+/* Class = "NSButtonCell"; title = "Show Subreddit after Title"; ObjectID = "nFK-xi-2F3"; */
+"nFK-xi-2F3.title" = "Show Subreddit after Title";
+
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "qSu-ha-DhM"; */
 "qSu-ha-DhM.title" = "Select All";
 
-/* Class = "NSButtonCell"; title = "Subscriptions"; ObjectID = "vW5-Cp-Bm1"; */
-"vW5-Cp-Bm1.title" = "Subscriptions";
-
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
 "wSY-To-FDI.title" = "Copy";
 

RedditBarTests/de.lproj/Prefs.strings

@@ -7,9 +7,6 @@
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
 "32T-3T-EcY.title" = "Cut";
 
-/* Class = "NSTextFieldCell"; title = "Subreddits:"; ObjectID = "Cmr-7n-CaG"; */
-"Cmr-7n-CaG.title" = "Subreddits:";
-
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
 "FNJ-RL-DXT.title" = "Items:";
 
@@ -40,12 +37,12 @@
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "m11-YF-fEa"; */
 "m11-YF-fEa.title" = "Password:";
 
+/* Class = "NSButtonCell"; title = "Show Subreddit after Title"; ObjectID = "nFK-xi-2F3"; */
+"nFK-xi-2F3.title" = "Show Subreddit after Title";
+
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "qSu-ha-DhM"; */
 "qSu-ha-DhM.title" = "Select All";
 
-/* Class = "NSButtonCell"; title = "Subscriptions"; ObjectID = "vW5-Cp-Bm1"; */
-"vW5-Cp-Bm1.title" = "Subscriptions";
-
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
 "wSY-To-FDI.title" = "Copy";
 

RedditBarTests/en.lproj/Prefs.strings

@@ -7,9 +7,6 @@
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
 "32T-3T-EcY.title" = "Cut";
 
-/* Class = "NSTextFieldCell"; title = "Subreddits:"; ObjectID = "Cmr-7n-CaG"; */
-"Cmr-7n-CaG.title" = "Subreddits:";
-
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
 "FNJ-RL-DXT.title" = "Items:";
 
@@ -40,12 +37,12 @@
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "m11-YF-fEa"; */
 "m11-YF-fEa.title" = "Password:";
 
+/* Class = "NSButtonCell"; title = "Show Subreddit after Title"; ObjectID = "nFK-xi-2F3"; */
+"nFK-xi-2F3.title" = "Show Subreddit after Title";
+
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "qSu-ha-DhM"; */
 "qSu-ha-DhM.title" = "Select All";
 
-/* Class = "NSButtonCell"; title = "Subscriptions"; ObjectID = "vW5-Cp-Bm1"; */
-"vW5-Cp-Bm1.title" = "Subscriptions";
-
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
 "wSY-To-FDI.title" = "Copy";