diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2013-04-11 11:53:52 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2013-04-11 11:53:52 +0000 |
| commit | 59dc2fc9f50342b690e50b748a89cb33155435fc (patch) | |
| tree | 3346d1d800fa53aaa8fa54312564788163073c93 | |
| parent | e2af23f7aca84f6292ef83403698c799108b5ca1 (diff) | |
| download | jitsi-59dc2fc9f50342b690e50b748a89cb33155435fc.zip jitsi-59dc2fc9f50342b690e50b748a89cb33155435fc.tar.gz jitsi-59dc2fc9f50342b690e50b748a89cb33155435fc.tar.bz2 | |
Renames the Options menu in MacOSX systray to Preferences to ensure conformity.
| -rw-r--r-- | resources/languages/resources.properties | 2 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/osdependent/jdic/TrayMenuFactory.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties index 352698b..ea1bc4c 100644 --- a/resources/languages/resources.properties +++ b/resources/languages/resources.properties @@ -383,6 +383,7 @@ service.gui.PASTE=&Paste service.gui.PERSONAL=Personal service.gui.PORT=Port service.gui.POSTAL_CODE=Postal code +service.gui.PREFERENCES=Preferences service.gui.PREFIX=Prefix service.gui.PRESENCE=Presence service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' for suggestions @@ -504,6 +505,7 @@ service.gui.UNKNOWN_STATUS=Unknown state service.gui.UNREGISTERED_MESSAGE=Unable to connect the following account: User name: {0}, Server name: {1}. You are currently offline. service.gui.USE_PROVISIONING=Use online provisioning service.gui.VIDEO_CALL=&Video call +service.gui.VIA=via service.gui.VIA_SMS=Via SMS service.gui.VIEW=&View service.gui.VIEW_HISTORY=View &history diff --git a/src/net/java/sip/communicator/impl/osdependent/jdic/TrayMenuFactory.java b/src/net/java/sip/communicator/impl/osdependent/jdic/TrayMenuFactory.java index d5a75ec..629d08f 100644 --- a/src/net/java/sip/communicator/impl/osdependent/jdic/TrayMenuFactory.java +++ b/src/net/java/sip/communicator/impl/osdependent/jdic/TrayMenuFactory.java @@ -154,7 +154,11 @@ public final class TrayMenuFactory if (showOptions.booleanValue()) { - add(trayMenu, createTrayMenuItem("settings", "service.gui.SETTINGS", + add(trayMenu, createTrayMenuItem( + "settings", + (OSUtils.IS_MAC) + ? "service.gui.PREFERENCES" + : "service.gui.SETTINGS", "service.systray.CONFIGURE_ICON", listener, swing)); } |