Repository: openmeetings
Updated Branches:
  refs/heads/3.3.x 8f5a3f442 -> 45b7578e7


[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/45b7578e
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/45b7578e
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/45b7578e

Branch: refs/heads/3.3.x
Commit: 45b7578e760a617508a4af705e7fb7e40aa93e93
Parents: 8f5a3f4
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:43 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/45b7578e/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 8445b59..c40aab9 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>
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 e62ea98..2d225df 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
@@ -1451,7 +1451,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>
@@ -1490,11 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 3984ec4..ccd2e95 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 6c5176f..e38e866 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 6cef3e5..75ddc9a 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 491a65e..3b7cded 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 03d7ee4..bc72657 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
@@ -1870,8 +1870,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/45b7578e/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 57b4ed3..fd436cf 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 876d392..1c32ca8 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
@@ -1490,11 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 4a4c712..28050b9 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 42b7f16..b35b34e 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 3577cb6..db26732 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
@@ -1838,8 +1838,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/45b7578e/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 418f3fa..feb7912 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 8ab046b..9d7faca 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
@@ -1604,7 +1604,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>
@@ -1833,8 +1833,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/45b7578e/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 f0759fc..56fb63c 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 596f7c2..24280d0 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
@@ -1851,8 +1851,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/45b7578e/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 9472869..cc8ed83 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
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 7a079c8..b12cf2e 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
@@ -1453,7 +1453,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>
@@ -1492,7 +1492,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>
@@ -1606,7 +1606,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>
@@ -1851,8 +1851,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/45b7578e/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 25f9fa8..e69cdc0 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 408c57f..6df815b 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 c8dc52d..d1b5291 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 d6c08b6..cbc7c7c 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
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 3bda679..3981a66 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 60dcd0c..91f8fdd 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 a97fc3f..4a6497b 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 f8853f7..88cae86 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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/45b7578e/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 ea8f11d..46f219b 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
@@ -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/45b7578e/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 b4abdeb..9febfba 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
@@ -1451,7 +1451,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>
@@ -1490,7 +1490,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>
@@ -1604,7 +1604,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>
@@ -1849,8 +1849,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