From 5319fd7388a0603acfe8174cd2d558effff6af4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Mon, 14 Mar 2011 21:40:15 +0100
Subject: Fixed conflicting shortcut strings.


diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index fb629cd..bb661fb 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -83,10 +83,10 @@ QtMainWindow::QtMainWindow(QtSettingsProvider* settings, UIEventStream* uiEventS
 
 	QMenu* actionsMenu = new QMenu(tr("&Actions"), this);
 	menus_.push_back(actionsMenu);
-	QAction* editProfileAction = new QAction(tr("&Edit Profile"), this);
+	QAction* editProfileAction = new QAction(tr("Edit &Profile"), this);
 	connect(editProfileAction, SIGNAL(triggered()), SLOT(handleEditProfileAction()));
 	actionsMenu->addAction(editProfileAction);
-	QAction* joinMUCAction = new QAction(tr("&Enter Room"), this);
+	QAction* joinMUCAction = new QAction(tr("Enter &Room"), this);
 	connect(joinMUCAction, SIGNAL(triggered()), SLOT(handleJoinMUCAction()));
 	actionsMenu->addAction(joinMUCAction);
 	addUserAction_ = new QAction(tr("&Add Contact"), this);
diff --git a/Swift/Translations/swift_nl.ts b/Swift/Translations/swift_nl.ts
index d7cabc2..001046d 100644
--- a/Swift/Translations/swift_nl.ts
+++ b/Swift/Translations/swift_nl.ts
@@ -930,14 +930,6 @@ afbeelding</translation>
         <translation>&amp;Toon offline contacten</translation>
     </message>
     <message>
-        <source>&amp;Edit Profile</source>
-        <translation>&amp;Bewerk profiel</translation>
-    </message>
-    <message>
-        <source>&amp;Enter Room</source>
-        <translation>&amp;Kamer betreden</translation>
-    </message>
-    <message>
         <source>&amp;Add Contact</source>
         <translation>Contact &amp;toevoegen</translation>
     </message>
@@ -957,6 +949,14 @@ afbeelding</translation>
         <source>Notices</source>
         <translation>Berichten</translation>
     </message>
+    <message>
+        <source>Edit &amp;Profile</source>
+        <translation>Bewerk &amp;profiel</translation>
+    </message>
+    <message>
+        <source>Enter &amp;Room</source>
+        <translation>&amp;Kamer betreden</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtNameWidget</name>
-- 
cgit v0.10.2-6-g49f6