Skip to content

Commit 897b097

Browse files
thorvaldthorvald
committed
Updated paths to match recommendations from Wiki
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@433 05730e5d-ab1b-0410-a4ac-84af385074fa
1 parent e652e5d commit 897b097

9 files changed

+61
-37
lines changed

‎About.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
*/
3030

3131
#include "About.h"
32+
#include "Global.h"
3233
#include "licenses.h"
3334

3435
AboutDialog::AboutDialog(QWidget *p) : QDialog(p) {
@@ -46,11 +47,11 @@ AboutDialog::AboutDialog(QWidget *p) : QDialog(p) {
4647

4748
QLabel *text=new QLabel(about);
4849
text->setText(tr(
49-
"<h3>Mumble v0.9.5</h3>"
50+
"<h3>Mumble v%1</h3>"
5051
"<p>Copyright 2005-2006 Thorvald Natvig<br />slicer@users.sourceforge.net</p>"
5152
"<p><b>A voice-chat utility for gamers</b></p>"
5253
"<p><tt>http://mumble.sourceforge.net/</tt></p>"
53-
));
54+
).arg(MUMBLE_RELEASE));
5455
QHBoxLayout *qhbl=new QHBoxLayout();
5556
qhbl->addWidget(icon);
5657
qhbl->addWidget(text);

‎INSTALL

+7-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ place offering Mumble is likely to contain trojans or viruses.
1111
Pre-requisites
1212
==============
1313

14-
Mumble and murmur depends on Qt version 4.1.0 or above; either the opensource
14+
Mumble and murmur depends on Qt version 4.2.0 or above; either the opensource
1515
or commercial versions will do.
1616
Please see http://www.trolltech.com/qt/ for more information. As we use the Qt
1717
build system, it's important that you have a fully functional Qt installation.
@@ -40,13 +40,17 @@ Mumble also needs the DirectX 9.0 SDK, and the Microsoft Speech SDK 5.1.
4040
The windows build has only been done with MinGW. If you have success with other
4141
build environments, please let us know.
4242

43+
Detailed build instructions are available at
44+
http://mumble.sourceforge.net/BuildingWindows and it is highly recommended
45+
to follow them to the letter.
46+
4347
Linux pre-requisites
4448
====================
4549

4650
Mumble needs libasound2 (the ALSA developer libraries) as well as the developer
4751
libraries for Xevie.
4852

49-
The Linux version of the client has been tested on Ubuntu 6.06. It may work on
53+
The Linux version of the client is developed on Ubuntu 6.10. It may work on
5054
other updated distributions. The server should work on any modern UNIX-based
5155
distribution and on Windows.
5256

@@ -55,6 +59,7 @@ Building Mumble
5559

5660
To build mumble, type
5761
qmake mumble.pro
62+
lupdate mumble.pro
5863
lrelease mumble.pro
5964
make
6065

‎mumble.pro

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ include(mumble.pri)
22

33
TEMPLATE = app
44
QT += network sql opengl
5+
CONFIG += qsa
56
TARGET = mumble
67
RC_FILE = mumble.rc
78
HEADERS = ACL.h BanEditor.h Group.h ACLEditor.h Channel.h Log.h AudioConfigDialog.h AudioStats.h AudioInput.h AudioOutput.h MainWindow.h Connection.h ServerHandler.h Player.h About.h Message.h ConnectDialog.h GlobalShortcut.h TextToSpeech.h Settings.h Database.h VersionCheck.h Global.h PlayerModel.h Audio.h ConfigDialog.h Plugins.h LookConfig.h
@@ -20,9 +21,8 @@ LIBS += -lspeex
2021
win32 {
2122
HEADERS += DXAudioInput.h DXAudioOutput.h DXConfigDialog.h GlobalShortcut_win.h Overlay.h
2223
SOURCES += DXAudioInput.cpp DXAudioOutput.cpp DXConfigDialog.cpp GlobalShortcut_win.cpp TextToSpeech_win.cpp Overlay_win.cpp os_win.cpp
23-
INCLUDEPATH += /dx90sdk/include "/Program Files/Microsoft Speech SDK 5.1/Include"
24-
LIBS += -L\\dx90sdk\\lib -L\"/Program Files/Microsoft Speech SDK 5.1/Lib/i386\" -ldsound -ldxguid -ldinput8 -lsapi -lole32 -lws2_32
25-
INCLUDEPATH += /boost/include/boost-1_33
24+
INCLUDEPATH += /dev/dxsdk/Include /dev/SpeechSDK/include /dev/Boost/include/boost-1_33_1 /dev/speex/include
25+
LIBS += -L/dev/SpeechSDK/Lib/i386 -ldsound -ldxguid -ldinput8 -lsapi -lole32 -lws2_32
2626
CONFIG += asio
2727
DEFINES += WIN32
2828
}

