diff options
| author | Thorvald Natvig <slicer@users.sourceforge.net> | 2011-01-23 04:51:45 +0300 |
|---|---|---|
| committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2011-01-23 04:51:45 +0300 |
| commit | ed29398caf80c74291392c927cfcdb50b27c1bfa (patch) | |
| tree | 99d5c4a2fa5f7bd86db7e00e2d2cf11ba3280eba | |
| parent | c61522e2e95273c79d1ce232bab0daff762e3c18 (diff) | |
Indent, changelog, submodule and language update1.2.3-rc2
| -rw-r--r-- | CHANGES | 17 | ||||
| -rw-r--r-- | src/mumble/ACLEditor.cpp | 22 | ||||
| -rw-r--r-- | src/mumble/mumble_cs.ts | 38 | ||||
| -rw-r--r-- | src/mumble/mumble_da.ts | 34 | ||||
| -rw-r--r-- | src/mumble/mumble_de.ts | 50 | ||||
| -rw-r--r-- | src/mumble/mumble_en.ts | 32 | ||||
| -rw-r--r-- | src/mumble/mumble_es.ts | 46 | ||||
| -rw-r--r-- | src/mumble/mumble_fr.ts | 42 | ||||
| -rw-r--r-- | src/mumble/mumble_he.ts | 36 | ||||
| -rw-r--r-- | src/mumble/mumble_it.ts | 38 | ||||
| -rw-r--r-- | src/mumble/mumble_ja.ts | 46 | ||||
| -rw-r--r-- | src/mumble/mumble_pl.ts | 42 | ||||
| -rw-r--r-- | src/mumble/mumble_pt_BR.ts | 32 | ||||
| -rwxr-xr-x | src/mumble/mumble_ru.ts | 38 | ||||
| -rw-r--r-- | src/mumble/mumble_sv.ts | 32 | ||||
| -rw-r--r-- | src/mumble/mumble_zh_CN.ts | 34 | ||||
| -rw-r--r-- | src/mumble/mumble_zh_TW.ts | 34 |
17 files changed, 315 insertions, 298 deletions
@@ -1,4 +1,20 @@ +2011-01-23 + Thorvald Natvig <slicer@users.sourceforge.net> + c61522e Remove older CELT 0.9.0 + +2011-01-22 + Benjamin Jemlich <pcgod@users.sourceforge.net> + 421833e Fix bIsSpeech logic + 95d13a5 Style fixes in ACLEditor.cpp + 2011-01-21 + Joshua Kocinski <git@cl0secall.net> + dc662e0 Set bAutoUnmute flag properly when deafening while muted. + + Thorvald Natvig <slicer@users.sourceforge.net> + 324338f Iterator oddness in ACL Editor + 460e489 Ok, slightly less verbose, then + Spaccaossi <spaccaossi@users.sourceforge.net> a7f91b7 Updated italian translation @@ -268,6 +284,7 @@ 2010-11-17 Benjamin Jemlich <pcgod@users.sourceforge.net> + 426c411 Simplify iIsSpeech logic c644952 Fix a crash in the overlay if a_ucTexture is NULL 2010-11-15 diff --git a/src/mumble/ACLEditor.cpp b/src/mumble/ACLEditor.cpp index 1e9663883..712626d25 100644 --- a/src/mumble/ACLEditor.cpp +++ b/src/mumble/ACLEditor.cpp @@ -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; } } @@ -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; } } diff --git a/src/mumble/mumble_cs.ts b/src/mumble/mumble_cs.ts index 0238dd865..6713c4eee 100644 --- a/src/mumble/mumble_cs.ts +++ b/src/mumble/mumble_cs.ts @@ -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> @@ -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> @@ -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é.<br />%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.<br />%2</source> <translation>Odebere privilegium %1. Pokud je privilegium zároveň přiděleno i odepřeno, považuje se za odepřené.<br />%2</translation> </message> @@ -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> @@ -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> @@ -5723,7 +5723,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete">&Uživatel</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2245"/> + <location filename="MainWindow.cpp" line="-2246"/> <source>&Channel</source> <translation type="unfinished">&Kanál</translation> </message> @@ -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> @@ -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> @@ -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>&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> @@ -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> @@ -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>&User</source> <translation type="unfinished"></translation> </message> @@ -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><b>WARNING:</b> The server presented a certificate that was different from the stored one.</source> <translation type="unfinished"></translation> </message> @@ -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> @@ -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><center>Not connected</center></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> diff --git a/src/mumble/mumble_da.ts b/src/mumble/mumble_da.ts index 37506b87c..a670d5fbc 100644 --- a/src/mumble/mumble_da.ts +++ b/src/mumble/mumble_da.ts @@ -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> @@ -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> @@ -45,7 +45,7 @@ <translation>Dette tildeler %1-privilegiet. Hvis et privilegium både er tilladt og nægtet, er det nægtet.<br />%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.<br />%2</source> <translation>Dette ophæver %1-privilegiet. Hvis et privilegium både er tilladt og nægtet, er det nægtet.<br />%2</translation> </message> @@ -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> @@ -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>&Window</source> <translation>&Vindue</translation> </message> @@ -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><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation><center>Ingen forbindelse oprettet</center></translation> </message> <message> - <location line="-1904"/> + <location line="-1905"/> <source>Clear</source> <translation>Ryd</translation> </message> @@ -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> @@ -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> @@ -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>&View Certificate</source> <translation>&Se certifikat</translation> </message> <message> - <location line="-1004"/> + <location line="-1005"/> <location line="+19"/> <source>Enter reason</source> <translation>Skriv begrundelse</translation> @@ -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> @@ -5167,7 +5167,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i <translation type="obsolete">&Server</translation> </message> <message> - <location line="-2430"/> + <location line="-2431"/> <source>&Channel</source> <translation>&Kanal</translation> </message> diff --git a/src/mumble/mumble_de.ts b/src/mumble/mumble_de.ts index accfd3b75..3f3aeb91c 100644 --- a/src/mumble/mumble_de.ts +++ b/src/mumble/mumble_de.ts @@ -102,7 +102,7 @@ Enthält eine Liste von Mitgliedern, deren Gruppenmitgliedschaft nicht vom über <translation>Benutzer ID</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+100"/> + <location filename="ACLEditor.cpp" line="+101"/> <source>Deny</source> <translation>Verweigern</translation> </message> @@ -427,17 +427,17 @@ Enthält die Liste von Mitgliedern, welche vom aktuellen Kanal geerbt wurden. De <translation>Dieses Feld steuert welchen Benutzer dieser Eintrag betrifft. Geben Sie einen Benutzernamen ein und drücken Sie Enter um die Existenz des Accounts auf dem Server zu überprüfen.</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+22"/> + <location filename="ACLEditor.cpp" line="+21"/> <source>Allow %1</source> <translation>%1 erlauben</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>%1 ablehnen</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation>Mumble - Kanal hinzufügen</translation> </message> @@ -458,7 +458,7 @@ Enthält die Liste von Mitgliedern, welche vom aktuellen Kanal geerbt wurden. De <translation>Dies gibt das %1-Recht. Wenn ein Recht sowohl erlaubt als auch verweigert wird, so wird es verweigert.<br />%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.<br />%2</source> <translation>Dies nimmt das %1-Recht. Wenn ein Recht sowohl erlaubt als auch verweigert wird, so wird es verweigert.<br />%2</translation> </message> @@ -6196,7 +6196,7 @@ Entfernen Sie die Auswahl um ihn zu verstecken.</translation> <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation>Hauptkanal</translation> </message> @@ -6760,9 +6760,9 @@ Entfernen Sie die Auswahl um ihn zu verstecken.</translation> <translation>Verbindet sich mit der Mumble-Webseite um zu überprüfen ob eine neue Version verfügbar ist. Ist eine neue Version verfügbar wird mit einer passenden Download-URL darauf hingewiesen.</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> @@ -6784,7 +6784,7 @@ Entfernen Sie die Auswahl um ihn zu verstecken.</translation> <translation type="obsolete">B&enutzer</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2245"/> + <location filename="MainWindow.cpp" line="-2246"/> <source>&Channel</source> <translation>&Kanal</translation> </message> @@ -6855,7 +6855,7 @@ Entfernen Sie die Auswahl um ihn zu verstecken.</translation> <translation>Taub gestellt.</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation>Taubstellen deaktiviert.</translation> </message> @@ -6883,7 +6883,7 @@ Entfernen Sie die Auswahl um ihn zu verstecken.</translation> <translation>Verbindung zum Server unterbrochen.</translation> </message> <message> - <location line="-1491"/> + <location line="-1492"/> <source>Reconnecting.</source> <translation>Neuverbindung.</translation> </message> @@ -7402,7 +7402,7 @@ Entfernen Sie die Auswahl um ihn zu verstecken.</translation> <translation><p>%1 (%2)<br />%3</p></translation> </message> <message> - <location line="+1570"/> + <location line="+1571"/> <source>Images (*.png *.jpg *.jpeg *.svg)</source> <translation>Bilder (*.png *.jpg *.jpeg *.svg)</translation> </message> @@ -7411,7 +7411,7 @@ Entfernen Sie die Auswahl um ihn zu verstecken.</translation> <translation type="obsolete"><h2>Kontrollkanal</h2><p>Verschlüsselt mit %1 bit %2<br />%3 ms Durchschnittslatenz (%4 Abweichung)</p></translation> </message> <message> - <location line="-1550"/> + <location line="-1551"/> <source><h2>Voice channel</h2><p>Encrypted with 128 bit OCB-AES128<br />%1 ms average latency (%4 deviation)</p></source> <translation><h2>Sprachkanal</h2><p>Verschlüsselt mit 128 bit OCB-AES128<br />%1 ms Durchschnittslatenz (%4 Abweichung)</p></translation> </message> @@ -7446,7 +7446,7 @@ Entfernen Sie die Auswahl um ihn zu verstecken.</translation> <translation>An %1: %2</translation> </message> <message> - <location line="+674"/> + <location line="+675"/> <source>Failed to launch compatibility client</source> <translation>Starten des Kompatibilitätsclienten fehlgeschlagen</translation> </message> @@ -7463,7 +7463,7 @@ Entfernen Sie die Auswahl um ihn zu verstecken.</translation> <translation type="obsolete">Öffnen der Bilddatei fehlgeschlagen.</translation> </message> <message> - <location line="-1416"/> + <location line="-1417"/> <location line="+327"/> <source>Register yourself as %1</source> <translation>Sich selbst als %1 registrieren</translation> @@ -7516,7 +7516,7 @@ Entfernen Sie die Auswahl um ihn zu verstecken.</translation> <translation>Sind Sie sicher, dass Sie %1 und alle Unterkanäle löschen möchten?</translation> </message> <message> - <location line="+571"/> + <location line="+572"/> <source>Connected.</source> <translation>Verbunden.</translation> </message> @@ -7613,7 +7613,7 @@ Beachten Sie, dass die Kompatibilitätsversion eine optionale Komponente bei den <translation type="obsolete">Sende eine Text-Nachricht an einen anderen Benutzer.</translation> </message> <message> - <location filename="MainWindow.cpp" line="-1257"/> + <location filename="MainWindow.cpp" line="-1258"/> <source>Sending message to %1</source> <translation>Sende Nachricht an %1</translation> </message> @@ -7628,7 +7628,7 @@ Beachten Sie, dass die Kompatibilitätsversion eine optionale Komponente bei den <translation type="obsolete">Ändere Beschreibung von Kanal %1</translation> </message> <message> - <location line="+927"/> + <location line="+928"/> <source>Invalid username</source> <translation>Ungültiger Benutzername</translation> </message> @@ -7677,7 +7677,7 @@ Beachten Sie, dass die Kompatibilitätsversion eine optionale Komponente bei den <translation>Schickt eine Textnachricht an einen anderen Benutzer.</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2230"/> + <location filename="MainWindow.cpp" line="-2231"/> <source>&User</source> <translation>&Benutzer</translation> </message> @@ -7779,7 +7779,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode <translation>Dies leitet Sie durch den Hardware-Konfigurationsprozess.</translation> </message> <message> - <location filename="MainWindow.cpp" line="+2140"/> + <location filename="MainWindow.cpp" line="+2141"/> <source>SSL Verification failed: %1</source> <translation>SSL-Überprüfung fehlgeschlagen: %1</translation> </message> @@ -7838,7 +7838,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode <translation>Dies zeigt erweitertete Informationen über die Verbindung zum Server an.</translation> </message> <message> - <location filename="MainWindow.cpp" line="-1260"/> + <location filename="MainWindow.cpp" line="-1261"/> <source>Mumble Server Information</source> <translation>Mumble - Server Informationen</translation> </message> @@ -7848,12 +7848,12 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode </message> <message> <location line="+4"/> - <location line="+1263"/> + <location line="+1264"/> <source>&View Certificate</source> <translation>&Zertifikat zeigen</translation> </message> <message> - <location line="-1713"/> + <location line="-1714"/> <source>Opening URL %1</source> <translation>Öffne URL %1</translation> </message> @@ -7906,13 +7906,13 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode </message> <message> <location line="+58"/> - <location line="+2188"/> + <location line="+2189"/> <source><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation><center>Nicht verbunden</center></translation> </message> <message> - <location line="-1873"/> + <location line="-1874"/> <source>File does not exist</source> <translation>Datei existiert nicht</translation> </message> diff --git a/src/mumble/mumble_en.ts b/src/mumble/mumble_en.ts index 9d0b6fcf6..9c33cfe52 100644 --- a/src/mumble/mumble_en.ts +++ b/src/mumble/mumble_en.ts @@ -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 type="unfinished"></translation> </message> @@ -14,17 +14,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+22"/> + <location line="+21"/> <source>Allow %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation type="unfinished"></translation> </message> @@ -45,7 +45,7 @@ <translation type="unfinished"></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.<br />%2</source> <translation type="unfinished"></translation> </message> @@ -4223,12 +4223,12 @@ This field describes the size of an LCD device. The size is given either in pixe <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1993"/> + <location line="-1994"/> <source>Push-to-Talk</source> <comment>Global Shortcut</comment> <translation type="unfinished"></translation> @@ -4307,12 +4307,12 @@ This field describes the size of an LCD device. The size is given either in pixe <message> <location filename="MainWindow.cpp" line="+4"/> <location line="+12"/> - <location line="+2158"/> + <location line="+2159"/> <source>Mumble -- %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="-2154"/> + <location line="-2155"/> <source>&Window</source> <translation type="unfinished"></translation> </message> @@ -4381,13 +4381,13 @@ This field describes the size of an LCD device. The size is given either in pixe </message> <message> <location line="+58"/> - <location line="+2188"/> + <location line="+2189"/> <source><center>Not connected</center></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> @@ -4511,7 +4511,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> @@ -4569,7 +4569,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> @@ -4641,12 +4641,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>&View Certificate</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1004"/> + <location line="-1005"/> <location line="+19"/> <source>Enter reason</source> <translation type="unfinished"></translation> @@ -4722,7 +4722,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="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation type="unfinished"></translation> </message> diff --git a/src/mumble/mumble_es.ts b/src/mumble/mumble_es.ts index 2d1aa63d9..c333fd104 100644 --- a/src/mumble/mumble_es.ts +++ b/src/mumble/mumble_es.ts @@ -74,7 +74,7 @@ <translation>ID de usuario</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+100"/> + <location filename="ACLEditor.cpp" line="+101"/> <source>Deny</source> <translation>Denegar</translation> </message> @@ -407,17 +407,17 @@ Contiene la lista de miembros heredados por el canal actual. Desmarque <i> <translation>Controla a qué usuario se le aplica esta entrada. Tan sólo escriba el nombre del usuario y pulse intro para buscar una correspondencia en el servidor.</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+22"/> + <location filename="ACLEditor.cpp" line="+21"/> <source>Allow %1</source> <translation>Permitir %1</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>Denegar %1</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation>Mumble - Agregar canal</translation> </message> @@ -438,7 +438,7 @@ Contiene la lista de miembros heredados por el canal actual. Desmarque <i> <translation>Concede el privilegio %1. Si un privilegio es permitido y denegado a la vez, entonces es denegado.<br />%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.<br />%2</source> <translation>Revoca el privilegio %1. Si un privilegio es permitido y denegado a la vez, entonces es denegado.<br />%2</translation> </message> @@ -6200,7 +6200,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation>Root</translation> </message> @@ -6707,9 +6707,9 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">Elimina la textura actual definida por el usuario.</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> @@ -6726,7 +6726,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">&Jugador</translation> </message> <message> - <location line="-2245"/> + <location line="-2246"/> <source>&Channel</source> <translation>&Canal</translation> </message> @@ -6797,7 +6797,7 @@ p, li { white-space: pre-wrap; } <translation>Sordo.</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation>Con escucha.</translation> </message> @@ -6825,7 +6825,7 @@ p, li { white-space: pre-wrap; } <translation>Desconectado del servidor.</translation> </message> <message> - <location line="-1491"/> + <location line="-1492"/> <source>Reconnecting.</source> <translation>Volviendo a conectar.</translation> </message> @@ -7347,7 +7347,7 @@ p, li { white-space: pre-wrap; } <translation>Mensaje al canal %1</translation> </message> <message> - <location line="+489"/> + <location line="+490"/> <source>Connected.</source> <translation>Conectado.</translation> </message> @@ -7406,7 +7406,7 @@ p, li { white-space: pre-wrap; } <translation>Envía un mensaje de texto a otro usuario.</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2230"/> + <location filename="MainWindow.cpp" line="-2231"/> <source>&User</source> <translation>&Usuario</translation> </message> @@ -7497,7 +7497,7 @@ p, li { white-space: pre-wrap; } <translation>Le guiará a través del proceso de configuración de su hardware de audio.</translation> </message> <message> - <location filename="MainWindow.cpp" line="+2140"/> + <location filename="MainWindow.cpp" line="+2141"/> <source>SSL Verification failed: %1</source> <translation>Falló la verificación SSL: %1</translation> </message> @@ -7556,7 +7556,7 @@ p, li { white-space: pre-wrap; } <translation>Muestra información extendida acerca de la conexión con el servidor.</translation> </message> <message> - <location filename="MainWindow.cpp" line="-1706"/> + <location filename="MainWindow.cpp" line="-1707"/> <source>Opening URL %1</source> <translation>Abriendo URL %1</translation> </message> @@ -7622,7 +7622,7 @@ p, li { white-space: pre-wrap; } <translation><p>%1 (%2)<br />%3</p></translation> </message> <message> - <location line="+1570"/> + <location line="+1571"/> <source>Images (*.png *.jpg *.jpeg *.svg)</source> <translation>Imágenes (*.png *.jpg *.jpeg *.svg)</translation> </message> @@ -7635,7 +7635,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><h2>Canal de control</h2><p>Cifrado con %2 de %1 bit<br />%3 ms de latencia media (desviación %4)</p></translation> </message> <message> - <location line="-1561"/> + <location line="-1562"/> <source><h2>Control channel</h2><p>Encrypted with %1 bit %2<br />%3 ms average latency (%4 deviation)</p><p>Remote host %5 (port %6)</p></source> <translation><h2>Canal de control</h2><p>Cifrado con %2 de %1 bit<br />%3 ms de latencia media (desviación %4)</p><p>Anfitrión remoto %5 (puerto %6)</p></translation> </message> @@ -7709,7 +7709,7 @@ p, li { white-space: pre-wrap; } <translation>Al (Árbol) %1: %2</translation> </message> <message> - <location line="+650"/> + <location line="+651"/> <source>SSL Version mismatch</source> <translation>Las versiones de SSL no coinciden</translation> </message> @@ -7769,8 +7769,8 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">Canal de control: latencia %1 ms, Cifrado con %3 bit %4<br />Canal de voz: latencia %2 ms, Sin cifrar</translation> </message> <message> - <location line="-1557"/> - <location line="+1263"/> + <location line="-1558"/> + <location line="+1264"/> <source>&View Certificate</source> <translation>&Ver certificado</translation> </message> @@ -7779,7 +7779,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><h2>Canal de control</h2><p>Cifrado con %2 de %1 bits<br />%3 ms de latencia media (%4 de varianza)</p></translation> </message> <message> - <location line="-2127"/> + <location line="-2128"/> <source>Push and hold this button to send voice.</source> <comment>Global Shortcut</comment> <translation>Mantenga pulsado este botón para enviar la voz.</translation> @@ -8078,13 +8078,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+65"/> - <location line="+2188"/> + <location line="+2189"/> <source><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation><center>Desconectado</center></translation> </message> <message> - <location line="-1904"/> + <location line="-1905"/> <source>Clear</source> <translation>Borrar</translation> </message> diff --git a/src/mumble/mumble_fr.ts b/src/mumble/mumble_fr.ts index 1f931b215..6752d184d 100644 --- a/src/mumble/mumble_fr.ts +++ b/src/mumble/mumble_fr.ts @@ -82,7 +82,7 @@ <translation>ID Utilisateur</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+100"/> + <location filename="ACLEditor.cpp" line="+101"/> <source>Deny</source> <translation>Refuser</translation> </message> @@ -421,17 +421,17 @@ Contient la liste des membres hérités par le salon actuel. Décochez <i> <translation>Contrôle sur quel utilisateur cette entrée s'applique. Tapez simplement le nom de l'utilisateur et pressez entrée pour interroger le serveur.</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+22"/> + <location filename="ACLEditor.cpp" line="+21"/> <source>Allow %1</source> <translation>Permettre %1</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>Refuser %1</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation>Mumble - Ajouter un salon</translation> </message> @@ -452,7 +452,7 @@ Contient la liste des membres hérités par le salon actuel. Décochez <i> <translation>Accorde le privilège %1. Si un privilège est à la fois accordé et refusé, il est refusé.<br />%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.<br />%2</source> <translation>Retirer le privilège %1. Si le privilège est à la fois accordé et refusé, il est refusé.<br />%2</translation> </message> @@ -5816,7 +5816,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>Racine</translation> </message> @@ -6008,7 +6008,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete">&Délier</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2025"/> + <location filename="MainWindow.cpp" line="-2026"/> <source>&User</source> <translation>&Utilisateur</translation> </message> @@ -6415,7 +6415,7 @@ This field describes the size of an LCD device. The size is given either in pixe <message> <location filename="MainWindow.cpp" line="+76"/> <location line="+12"/> - <location line="+2158"/> + <location line="+2159"/> <source>Mumble -- %1</source> <translation>Mumble -- %1</translation> </message> @@ -6437,7 +6437,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete">&Joueur</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2245"/> + <location filename="MainWindow.cpp" line="-2246"/> <source>&Channel</source> <translation>&Salon</translation> </message> @@ -6598,7 +6598,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Sourd(e).</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation>N'est pas sourd(e).</translation> </message> @@ -6626,7 +6626,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Déconnecté du serveur.</translation> </message> <message> - <location line="-1491"/> + <location line="-1492"/> <source>Reconnecting.</source> <translation>Reconnexion.</translation> </message> @@ -7032,7 +7032,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>A l'arborescence %1 : %2</translation> </message> <message> - <location line="+676"/> + <location line="+677"/> <source>Failed to launch compatibility client</source> <translation>Erreur lors du lancement du client de compatibilité</translation> </message> @@ -7130,7 +7130,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Ceci affiche des informations supplémentaires sur la connexion au serveur.</translation> </message> <message> - <location filename="MainWindow.cpp" line="-1699"/> + <location filename="MainWindow.cpp" line="-1700"/> <source>Opening URL %1</source> <translation>Ouvrir l'URL %1</translation> </message> @@ -7196,7 +7196,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation><p>%1 (%2)<br />%3</p></translation> </message> <message> - <location line="+1570"/> + <location line="+1571"/> <source>Images (*.png *.jpg *.jpeg *.svg)</source> <translation>Images (*.png *.jpg *.jpeg *.svg)</translation> </message> @@ -7205,7 +7205,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete"><h2>Canal de contrôle</h2><p>Chiffré en %2 %1 bits<br/>%3 ms de latence moyenne (déviation de %4)</p></translation> </message> <message> - <location line="-1550"/> + <location line="-1551"/> <source><h2>Voice channel</h2><p>Encrypted with 128 bit OCB-AES128<br />%1 ms average latency (%4 deviation)</p></source> <translation><h2>Canal de voix</h2><p>Chiffré en OCB-AES128 128 bits<br/>%1 ms de latence moyenne (déviation de %4)</p></translation> </message> @@ -7221,12 +7221,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>&View Certificate</source> <translation>&Voir le certificat</translation> </message> <message> - <location line="-1373"/> + <location line="-1374"/> <location line="+327"/> <source>Register yourself as %1</source> <translation>S'enregistrement en tant que %1</translation> @@ -7272,7 +7272,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Message pour le salon %1</translation> </message> <message> - <location line="+489"/> + <location line="+490"/> <source>Connected.</source> <translation>Connecté.</translation> </message> @@ -7338,7 +7338,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Format d'image non reconnu.</translation> </message> <message> - <location line="-1576"/> + <location line="-1577"/> <source>Voice channel is sent over control channel.</source> <translation>La voix est envoyée au dessus du canal de contrôle.</translation> </message> @@ -7585,13 +7585,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><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation><center>Non connecté</center></translation> </message> <message> - <location line="-1904"/> + <location line="-1905"/> <source>Clear</source> <translation>Effacer</translation> </message> diff --git a/src/mumble/mumble_he.ts b/src/mumble/mumble_he.ts index 3a41d62f8..781dfac2b 100644 --- a/src/mumble/mumble_he.ts +++ b/src/mumble/mumble_he.ts @@ -4,7 +4,7 @@ <context> <name>ACLEditor</name> <message> - <location filename="ACLEditor.cpp" line="+100"/> + <location filename="ACLEditor.cpp" line="+101"/> <source>Deny</source> <translatorcomment>דחה</translatorcomment> <translation type="unfinished">אסור</translation> @@ -15,17 +15,17 @@ <translation type="unfinished">אפשר</translation> </message> <message> - <location line="+22"/> + <location line="+21"/> <source>Allow %1</source> <translation type="unfinished">אפשר %1</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation type="unfinished">אסור %1</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation type="unfinished">ממבל - הוסף חדר</translation> </message> @@ -46,7 +46,7 @@ <translation type="unfinished"></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.<br />%2</source> <translation type="unfinished"></translation> </message> @@ -4279,12 +4279,12 @@ This field describes the size of an LCD device. The size is given either in pixe <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1993"/> + <location line="-1994"/> <source>Push-to-Talk</source> <comment>Global Shortcut</comment> <translation type="unfinished">לחץ-כדי-לדבר</translation> @@ -4363,12 +4363,12 @@ This field describes the size of an LCD device. The size is given either in pixe <message> <location filename="MainWindow.cpp" line="+4"/> <location line="+12"/> - <location line="+2158"/> + <location line="+2159"/> <source>Mumble -- %1</source> <translation type="unfinished">ממבל -- %1</translation> </message> <message> - <location line="-2154"/> + <location line="-2155"/> <source>&Window</source> <translation type="unfinished">&חלון</translation> </message> @@ -4567,7 +4567,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="+491"/> + <location line="+492"/> <source>Connected.</source> <translation type="unfinished">מחובר.</translation> </message> @@ -4620,7 +4620,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="unfinished"><p dir="RTL">פורמט התמונה לא מזוהה.</p></translation> </message> <message> - <location line="-1576"/> + <location line="-1577"/> <source>Voice channel is sent over control channel.</source> <translation type="unfinished"></translation> </message> @@ -4647,12 +4647,12 @@ This field describes the size of an LCD device. The size is given either in pixe </message> <message> <location line="+58"/> - <location line="+2188"/> + <location line="+2189"/> <source><center>Not connected</center></source> <translation type="unfinished"><center><p dir="RTL">לא מחובר</p></center></translation> </message> <message> - <location line="-1563"/> + <location line="-1564"/> <source>Change your comment</source> <translation type="unfinished"></translation> </message> @@ -4703,12 +4703,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>&View Certificate</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1004"/> + <location line="-1005"/> <location line="+19"/> <source>Enter reason</source> <translation type="unfinished">הכנס סיבה</translation> @@ -4753,7 +4753,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="+803"/> + <location line="+804"/> <source><center>Type message to channel '%1' here</center></source> <translation type="unfinished"><center><p dir="RTL">רשום הודעה לחדר %1 כאן</p></center></translation> </message> @@ -4768,7 +4768,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="-773"/> + <location line="-774"/> <source>Unmuted and undeafened.</source> <translation type="unfinished"></translation> </message> @@ -4793,7 +4793,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="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation type="unfinished"></translation> </message> diff --git a/src/mumble/mumble_it.ts b/src/mumble/mumble_it.ts index 04514a361..64e1f6d14 100644 --- a/src/mumble/mumble_it.ts +++ b/src/mumble/mumble_it.ts @@ -8,7 +8,7 @@ <translation type="obsolete">Mumble - Modifica ACL per %1</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+100"/> + <location filename="ACLEditor.cpp" line="+101"/> <source>Deny</source> <translation>Nega</translation> </message> @@ -18,17 +18,17 @@ <translation>Permetti</translation> </message> <message> - <location line="+22"/> + <location line="+21"/> <source>Allow %1</source> <translation>Permetti %1</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>Nega %1</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation>Mumble - Aggiunta di un canale</translation> </message> @@ -49,7 +49,7 @@ <translation>Garantisce il privilegio %1. Se un privilegio è contemporaneamente garantito e negato, sarà negato.<br />%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.<br />%2</source> <translation>Revoca il privilegio %1. Se un privilegio è contemporaneamente garantito e negato, sarà negato.<br />%2</translation> </message> @@ -5184,12 +5184,12 @@ p, li { white-space: pre-wrap; } <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation>Radice</translation> </message> <message> - <location line="-1993"/> + <location line="-1994"/> <source>Push-to-Talk</source> <comment>Global Shortcut</comment> <translation>Premi-per-parlare</translation> @@ -5328,12 +5328,12 @@ p, li { white-space: pre-wrap; } <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>&Window</source> <translation>&Finestra</translation> </message> @@ -5407,13 +5407,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+58"/> - <location line="+2188"/> + <location line="+2189"/> <source><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation><center>Disconnesso</center></translation> </message> <message> - <location line="-1904"/> + <location line="-1905"/> <source>Clear</source> <translation>Cancella</translation> </message> @@ -5495,7 +5495,7 @@ p, li { white-space: pre-wrap; } <translation><h2>Canale di controllo</h2><p>Crittografato con %1 bit %2<br/>%3 ms latenza media (%4 deviazione)</p><p>Host remoto %5 (porta%6)</p></translation> </message> <message> - <location line="+1561"/> + <location line="+1562"/> <source>Images (*.png *.jpg *.jpeg *.svg)</source> <translation type="unfinished"></translation> </message> @@ -5508,7 +5508,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><h2>Canale di controllo</h2><p>Crittografato con %1 bit %2<br/>%3 ms latenza media (%4 deviazione)</p></translation> </message> <message> - <location line="-1550"/> + <location line="-1551"/> <source><h2>Voice channel</h2><p>Encrypted with 128 bit OCB-AES128<br />%1 ms average latency (%4 deviation)</p></source> <translation><h2>Canale di voce</h2><p>Crittografato con 128 bit OCB-AES128<br/>%1 ms latenza media (%4 deviazione)</p></translation> </message> @@ -5595,7 +5595,7 @@ p, li { white-space: pre-wrap; } <translation>Per %1: %2</translation> </message> <message> - <location line="+489"/> + <location line="+490"/> <source>Connected.</source> <translation>Connesso.</translation> </message> @@ -5656,7 +5656,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><h2>Canale di controllo</h2><p>Crittografato con %1 bit %2<br/>%3 ms latenza media (%4 variazione)</p></translation> </message> <message> - <location line="-1576"/> + <location line="-1577"/> <source>Voice channel is sent over control channel.</source> <translation>Il canale di voce è trasmesso sul canale di controllo.</translation> </message> @@ -5710,7 +5710,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+4"/> - <location line="+1263"/> + <location line="+1264"/> <source>&View Certificate</source> <translation>&Visualizza certificato</translation> </message> @@ -5719,7 +5719,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">Espulsione giocatore %1</translation> </message> <message> - <location line="-1004"/> + <location line="-1005"/> <location line="+19"/> <source>Enter reason</source> <translation>Inserisci motivazione</translation> @@ -5796,7 +5796,7 @@ p, li { white-space: pre-wrap; } <translation>Ti sei escluso.</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation>Ti sei riattivato.</translation> </message> @@ -5887,7 +5887,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">&Giocatore</translation> </message> <message> - <location line="-2229"/> + <location line="-2230"/> <source>&Channel</source> <translation>&Canale</translation> </message> diff --git a/src/mumble/mumble_ja.ts b/src/mumble/mumble_ja.ts index 132d6ec66..c04e51662 100644 --- a/src/mumble/mumble_ja.ts +++ b/src/mumble/mumble_ja.ts @@ -83,7 +83,7 @@ <translation>ユーザID</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+100"/> + <location filename="ACLEditor.cpp" line="+101"/> <source>Deny</source> <translation>禁止</translation> </message> @@ -421,17 +421,17 @@ Contains the list of members inherited by the current channel. Uncheck <i> <translation>この項目がどのユーザに適用されるかを制御します。検索するにはユーザ名を入力してEnterキーを押してください。</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+22"/> + <location filename="ACLEditor.cpp" line="+21"/> <source>Allow %1</source> <translation>%1を許可する</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>%1を禁止する</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation>Mumble - チャンネル追加</translation> </message> @@ -452,7 +452,7 @@ Contains the list of members inherited by the current channel. Uncheck <i> <translation>%1に特権を付与します。特権の許可と禁止の両方が設定されている場合、禁止になります。<br />%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.<br />%2</source> <translation>%1から特権を剥奪します。特権の許可と禁止の両方が設定されている場合、禁止になります。<br />%2</translation> </message> @@ -6072,7 +6072,7 @@ This field describes the size of an LCD device. The size is given either in pixe <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation>ルート</translation> </message> @@ -6588,9 +6588,9 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Mumbleのウェブページに接続して新しいバージョンが出ているかを確認します。もし新しいのが出ていたら適切なダウンロードURLを通知します。</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> @@ -6612,7 +6612,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete">プレイヤー(&P)</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2245"/> + <location filename="MainWindow.cpp" line="-2246"/> <source>&Channel</source> <translation>チャンネル(&C)</translation> </message> @@ -6798,7 +6798,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="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation type="unfinished">聴取禁止を解除しました。</translation> </message> @@ -6826,7 +6826,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>サーバから切断しました。</translation> </message> <message> - <location line="-1491"/> + <location line="-1492"/> <source>Reconnecting.</source> <translation type="unfinished">再接続中です。</translation> </message> @@ -7252,7 +7252,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>(ツリー） %1宛: %2</translation> </message> <message> - <location line="+676"/> + <location line="+677"/> <source>Failed to launch compatibility client</source> <translation>互換クライアントの起動に失敗しました</translation> </message> @@ -7315,7 +7315,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>他のユーザにテキストメッセージを送信します。</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2431"/> + <location filename="MainWindow.cpp" line="-2432"/> <source>&User</source> <translation>ユーザ(&U)</translation> </message> @@ -7407,7 +7407,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>サウンドハードウェアの設定プロセスに案内します。</translation> </message> <message> - <location filename="MainWindow.cpp" line="+2140"/> + <location filename="MainWindow.cpp" line="+2141"/> <source>SSL Verification failed: %1</source> <translation>SSL検証エラー: %1</translation> </message> @@ -7437,7 +7437,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>サーバとの接続についての詳細な情報を表示します。</translation> </message> <message> - <location filename="MainWindow.cpp" line="-1699"/> + <location filename="MainWindow.cpp" line="-1700"/> <source>Opening URL %1</source> <translation>URL %1 を開きます</translation> </message> @@ -7523,12 +7523,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>&View Certificate</source> <translation>証明書を見る(&V)</translation> </message> <message> - <location line="-1373"/> + <location line="-1374"/> <location line="+327"/> <source>Register yourself as %1</source> <translation>%1 の名前で自分をユーザ登録します</translation> @@ -7580,7 +7580,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>チャンネル %1 へのメッセージ</translation> </message> <message> - <location line="+489"/> + <location line="+490"/> <source>Connected.</source> <translation type="unfinished">サーバに接続しました。</translation> </message> @@ -7609,12 +7609,12 @@ This field describes the size of an LCD device. The size is given either in pixe <translation><p>%1.<br />詳細な証明書エラーの内容: </p><ol>%2</ol><p>この証明書を受け入れますか？<br />(同時に証明書を保存するので、今後この質問は表示されません。)</p></translation> </message> <message> - <location line="-1284"/> + <location line="-1285"/> <source><h2>Control channel</h2><p>Encrypted with %1 bit %2<br />%3 ms average latency (%4 deviation)</p><p>Remote host %5 (port %6)</p></source> <translation><h2>制御チャンネル</h2><p>%1 bit %2 で暗号化されています。<br />平均 %3 ms の遅延 (平方偏差 %4)</p><p>リモートホスト %5 (ポート %6)</p></translation> </message> <message> - <location line="+1461"/> + <location line="+1462"/> <source><center>Type message to channel '%1' here</center></source> <oldsource>Type message to channel '%1' here</oldsource> <translation>チャンネル '%1' へのメッセージをここに入力</translation> @@ -7655,7 +7655,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete"><h2>制御チャンネル</h2><p>%1 bit %2 で暗号化されています。<br />平均 %3 ms の遅延 (平方偏差 %4)</p></translation> </message> <message> - <location line="-1576"/> + <location line="-1577"/> <source>Voice channel is sent over control channel.</source> <translation>音声チャンネルは管理チャンネルを通して送信されます。</translation> </message> @@ -7911,13 +7911,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><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation>接続されていません</translation> </message> <message> - <location line="-1904"/> + <location line="-1905"/> <source>Clear</source> <translation>クリア</translation> </message> diff --git a/src/mumble/mumble_pl.ts b/src/mumble/mumble_pl.ts index 8b593573f..5aa3ab733 100644 --- a/src/mumble/mumble_pl.ts +++ b/src/mumble/mumble_pl.ts @@ -83,7 +83,7 @@ <translation>ID Użytkownika</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+100"/> + <location filename="ACLEditor.cpp" line="+101"/> <source>Deny</source> <translation>Zabroń</translation> </message> @@ -386,17 +386,17 @@ Contains the list of members inherited by the current channel. Uncheck <i> <translation>Kontroluje do którego użytkownika należy ta reguła. Wpisz nazwę użytkownika i naciśnij Enter by wysłać zapytanie do serwera w celu sprawdzenia poprawności nazwy użytkownika.</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+22"/> + <location filename="ACLEditor.cpp" line="+21"/> <source>Allow %1</source> <translation>Zezwól %1</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>Zabroń %1</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation>Mumble - Dodaj kanał</translation> </message> @@ -417,7 +417,7 @@ Contains the list of members inherited by the current channel. Uncheck <i> <translation>Przydziela uprawnienie: <i>%1</i>. Jeżeli uprawnienie jest jednocześnie dozwolone i zabronione, to jest zabronione.<br />%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.<br />%2</source> <translation>Odbiera uprawnienie: <i>%1</i>. Jeżeli uprawnienie jest jednocześnie dozwolone i zabronione, to jest zabronione.<br />%2</translation> </message> @@ -5175,7 +5175,7 @@ p, li { white-space: pre-wrap; } <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation>Źródło</translation> </message> @@ -5675,9 +5675,9 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">Usuwa obecną teksturę z nakładki.</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> @@ -5695,7 +5695,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">&Użytkownik</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2245"/> + <location filename="MainWindow.cpp" line="-2246"/> <source>&Channel</source> <translation>&Kanał</translation> </message> @@ -5804,7 +5804,7 @@ p, li { white-space: pre-wrap; } <translation>Ogłuszono.</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation>Wyłączono ogłuszenie.</translation> </message> @@ -5828,7 +5828,7 @@ p, li { white-space: pre-wrap; } <translation>Rozłączony od serwera.</translation> </message> <message> - <location line="-1491"/> + <location line="-1492"/> <source>Reconnecting.</source> <translation>Ponowne łączenie.</translation> </message> @@ -6354,7 +6354,7 @@ p, li { white-space: pre-wrap; } <translation>Czy jesteś pewien, że chcesz usunąć %1 oraz wszystkie pod-kanały?</translation> </message> <message> - <location line="+883"/> + <location line="+884"/> <source><center>Type message to channel '%1' here</center></source> <oldsource>Type message to channel '%1' here</oldsource> <translation><center>Wiadomość do kanału '%1'</center></translation> @@ -6415,7 +6415,7 @@ p, li { white-space: pre-wrap; } <translation>Wyślij wiadomość tekstową</translation> </message> <message> - <location filename="MainWindow.cpp" line="-1585"/> + <location filename="MainWindow.cpp" line="-1586"/> <source><h2>Control channel</h2><p>Encrypted with %1 bit %2<br />%3 ms average latency (%4 deviation)</p><p>Remote host %5 (port %6)</p></source> <translation><h2>Kanał kontrolny</h2><p>Szyfrowanie %1 bit %2<br />Średnie opóźnienie %3 ms (%4 odchylenie)</p><p>Zdalny host %5 (port %6)</p></translation> </message> @@ -6455,7 +6455,7 @@ p, li { white-space: pre-wrap; } <translation>(Do drzewa kanałów) %1: %2</translation> </message> <message> - <location line="+491"/> + <location line="+492"/> <source>Connected.</source> <translation>Połączono.</translation> </message> @@ -6534,7 +6534,7 @@ p, li { white-space: pre-wrap; } <translation>Wysyła wiadomość tekstową do innego użytkownika.</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2431"/> + <location filename="MainWindow.cpp" line="-2432"/> <source>&User</source> <translation>&Użytkownik</translation> </message> @@ -6624,7 +6624,7 @@ p, li { white-space: pre-wrap; } <translation>Ten kreator poprowadzi cię przez proces konfiguracji ustawień dźwięku.</translation> </message> <message> - <location filename="MainWindow.cpp" line="+2140"/> + <location filename="MainWindow.cpp" line="+2141"/> <source>SSL Verification failed: %1</source> <translation>Weryfikacja SSL nie powiodła się: %1</translation> </message> @@ -6659,18 +6659,18 @@ p, li { white-space: pre-wrap; } <translation>Wyświetla zaawansowane informacje na temat połączenia z serwerem.</translation> </message> <message> - <location filename="MainWindow.cpp" line="-1260"/> + <location filename="MainWindow.cpp" line="-1261"/> <source>Mumble Server Information</source> <translation>Serwer Mumble - Informacje</translation> </message> <message> <location line="+4"/> - <location line="+1263"/> + <location line="+1264"/> <source>&View Certificate</source> <translation>&Zobacz certyfikat</translation> </message> <message> - <location line="-1713"/> + <location line="-1714"/> <source>Opening URL %1</source> <translation>Otwieranie adresu %1</translation> </message> @@ -6723,13 +6723,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+58"/> - <location line="+2188"/> + <location line="+2189"/> <source><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation><center>Niepołączony</center></translation> </message> <message> - <location line="-1873"/> + <location line="-1874"/> <source>File does not exist</source> <translation>Plik nie istnieje</translation> </message> diff --git a/src/mumble/mumble_pt_BR.ts b/src/mumble/mumble_pt_BR.ts index 93fa7e14c..f1e1c7648 100644 --- a/src/mumble/mumble_pt_BR.ts +++ b/src/mumble/mumble_pt_BR.ts @@ -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>Negar</translation> </message> @@ -14,17 +14,17 @@ <translation>Permitir</translation> </message> <message> - <location line="+22"/> + <location line="+21"/> <source>Allow %1</source> <translation>Permitir %1</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>Negar %1</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation>Mumble - Adicionar canal</translation> </message> @@ -45,7 +45,7 @@ <translation>Concede o privilégio %1. Se um privilégio é ambos permitido e negado, ele é negado.<br />%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.<br />%2</source> <translation>Revoga o privilégio %1. Se um privilégio é ambos permitido e negado, ele é negado.<br />%2</translation> </message> @@ -4287,12 +4287,12 @@ Este campo descreve o tamanho de um dispositivo LCD. O tamanho é dado em pixels <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation>Raíz</translation> </message> <message> - <location line="-1993"/> + <location line="-1994"/> <source>Push-to-Talk</source> <comment>Global Shortcut</comment> <translation>Pressionar-para-Falar</translation> @@ -4371,12 +4371,12 @@ Este campo descreve o tamanho de um dispositivo LCD. O tamanho é dado em pixels <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>&Window</source> <translation>&Janela</translation> </message> @@ -4445,13 +4445,13 @@ Este campo descreve o tamanho de um dispositivo LCD. O tamanho é dado em pixels </message> <message> <location line="+58"/> - <location line="+2188"/> + <location line="+2189"/> <source><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation><center>Não conectado</center></translation> </message> <message> - <location line="-1904"/> + <location line="-1905"/> <source>Clear</source> <translation>Limpar</translation> </message> @@ -4575,7 +4575,7 @@ Este campo descreve o tamanho de um dispositivo LCD. O tamanho é dado em pixels <translation>Mensagem para canal %1</translation> </message> <message> - <location line="+489"/> + <location line="+490"/> <source>Connected.</source> <translation>Conectado.</translation> </message> @@ -4633,7 +4633,7 @@ Este campo descreve o tamanho de um dispositivo LCD. O tamanho é dado em pixels <translation>Formato de imagem não reconhecido.</translation> </message> <message> - <location line="-1576"/> + <location line="-1577"/> <source>Voice channel is sent over control channel.</source> <translation>Vanal de voz é enviado pelo canal de controle.</translation> </message> @@ -4705,12 +4705,12 @@ Este campo descreve o tamanho de um dispositivo LCD. O tamanho é dado em pixels </message> <message> <location line="+4"/> - <location line="+1263"/> + <location line="+1264"/> <source>&View Certificate</source> <translation>&Ver certificado</translation> </message> <message> - <location line="-1004"/> + <location line="-1005"/> <location line="+19"/> <source>Enter reason</source> <translation>Especifique a razão</translation> @@ -4786,7 +4786,7 @@ Este campo descreve o tamanho de um dispositivo LCD. O tamanho é dado em pixels <translation>Surdo.</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation>Desensurdecido.</translation> </message> diff --git a/src/mumble/mumble_ru.ts b/src/mumble/mumble_ru.ts index fe1ec7089..f7df4a204 100755 --- a/src/mumble/mumble_ru.ts +++ b/src/mumble/mumble_ru.ts @@ -82,7 +82,7 @@ <translation>Идентификатор пользователя</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+100"/> + <location filename="ACLEditor.cpp" line="+101"/> <source>Deny</source> <translation>Запретить</translation> </message> @@ -416,17 +416,17 @@ Contains the list of members inherited by the current channel. Uncheck <i> <translation>Управляет, к какому пользователю применять ACL. Просто введите имя пользователя и нажмите Enter, чтобы послать запрос на сервер.</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+22"/> + <location filename="ACLEditor.cpp" line="+21"/> <source>Allow %1</source> <translation>Разрешить %1</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>Запретить %1</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation>Mumble - Добавить канал</translation> </message> @@ -447,7 +447,7 @@ Contains the list of members inherited by the current channel. Uncheck <i> <translation>Устанавливает привелегию на %1. Если привелегия позволяет и запрещает, то она запрещает.<br />%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.<br />%2</source> <translation>Отбирает привелегию на %1. Если привелегия позволяет и запрещает, то она запрещает.<br />%2</translation> </message> @@ -5236,7 +5236,7 @@ This field describes the size of an LCD device. The size is given either in pixe <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation>Корень</translation> </message> @@ -5700,9 +5700,9 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Соединиться с веб-страницей Mumble, чтобы проверить доступность новой версии и уведомить Вас о ссылке для ее закачки.</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> @@ -5724,7 +5724,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete">&Игрок</translation> </message> <message> - <location filename="MainWindow.cpp" line="-2245"/> + <location filename="MainWindow.cpp" line="-2246"/> <source>&Channel</source> <translation>&Канал</translation> </message> @@ -5886,7 +5886,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Заглушен.</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation>Глушение снято.</translation> </message> @@ -5914,7 +5914,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Отключен от сервера.</translation> </message> <message> - <location line="-1491"/> + <location line="-1492"/> <source>Reconnecting.</source> <translation>Повтор связи.</translation> </message> @@ -6317,7 +6317,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Для %1 (Дерево): %2</translation> </message> <message> - <location line="+676"/> + <location line="+677"/> <source>Failed to launch compatibility client</source> <translation>Ошибка при запуске совместимого клиента</translation> </message> @@ -6483,7 +6483,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Показывает расширенную информацию о соединении с сервером.</translation> </message> <message> - <location filename="MainWindow.cpp" line="-1699"/> + <location filename="MainWindow.cpp" line="-1700"/> <source>Opening URL %1</source> <translation>Открывается URL %1</translation> </message> @@ -6565,7 +6565,7 @@ 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>&View Certificate</source> <translation>&Посмотреть сертификат</translation> </message> @@ -6574,7 +6574,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete">Картинки (*.png *.jpg *.svg)</translation> </message> <message> - <location line="-1373"/> + <location line="-1374"/> <location line="+327"/> <source>Register yourself as %1</source> <translation>Зарегистрироваться как %1</translation> @@ -6623,7 +6623,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Сообщение в канал %1</translation> </message> <message> - <location line="+489"/> + <location line="+490"/> <source>Connected.</source> <translation>Подключено.</translation> </message> @@ -6686,7 +6686,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>Формат изображения не поддерживается.</translation> </message> <message> - <location line="-1576"/> + <location line="-1577"/> <source>Voice channel is sent over control channel.</source> <translation>Голосовой канал отправлен через канал управления.</translation> </message> @@ -6867,13 +6867,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><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation><center>Нет соединения с сервером</center></translation> </message> <message> - <location line="-1904"/> + <location line="-1905"/> <source>Clear</source> <translation>Очистить</translation> </message> diff --git a/src/mumble/mumble_sv.ts b/src/mumble/mumble_sv.ts index 141bb603e..d5fe0fd7b 100644 --- a/src/mumble/mumble_sv.ts +++ b/src/mumble/mumble_sv.ts @@ -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>Neka</translation> </message> @@ -14,17 +14,17 @@ <translation>Tillåt</translation> </message> <message> - <location line="+22"/> + <location line="+21"/> <source>Allow %1</source> <translation>Tillåt %1</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>Neka %1</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation>Mumble - Lägg till kanal</translation> </message> @@ -45,7 +45,7 @@ <translation>Detta ger %1 behörigheten. Om en behörighet både är tillåten och otillåten, blir den otillåten.<br />%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.<br />%2</source> <translation>Detta återkallar %1 behörigheten. Om en behörighet både är tillåten och otillåten, blir den otillåten.<br />%2</translation> </message> @@ -4385,12 +4385,12 @@ Detta fält beskriver storleken av en LCD-enhet. Storleken mäts i pixlar (för <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation>Rot</translation> </message> <message> - <location line="-1993"/> + <location line="-1994"/> <source>Push-to-Talk</source> <comment>Global Shortcut</comment> <translation>Tryck-för-att-Tala</translation> @@ -4469,12 +4469,12 @@ Detta fält beskriver storleken av en LCD-enhet. Storleken mäts i pixlar (för <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>&Window</source> <translation>&Fönster</translation> </message> @@ -4543,13 +4543,13 @@ Detta fält beskriver storleken av en LCD-enhet. Storleken mäts i pixlar (för </message> <message> <location line="+58"/> - <location line="+2188"/> + <location line="+2189"/> <source><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation><center>Ej ansluten</center></translation> </message> <message> - <location line="-1904"/> + <location line="-1905"/> <source>Clear</source> <translation>Rensa</translation> </message> @@ -4673,7 +4673,7 @@ Detta fält beskriver storleken av en LCD-enhet. Storleken mäts i pixlar (för <translation>Meddelande till kanalen %1</translation> </message> <message> - <location line="+489"/> + <location line="+490"/> <source>Connected.</source> <translation>Ansluten.</translation> </message> @@ -4731,7 +4731,7 @@ Detta fält beskriver storleken av en LCD-enhet. Storleken mäts i pixlar (för <translation>Bildformatet stöds ej.</translation> </message> <message> - <location line="-1576"/> + <location line="-1577"/> <source>Voice channel is sent over control channel.</source> <translation>Röstkanal skickas över kontrollkanal.</translation> </message> @@ -4803,12 +4803,12 @@ Detta fält beskriver storleken av en LCD-enhet. Storleken mäts i pixlar (för </message> <message> <location line="+4"/> - <location line="+1263"/> + <location line="+1264"/> <source>&View Certificate</source> <translation>&Visa certifikat</translation> </message> <message> - <location line="-1004"/> + <location line="-1005"/> <location line="+19"/> <source>Enter reason</source> <translation>Ange anledning</translation> @@ -4884,7 +4884,7 @@ Detta fält beskriver storleken av en LCD-enhet. Storleken mäts i pixlar (för <translation>Ljud avaktiverat.</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation>Ljud aktiverat.</translation> </message> diff --git a/src/mumble/mumble_zh_CN.ts b/src/mumble/mumble_zh_CN.ts index eeff763d2..bc113aee7 100644 --- a/src/mumble/mumble_zh_CN.ts +++ b/src/mumble/mumble_zh_CN.ts @@ -8,7 +8,7 @@ <translation type="obsolete">Mumble - 编辑 访问控制列表 %1</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+100"/> + <location filename="ACLEditor.cpp" line="+101"/> <source>Deny</source> <translation>拒绝</translation> </message> @@ -18,17 +18,17 @@ <translation>允许</translation> </message> <message> - <location line="+22"/> + <location line="+21"/> <source>Allow %1</source> <translation>允许 %1</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>拒绝 %1</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation type="unfinished"></translation> </message> @@ -49,7 +49,7 @@ <translation>授予 %1 权限.如果一个权限同时被拒绝和允许，则被视为拒绝。<br />%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.<br />%2</source> <translation>撤销 %1 权限.如果一个权限同时被拒绝和允许，则被视为拒绝。<br />%2</translation> </message> @@ -4747,12 +4747,12 @@ This field describes the size of an LCD device. The size is given either in pixe <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation>根</translation> </message> <message> - <location line="-1993"/> + <location line="-1994"/> <source>Push-to-Talk</source> <comment>Global Shortcut</comment> <translation>按键通话</translation> @@ -4891,12 +4891,12 @@ This field describes the size of an LCD device. The size is given either in pixe <message> <location filename="MainWindow.cpp" line="+4"/> <location line="+12"/> - <location line="+2158"/> + <location line="+2159"/> <source>Mumble -- %1</source> <translation></translation> </message> <message> - <location line="-2154"/> + <location line="-2155"/> <source>&Window</source> <translation>&窗口</translation> </message> @@ -4970,13 +4970,13 @@ This field describes the size of an LCD device. The size is given either in pixe </message> <message> <location line="+58"/> - <location line="+2188"/> + <location line="+2189"/> <source><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation type="unfinished">未连接</translation> </message> <message> - <location line="-1904"/> + <location line="-1905"/> <source>Clear</source> <translation>清除</translation> </message> @@ -5136,7 +5136,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="unfinished">发送给 %1: %2</translation> </message> <message> - <location line="+489"/> + <location line="+490"/> <source>Connected.</source> <translation type="unfinished"></translation> </message> @@ -5198,7 +5198,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete"><h2>控制信道</h2><p>使用 %1 比特 %2 加密<br />平均延迟 %3 毫秒（%4 方差）</p></translation> </message> <message> - <location line="-1576"/> + <location line="-1577"/> <source>Voice channel is sent over control channel.</source> <translation>语音频道通过控制信道发送。</translation> </message> @@ -5252,7 +5252,7 @@ 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>&View Certificate</source> <translation>&查看认证</translation> </message> @@ -5261,7 +5261,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete">踢出玩家 %1</translation> </message> <message> - <location line="-1004"/> + <location line="-1005"/> <location line="+19"/> <source>Enter reason</source> <translation>输入原因</translation> @@ -5338,7 +5338,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>耳聋.</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation>解除耳聋。</translation> </message> @@ -5429,7 +5429,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete">&玩家</translation> </message> <message> - <location line="-2229"/> + <location line="-2230"/> <source>&Channel</source> <translation type="unfinished">&频道</translation> </message> diff --git a/src/mumble/mumble_zh_TW.ts b/src/mumble/mumble_zh_TW.ts index 8745dccdd..2571b1fdf 100644 --- a/src/mumble/mumble_zh_TW.ts +++ b/src/mumble/mumble_zh_TW.ts @@ -8,7 +8,7 @@ <translation type="obsolete">Mumble - 編輯 訪問控制列表 %1</translation> </message> <message> - <location filename="ACLEditor.cpp" line="+100"/> + <location filename="ACLEditor.cpp" line="+101"/> <source>Deny</source> <translation>拒絕</translation> </message> @@ -18,17 +18,17 @@ <translation>允許</translation> </message> <message> - <location line="+22"/> + <location line="+21"/> <source>Allow %1</source> <translation>允許 %1</translation> </message> <message> - <location line="-9"/> + <location line="-8"/> <source>Deny %1</source> <translation>拒絕 %1</translation> </message> <message> - <location line="-61"/> + <location line="-62"/> <source>Mumble - Add channel</source> <translation type="unfinished"></translation> </message> @@ -49,7 +49,7 @@ <translation>授予 %1 權限.如果一個權限同時被拒絕和允許，則被視為拒絕。<br />%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.<br />%2</source> <translation>撤銷 %1 權限.如果一個權限同時被拒絕和允許，則被視為拒絕。<br />%2</translation> </message> @@ -4747,12 +4747,12 @@ This field describes the size of an LCD device. The size is given either in pixe <name>MainWindow</name> <message> <location filename="MainWindow.cpp" line="+171"/> - <location line="+2047"/> + <location line="+2048"/> <source>Root</source> <translation>根</translation> </message> <message> - <location line="-1993"/> + <location line="-1994"/> <source>Push-to-Talk</source> <comment>Global Shortcut</comment> <translation>按鍵通話</translation> @@ -4891,12 +4891,12 @@ This field describes the size of an LCD device. The size is given either in pixe <message> <location filename="MainWindow.cpp" line="+4"/> <location line="+12"/> - <location line="+2158"/> + <location line="+2159"/> <source>Mumble -- %1</source> <translation></translation> </message> <message> - <location line="-2154"/> + <location line="-2155"/> <source>&Window</source> <translation>&窗口</translation> </message> @@ -4970,13 +4970,13 @@ This field describes the size of an LCD device. The size is given either in pixe </message> <message> <location line="+58"/> - <location line="+2188"/> + <location line="+2189"/> <source><center>Not connected</center></source> <oldsource>Not connected</oldsource> <translation type="unfinished">未連接</translation> </message> <message> - <location line="-1904"/> + <location line="-1905"/> <source>Clear</source> <translation>清除</translation> </message> @@ -5136,7 +5136,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="unfinished">發送給 %1: %2</translation> </message> <message> - <location line="+489"/> + <location line="+490"/> <source>Connected.</source> <translation type="unfinished"></translation> </message> @@ -5198,7 +5198,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete"><h2>控制信道</h2><p>使用 %1 比特 %2 加密<br />平均延遲 %3 毫秒（%4 方差）</p></translation> </message> <message> - <location line="-1576"/> + <location line="-1577"/> <source>Voice channel is sent over control channel.</source> <translation>語音頻道通過控制信道發送。</translation> </message> @@ -5252,7 +5252,7 @@ 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>&View Certificate</source> <translation>&查看認証</translation> </message> @@ -5261,7 +5261,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete">踢出玩家 %1</translation> </message> <message> - <location line="-1004"/> + <location line="-1005"/> <location line="+19"/> <source>Enter reason</source> <translation>輸入原因</translation> @@ -5338,7 +5338,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation>耳聾.</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Undeafened.</source> <translation>解除耳聾。</translation> </message> @@ -5429,7 +5429,7 @@ This field describes the size of an LCD device. The size is given either in pixe <translation type="obsolete">&玩家</translation> </message> <message> - <location line="-2229"/> + <location line="-2230"/> <source>&Channel</source> <translation type="unfinished">&頻道</translation> </message> |