diff --git a/src/mumble/ACLEditor.ui b/src/mumble/ACLEditor.ui index 75557a0b1..facb6bf0c 100644 --- a/src/mumble/ACLEditor.ui +++ b/src/mumble/ACLEditor.ui @@ -16,6 +16,9 @@ + + Maximum Users + 1 @@ -79,7 +82,7 @@ This value enables you to change the way Mumble arranges the channels in the tree. A channel with a higher <i>Position</i> value will always be placed below one with a lower value and the other way around. If the <i>Position</i> value of two channels is equal they will get sorted alphabetically by their name. - Position + Channel position 99 @@ -112,7 +115,7 @@ This value enables you to change the way Mumble arranges the channels in the tre This value allows you to set the maximum number of users allowed in the channel. If the value is above zero, only that number of users will be allowed to enter the channel. If the value is zero, the maximum number of users in the channel is given by the server's default limit. - Maximum users + Channel maximum users @@ -176,7 +179,7 @@ When checked the channel created will be marked as temporary. This means when th - Description + Channel description @@ -376,7 +379,7 @@ This list contains all members that were added to the group by the current chann Type in the name of a user you wish to add to the group and click Add. - Add members to group + Select member to add true @@ -441,7 +444,7 @@ This list contains all members that were added to the group by the current chann Contains a list of members whose group membership will not be inherited from the parent channel. - Foreign group members + Excluded group members @@ -460,7 +463,7 @@ Contains a list of members whose group membership will not be inherited from the Type in the name of a user you wish to remove from the group and click Add. - Remove member from group + Select member to remove true @@ -570,13 +573,13 @@ Contains the list of members inherited by the current channel. Uncheck <i> - List of entries + List of ACL entries This shows all the entries active on this channel. Entries inherited from parent channels will be shown in italics.<br />ACLs are evaluated top to bottom, meaning priority increases as you move down the list. - List of ACL entries + List of access control list entries @@ -738,7 +741,10 @@ Contains the list of members inherited by the current channel. Uncheck <i> This controls which group of users this entry applies to.<br />Note that the group is evaluated in the context of the channel the entry is used in. For example, the default ACL on the Root channel gives <i>Write</i> permission to the <i>admin</i> group. This entry, if inherited by a channel, will give a user write privileges if he belongs to the <i>admin</i> group in that channel, even if he doesn't belong to the <i>admin</i> group in the channel where the ACL originated.<br />If a group name starts with '!', its membership is negated, and if it starts with '~', it is evaluated in the channel the ACL was defined in, rather than the channel the ACL is active in.<br />If a group name starts with '#', it is interpreted as an access token. Users must have entered whatever follows the '#' in their list of access tokens to match. This can be used for very simple password access to channels for non-authenticated users.<br />If a group name starts with '$', it will only match users whose certificate hash matches what follows the '$'.<br />A few special predefined groups are:<br /><b>all</b> - Everyone will match.<br /><b>auth</b> - All authenticated users will match.<br /><b>sub,a,b,c</b> - User currently in a sub-channel minimum <i>a</i> common parents, and between <i>b</i> and <i>c</i> channels down the chain. See the website for more extensive documentation on this one.<br /><b>in</b> - Users currently in the channel will match (convenience for '<i>sub,0,0,0</i>').<br /><b>out</b> - Users outside the channel will match (convenience for '<i>!sub,0,0,0</i>').<br />Note that an entry applies to either a user or a group, not both. - Group this entry applies to + Select group + + + Selects a group this ACL entry applies to. Selecting a group and selecting a user are mutually exclusive. true @@ -770,7 +776,10 @@ Contains the list of members inherited by the current channel. Uncheck <i> This controls which user this entry applies to. Just type in the user name and hit enter to query the server for a match. - User this entry applies to + Select user + + + Selects a user this ACL entry applies to. Selecting a group and selecting a user are mutually exclusive. true @@ -787,6 +796,9 @@ Contains the list of members inherited by the current channel. Uncheck <i> + + List of available permissions + Permissions diff --git a/src/mumble/ASIOInput.ui b/src/mumble/ASIOInput.ui index e1cbdcd96..59167aefe 100644 --- a/src/mumble/ASIOInput.ui +++ b/src/mumble/ASIOInput.ui @@ -45,7 +45,7 @@ This chooses what device to query. You still need to actually query the device and select which channels to use. - Device to use for microphone + Device list @@ -214,6 +214,9 @@ 16777215 + + Move from unused to microphone list + <- @@ -227,6 +230,9 @@ 16777215 + + Move from microphone to unused list + -> @@ -273,6 +279,9 @@ 16777215 + + List of unused devices + @@ -300,6 +309,9 @@ 16777215 + + Move from unused to speakers list + -> @@ -313,6 +325,9 @@ 16777215 + + Move from speakers to unused list + <- diff --git a/src/mumble/AudioInput.ui b/src/mumble/AudioInput.ui index 6e3036f93..3507f526e 100644 --- a/src/mumble/AudioInput.ui +++ b/src/mumble/AudioInput.ui @@ -39,13 +39,13 @@ - Input method for audio + Input backend for audio <b>This is the input method to use for audio.</b> - Audio system + Audio input system @@ -74,7 +74,7 @@ <b>This is the input device to use for audio.</b> - Input device + Audio input device QComboBox::AdjustToContents @@ -244,7 +244,10 @@ <b>DoublePush Time</b><br />If you press the push-to-talk key twice during the configured interval of time it will be locked. Mumble will keep transmitting until you hit the key once more to unlock PTT again. - PTT lock threshold + Push to talk lock threshold + + + Switch between push to talk and continuous mode by double tapping in this time frame 1000 @@ -282,8 +285,14 @@ Time the microphone stays open after the PTT key is released + + <b>Voice hold Time</b><br />After you release the push-to-talk key Mumble will keep transmitting for the selected amount of time. + - PTT hold threshold + Push to talk hold threshold + + + Extend push to talk send time after the key is released by this amount of time 5000 @@ -332,7 +341,7 @@ <b>This selects how long after a perceived stop in speech transmission should continue.</b><br />Set this higher if your voice breaks up when you speak (seen by a rapidly blinking voice icon next to your name). - Silence below + Voice hold time 20 @@ -423,7 +432,10 @@ <b>This sets the trigger values for voice detection.</b><br />Use this together with the Audio Statistics window to manually tune the trigger values for detecting speech. Input values below "Silence Below" always count as silence. Values above "Speech Above" always count as voice. Values in between will count as voice if you're already talking, but will not trigger a new detection. - Silence below + Silence below threshold + + + This sets the threshold when Mumble will definitively consider a signal silence 1 @@ -451,7 +463,10 @@ <b>This sets the trigger values for voice detection.</b><br />Use this together with the Audio Statistics window to manually tune the trigger values for detecting speech. Input values below "Silence Below" always count as silence. Values above "Speech Above" always count as voice. Values in between will count as voice if you're already talking, but will not trigger a new detection. - Speech above + Speech above threshold + + + This sets the threshold when Mumble will definitively consider a signal speech 1 @@ -503,7 +518,10 @@ <b>This selects how many audio frames should be put in one packet.</b><br />Increasing this will increase the latency of your voice, but will also reduce bandwidth requirements. - Audio per packet in milliseconds + Audio per packet + + + This sets how much speech is packed into a single network package 1 @@ -554,7 +572,10 @@ <b>This sets the quality of compression.</b><br />This determines how much bandwidth Mumble is allowed to use for outgoing audio. - Audio compression quality in kilobit per second + Audio compression quality + + + This sets the target compression bitrate 8000 @@ -640,6 +661,9 @@ Maximum amplification + + Speech is dynamically amplified by at most this amount + 19500 @@ -707,7 +731,7 @@ Don't use noise suppression. - Noise suppression disabled + Disabled @@ -770,7 +794,7 @@ <b>This sets the amount of noise suppression to apply.</b><br />The higher this value, the more aggressively stationary noise will be suppressed. - Noise suppression + Noise suppression strength 15 @@ -840,8 +864,11 @@ Gets played when stopping to transmit + + Path to audio file + - Path to audio cue file when stopping to speak + Path to audio cue file when stopping to speak. Use the "browse" button to open a file dialog. @@ -850,7 +877,7 @@ - Initiate idle action after (in minutes) + Idle action time threshold (in minutes) 1 @@ -921,8 +948,11 @@ Gets played when you are trying to speak while being muted + + Path to audio file + - Path to mute cue file + Path to mute cue file. Use the "browse" button to open a file dialog. @@ -941,8 +971,11 @@ Gets played when starting to transmit + + Path to audio file + - Path to audio cue file when starting to speak + Path to audio cue file when starting to speak. Use the "browse" button to open a file dialog. diff --git a/src/mumble/AudioOutput.ui b/src/mumble/AudioOutput.ui index 325e28e3a..d4261be77 100644 --- a/src/mumble/AudioOutput.ui +++ b/src/mumble/AudioOutput.ui @@ -45,7 +45,7 @@ <b>This is the output method to use for audio.</b> - Output system + Audio output system @@ -90,7 +90,7 @@ <b>This is the output device to use for audio.</b> - Output device + Audio output device QComboBox::AdjustToContents @@ -147,7 +147,7 @@ This sets the amount of data to pre-buffer in the output buffer. Experiment with different values and set it to the lowest which doesn't cause rapid jitter in the sound. - Output delay + Output delay of incoming speech 1 @@ -237,7 +237,7 @@ <b>This sets the minimum safety margin for the jitter buffer.</b><br />All incoming audio is buffered, and the jitter buffer continually tries to push the buffer to the minimum sustainable by your network, so latency can be as low as possible. This sets the minimum buffer size to use. If the start of sentences you hear is very jittery, increase this value. - Default jitter buffer + Jitter buffer time 1 @@ -401,7 +401,10 @@ <b>Attenuate volume of other applications during speech</b><br />Mumble supports decreasing the volume of other applications during incoming and/or outgoing speech. This sets the attenuation of other applications if the feature is enabled. - Attenuation of other applications during speech + Attenuation percentage + + + During speech, the volume of other applications will be reduced by this amount 0 @@ -638,7 +641,7 @@ <b>This sets the packet latency variance for loopback testing.</b><br />Most audio paths contain some variable latency. This allows you to set that variance for loopback mode testing. For example, if you set this to 15ms, this will emulate a network with 20-35ms ping latency or one with 80-95ms latency. Most domestic net connections have a variance of about 5ms. - Delay variance + Loopback artificial delay 100 @@ -680,7 +683,7 @@ <b>This sets the packet loss for loopback mode.</b><br />This will be the ratio of packets lost. Unless your outgoing bandwidth is peaked or there's something wrong with your network connection, this will be 0% - Packet loss + Loopback artificial packet loss 50 @@ -728,7 +731,10 @@ <b>This enables one of the loopback test modes.</b><br /><i>None</i> - Loopback disabled<br /><i>Local</i> - Emulate a local server.<br /><i>Server</i> - Request loopback from server.<br />Please note than when loopback is enabled, no other users will hear your voice. This setting is not saved on application exit. - Loopback + Loopback test mode + + + The loopback test can be used to test your audio configuration. While the loopback test is enabled, others will not be able to hear you. diff --git a/src/mumble/AudioWizard.ui b/src/mumble/AudioWizard.ui index 486b9ff82..e80b2c83a 100644 --- a/src/mumble/AudioWizard.ui +++ b/src/mumble/AudioWizard.ui @@ -95,7 +95,7 @@ <b>This is the input method to use for audio.</b> - Input system + Audio input system @@ -118,7 +118,7 @@ <b>Selects which sound card to use for audio input.</b> - Input device + Audio input device @@ -141,7 +141,7 @@ - Output system + Select audio output device Output Device @@ -176,7 +176,7 @@ <b>This is the Output method to use for audio.</b> - Output system + Audio output system @@ -199,7 +199,7 @@ <b>Selects which sound card to use for audio Output.</b> - Output device + Audio output device @@ -211,6 +211,9 @@ This allows Mumble to use positional audio to place voices. + + The Mumble positional audio system enables users to link the relative position of their voice to third party applications such as games. + Enable positional audio @@ -289,7 +292,7 @@ You should hear a voice sample. Change the slider below to the lowest value whic This sets the amount of data to pre-buffer in the output buffer. Experiment with different values and set it to the lowest which doesn't cause rapid jitter in the sound. - Output delay + Output delay for incoming speech 1 @@ -423,9 +426,15 @@ Speak loudly, as when you are annoyed or excited. Decrease the volume in the sou + + Maximum amplification of input sound + Maximum amplification + + Speech is dynamically amplified by at most this amount + 32767 @@ -572,6 +581,9 @@ Speak loudly, as when you are annoyed or excited. Decrease the volume in the sou Voice activity detection level + + This will set the range in which Mumble will consider a signal speech. Increase value to make voice activation more sensitive. + 1 @@ -617,6 +629,12 @@ Speak loudly, as when you are annoyed or excited. Decrease the volume in the sou 0 + + Push to talk + + + Use the "push to talk shortcut" button to assign a key + Push To Talk: @@ -624,8 +642,14 @@ Speak loudly, as when you are annoyed or excited. Decrease the volume in the sou + + Set push to talk shortcut + - PTT shortcut + Set push to talk shortcut + + + This will open a shortcut edit dialog @@ -871,7 +895,14 @@ Speak loudly, as when you are annoyed or excited. Decrease the volume in the sou - + + + Graphical positional audio simulation view + + + This visually represents the positional audio that is currently being played + + diff --git a/src/mumble/BanEditor.ui b/src/mumble/BanEditor.ui index edadd90d7..2c386ae56 100644 --- a/src/mumble/BanEditor.ui +++ b/src/mumble/BanEditor.ui @@ -44,7 +44,7 @@ This is the search field. Use it to find bans that have this username set in the username field. - Search + Search for banned user Qt::AlignCenter @@ -72,7 +72,7 @@ - User + Username to ban No nickname @@ -112,7 +112,7 @@ IP address - IP Address + IP address to ban @@ -170,7 +170,7 @@ Reason for the ban - Reason + Ban reason No reason @@ -193,7 +193,7 @@ false - Start date/time + Ban start date/time false @@ -228,7 +228,7 @@ Ban end date. If you set the same date for start and end, the ban will be permanent (it will not expire). - End date/time + Ban end date/time true @@ -251,7 +251,7 @@ Certificate hash - Certificate hash + Certificate hash to ban Qt::ImhLowercaseOnly|Qt::ImhNoAutoUppercase @@ -270,7 +270,7 @@ This is a list with banned users. - Banned users + List of banned users true diff --git a/src/mumble/Cert.ui b/src/mumble/Cert.ui index 3057f987a..dd5ee67cf 100644 --- a/src/mumble/Cert.ui +++ b/src/mumble/Cert.ui @@ -46,7 +46,7 @@ This is the certificate Mumble currently uses. - Current certificate + Displays current certificate Current Certificate @@ -189,6 +189,9 @@ Certificate file to import + + Use the "open" button to select a file using a dialog. + @@ -196,9 +199,6 @@ Select file to import from - - This opens a file selection dialog to choose a file to import a certificate from. - Open... @@ -261,7 +261,7 @@ This is the certificate you are importing. - Certificate to import + Displays imported certificate Certificate Details @@ -317,7 +317,7 @@ Are you sure you wish to replace your certificate? This is the certificate Mumble currently uses. It will be replaced. - Current certificate + Displays current certificate Current Certificate @@ -339,7 +339,7 @@ Are you sure you wish to replace your certificate? This is the new certificate that will replace the old one. - New certificate + Displays new certificate New Certificate @@ -391,6 +391,9 @@ Are you sure you wish to replace your certificate? File to export certificate to + + Use the "save as" button to select a file using a dialog. + @@ -413,7 +416,7 @@ Are you sure you wish to replace your certificate? This is the certificate Mumble currently uses. It will be exported. - Current certificate + Displays current certificate Certificate Details @@ -453,6 +456,19 @@ Are you sure you wish to replace your certificate? + + + + Your name (e.g. John Doe) + + + This is your name, and will be filled out in the certificate. This field is entirely optional. + + + Your name. For example: John Doe + + + @@ -471,8 +487,8 @@ Are you sure you wish to replace your certificate? This is your email address. It is strongly recommended to provide a valid email address, as this will allow you to upgrade to a strong certificate without authentication problems. - - Email address + + Your email address. For example: johndoe@mumble.info @@ -483,16 +499,6 @@ Are you sure you wish to replace your certificate? - - - - Your name (e.g. John Doe) - - - This is your name, and will be filled out in the certificate. This field is entirely optional. - - - diff --git a/src/mumble/ConnectDialog.ui b/src/mumble/ConnectDialog.ui index 0c922e31d..51efe4460 100644 --- a/src/mumble/ConnectDialog.ui +++ b/src/mumble/ConnectDialog.ui @@ -13,6 +13,9 @@ Mumble Server Connect + + This is the connection dialog. There are two different ways to connect to a Mumble server. If the server is listed publicly, you can use the server list to find it. If you know the server IP address, you can manually add a new permanent entry to your favorites. + @@ -29,6 +32,9 @@ Server list + + The server list contains your favorites and all publicly listed servers. + true @@ -75,6 +81,9 @@ true + + With this search interface you can filter the Mumble servers displayed in the server list. + Search @@ -91,6 +100,9 @@ + + Search for servername + Servername @@ -107,7 +119,11 @@ - + + + Search for location + + @@ -124,6 +140,9 @@ true + + Set filter mode + Show All diff --git a/src/mumble/ConnectDialogEdit.ui b/src/mumble/ConnectDialogEdit.ui index 3b87ecd66..57f28bf0c 100644 --- a/src/mumble/ConnectDialogEdit.ui +++ b/src/mumble/ConnectDialogEdit.ui @@ -123,6 +123,9 @@ <b>Address</b><br/> Internet address of the server. This can be a normal hostname, an IPv4/IPv6 address or a Bonjour service identifier. Bonjour service identifiers have to be prefixed with a '@' to be recognized by Mumble. + + Server IP address + 127.0.0.1 @@ -147,6 +150,9 @@ Internet address of the server. This can be a normal hostname, an IPv4/IPv6 addr <b>Port</b><br/> Port on which the server is listening. If the server is identified by a Bonjour service identifier this field will be ignored. + + Server port + 64738 @@ -181,6 +187,9 @@ Port on which the server is listening. If the server is identified by a Bonjour <b>Username</b><br/> Username to send to the server. Be aware that the server can impose restrictions on how a username might look like. Also your username could already be taken by another user. + + Username + Your username @@ -202,6 +211,9 @@ Username to send to the server. Be aware that the server can impose restrictions <b>Password</b><br/> Password to be sent to the server on connect. This password is needed when connecting as <i>SuperUser</i> or to a server using password authentication. If not entered here the password will be queried on connect. + + Password + Your password @@ -236,6 +248,9 @@ Password to be sent to the server on connect. This password is needed when conne <b>Label</b><br/> Label of the server. This is what the server will be named like in your server list and can be chosen freely. + + Label for server + Local server label diff --git a/src/mumble/GlobalShortcutButtons.ui b/src/mumble/GlobalShortcutButtons.ui index da8ad5ea8..c31d1f14a 100644 --- a/src/mumble/GlobalShortcutButtons.ui +++ b/src/mumble/GlobalShortcutButtons.ui @@ -22,6 +22,9 @@ + + List of shortcuts + QAbstractItemView::ExtendedSelection diff --git a/src/mumble/Log.ui b/src/mumble/Log.ui index ff80dc1d5..95fa1f913 100644 --- a/src/mumble/Log.ui +++ b/src/mumble/Log.ui @@ -17,7 +17,7 @@ - Log messages + Log message types and actions true @@ -124,7 +124,7 @@ <b>This is the length threshold used for the Text-To-Speech Engine.</b><br />Messages longer than this limit will not be read aloud in their full length. - Length threshold + Set length threshold QAbstractSpinBox::PlusMinus @@ -327,7 +327,7 @@ <b>This is the volume used for the speech synthesis.</b> - TTS engine volume + Text to speech volume 100 @@ -398,7 +398,7 @@ The setting only applies for new messages, the already shown ones will retain th - Maximum chat length + Maximum chat log length QAbstractSpinBox::PlusMinus @@ -512,7 +512,7 @@ The setting only applies for new messages, the already shown ones will retain th Number of users that will trigger message limiting functionality. - User limit for message limiting + User limit for notifications true diff --git a/src/mumble/LookConfig.ui b/src/mumble/LookConfig.ui index edea75918..f87994cc2 100644 --- a/src/mumble/LookConfig.ui +++ b/src/mumble/LookConfig.ui @@ -36,7 +36,7 @@ This sets which channels to automatically expand. <i>None</i> and <i>All</i> will expand no or all channels, while <i>Only with users</i> will expand and collapse channels as users join and leave them. - Automatically expand channels when + Channel expand mode @@ -49,7 +49,7 @@ This sets the behavior of user drags; it can be used to prevent accidental dragging. <i>Move</i> moves the user without prompting. <i>Do Nothing</i> does nothing and prints an error message. <i>Ask</i> uses a message box to confirm if you really wanted to move the user. - User dragging behavior + User dragging mode @@ -109,7 +109,7 @@ This sets the behavior of channel drags; it can be used to prevent accidental dragging. <i>Move</i> moves the channel without prompting. <i>Do Nothing</i> does nothing and prints an error message. <i>Ask</i> uses a message box to confirm if you really wanted to move the channel. - Channel dragging + Channel dragging mode @@ -437,7 +437,7 @@ This setting controls in which situations the application will stay always on top. If you select <i>Never</i> the application will not stay on top. <i>Always</i> will always keep the application on top. <i>In minimal view</i> / <i>In normal view</i> will only keep the application always on top when minimal view is activated / deactivated. - Always on top + Always on top mode @@ -489,6 +489,9 @@ This setting controls the behavior when closing Mumble. You can choose between being asked for confirmation, minimize instead if closing or just closing without any additional prompt. Optionally, the first two options can only apply when you are currently connected to a server (in that case, Mumble will quit without asking, when not connected to any server). + + Quit behavior mode + Always Ask @@ -570,7 +573,7 @@ String to separate a channel name from its parent's. - Channel separator + Channel separator string @@ -617,7 +620,7 @@ The preferred maximum length of a channel (hierarchy) name in the Talking UI. Note that this is not a hard limit though. - Maximum name length + Maximum channel name length @@ -633,7 +636,7 @@ String that gets used instead of the cut-out part of an abbreviated name. - Abbreviation replacement + Abbreviation replacement characters @@ -653,7 +656,7 @@ Relative font size to use in the Talking UI in percent. - Relative font size + Relative font size (in percent) 1 @@ -688,7 +691,7 @@ A user that is silent for the given amount of seconds will be removed from the Talkin UI. - Silent user lifetime + Silent user display time (in seconds) seconds @@ -886,7 +889,7 @@ <b>Configures which theme the Mumble user interface should be styled with</b><br />Mumble will pick up themes from certain directories and display them in this list. The one you select will be used to customize the visual appearance of Mumble. This includes colors, icons and more. - Theme + Mumble theme @@ -960,6 +963,9 @@ The action to perform when a user is activated (via double-click or enter) in the search dialog. + + User search action mode + @@ -986,6 +992,9 @@ The action to perform when a channel is activated (via double-click or enter) in the search dialog. + + Channel search action mode + diff --git a/src/mumble/MainWindow.ui b/src/mumble/MainWindow.ui index 839e5a2c0..562f927a7 100644 --- a/src/mumble/MainWindow.ui +++ b/src/mumble/MainWindow.ui @@ -162,7 +162,7 @@ - Chat message + Enter chat message false diff --git a/src/mumble/ManualPlugin.ui b/src/mumble/ManualPlugin.ui index fb38eb111..6fd2249f7 100644 --- a/src/mumble/ManualPlugin.ui +++ b/src/mumble/ManualPlugin.ui @@ -30,6 +30,12 @@ + + Graphical positional audio simulation view + + + This visually represents the positional audio configuration that is currently being used + Qt::ScrollBarAlwaysOff @@ -87,6 +93,9 @@ + + Listener Z coordinate + m @@ -94,6 +103,9 @@ + + Listener X coordinate + @@ -130,6 +142,9 @@ + + Listener Y coordinate + m @@ -172,6 +187,9 @@ How long silent user's positions should stay marked after they have stopped talking (in seconds). + + Silent user display time (in seconds) + @@ -191,6 +209,9 @@ + + Listener azimuth (in degrees) + ° @@ -220,6 +241,9 @@ + + Listener elevation (in degrees) + -180 @@ -248,6 +272,9 @@ + + Listener elevation (in degrees) + ° @@ -280,6 +307,9 @@ + + Listener azimuth (in degrees) + 0 @@ -323,7 +353,14 @@ - + + + Context string + + + Use the "set" button to apply the context string + + @@ -347,6 +384,9 @@ + + Apply the context string + Set @@ -354,13 +394,23 @@ + + Apply the identity string + Set - + + + Identity string + + + Use the "set" button to apply the identity string + + diff --git a/src/mumble/NetworkConfig.ui b/src/mumble/NetworkConfig.ui index efc6ed994..73134d2a2 100644 --- a/src/mumble/NetworkConfig.ui +++ b/src/mumble/NetworkConfig.ui @@ -131,7 +131,7 @@ <b>Type of proxy to connect through.</b><br />This makes Mumble connect through a proxy for all outgoing connections. Note: Proxy tunneling forces Mumble into TCP compatibility mode, causing all voice data to be sent via the control channel. - Type + Proxy type @@ -178,7 +178,7 @@ <b>Hostname of the proxy.</b><br />This field specifies the hostname of the proxy you wish to tunnel network traffic through. - Hostname + Proxy hostname @@ -234,7 +234,7 @@ <b>Port number of the proxy.</b><br />This field specifies the port number that the proxy expects connections on. - Port + Proxy port @@ -265,6 +265,9 @@ <b>Username for proxy authentication.</b><br />This specifies the username you use for authenticating yourself with the proxy. In case the proxy does not use authentication, or you want to connect anonymously, simply leave this field blank. + + Proxy username + @@ -286,7 +289,7 @@ <b>Password for proxy authentication.</b><br />This specifies the password you use for authenticating yourself with the proxy. In case the proxy does not use authentication, or you want to connect anonymously, simply leave this field blank. - Password + Proxy password diff --git a/src/mumble/PluginConfig.ui b/src/mumble/PluginConfig.ui index fff242cac..bb9325eb1 100644 --- a/src/mumble/PluginConfig.ui +++ b/src/mumble/PluginConfig.ui @@ -44,6 +44,9 @@ + + List of plugins + false diff --git a/src/mumble/SearchDialog.ui b/src/mumble/SearchDialog.ui index f39f3d609..4885fddda 100644 --- a/src/mumble/SearchDialog.ui +++ b/src/mumble/SearchDialog.ui @@ -22,6 +22,9 @@ + + Search string + @@ -55,6 +58,9 @@ + + Search results + diff --git a/src/mumble/Tokens.ui b/src/mumble/Tokens.ui index f30963c65..102e2eea2 100644 --- a/src/mumble/Tokens.ui +++ b/src/mumble/Tokens.ui @@ -25,6 +25,12 @@ An access token is a text string, which can be used as a password for very simple access management on channels. Mumble will remember the tokens you've used and resend them to the server next time you reconnect, so you don't have to enter these every time. + + Token List + + + Use the arrow keys to navigate this list of access tokens. The tokens are displayed in plain text. + QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed diff --git a/src/mumble/UserEdit.ui b/src/mumble/UserEdit.ui index 2cd5c200d..0d3cbec1d 100644 --- a/src/mumble/UserEdit.ui +++ b/src/mumble/UserEdit.ui @@ -79,7 +79,7 @@ - Search + Search for user @@ -101,7 +101,7 @@ - Inactive for + Set inactivity filter mode @@ -153,7 +153,7 @@ - Inactive for + Filter for inactivity true diff --git a/src/mumble/VoiceRecorderDialog.ui b/src/mumble/VoiceRecorderDialog.ui index f03868cad..497acf369 100644 --- a/src/mumble/VoiceRecorderDialog.ui +++ b/src/mumble/VoiceRecorderDialog.ui @@ -181,7 +181,11 @@ - + + + This field contains the directory path to store any voice recordings in. Use the "browse" button to open a file dialog. + + @@ -193,7 +197,11 @@ - + + + This field contains the filename any voice recording is saved as. Various variables can be used to augment the filename. For example %time for the current time. + +