‎mumble_de.ts

+11-6
Original file line numberDiff line numberDiff line change
@@ -519,33 +519,38 @@
519519
<message>
520520
<location filename="About.cpp" line="53"/>
521521
<source>&lt;h3&gt;Mumble v0.9.5&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;A voice-chat utility for gamers&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</source>
522-
<translation type="unfinished">&lt;h3&gt;Mumble v0.9.4&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;Deutsche Übersetzung von Matthias Vogelgesang&lt;br /&gt; m0ta@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;Ein Voicechat-Programm für Spieler&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</translation>
522+
<translation type="obsolete">&lt;h3&gt;Mumble v0.9.4&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;Deutsche Übersetzung von Matthias Vogelgesang&lt;br /&gt; m0ta@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;Ein Voicechat-Programm für Spieler&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</translation>
523523
</message>
524524
<message>
525-
<location filename="About.cpp" line="59"/>
525+
<location filename="About.cpp" line="60"/>
526526
<source>&amp;About Mumble</source>
527527
<translation>Ü&amp;ber Mumble</translation>
528528
</message>
529529
<message>
530-
<location filename="About.cpp" line="60"/>
530+
<location filename="About.cpp" line="61"/>
531531
<source>&amp;License</source>
532532
<translation>&amp;Lizenz</translation>
533533
</message>
534534
<message>
535-
<location filename="About.cpp" line="62"/>
535+
<location filename="About.cpp" line="63"/>
536536
<source>OK</source>
537537
<translation>OK</translation>
538538
</message>
539+
<message>
540+
<location filename="About.cpp" line="54"/>
541+
<source>&lt;h3&gt;Mumble v%1&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;A voice-chat utility for gamers&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</source>
542+
<translation type="unfinished"></translation>
543+
</message>
539544
</context>
540545
<context>
541546
<name>AboutSpeexDialog</name>
542547
<message>
543-
<location filename="About.cpp" line="83"/>
548+
<location filename="About.cpp" line="84"/>
544549
<source>&lt;h3&gt;About Speex&lt;/h3&gt;&lt;p&gt;&lt;tt&gt;http://www.speex.org/&lt;/tt&gt;&lt;/p&gt;&lt;p&gt;This program uses Speex version %1&lt;/p&gt;&lt;p&gt;Speex is used for echo cancellation, noise&lt;br /&gt;filtering, voice activity detection and speech&lt;br /&gt;compression.&lt;/p&gt;</source>
545550
<translation>&lt;h3&gt;Über Speex&lt;/h3&gt;&lt;p&gt;&lt;tt&gt;http://www.speex.org/&lt;/tt&gt;&lt;/p&gt;&lt;p&gt;Dieses Programm nutzt Speex Version %1&lt;/p&gt;&lt;p&gt;Speex wird zur Echoreduktion, Geräuschfilterung&lt;br /&gt;, Stimmaktivierungserkennung und&lt;br /&gt;Sprachkompression genutzt.&lt;/p&gt;</translation>
546551
</message>
547552
<message>
548-
<location filename="About.cpp" line="85"/>
553+
<location filename="About.cpp" line="86"/>
549554
<source>OK</source>
550555
<translation>OK</translation>
551556
</message>

‎mumble_es.ts

