Merge branch 'master' of github.com:/pokerth/pokerth

pokerth_game.pro

@@ -318,6 +318,7 @@ TRANSLATIONS = ts/pokerth_af.ts \
 	ts/pokerth_sv.ts \
 	ts/pokerth_ta.ts \
 	ts/pokerth_tr.ts \
+	ts/pokerth_vi.ts \
 	ts/pokerth_START_HERE.ts
 
 LIBS += -lpokerth_lib \
@@ -404,7 +405,7 @@ unix:!mac {
 	# QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
 	# QMAKE_LFLAGS += -Wl,--gc-sections
 	INCLUDEPATH += $${PREFIX}/include
-	LIBPATH += lib
+	QMAKE_LIBDIR += lib
 	!android{
 		LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
 		LIB_DIRS = $${PREFIX}/lib \

src/gui/qt/settingsdialog/settingsdialogimpl.cpp

@@ -96,6 +96,7 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
 	comboBox_switchLanguage->addItem(QString(tr("Swedish")+" "+QString::fromUtf8("(svenska)")),"sv");
 	comboBox_switchLanguage->addItem(QString(tr("Tamil")+" "+QString::fromUtf8("(தமிழ்)")),"ta");
 	comboBox_switchLanguage->addItem(QString(tr("Turkish")+" "+QString::fromUtf8("(Tϋrkçe)")),"tr");
+	comboBox_switchLanguage->addItem(QString(tr("Vietnamese")+" "+QString::fromUtf8("(Tiếng Việt)")),"vi");
 
 #ifdef GUI_800x480
 	connect( pushButton_ok, SIGNAL( clicked() ), this, SLOT( isAccepted() ) );

ts/pokerth_cz.ts

@@ -3333,6 +3333,27 @@ Další hráče můžete pozvat pravým kliknutím na jejich přezdívku v sezna
         <source>Time</source>
         <translation>Čas</translation>
     </message>
+    <message>
+        <source>Admin action ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total kickban</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to close the game:
+&quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to total kickban the player: &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>gameTable</name>
@@ -4230,7 +4251,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Server Password:</source>
-        <translation type="obsolete">Heslo serveru:</translation>
+        <translation type="unfinished">Heslo serveru:</translation>
     </message>
     <message>
         <source>Server Port:</source>
@@ -5048,6 +5069,14 @@ Opravdu se chcete vrátit do továrního nastavení?</translation>
         <source>Scottish Gaelic</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Galician</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnamese</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>startNetworkGameDialog</name>
@@ -5560,6 +5589,31 @@ Prosím, zkontrolujte své uživatelské jméno a heslo.</translation>
         <source>Start Network Game</source>
         <translation>Začít síťovou hru</translation>
     </message>
+    <message>
+        <source>The game was closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The game could not be closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The player was kicked and banned permanently.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The player was kicked, but could not be banned because it was a guest player.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The player was kicked, but could not be banned, 
+because the nick could not be found in the database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The player could not be found.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>tabs</name>

ts/pokerth_ptbr.ts

@@ -4021,6 +4021,27 @@ Sinta se avontade para convidar outro jogador clicando no apelido na lista de jo
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
+    <message>
+        <source>Admin action ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total kickban</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to close the game:
+&quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to total kickban the player: &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>gameTable</name>
@@ -5413,7 +5434,7 @@ p, li { white-space: pre-wrap; }(new line)
     </message>
     <message>
         <source>Server Password:</source>
-        <translation type="obsolete">Senha do Servidor:</translation>
+        <translation type="unfinished">Senha do Servidor:</translation>
     </message>
     <message>
         <source>Server Port:</source>
@@ -6293,6 +6314,14 @@ Voce tem certeza que deseja resetar para as configurações padrão?</translatio
         <source>Scottish Gaelic</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Galician</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnamese</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>startNetworkGameDialog</name>
@@ -6829,6 +6858,31 @@ Por favor escolha um nome diferente.</translation>
         <source>Start Network Game</source>
         <translation>Iniciar Jogo em rede</translation>
     </message>
+    <message>
+        <source>The game was closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The game could not be closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The player was kicked and banned permanently.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The player was kicked, but could not be banned because it was a guest player.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The player was kicked, but could not be banned, 
+because the nick could not be found in the database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The player could not be found.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>tabs</name>