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

src/gui/qt/gametable/myavatarlabel.cpp

@@ -434,7 +434,7 @@ void MyAvatarLabel::paintEvent(QPaintEvent*)
 	//		brush.setAlpha(130);
 			painter.setBrush(brush);
 			painter.setRenderHint(QPainter::Antialiasing);
-			painter.drawEllipse(1, 1, 10, 10);
+			painter.drawEllipse(1, 39, 10, 10);
 		}
 	}
 }

src/gui/qt/gui_800x480/settingsdialog_800x480.ui

@@ -342,7 +342,7 @@
              <item row="1" column="0">
               <widget class="QCheckBox" name="checkBox_showPingStateInAvatar">
                <property name="text">
-                <string>Show multicolor network state display in the avatar</string>
+                <string>Show network state color on the avatar</string>
                </property>
               </widget>
              </item>

src/gui/qt/settingsdialog.ui

@@ -347,7 +347,7 @@
              <item row="1" column="0">
               <widget class="QCheckBox" name="checkBox_showPingStateInAvatar">
                <property name="text">
-                <string>Show multicolor network state display in the corner of the avatar</string>
+                <string>Show network state color in the corner of the avatar</string>
                </property>
               </widget>
              </item>

ts/pokerth_cz.ts

@@ -483,6 +483,34 @@ Zkontrolujte, že jste nahrávali platný PokerTH soubor záznamů.</translation
         <source>Add/Edit/Remove tooltip</source>
         <translation>Přidat/Upravit/Odstranit text</translation>
     </message>
+    <message>
+        <source>Unignore Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server response times</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimum: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximum: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You will receive chat messages and game invitations from this user again!&lt;br&gt;Do you really want to remove player &lt;b&gt;%1&lt;/b&gt; from your ignore list?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ServerListDialog</name>
@@ -3415,6 +3443,22 @@ Další hráče můžete pozvat pravým kliknutím na jejich přezdívku v sezna
         <source>Spectators (%1)</source>
         <translation>Přihlížející (%1)</translation>
     </message>
+    <message>
+        <source>Unignore player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unignore %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unignore player ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You will receive chat messages and game invitations from this user again!&lt;br&gt;Do you really want to remove player &lt;b&gt;%1&lt;/b&gt; from your ignore list?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>gameTable</name>
@@ -4822,6 +4866,14 @@ p, li { white-space: pre-wrap; }
         <source>Allow spectators to watch the game</source>
         <translation>Povolit přihlíženícím sledovat hru</translation>
     </message>
+    <message>
+        <source>Show network state color on the avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show network state color in the corner of the avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>settingsDialogImpl</name>

ts/pokerth_ptbr.ts

@@ -491,6 +491,34 @@ Por Favor, verifique se você está enviando o arquivo de log valido do PokerTH.
         <source>Add/Edit/Remove tooltip</source>
         <translation></translation>
     </message>
+    <message>
+        <source>Unignore Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server response times</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimum: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximum: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You will receive chat messages and game invitations from this user again!&lt;br&gt;Do you really want to remove player &lt;b&gt;%1&lt;/b&gt; from your ignore list?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ServerListDialog</name>
@@ -4096,6 +4124,22 @@ Sinta se avontade para convidar outro jogador clicando no apelido na lista de jo
         <source>Spectators (%1)</source>
         <translation>Espectadores (%1)</translation>
     </message>
+    <message>
+        <source>Unignore player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unignore %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unignore player ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You will receive chat messages and game invitations from this user again!&lt;br&gt;Do you really want to remove player &lt;b&gt;%1&lt;/b&gt; from your ignore list?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>gameTable</name>
@@ -6039,6 +6083,14 @@ p, li { white-space: pre-wrap; }
         <source>Allow spectators to watch the game</source>
         <translation>Permitir espectadores a assistirem o jogo</translation>
     </message>
+    <message>
+        <source>Show network state color on the avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show network state color in the corner of the avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>settingsDialogImpl</name>