aboutsummaryrefslogtreecommitdiffstats
path: root/resources/config
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-03-11 22:15:03 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-03-11 22:15:03 +0100
commit85901329b0794b136b96bf745f4ab1572806fc89 (patch)
treef23da7e97cae727f39d825f0fef8348cffb238e4 /resources/config
parent3db2e44f186c59429901b2c899e139ea60117a55 (diff)
parentcf5da997da8820b4050f5b87ee9440a0ede36d1f (diff)
downloadjitsi-master.zip
jitsi-master.tar.gz
jitsi-master.tar.bz2
Merge commit 'cf5da99'HEADmaster
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'resources/config')
-rw-r--r--resources/config/defaults.properties5
-rw-r--r--resources/config/spellcheck/parameters.xml1
2 files changed, 1 insertions, 5 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/config/spellcheck/parameters.xml b/resources/config/spellcheck/parameters.xml
index 1d3e1e2..3c1cf87 100644
--- a/resources/config/spellcheck/parameters.xml
+++ b/resources/config/spellcheck/parameters.xml
@@ -117,6 +117,7 @@
<locale label="Occitan (France)" isoCode="oc,fr" dictionaryUrl="http://dictionaries.jitsi.net/oc_FR.zip" flagIcon="fr"/>
<locale label="Persian (Iran)" isoCode="fa,ir" dictionaryUrl="http://dictionaries.jitsi.net/fa_IR.zip" flagIcon="ir"/>
<locale label="Polish (Poland)" isoCode="pl,pl" dictionaryUrl="http://dictionaries.jitsi.net/pl_PL.zip" flagIcon="pl"/>
+ <locale label="Portuguese (Brazil)" isoCode="pt,br" dictionaryUrl="http://dictionaries.jitsi.net/pt_BR.zip" flagIcon="br"/>
<locale label="Portuguese (Portugal)" isoCode="pt,pt" dictionaryUrl="http://dictionaries.jitsi.net/pt_PT.zip" flagIcon="pt"/>
<locale label="Punjabi (India)" isoCode="xx,in" dictionaryUrl="http://dictionaries.jitsi.net/xx_IN.zip" flagIcon="in"/>
<locale label="Romanian (Romania)" isoCode="ro,ro" dictionaryUrl="http://dictionaries.jitsi.net/ro_RO.zip" flagIcon="ro"/>