Skip to content

Commit

Permalink
Indent, changelog, submodule and language update
Browse files Browse the repository at this point in the history
  • Loading branch information
@thorvald
thorvald committed Jan 23, 2011
1 parent c61522e commit ed29398
Show file tree
Hide file tree
Showing 17 changed files with 315 additions and 298 deletions.
17 changes: 17 additions & 0 deletions CHANGES
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
2011-01-23
Thorvald Natvig <[email protected]>
c61522e Remove older CELT 0.9.0

2011-01-22
Benjamin Jemlich <[email protected]>
421833e Fix bIsSpeech logic
95d13a5 Style fixes in ACLEditor.cpp

2011-01-21
Joshua Kocinski <[email protected]>
dc662e0 Set bAutoUnmute flag properly when deafening while muted.

Thorvald Natvig <[email protected]>
324338f Iterator oddness in ACL Editor
460e489 Ok, slightly less verbose, then

Spaccaossi <[email protected]>
a7f91b7 Updated italian translation

Expand Down Expand Up @@ -268,6 +284,7 @@

2010-11-17
Benjamin Jemlich <[email protected]>
426c411 Simplify iIsSpeech logic
c644952 Fix a crash in the overlay if a_ucTexture is NULL

2010-11-15
Expand Down
22 changes: 11 additions & 11 deletions src/mumble/ACLEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,12 +636,12 @@ void ACLEditor::updatePasswordField() {
// Check for sth that applies to '#<something>' AND grants 'Enter' AND may grant 'Speak', 'Whisper',
// 'TextMessage', 'Link' but NOTHING else AND does not deny anything, then '<something>' is the password.
if (acl->qsGroup.startsWith(QLatin1Char('#')) &&
acl->bApplyHere &&
!acl->bInherited &&
(acl->pAllow & ChanACL::Enter) &&
(acl->pAllow == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel) || // Backwards compat with old behaviour that didn't deny traverse
acl->pAllow == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel | ChanACL::Traverse)) &&
acl->pDeny == ChanACL::None) {
acl->bApplyHere &&
!acl->bInherited &&
(acl->pAllow & ChanACL::Enter) &&
(acl->pAllow == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel) || // Backwards compat with old behaviour that didn't deny traverse
acl->pAllow == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel | ChanACL::Traverse)) &&
acl->pDeny == ChanACL::None) {
pcaPassword = acl;
}
}
Expand All @@ -662,11 +662,11 @@ void ACLEditor::updatePasswordACL() {
ChanACL *denyall = NULL;
foreach(ChanACL *acl, qlACLs) {
if (acl->qsGroup == QLatin1String("all") &&
acl->bInherited == false &&
acl->bApplyHere == true &&
acl->pAllow == ChanACL::None &&
(acl->pDeny == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel) || // Backwards compat with old behaviour that didn't deny traverse
acl->pDeny == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel | ChanACL::Traverse))) {
acl->bInherited == false &&
acl->bApplyHere == true &&
acl->pAllow == ChanACL::None &&
(acl->pDeny == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel) || // Backwards compat with old behaviour that didn't deny traverse
acl->pDeny == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel | ChanACL::Traverse))) {
denyall = acl;
}
}
Expand Down
38 changes: 19 additions & 19 deletions src/mumble/mumble_cs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<translation>Uživatelovo ID</translation>
</message>
<message>
<location filename="ACLEditor.cpp" line="+100"/>
<location filename="ACLEditor.cpp" line="+101"/>
<source>Deny</source>
<translation>Zakázat</translation>
</message>
Expand Down Expand Up @@ -346,17 +346,17 @@ Add a new group.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ACLEditor.cpp" line="+22"/>
<location filename="ACLEditor.cpp" line="+21"/>
<source>Allow %1</source>
<translation>Povolit %1</translation>
</message>
<message>
<location line="-9"/>
<location line="-8"/>
<source>Deny %1</source>
<translation>Odepřít %1</translation>
</message>
<message>
<location line="-61"/>
<location line="-62"/>
<source>Mumble - Add channel</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -377,7 +377,7 @@ Add a new group.</source>
<translation>Tímto se povolí privilegium %1. Pokud je privilegium zároveň přiděleno i odepřeno, považuje se za odepřené.&lt;br /&gt;%2</translation>
</message>
<message>
<location line="-9"/>
<location line="-8"/>
<source>This revokes the %1 privilege. If a privilege is both allowed and denied, it is denied.&lt;br /&gt;%2</source>
<translation>Odebere privilegium %1. Pokud je privilegium zároveň přiděleno i odepřeno, považuje se za odepřené.&lt;br /&gt;%2</translation>
</message>
Expand Down Expand Up @@ -5107,7 +5107,7 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location filename="MainWindow.cpp" line="+171"/>
<location line="+2047"/>
<location line="+2048"/>
<source>Root</source>
<translation>Kořen</translation>
</message>
Expand Down Expand Up @@ -5699,9 +5699,9 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>Připojí se k webové stránce Mumble pro zjištění případné dostupnosti novějších verzí a vypíše vhodný odkaz na stažení, pokud je nová verze k dispozici.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1949"/>
<location filename="MainWindow.cpp" line="-1950"/>
<location line="+12"/>
<location line="+2158"/>
<location line="+2159"/>
<source>Mumble -- %1</source>
<translation>Mumble =- %1 </translation>
</message>
Expand All @@ -5723,7 +5723,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">&amp;Uživatel</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-2245"/>
<location filename="MainWindow.cpp" line="-2246"/>
<source>&amp;Channel</source>
<translation type="unfinished">&amp;Kanál</translation>
</message>
Expand Down Expand Up @@ -5907,7 +5907,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>Vypnut poslech.</translation>
</message>
<message>
<location line="+2"/>
<location line="+3"/>
<source>Undeafened.</source>
<translation>Opět schopen slyšet.</translation>
</message>
Expand Down Expand Up @@ -6325,7 +6325,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1765"/>
<location filename="MainWindow.cpp" line="-1766"/>
<source>Opening URL %1</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -6407,12 +6407,12 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+4"/>
<location line="+1263"/>
<location line="+1264"/>
<source>&amp;View Certificate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1373"/>
<location line="-1374"/>
<location line="+327"/>
<source>Register yourself as %1</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -6455,7 +6455,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+489"/>
<location line="+490"/>
<source>Connected.</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -6480,7 +6480,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="-2140"/>
<location line="-2141"/>
<source>&amp;User</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -6507,7 +6507,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+617"/>
<location line="+618"/>
<source>&lt;b&gt;WARNING:&lt;/b&gt; The server presented a certificate that was different from the stored one.</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -6565,7 +6565,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1576"/>
<location line="-1577"/>
<source>Voice channel is sent over control channel.</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -6732,13 +6732,13 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+65"/>
<location line="+2188"/>
<location line="+2189"/>
<source>&lt;center&gt;Not connected&lt;/center&gt;</source>
<oldsource>Not connected</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1904"/>
<location line="-1905"/>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
Expand Down
34 changes: 17 additions & 17 deletions src/mumble/mumble_da.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<context>
<name>ACLEditor</name>
<message>
<location filename="ACLEditor.cpp" line="+100"/>
<location filename="ACLEditor.cpp" line="+101"/>
<source>Deny</source>
<translation>Nægt</translation>
</message>
Expand All @@ -14,17 +14,17 @@
<translation>Tillad</translation>
</message>
<message>
<location line="+22"/>
<location line="+21"/>
<source>Allow %1</source>
<translation>Tillad %1</translation>
</message>
<message>
<location line="-9"/>
<location line="-8"/>
<source>Deny %1</source>
<translation>Nægt %1</translation>
</message>
<message>
<location line="-61"/>
<location line="-62"/>
<source>Mumble - Add channel</source>
<translation>Mumble - Tilføj kanal</translation>
</message>
Expand All @@ -45,7 +45,7 @@
<translation>Dette tildeler %1-privilegiet. Hvis et privilegium både er tilladt og nægtet, er det nægtet.&lt;br /&gt;%2</translation>
</message>
<message>
<location line="-9"/>
<location line="-8"/>
<source>This revokes the %1 privilege. If a privilege is both allowed and denied, it is denied.&lt;br /&gt;%2</source>
<translation>Dette ophæver %1-privilegiet. Hvis et privilegium både er tilladt og nægtet, er det nægtet.&lt;br /&gt;%2</translation>
</message>
Expand Down Expand Up @@ -4570,12 +4570,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+171"/>
<location line="+2047"/>
<location line="+2048"/>
<source>Root</source>
<translation>Rod</translation>
</message>
<message>
<location line="-1993"/>
<location line="-1994"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Tryk-for-snak</translation>
Expand Down Expand Up @@ -4654,12 +4654,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<message>
<location filename="MainWindow.cpp" line="+4"/>
<location line="+12"/>
<location line="+2158"/>
<location line="+2159"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
</message>
<message>
<location line="-2154"/>
<location line="-2155"/>
<source>&amp;Window</source>
<translation>&amp;Vindue</translation>
</message>
Expand Down Expand Up @@ -4733,13 +4733,13 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
</message>
<message>
<location line="+58"/>
<location line="+2188"/>
<location line="+2189"/>
<source>&lt;center&gt;Not connected&lt;/center&gt;</source>
<oldsource>Not connected</oldsource>
<translation>&lt;center&gt;Ingen forbindelse oprettet&lt;/center&gt;</translation>
</message>
<message>
<location line="-1904"/>
<location line="-1905"/>
<source>Clear</source>
<translation>Ryd</translation>
</message>
Expand Down Expand Up @@ -4879,7 +4879,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation>Besked til kanal %1</translation>
</message>
<message>
<location line="+489"/>
<location line="+490"/>
<source>Connected.</source>
<translation>Forbindelse oprettet.</translation>
</message>
Expand Down Expand Up @@ -4936,7 +4936,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation>Billedformatet blev ikke genkendt.</translation>
</message>
<message>
<location line="-1576"/>
<location line="-1577"/>
<source>Voice channel is sent over control channel.</source>
<translation>Lydkanal er sendt over kontrolkanal.</translation>
</message>
Expand Down Expand Up @@ -4993,12 +4993,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
</message>
<message>
<location line="+4"/>
<location line="+1263"/>
<location line="+1264"/>
<source>&amp;View Certificate</source>
<translation>&amp;Se certifikat</translation>
</message>
<message>
<location line="-1004"/>
<location line="-1005"/>
<location line="+19"/>
<source>Enter reason</source>
<translation>Skriv begrundelse</translation>
Expand Down Expand Up @@ -5083,7 +5083,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation>Lyd deaktiveret.</translation>
</message>
<message>
<location line="+2"/>
<location line="+3"/>
<source>Undeafened.</source>
<translation>Lyd aktiveret.</translation>
</message>
Expand Down Expand Up @@ -5167,7 +5167,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation type="obsolete">&amp;Server</translation>
</message>
<message>
<location line="-2430"/>
<location line="-2431"/>
<source>&amp;Channel</source>
<translation>&amp;Kanal</translation>
</message>
Expand Down
Loading

0 comments on commit ed29398

Please sign in to comment.