Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java (revision 28474) +++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java (revision 28475) @@ -67,4 +67,5 @@ new SideButton(new OpenWikipediaArticleAction()), new SideButton(new WikipediaSettingsAction(), false))); + setTitle(/* I18n: [language].Wikipedia.org */ tr("{0}.Wikipedia.org", wikipediaLang.get())); } final StringProperty wikipediaLang = new StringProperty("wikipedia.lang", LanguageInfo.getJOSMLocaleCode().substring(0, 2)); @@ -98,26 +99,17 @@ if (entry.getWiwosmStatus() != null && entry.getWiwosmStatus()) { label.setIcon(ImageProvider.getIfAvailable("misc", "grey_check")); - label.setToolTipText(tr("Available via WIWOSM server")); + label.setToolTipText(/* I18n: WIWOSM server already links Wikipedia article to object/s */ tr("Available via WIWOSM server")); } else if (articles.contains(entry.wikipediaArticle)) { label.setIcon(ImageProvider.getIfAvailable("misc", "green_check")); - label.setToolTipText(tr("Available in local dataset")); + label.setToolTipText(/* I18n: object/s from dataset contain link to Wikipedia article */ tr("Available in local dataset")); } else { label.setToolTipText(tr("Not linked yet")); } + if (entry.description != null) { + label.setToolTipText("" + entry.description + ""); + } return label; } }); - } - - @Override - public String getToolTipText(MouseEvent e) { - final int index = locationToIndex(e.getPoint()); - if (index >= 0) { - final String description = ((WikipediaEntry) model.getElementAt(index)).description; - if (description != null) { - return "" + description + ""; - } - } - return super.getToolTipText(e); } }; @@ -300,4 +292,5 @@ // add entries to list model setWikipediaEntries(entries); + setTitle(/* I18n: [language].Wikipedia.org: coordinates */ tr("{0}.Wikipedia.org: coordinates", wikipediaLang.get())); } catch (Exception ex) { throw new RuntimeException(ex); @@ -336,4 +329,5 @@ Collections.sort(entries); setWikipediaEntries(entries); + setTitle(/* I18n: [language].Wikipedia.org: [category] */ tr("{0}.Wikipedia.org: {1}", wikipediaLang.get(), category)); } catch (IOException ex) { throw new RuntimeException(ex);