Repository: openmeetings
Updated Branches:
  refs/heads/master 60fb3e6a0 -> 9c7e45ee6


[OPENMEETINGS-1662] 'micro' is changed to 'microphone'


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/9c7e45ee
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9c7e45ee
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9c7e45ee

Branch: refs/heads/master
Commit: 9c7e45ee6ed6db837891f13999c9c90842a34ca6
Parents: 60fb3e6
Author: Maxim Solodovnik <[email protected]>
Authored: Tue Jul 25 16:46:06 2017 +0700
Committer: Maxim Solodovnik <[email protected]>
Committed: Tue Jul 25 16:46:06 2017 +0700

----------------------------------------------------------------------
 .../openmeetings/web/app/Application.properties.xml     | 12 ++++++------
 .../openmeetings/web/app/Application_ar.properties.xml  | 12 ++++++------
 .../openmeetings/web/app/Application_bg.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_ca.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_cs.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_da.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_de.properties.xml  |  4 ++--
 .../openmeetings/web/app/Application_el.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_es.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_fa.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_fi.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_fr.properties.xml  |  4 ++--
 .../openmeetings/web/app/Application_gl.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_hu.properties.xml  |  6 +++---
 .../openmeetings/web/app/Application_id.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_it.properties.xml  |  4 ++--
 .../openmeetings/web/app/Application_ja.properties.xml  |  6 +++---
 .../openmeetings/web/app/Application_ko.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_nl.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_pl.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_pt.properties.xml  | 10 +++++-----
 .../web/app/Application_pt_BR.properties.xml            |  8 ++++----
 .../openmeetings/web/app/Application_sk.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_sv.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_th.properties.xml  | 10 +++++-----
 .../openmeetings/web/app/Application_tr.properties.xml  | 10 +++++-----
 .../web/app/Application_zh_CN.properties.xml            |  4 ++--
 .../web/app/Application_zh_TW.properties.xml            | 10 +++++-----
 28 files changed, 125 insertions(+), 125 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 956710e..db34eef 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -70,7 +70,7 @@
   <entry key="50">System information</entry>
   <entry key="51">Choose device</entry>
   <entry key="52">Choose webcam</entry>
-  <entry key="53">Choose micro</entry>
+  <entry key="53">Choose microphone</entry>
   <entry key="54">OK</entry>
   <entry key="55">Cancel</entry>
   <entry key="56">You need to reconnect</entry>
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 4f26fda..fba80f3 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,11 +1485,11 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
-  <entry key="1486">Edit cam and mic settings</entry>
+  <entry key="1486">Edit webcam and microphone settings</entry>
   <entry key="1487">Confirm and leave the room</entry>
   <entry key="1488">Call external people via VoIP/SIP</entry>
   <entry key="1489">Send an email with a direct link to this room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 49ad642..16c671f 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 98e2f46..b43dafd 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 5cc5fff..ff13897 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index c71d470..3b148e3 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index ddcaa92..f60046e 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -1835,8 +1835,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index 21789ae..f98e321 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index d2ea552..011cc50 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -1485,11 +1485,11 @@
   <entry key="1479">Subir nuevo archivo al explorador de archivos</entry>
   <entry key="1480">Abrir nuevo diálogo de configuraciones compartidas</entry>
   <entry key="1481">Un moderador debe aprobarlo</entry>
-  <entry key="1482">Decir al moderador que quieres compartir tu 
webcam/micro</entry>
+  <entry key="1482">Decir al moderador que quieres compartir tu 
webcam/microphone</entry>
   <entry key="1483">Reunir feedback al crear una encuesta</entry>
   <entry key="1484">Resultados de las encuestas pasadas y actual como 
gráfico</entry>
   <entry key="1485">Vote si hay una encuesta para esta sala de 
conferencias</entry>
-  <entry key="1486">Editar configuraciones de cam y micro</entry>
+  <entry key="1486">Editar configuraciones de cam y microphone</entry>
   <entry key="1487">Confirmar y dejar la sala</entry>
   <entry key="1488">Llamada a gente externa via VoIP/SIP</entry>
   <entry key="1489">Enviar un correo con un link directo a esta sala</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index a8e3fb8..6fc6204 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 7bb2bdb..72412b2 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index b27423e..7e4ba5a 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -1822,8 +1822,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 774663f..0024569 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index 5616f84..596265c 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1818,8 +1818,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index 631cda4..a44c852 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index 01efafe..126db5a 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -1832,8 +1832,8 @@
        <entry key="install.room.public.video.only">Stanza Solo Video 
