Update about window to current license, remove in-app splashscreen

4 files changed, 4 insertions, 18 deletions

diff --git a/resources/config/defaults.properties b/resources/config/defaults.properties
index f126476..38bb564 100644
--- a/resources/config/defaults.properties
+++ b/resources/config/defaults.properties
@@ -54,14 +54,9 @@ net.java.sip.communicator.service.msghistory.IS_MESSAGE_HISTORY_ENABLED=true
 plugin.branding.ABOUT_LOGO_FONT_SIZE=14
 plugin.branding.ABOUT_TEXT_INDENT=180
 plugin.branding.SPLASH_SCREEN_TEXT_INDENT=190
-plugin.branding.LOADING_BUNDLE_PANEL_HEIGHT=40
 plugin.branding.LOADING_BUNDLE_PANEL_BORDER=10
 plugin.branding.ABOUT_PARAGRAPH_GAP=10
 
-# Application name could be present in the background image and in this case
-# we may not want to show it again.
-plugin.branding.IS_APPLICATION_NAME_SHOWN=true
-
 # jabber accregwizz
 plugin.jabberaccregwizz.SERVER_COMMENTS=net/java/sip/communicator/plugin/jabberaccregwizz/resources/servercomments.xml
 
diff --git a/resources/images/images.properties b/resources/images/images.properties
index b7de44a..e9ac9ea 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -471,7 +471,6 @@ service.protocol.ippi.IPPI_64x64=resources/images/protocol/ippi/sip64x64.png
 
 # branding plugin images
 plugin.branding.ABOUT_WINDOW_BACKGROUND=resources/images/plugin/branding/aboutWindowBackground.png
-plugin.branding.SPLASH_SCREEN_BACKGROUND=resources/images/plugin/branding/splashScreenBackground.png
 
 #plugin busylampfield
 plugin.busylampfield.PICKUP_CALL=resources/images/impl/gui/buttons/pickupCall.png
diff --git a/resources/images/plugin/branding/splashScreenBackground.png b/resources/images/plugin/branding/splashScreenBackground.png
deleted file mode 100644
index 5754b26..0000000
--- a/resources/images/plugin/branding/splashScreenBackground.png
+++ /dev/null
diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index c35bacf..89de334 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -1008,19 +1008,11 @@ plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default opt
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=About {0}
 plugin.branding.LOGO_MESSAGE=Open Source VoIP && Instant Messaging
-plugin.branding.LOADING=Loading
 plugin.branding.ABOUT_MENU_ENTRY=&About
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>The {1} is currently under active development. \
-               The version you are running is only experimental and MAY NOT \
-               work as expected. Please refer to {2} for more information.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright \
-          <b>jitsi.org</b>. All rights reserved. Visit \
-          <a href="https://jitsi.org">https://jitsi.org</a>.\
-          </font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> is distributed under \
-        the terms of the \
-        <a href=\"http://www.apache.org/licenses/LICENSE-2.0\">\
-        Apache License 2.0</a>.</DIV>
+plugin.branding.COPYRIGHT_LICENSE=<DIV><font size=3 color={0}>Copyright 2003-{1} \
+          <a href="{2}"><b>{3}</b></a>, All rights reserved.\
+          </font><br><br>{4} is distributed under \
+        the terms of the <a href=\"{5}\">{6}</a>.</DIV>
 
 plugin.busylampfield.PICKUP=Pickup call