Fix #10434

iterate-ch · Dec 6, 2018 · dec611c · dec611c
1 parent c279912
commit dec611c
Show file tree

Hide file tree

Showing 39 changed files with 7 additions and 9 deletions.
diff --git a/i18n/src/main/resources/ar.lproj/Localizable.strings b/i18n/src/main/resources/ar.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/bg.lproj/Localizable.strings b/i18n/src/main/resources/bg.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/ca.lproj/Localizable.strings b/i18n/src/main/resources/ca.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/cs.lproj/Localizable.strings b/i18n/src/main/resources/cs.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/cy.lproj/Localizable.strings b/i18n/src/main/resources/cy.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/da.lproj/Localizable.strings b/i18n/src/main/resources/da.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/de.lproj/Localizable.strings b/i18n/src/main/resources/de.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/el.lproj/Localizable.strings b/i18n/src/main/resources/el.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/en.lproj/Localizable.strings b/i18n/src/main/resources/en.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/es.lproj/Localizable.strings b/i18n/src/main/resources/es.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/fi.lproj/Localizable.strings b/i18n/src/main/resources/fi.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/fr.lproj/Localizable.strings b/i18n/src/main/resources/fr.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/he.lproj/Localizable.strings b/i18n/src/main/resources/he.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/it.lproj/Localizable.strings b/i18n/src/main/resources/it.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/ja.lproj/Localizable.strings b/i18n/src/main/resources/ja.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/ka.lproj/Localizable.strings b/i18n/src/main/resources/ka.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/ko.lproj/Localizable.strings b/i18n/src/main/resources/ko.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/lv.lproj/Localizable.strings b/i18n/src/main/resources/lv.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/nl.lproj/Localizable.strings b/i18n/src/main/resources/nl.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/no.lproj/Localizable.strings b/i18n/src/main/resources/no.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/pl.lproj/Localizable.strings b/i18n/src/main/resources/pl.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/pt_BR.lproj/Localizable.strings b/i18n/src/main/resources/pt_BR.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/pt_PT.lproj/Localizable.strings b/i18n/src/main/resources/pt_PT.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/ro.lproj/Localizable.strings b/i18n/src/main/resources/ro.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/ru.lproj/Localizable.strings b/i18n/src/main/resources/ru.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/sk.lproj/Localizable.strings b/i18n/src/main/resources/sk.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/sl.lproj/Localizable.strings b/i18n/src/main/resources/sl.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/sr.lproj/Localizable.strings b/i18n/src/main/resources/sr.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/sv.lproj/Localizable.strings b/i18n/src/main/resources/sv.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/th.lproj/Localizable.strings b/i18n/src/main/resources/th.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/tr.lproj/Localizable.strings b/i18n/src/main/resources/tr.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/uk.lproj/Localizable.strings b/i18n/src/main/resources/uk.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/zh_CN.lproj/Localizable.strings b/i18n/src/main/resources/zh_CN.lproj/Localizable.strings
diff --git a/i18n/src/main/resources/zh_TW.lproj/Localizable.strings b/i18n/src/main/resources/zh_TW.lproj/Localizable.strings
diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java
@@ -920,7 +920,7 @@ public void setBookmarkSwitchView(NSSegmentedControl bookmarkSwitchView) {
         final NSSegmentedCell cell = Rococoa.cast(this.bookmarkSwitchView.cell(), NSSegmentedCell.class);
         cell.setToolTip_forSegment(LocaleFactory.localizedString("Browser", "Preferences"), BookmarkSwitchSegement.browser.ordinal());
         this.bookmarkSwitchView.setImage_forSegment(BookmarkSwitchSegement.browser.image(), BookmarkSwitchSegement.browser.ordinal());
-        cell.setToolTip_forSegment(LocaleFactory.localizedString("Bookmarks"), BookmarkSwitchSegement.bookmarks.ordinal());
+        cell.setToolTip_forSegment(LocaleFactory.localizedString("Bookmarks", "Browser"), BookmarkSwitchSegement.bookmarks.ordinal());
         this.bookmarkSwitchView.setImage_forSegment(BookmarkSwitchSegement.bookmarks.image(), BookmarkSwitchSegement.bookmarks.ordinal());
         cell.setToolTip_forSegment(LocaleFactory.localizedString("History"), BookmarkSwitchSegement.history.ordinal());
         this.bookmarkSwitchView.setImage_forSegment(BookmarkSwitchSegement.history.image(), BookmarkSwitchSegement.history.ordinal());
@@ -1498,7 +1498,7 @@ public void setBookmarkTable(NSTableView view) {
         }
         {
             NSTableColumn c = bookmarkTableColumnFactory.create(BookmarkColumn.bookmark.name());
-            c.headerCell().setStringValue(LocaleFactory.localizedString("Bookmarks"));
+            c.headerCell().setStringValue(LocaleFactory.localizedString("Bookmarks", "Browser"));
             c.setMinWidth(150);
             c.setResizingMask(NSTableColumn.NSTableColumnAutoresizingMask);
             c.setDataCell(BookmarkCell.bookmarkCell());
@@ -2112,8 +2112,7 @@ public void run() {
                 else {
                     if(getSelectedTabView() == BrowserTab.bookmarks) {
                         statusLabel.setAttributedStringValue(
-                            NSAttributedString.attributedStringWithAttributes(String.format("%s %s", bookmarkTable.numberOfRows(),
-                                LocaleFactory.localizedString("Bookmarks")),
+                            NSAttributedString.attributedStringWithAttributes(String.format(LocaleFactory.localizedString("{0} Bookmarks"), bookmarkTable.numberOfRows()),
                                 TRUNCATE_MIDDLE_ATTRIBUTES
                             )
                         );

diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/MainController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/MainController.java
@@ -724,7 +724,7 @@ private boolean upload(final List<Local> files) {
             return false;
         }
         final NSPopUpButton bookmarksPopup = NSPopUpButton.buttonWithFrame(new NSRect(0, 26));
-        bookmarksPopup.setToolTip(LocaleFactory.localizedString("Bookmarks"));
+        bookmarksPopup.setToolTip(LocaleFactory.localizedString("Bookmarks", "Browser"));
         for(Host b : bookmarks) {
             String title = BookmarkNameProvider.toString(b);
             int i = 1;

diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/PreferencesController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/PreferencesController.java
@@ -511,7 +511,7 @@ public void run() {
 
     public void setDefaultBookmarkCombobox(NSPopUpButton b) {
         this.defaultBookmarkCombobox = b;
-        this.defaultBookmarkCombobox.setToolTip(LocaleFactory.localizedString("Bookmarks"));
+        this.defaultBookmarkCombobox.setToolTip(LocaleFactory.localizedString("Bookmarks", "Preferences"));
         this.defaultBookmarkCombobox.removeAllItems();
         this.defaultBookmarkCombobox.addItemWithTitle(LocaleFactory.localizedString("None"));
         this.defaultBookmarkCombobox.selectItem(this.defaultBookmarkCombobox.lastItem());

diff --git a/windows/src/main/csharp/ch/cyberduck/ui/controller/BrowserController.cs b/windows/src/main/csharp/ch/cyberduck/ui/controller/BrowserController.cs
@@ -407,8 +407,7 @@ public override void message(string msg)
                 if (View.CurrentView == BrowserView.Bookmark || View.CurrentView == BrowserView.History ||
                     View.CurrentView == BrowserView.Bonjour)
                 {
-                    label = String.Format("{0} {1}", View.NumberOfBookmarks,
-                        LocaleFactory.localizedString("Bookmarks"));
+                    label = String.Format(LocaleFactory.localizedString("{0} Bookmarks"), View.NumberOfBookmarks);
                 }
                 else
                 {

diff --git a/windows/src/main/csharp/ch/cyberduck/ui/winforms/BrowserForm.cs b/windows/src/main/csharp/ch/cyberduck/ui/winforms/BrowserForm.cs
@@ -182,7 +182,7 @@ public BrowserForm()
             deleteBookmarkToolStripButton.Tag = ResourcesBundle.removePressed;
 
             browserToolStripButton.ToolTipText = LocaleFactory.localizedString("Browser", "Preferences");
-            bookmarksToolStripButton.ToolTipText = LocaleFactory.localizedString("Bookmarks", "Preferences");
+            bookmarksToolStripButton.ToolTipText = LocaleFactory.localizedString("Bookmarks", "Browser");
             historyToolStripButton.ToolTipText = LocaleFactory.localizedString("History");
             bonjourToolStripButton.ToolTipText = LocaleFactory.localizedString("Bonjour", "Browser");