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 committed Jan 7, 2010
1 parent 2e36c68 commit 551fd6f
Show file tree
Hide file tree
Showing 13 changed files with 140 additions and 139 deletions.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
7426294 Update LICENSE

Thorvald Natvig <[email protected]>
2e36c68 Process disconnect events before connecting to new server
10e4c19 Add Africa
f6dd2b7 Intel C++ 11.1.054 on Win32
b5b6ba2 Add getCertificateList to Ice
Expand Down
24 changes: 12 additions & 12 deletions src/mumble/mumble_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4912,7 +4912,7 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location filename="MainWindow.cpp" line="+147"/>
<location line="+1768"/>
<location line="+1770"/>
<source>Root</source>
<translation>Kořen</translation>
</message>
Expand Down Expand Up @@ -5530,7 +5530,7 @@ 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="-1680"/>
<location filename="MainWindow.cpp" line="-1682"/>
<location line="+12"/>
<source>Mumble -- %1</source>
<translation>Mumble =- %1 </translation>
Expand Down Expand Up @@ -5658,7 +5658,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">Alternativní klávesa pro mluvení</translation>
</message>
<message>
<location line="+524"/>
<location line="+526"/>
<source>Reconnecting.</source>
<translation>Opětovné připojování.</translation>
</message>
Expand Down Expand Up @@ -5700,8 +5700,8 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="-895"/>
<location line="+853"/>
<location filename="MainWindow.cpp" line="-897"/>
<location line="+855"/>
<location line="+180"/>
<location line="+649"/>
<location filename="main.cpp" line="+17"/>
Expand Down Expand Up @@ -6119,7 +6119,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="-1596"/>
<location filename="MainWindow.cpp" line="-1598"/>
<source>Opening URL %1</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -6159,8 +6159,8 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished">Zadejte jmého uživatele</translation>
</message>
<message>
<location line="+13"/>
<location line="+153"/>
<location line="+14"/>
<location line="+154"/>
<source>Connecting to server %1.</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -6418,7 +6418,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="-1120"/>
<location filename="MainWindow.cpp" line="-1122"/>
<source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -6525,12 +6525,12 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+65"/>
<location line="+1894"/>
<location line="+1896"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1704"/>
<location line="-1706"/>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -7585,7 +7585,7 @@ To může být způsobeno například těmito důvody:
<context>
<name>ServerHandler</name>
<message>
<location filename="ServerHandler.cpp" line="+390"/>
<location filename="ServerHandler.cpp" line="+391"/>
<source>UDP packets cannot be sent to or received from the server. Switching to TCP mode.</source>
<translation type="unfinished"></translation>
</message>
Expand Down
18 changes: 9 additions & 9 deletions src/mumble/mumble_da.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4186,12 +4186,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="+147"/>
<location line="+1768"/>
<location line="+1770"/>
<source>Root</source>
<translation>Rod</translation>
</message>
<message>
<location line="-1724"/>
<location line="-1726"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Tryk-for-snak</translation>
Expand Down Expand Up @@ -4265,15 +4265,15 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="+115"/>
<location line="+853"/>
<location line="+855"/>
<location line="+180"/>
<location line="+649"/>
<location filename="main.cpp" line="+313"/>
<source>Mumble</source>
<translation>Mumble</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1793"/>
<location filename="MainWindow.cpp" line="-1795"/>
<location line="+12"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
Expand Down Expand Up @@ -4353,12 +4353,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
</message>
<message>
<location line="+58"/>
<location line="+1894"/>
<location line="+1896"/>
<source>Not connected</source>
<translation>Ingen forbindelse oprettet</translation>
</message>
<message>
<location line="-1704"/>
<location line="-1706"/>
<source>Clear</source>
<translation>Ryd</translation>
</message>
Expand Down Expand Up @@ -4403,8 +4403,8 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation>Skriv brugernavn</translation>
</message>
<message>
<location line="+13"/>
<location line="+153"/>
<location line="+14"/>
<location line="+154"/>
<source>Connecting to server %1.</source>
<translation>Opretter forbindelse til server %1.</translation>
</message>
Expand Down Expand Up @@ -6578,7 +6578,7 @@ Forhindrer at programmet downloader billeder, der er indsat i chatbeskeder med i
<context>
<name>ServerHandler</name>
<message>
<location filename="ServerHandler.cpp" line="+390"/>
<location filename="ServerHandler.cpp" line="+391"/>
<source>UDP packets cannot be sent to or received from the server. Switching to TCP mode.</source>
<translation>UDP-pakker kan ikke blive sendt eller modtaget fra serveren. Skifter til TCP-tilstand.</translation>
</message>
Expand Down
28 changes: 14 additions & 14 deletions src/mumble/mumble_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5804,7 +5804,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+147"/>
<location line="+1768"/>
<location line="+1770"/>
<source>Root</source>
<translation>Hauptkanal</translation>
</message>
Expand Down Expand Up @@ -6375,7 +6375,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<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="-1680"/>
<location filename="MainWindow.cpp" line="-1682"/>
<location line="+12"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
Expand Down Expand Up @@ -6423,7 +6423,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation type="obsolete">Kicke Benutzer %1</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="+844"/>
<location filename="MainWindow.cpp" line="+846"/>
<location line="+22"/>
<source>Enter reason</source>
<translation>Grund eingeben</translation>
Expand All @@ -6434,8 +6434,8 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
</message>
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="-767"/>
<location line="+853"/>
<location filename="MainWindow.cpp" line="-769"/>
<location line="+855"/>
<location line="+180"/>
<location line="+649"/>
<location filename="main.cpp" line="+313"/>
Expand Down Expand Up @@ -6829,7 +6829,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation>Willkommen in Mumble.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-554"/>
<location filename="MainWindow.cpp" line="-556"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Push-To-Talk</translation>
Expand Down Expand Up @@ -6954,8 +6954,8 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation>Diese Version von Mumble kann keine URLs von Mumble Version %1.%2.%3 verarbeiten</translation>
</message>
<message>
<location line="+39"/>
<location line="+153"/>
<location line="+40"/>
<location line="+154"/>
<source>Connecting to server %1.</source>
<translation>Zu Server %1 verbinden.</translation>
</message>
Expand Down Expand Up @@ -7418,7 +7418,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode
<translation>&amp;Zertifikat zeigen</translation>
</message>
<message>
<location line="-1544"/>
<location line="-1546"/>
<source>Opening URL %1</source>
<translation>Öffne URL %1</translation>
</message>
Expand Down Expand Up @@ -7471,12 +7471,12 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode
</message>
<message>
<location line="+58"/>
<location line="+1894"/>
<location line="+1896"/>
<source>Not connected</source>
<translation>Nicht verbunden</translation>
</message>
<message>
<location line="-1694"/>
<location line="-1696"/>
<source>File does not exist</source>
<translation>Datei existiert nicht</translation>
</message>
Expand Down Expand Up @@ -7526,7 +7526,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode
<translation type="obsolete">&lt;h2&gt;Kontrollkanal&lt;/h2&gt;&lt;p&gt;Verschlüsselt mit %1 Bit %2&lt;br /&gt;%3 ms Durchschnittslatenz (%4 Varianz)&lt;/p&gt;</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="+269"/>
<location filename="MainWindow.cpp" line="+271"/>
<source>Voice channel is sent over control channel.</source>
<translation>Sprachkanal wird über den Kontrollkanal gesendet.</translation>
</message>
Expand Down Expand Up @@ -7655,7 +7655,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode
<translation type="obsolete">Mit Server %1 verbunden.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1120"/>
<location filename="MainWindow.cpp" line="-1122"/>
<source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
<translation>Mumble ist gerade zu einem Server verbunden. Möchten Sie es schließen oder minimieren?</translation>
</message>
Expand Down Expand Up @@ -8787,7 +8787,7 @@ Bitte beachten Sie: Wenn Sie Mumble nach dem Applikationsstart starten oder das
<translation type="obsolete">UDP Pakete konnten nicht vom Server empfangen werden. Wechsel zum TCP-Modus.</translation>
</message>
<message>
<location filename="ServerHandler.cpp" line="+390"/>
<location filename="ServerHandler.cpp" line="+391"/>
<source>UDP packets cannot be sent to or received from the server. Switching to TCP mode.</source>
<translation>UDP Pakete können nicht gesendet oder vom Server nicht empfangen werden. Wechsle zu TCP-Modus.</translation>
</message>
Expand Down
18 changes: 9 additions & 9 deletions src/mumble/mumble_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4060,12 +4060,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="+147"/>
<location line="+1768"/>
<location line="+1770"/>
<source>Root</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1724"/>
<location line="-1726"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -4139,15 +4139,15 @@ This field describes the size of an LCD device. The size is given either in pixe
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="+115"/>
<location line="+853"/>
<location line="+855"/>
<location line="+180"/>
<location line="+649"/>
<location filename="main.cpp" line="+313"/>
<source>Mumble</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1793"/>
<location filename="MainWindow.cpp" line="-1795"/>
<location line="+12"/>
<source>Mumble -- %1</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -4227,12 +4227,12 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+58"/>
<location line="+1894"/>
<location line="+1896"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1704"/>
<location line="-1706"/>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -4277,8 +4277,8 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
<location line="+153"/>
<location line="+14"/>
<location line="+154"/>
<source>Connecting to server %1.</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -6392,7 +6392,7 @@ Prevents the client from downloading images embedded into chat messages with the
<context>
<name>ServerHandler</name>
<message>
<location filename="ServerHandler.cpp" line="+390"/>
<location filename="ServerHandler.cpp" line="+391"/>
<source>UDP packets cannot be sent to or received from the server. Switching to TCP mode.</source>
<translation type="unfinished"></translation>
</message>
Expand Down
Loading

0 comments on commit 551fd6f

Please sign in to comment.