The {1} is currently under active
The version you are running is only experimental and MAY NOT \
work as expected. Please refer to {2} for more information.
plugin.branding.COPYRIGHT=The
SIP Communicator is distributed under \
+plugin.branding.LICENSE=
@@ -705,7 +705,7 @@ plugin.generalconfig.LEAVE_CHATROOM_ON_WINDOW_CLOSE=Leave chat rooms when closin
# gibberish accregwizz
plugin.gibberishaccregwizz.PROTOCOL_NAME=Gibberish
-plugin.gibberishaccregwizz.PROTOCOL_DESCRIPTION=A SIP Communicator test protocol.
+plugin.gibberishaccregwizz.PROTOCOL_DESCRIPTION=A Jitsi test protocol.
plugin.gibberishaccregwizz.USERNAME=User ID:
plugin.gibberishaccregwizz.USERNAME_AND_PASSWORD=Identification
@@ -799,7 +799,7 @@ plugin.pluginmanager.NEW=New
# rss accregwizz
plugin.rssaccregwizz.PROTOCOL_NAME=RSS
-plugin.rssaccregwizz.PROTICOL_DESCRIPTION=Add your preferred RSS feeds into SIP Communicator !
+plugin.rssaccregwizz.PROTICOL_DESCRIPTION=Add your preferred RSS feeds into Jitsi !
plugin.rssaccregwizz.ERROR_ACCOUNT_EXISTS=RSS account already exists!
plugin.rssaccregwizz.ACCOUNT_INFO=This wizard will create an RSS account for you.\n\n\
Note that you could have only one RSS account!\n\n\
@@ -1083,7 +1083,7 @@ plugin.otr.menu.CB_AUTO=Automatically initiate private messaging
plugin.otr.menu.CB_ENABLE=Enable private messaging
plugin.otr.menu.CB_REQUIRE=Require private messaging
plugin.otr.menu.CB_RESET=Reset
-plugin.otr.authbuddydialog.HELP_URI=http://www.sip-communicator.org/index.php/GSOC2009/OTR
+plugin.otr.authbuddydialog.HELP_URI=http://www.jitsi.org/index.php/GSOC2009/OTR
plugin.otr.authbuddydialog.AUTHENTICATION_INFO=Authenticating a buddy helps ensure that the person you are talking to is who he or she claims to be. To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the above dialog that you *have* verified the fingerprint.
plugin.otr.authbuddydialog.LOCAL_FINGERPRINT=Fingerprint for you, {0}: {1}
plugin.otr.authbuddydialog.REMOTE_FINGERPRINT=Purported fingerprint for {0}: {1}
diff --git a/src/net/java/sip/communicator/launcher/SIPCommunicator.java b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
index beda167b9..0d7728012 100644
--- a/src/net/java/sip/communicator/launcher/SIPCommunicator.java
+++ b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
@@ -168,7 +168,15 @@ private static void setScHomeDir(String osName)
if ((location == null) || (name == null))
{
String defaultLocation = System.getProperty("user.home");
- String defaultName = ".sip-communicator";
+ String defaultName = ".jitsi";
+
+ // Whether we should check legacy names
+ // 1) when such name is not forced we check
+ // 2) if such is forced and is the overridableDirName check it
+ // (the later is the case with name transition SIP Communicator
+ // -> Jitsi, check them only for Jitsi)
+ boolean chekLegacyDirNames = (name == null) ||
+ name.equals(overridableDirName);
if (osName.startsWith("Mac"))
{
@@ -213,11 +221,9 @@ && new File(defaultLocation, defaultName).isDirectory())
name = defaultName;
}
- // if we are after app name transition SIP Communicator -> Jitsi
- // lets use old one (in case of windows and macosx) if
- // there is a old home directory with settings
- if(isHomeDirnameForced
- && name.equals(overridableDirName)
+ // if we need to check legacy names and there is no
+ // current home dir already created
+ if(chekLegacyDirNames
&& !new File(location, name).isDirectory())
{
// now check whether some of the legacy dir names
@@ -244,5 +250,8 @@ && new File(defaultLocation, defaultName).isDirectory())
System.setProperty(PNAME_SC_HOME_DIR_LOCATION, location);
System.setProperty(PNAME_SC_HOME_DIR_NAME, name);
}
+
+ // when we end up with the home dirs, make sure we have log dir
+ new File(location, name + File.separator + "log").mkdirs();
}
}