+11-6
Original file line numberDiff line numberDiff line change
@@ -529,33 +529,38 @@
529529
<message>
530530
<location filename="About.cpp" line="53"/>
531531
<source>&lt;h3&gt;Mumble v0.9.5&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;A voice-chat utility for gamers&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</source>
532-
<translation>&lt;h3&gt;Mumble v0.9.5&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;Traducción al español por Álvaro M. Recio Pérez&lt;br /&gt;naproxeno@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;Una utilidad de charla por voz para jugadores&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</translation>
532+
<translation type="obsolete">&lt;h3&gt;Mumble v0.9.5&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;Traducción al español por Álvaro M. Recio Pérez&lt;br /&gt;naproxeno@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;Una utilidad de charla por voz para jugadores&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</translation>
533533
</message>
534534
<message>
535-
<location filename="About.cpp" line="59"/>
535+
<location filename="About.cpp" line="60"/>
536536
<source>&amp;About Mumble</source>
537537
<translation>&amp;Acerca de Mumble</translation>
538538
</message>
539539
<message>
540-
<location filename="About.cpp" line="60"/>
540+
<location filename="About.cpp" line="61"/>
541541
<source>&amp;License</source>
542542
<translation>&amp;Licencia</translation>
543543
</message>
544544
<message>
545-
<location filename="About.cpp" line="62"/>
545+
<location filename="About.cpp" line="63"/>
546546
<source>OK</source>
547547
<translation>Aceptar</translation>
548548
</message>
549+
<message>
550+
<location filename="About.cpp" line="54"/>
551+
<source>&lt;h3&gt;Mumble v%1&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;A voice-chat utility for gamers&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</source>
552+
<translation type="unfinished"></translation>
553+
</message>
549554
</context>
550555
<context>
551556
<name>AboutSpeexDialog</name>
552557
<message>
553-
<location filename="About.cpp" line="83"/>
558+
<location filename="About.cpp" line="84"/>
554559
<source>&lt;h3&gt;About Speex&lt;/h3&gt;&lt;p&gt;&lt;tt&gt;http://www.speex.org/&lt;/tt&gt;&lt;/p&gt;&lt;p&gt;This program uses Speex version %1&lt;/p&gt;&lt;p&gt;Speex is used for echo cancellation, noise&lt;br /&gt;filtering, voice activity detection and speech&lt;br /&gt;compression.&lt;/p&gt;</source>
555560
<translation>&lt;h3&gt;Acerca de Speex&lt;/h3&gt;&lt;p&gt;&lt;tt&gt;http://www.speex.org/&lt;/tt&gt;&lt;/p&gt;&lt;p&gt;Este programa usa Speex versión %1&lt;/p&gt;&lt;p&gt;Speex se usa para cancelación de eco, filtrado de&lt;br /&gt;ruido, detección de actividad vocal y compresión del&lt;br /&gt;habla.&lt;/p&gt;</translation>
556561
</message>
557562
<message>
558-
<location filename="About.cpp" line="85"/>
563+
<location filename="About.cpp" line="86"/>
559564
<source>OK</source>
560565
<translation>Aceptar</translation>
561566
</message>

‎mumble_pch.h

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
#define __cdecl
99
#endif
1010

11+
#define QT_NO_DEBUG_STREAM
12+
#define QT_ASCII_CAST_WARNINGS
13+
#define QT_NO_CAST_TO_ASCII
1114
#include <QtCore>
1215
#include <QtGui>
1316
#include <QtNetwork>

‎mumble_ru.ts

+11-6
Original file line numberDiff line numberDiff line change
@@ -514,34 +514,39 @@
514514
<message>
515515
<location filename="About.cpp" line="53"/>
516516
<source>&lt;h3&gt;Mumble v0.9.5&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;A voice-chat utility for gamers&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</source>
517-
<translation>&lt;h3&gt;Mumble v0.9.5&lt;/h3&gt;&lt;p&gt;Все права принадлежат 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;
517+
<translation type="obsolete">&lt;h3&gt;Mumble v0.9.5&lt;/h3&gt;&lt;p&gt;Все права принадлежат 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;
518518
Русский перевод Khazov Nick&lt;br /&gt;m2k3d0n@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;Программа для голосового общения игроков&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</translation>
519519
</message>
520520
<message>
521-
<location filename="About.cpp" line="59"/>
521+
<location filename="About.cpp" line="60"/>
522522
<source>&amp;About Mumble</source>
523523
<translation>&amp;О Mumble</translation>
524524
</message>
525525
<message>
526-
<location filename="About.cpp" line="60"/>
526+
<location filename="About.cpp" line="61"/>
527527
<source>&amp;License</source>
528528
<translation>Л&amp;ицензия</translation>
529529
</message>
530530
<message>
531-
<location filename="About.cpp" line="62"/>
531+
<location filename="About.cpp" line="63"/>
532532
<source>OK</source>
533533
<translation>ОК</translation>
534534
</message>
535+
<message>
536+
<location filename="About.cpp" line="54"/>
537+
<source>&lt;h3&gt;Mumble v%1&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;A voice-chat utility for gamers&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</source>
538+
<translation type="unfinished"></translation>
539+
</message>
535540
</context>
536541
<context>
537542
<name>AboutSpeexDialog</name>
538543
<message>
539-
<location filename="About.cpp" line="83"/>
544+
<location filename="About.cpp" line="84"/>
540545
<source>&lt;h3&gt;About Speex&lt;/h3&gt;&lt;p&gt;&lt;tt&gt;http://www.speex.org/&lt;/tt&gt;&lt;/p&gt;&lt;p&gt;This program uses Speex version %1&lt;/p&gt;&lt;p&gt;Speex is used for echo cancellation, noise&lt;br /&gt;filtering, voice activity detection and speech&lt;br /&gt;compression.&lt;/p&gt;</source>
541546
<translation>&lt;h3&gt;О Speex&lt;/h3&gt;&lt;p&gt;&lt;tt&gt;http://www.speex.org/&lt;/tt&gt;&lt;/p&gt;&lt;p&gt;Эта программа использует Speex версии %1&lt;/p&gt;&lt;p&gt;Speex используется для подавления эха, шумов&lt;br /&gt;фильтрации, определения голосовой активности и сжатия&lt;br /&gt;речи.&lt;/p&gt;</translation>
542547
</message>
543548
<message>
544-
<location filename="About.cpp" line="85"/>
549+
<location filename="About.cpp" line="86"/>
545550
<source>OK</source>
546551
<translation>ОК</translation>
547552
</message>

