Felipe Cecagno
015d708d7c
Merge branch 'mconf-branding-0.81' into 090-mconf-branding
...
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"
Conflicts:
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/src/BigBlueButton.mxml
record-and-playback/presentation/playback/presentation/playback.html
2014-10-05 19:36:43 -03:00
Felipe Cecagno
f8e63fd6f4
Merge branch 'master' into mconf-branding
...
Conflicts:
bigbluebutton-client/build.xml
bigbluebutton-client/locale/ar_SY/bbbResources.properties
bigbluebutton-client/locale/az_AZ/bbbResources.properties
bigbluebutton-client/locale/bg_BG/bbbResources.properties
bigbluebutton-client/locale/ca_ES/bbbResources.properties
bigbluebutton-client/locale/cs_CZ/bbbResources.properties
bigbluebutton-client/locale/da_DK/bbbResources.properties
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/el_GR/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_ES/bbbResources.properties
bigbluebutton-client/locale/es_LA/bbbResources.properties
bigbluebutton-client/locale/et_EE/bbbResources.properties
bigbluebutton-client/locale/eu_EU/bbbResources.properties
bigbluebutton-client/locale/fa_IR/bbbResources.properties
bigbluebutton-client/locale/fi_FI/bbbResources.properties
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/locale/fr_FR/bbbResources.properties
bigbluebutton-client/locale/he_IL/bbbResources.properties
bigbluebutton-client/locale/hr_HR/bbbResources.properties
bigbluebutton-client/locale/hu_HU/bbbResources.properties
bigbluebutton-client/locale/id_ID/bbbResources.properties
bigbluebutton-client/locale/it_IT/bbbResources.properties
bigbluebutton-client/locale/ja_JP/bbbResources.properties
bigbluebutton-client/locale/kk_KZ/bbbResources.properties
bigbluebutton-client/locale/km_KH/bbbResources.properties
bigbluebutton-client/locale/ko_KR/bbbResources.properties
bigbluebutton-client/locale/lt_LT/bbbResources.properties
bigbluebutton-client/locale/lv_LV/bbbResources.properties
bigbluebutton-client/locale/mn_MN/bbbResources.properties
bigbluebutton-client/locale/ne_NE/bbbResources.properties
bigbluebutton-client/locale/nl_NL/bbbResources.properties
bigbluebutton-client/locale/no_NO/bbbResources.properties
bigbluebutton-client/locale/pl_PL/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/locale/pt_PT/bbbResources.properties
bigbluebutton-client/locale/ro_RO/bbbResources.properties
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/locale/si_LK/bbbResources.properties
bigbluebutton-client/locale/sk_SK/bbbResources.properties
bigbluebutton-client/locale/sr_RS/bbbResources.properties
bigbluebutton-client/locale/sv_SE/bbbResources.properties
bigbluebutton-client/locale/th_TH/bbbResources.properties
bigbluebutton-client/locale/tr_TR/bbbResources.properties
bigbluebutton-client/locale/uk_UA/bbbResources.properties
bigbluebutton-client/locale/vi_VN/bbbResources.properties
bigbluebutton-client/locale/zh_CN/bbbResources.properties
bigbluebutton-client/locale/zh_TW/bbbResources.properties
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/lib/bbb_blinker.js
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
record-and-playback/presentation/playback/presentation/playback.html
2013-08-26 21:26:44 -03:00
Felipe Cecagno
13bff3a7ba
removing the copyright string from the localization files - we will keep the Mconf-Live copyright message only on en_US, and all the other languages will load from it
2013-01-09 16:10:44 -02:00
jtrobinson
50a2e83153
Fixed permission issue
2012-08-22 16:23:18 +00:00
Localization Server
4c75e43b30
Updating locale
2011-11-01 22:40:01 +00:00
Richard Alam
87b7380320
rename Norwegian locale code from nb_No to no_NO
2011-11-01 01:44:03 +00:00
Localization Server
d09141d0be
Updating locale
2011-10-18 17:20:02 +00:00
Localization Server
07e6d4570e
Updating locale
2011-10-17 00:20:01 +00:00
Localization Server
31993cc824
Updating locale
2011-10-17 00:00:02 +00:00
Localization Server
f3f95bc9ef
Updating locale
2011-10-16 23:40:02 +00:00
Richard Alam
f524cfda17
- change locale version 0.8-beta2
2011-10-02 13:53:24 -07:00
Localization Server
47e33e1bd9
Updating locale
2011-09-19 18:00:22 +00:00
Localization Server
079e7d12f5
Updating locale
2011-09-12 17:00:03 +00:00
Localization Server
fd47093e13
Updating locale
2011-08-10 09:00:04 +00:00
Localization Server
e7ae9d6297
Updating locale
2011-08-10 07:20:02 +00:00
Localization Server
74cfd9153f
Updating locale
2011-05-25 14:37:34 +00:00
Marco Calderon
c70e26f3cb
update locale for ukrainian and norwegian
2011-03-01 10:35:18 +00:00
Richard Alam
ccce72a9b2
- upgrade checking of locales to 0.71
2010-11-03 13:49:11 -04:00
Jeremy Thomerson
a70047d4aa
resources from djp
2010-07-14 09:13:57 -05:00
Richard Alam
36431188c0
- update locales
2010-06-25 13:21:04 -04:00
DJP
fab0daee4c
Added nb_NO, ro_RO and pt_PT locale. Updated tr_TR. Thanks to contributors cf wiki
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4167 af16638f-c34d-0410-8cfa-b39d5352b314
2010-04-13 20:39:38 +00:00