summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-02-14 21:00:48 +0100
committerPetr Mrázek <peterix@gmail.com>2014-02-14 21:00:48 +0100
commit5cf599673db88b39100ffca78e10bbe5e10200d7 (patch)
tree72f419036428b96a30daf2ab1f24762412ede9f9
parent65e30aa1184ab9d1106737fe91f0d58c9c5c3c3e (diff)
parent725e6a36bbe58823c4d1e7652a1fce316245eedc (diff)
downloadMultiMC-5cf599673db88b39100ffca78e10bbe5e10200d7.tar
MultiMC-5cf599673db88b39100ffca78e10bbe5e10200d7.tar.gz
MultiMC-5cf599673db88b39100ffca78e10bbe5e10200d7.tar.lz
MultiMC-5cf599673db88b39100ffca78e10bbe5e10200d7.tar.xz
MultiMC-5cf599673db88b39100ffca78e10bbe5e10200d7.zip
Merge https://github.com/p-schneider/MultiMC5 into develop
-rw-r--r--gui/dialogs/AboutDialog.ui2
-rw-r--r--translations/mmc_de.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/gui/dialogs/AboutDialog.ui b/gui/dialogs/AboutDialog.ui
index 64a355d3..b13c379f 100644
--- a/gui/dialogs/AboutDialog.ui
+++ b/gui/dialogs/AboutDialog.ui
@@ -201,7 +201,7 @@
</font>
</property>
<property name="text">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://github.com/Forkk/MultiMC5&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://github.com/MultiMC/MultiMC5&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://github.com/MultiMC/MultiMC5&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://github.com/MultiMC/MultiMC5&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
diff --git a/translations/mmc_de.ts b/translations/mmc_de.ts
index 7bca2272..67ea67f6 100644
--- a/translations/mmc_de.ts
+++ b/translations/mmc_de.ts
@@ -38,7 +38,7 @@
</message>
<message>
<location line="+15"/>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://github.com/Forkk/MultiMC5&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://github.com/MultiMC/MultiMC5&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://github.com/MultiMC/MultiMC5&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://github.com/MultiMC/MultiMC5&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation></translation>
</message>
<message>