diff options
| author | Manuel Schneider | 2014-05-06 15:25:13 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-05-06 15:25:13 +0200 |
| commit | 9d92e6f2202339de585b6bd5c3858e03b89651f0 (patch) | |
| tree | acb8e72d3b9f60fcad0ac4fa3af00db20a90133e /gui/client/toolbar.ui | |
| parent | Changes the approach of Qt Gui initialization to the member pointer approach.... (diff) | |
| parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
| download | pvs2-9d92e6f2202339de585b6bd5c3858e03b89651f0.tar.gz pvs2-9d92e6f2202339de585b6bd5c3858e03b89651f0.tar.xz pvs2-9d92e6f2202339de585b6bd5c3858e03b89651f0.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Conflicts:
gui/client/toolbar.ui
src/client/connectwindow/connectwindow.cpp
Diffstat (limited to 'gui/client/toolbar.ui')
| -rw-r--r-- | gui/client/toolbar.ui | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/client/toolbar.ui b/gui/client/toolbar.ui index 199eef2..3e39e16 100644 --- a/gui/client/toolbar.ui +++ b/gui/client/toolbar.ui @@ -100,7 +100,7 @@ QCheckBox::indicator:checked:pressed { <string>Menu</string> </property> <property name="text"> - <string notr="true">Menu</string> + <string>Menu</string> </property> </widget> </item> |