‎mumble_tr.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -512,35 +512,35 @@
512512
<context>
513513
<name>AboutDialog</name>
514514
<message>
515-
<location filename="About.cpp" line="53"/>
516-
<source>&lt;h3&gt;Mumble v0.9.5&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;A voice-chat utility for gamers&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</source>
517-
<translation type="unfinished"></translation>
518-
</message>
519-
<message>
520-
<location filename="About.cpp" line="59"/>
515+
<location filename="About.cpp" line="60"/>
521516
<source>&amp;About Mumble</source>
522517
<translation type="unfinished"></translation>
523518
</message>
524519
<message>
525-
<location filename="About.cpp" line="60"/>
520+
<location filename="About.cpp" line="61"/>
526521
<source>&amp;License</source>
527522
<translation type="unfinished"></translation>
528523
</message>
529524
<message>
530-
<location filename="About.cpp" line="62"/>
525+
<location filename="About.cpp" line="63"/>
531526
<source>OK</source>
532527
<translation type="unfinished"></translation>
533528
</message>
529+
<message>
530+
<location filename="About.cpp" line="54"/>
531+
<source>&lt;h3&gt;Mumble v%1&lt;/h3&gt;&lt;p&gt;Copyright 2005-2006 Thorvald Natvig&lt;br /&gt;slicer@users.sourceforge.net&lt;/p&gt;&lt;p&gt;&lt;b&gt;A voice-chat utility for gamers&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;http://mumble.sourceforge.net/&lt;/tt&gt;&lt;/p&gt;</source>
532+
<translation type="unfinished"></translation>
533+
</message>
534534
</context>
535535
<context>
536536
<name>AboutSpeexDialog</name>
537537
<message>
538-
<location filename="About.cpp" line="83"/>
538+
<location filename="About.cpp" line="84"/>
539539
<source>&lt;h3&gt;About Speex&lt;/h3&gt;&lt;p&gt;&lt;tt&gt;http://www.speex.org/&lt;/tt&gt;&lt;/p&gt;&lt;p&gt;This program uses Speex version %1&lt;/p&gt;&lt;p&gt;Speex is used for echo cancellation, noise&lt;br /&gt;filtering, voice activity detection and speech&lt;br /&gt;compression.&lt;/p&gt;</source>
540540
<translation type="unfinished"></translation>
541541
</message>
542542
<message>
543-
<location filename="About.cpp" line="85"/>
543+
<location filename="About.cpp" line="86"/>
544544
<source>OK</source>
545545
<translation type="unfinished"></translation>
546546
</message>

‎overlay/Makefile.Library

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CXX = icl
22
CXXFLAGS = -nologo -Zm500 -Qrestrict -W3 -MT -O3 -G7 -Ob2 -Gf -QxK -Qip -GX
3-
INCPATH = -I"C:\dx90sdk\include"
3+
INCPATH = -I"C:\dev\dxsdk\include"
44
LINK = link
5-
LFLAGS = /NOLOGO /NODEFAULTLIB:msvcrt /NODEFAULTLIB:"libc" /SUBSYSTEM:console /DLL /LIBPATH:"c:\dx90sdk\lib\x86"
5+
LFLAGS = /NOLOGO /NODEFAULTLIB:msvcrt /NODEFAULTLIB:"libc" /SUBSYSTEM:console /DLL /LIBPATH:"c:\dev\dxsdk\lib\x86"
66
LIBS = "kernel32.lib" "user32.lib" "uuid.lib" "d3dx9.lib" "d3d9.lib" "Advapi32.lib" "gdi32.lib"
77
OBJECTS = lib.obj
88
TARGET = mumble_ol.dll

0 commit comments

Comments
 (0)