Pubblica</entry>
        <entry key="install.room.public.video.wb">Stanza Video e Lavagna 
Pubblica</entry>
        <entry key="install.room.public.restricted">Stanza Seminario 
Publica</entry>
-       <entry key="install.room.restricted.micro">Stanza seminario con 
impostazione micro</entry>
-       <entry key="install.room.conference.micro">Stanza conferenze con 
impostazione micro</entry>
+       <entry key="install.room.restricted.micro">Stanza seminario con 
impostazione microfono</entry>
+       <entry key="install.room.conference.micro">Stanza conferenze con 
impostazione microfono</entry>
        <entry key="install.room.private.conference">Stanza Conferenze 
Privata</entry>
        <entry key="appointment.tab.general">Generale</entry>
        <entry key="appointment.tab.advanced">Avanzate</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 43ad3e7..7c7721b 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -1599,7 +1599,7 @@
   <entry key="1599">この会議室へは入れません</entry>
   <entry key="1600">再録音開始</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 164f9ce..706355f 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -1448,7 +1448,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1487,7 +1487,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1601,7 +1601,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1832,8 +1832,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 1ef8dd3..54cea53 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index be534e0..99f3593 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index caf71a6..22016ca 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index f911686..f2094bb 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -1485,7 +1485,7 @@
   <entry key="1479">Carregar novo arquivo para a pasta de arquivos</entry>
   <entry key="1480">Abra nova caixa de diálogo com as configurações de 
compartilhamento</entry>
   <entry key="1481">Um moderador existente tem que aprovar isto</entry>
-  <entry key="1482">Pergunte moderador para compartilhar sua 
webcam/micro</entry>
+  <entry key="1482">Pergunte moderador para compartilhar sua 
webcam/microfone</entry>
   <entry key="1483">Reúna comentários, criando uma enquete</entry>
   <entry key="1484">Resultados da enquete corrente e passada como 
gráfico</entry>
   <entry key="1485">Votar se houver uma enquete para esta sala de 
conferência</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 64426d2..00db4b5 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 0dafc7f..2c4641d 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index eb06920..75d18d6 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 79e18d1..2270c0f 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 6695530..6a49f4e 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -1820,8 +1820,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9c7e45ee/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index edeb016..4addeb2 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -1446,7 +1446,7 @@
   <entry key="1439">Hide actions menu</entry>
   <entry key="1440">Hide screen sharing</entry>
   <entry key="1441">Hide whiteboard</entry>
-  <entry key="1442">Show micro status in video</entry>
+  <entry key="1442">Show microphone status in video</entry>
   <entry key="1443">Layout options</entry>
   <entry key="1444">New Event</entry>
   <entry key="1445">Password protected are the links to the conference that 
are send to the participents when you save the calendar event, not the room! 
That means if you save the event multiple times but with different passwords 
every participent receives a new link that has a different password. But old 
links still work once send!</entry>
@@ -1485,7 +1485,7 @@
   <entry key="1479">Upload new file to file explorer</entry>
   <entry key="1480">Open new dialog with sharing settings</entry>
   <entry key="1481">An existing moderator must approve it</entry>
-  <entry key="1482">Ask moderator to share your webcam/micro</entry>
+  <entry key="1482">Ask moderator to share your webcam/microphone</entry>
   <entry key="1483">Gather feedback by creating a poll</entry>
   <entry key="1484">Past and current poll results as charts</entry>
   <entry key="1485">Vote if there is a poll for this conference room</entry>
@@ -1599,7 +1599,7 @@
   <entry key="1599">Access denied. You have no rights to enter this 
room.</entry>
   <entry key="1600">Re-convert</entry>
   <entry key="1601">Apply for audio access</entry>
-  <entry key="1602">Ask moderator to share your micro</entry>
+  <entry key="1602">Ask moderator to share your microphone</entry>
   <entry key="1603">would like to share his audio</entry>
   <entry key="1604">Allow this user to publish their audio</entry>
   <entry key="1605">Remove audio of this user</entry>
@@ -1830,8 +1830,8 @@
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
        <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with micro 
option set</entry>
-       <entry key="install.room.conference.micro">Conference room with micro 
option set</entry>
+       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
        <entry key="appointment.tab.advanced">Advanced</entry>

Reply via email to