From 89ecd9601ff3717c5b0e8e603d56f5bd656743ed Mon Sep 17 00:00:00 2001
From: Pavol Babincak <scroolik@gmail.com>
Date: Fri, 27 Apr 2012 18:33:09 +0200
Subject: Added ellipsis to menu items which needs further input to complete
 action

This is recommended in HIGs for Gnome, OS X, Windows:
- http://developer.gnome.org/hig-book/3.0/menus-design.html.en
- https://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/TextStyle/TextStyle.html#//apple_ref/doc/uid/TP30000365-TPXREF126
- http://msdn.microsoft.com/en-us/library/aa511502.aspx#ellipses

Resolves: #1114

License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.

diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 05c78b3..9a3ce6b 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -99,20 +99,20 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
 
 	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);
+	addUserAction_ = new QAction(tr("&Add Contact…"), this);
 	connect(addUserAction_, SIGNAL(triggered(bool)), this, SLOT(handleAddUserActionTriggered(bool)));
 	actionsMenu->addAction(addUserAction_);
-	editUserAction_ = new QAction(tr("&Edit Selected Contact"), this);
+	editUserAction_ = new QAction(tr("&Edit Selected Contact…"), this);
 	connect(editUserAction_, SIGNAL(triggered(bool)), treeWidget_, SLOT(handleEditUserActionTriggered(bool)));
 	actionsMenu->addAction(editUserAction_);
 	editUserAction_->setEnabled(false);
-	chatUserAction_ = new QAction(tr("Start &Chat"), this);
+	chatUserAction_ = new QAction(tr("Start &Chat…"), this);
 	connect(chatUserAction_, SIGNAL(triggered(bool)), this, SLOT(handleChatUserActionTriggered(bool)));
 	actionsMenu->addAction(chatUserAction_);
 	serverAdHocMenu_ = new QMenu(tr("Run Server Command"), this);
diff --git a/Swift/Translations/swift_ca.ts b/Swift/Translations/swift_ca.ts
index 85d2c0c..8f29a30 100644
--- a/Swift/Translations/swift_ca.ts
+++ b/Swift/Translations/swift_ca.ts
@@ -1595,27 +1595,27 @@ Si esculls ajornar aquesta elecció, se&apos;t preguntarà de nou la propera veg
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Editar &amp;Perfil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Editar &amp;Perfil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>Entrar a &amp;Sala</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Entrar a &amp;Sala…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Afegir Contacte</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Afegir Contacte…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Editar Contacte Sel·leccionat</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Editar Contacte Sel·leccionat…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Començar &amp;Conversa</translation>
     </message>
     <message>
diff --git a/Swift/Translations/swift_de.ts b/Swift/Translations/swift_de.ts
index 6183099..0fee815 100644
--- a/Swift/Translations/swift_de.ts
+++ b/Swift/Translations/swift_de.ts
@@ -1532,27 +1532,27 @@
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>Edit &amp;Profile</source>
-        <translation>&amp;Profil editieren</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>&amp;Profil editieren…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="98"/>
-        <source>Enter &amp;Room</source>
-        <translation>Chat&amp;raum betreten</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Chat&amp;raum betreten…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="101"/>
-        <source>&amp;Add Contact</source>
-        <translation>Kont&amp;akt hinzufügen</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>Kont&amp;akt hinzufügen…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="104"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>Ausgewählten Kontakt &amp;editieren</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>Ausgewählten Kontakt &amp;editieren…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="108"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Gesprä&amp;ch beginnen</translation>
     </message>
     <message>
diff --git a/Swift/Translations/swift_es.ts b/Swift/Translations/swift_es.ts
index 2231ecf..8d7805f 100644
--- a/Swift/Translations/swift_es.ts
+++ b/Swift/Translations/swift_es.ts
@@ -1595,27 +1595,27 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Editar &amp;Perfil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Editar &amp;Perfil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>Entrar a &amp;Sala</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Entrar a &amp;Sala…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Añadir Contacto</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Añadir Contacto…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Editar Contacto Seleccionado</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Editar Contacto Seleccionado…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Comenzar &amp;Conversación</translation>
     </message>
     <message>
diff --git a/Swift/Translations/swift_fr.ts b/Swift/Translations/swift_fr.ts
index 44bb980..b95c0d1 100644
--- a/Swift/Translations/swift_fr.ts
+++ b/Swift/Translations/swift_fr.ts
@@ -1437,27 +1437,27 @@
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Editer le &amp;Profil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Editer le &amp;Profil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>Joindre un &amp;Salon</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Joindre un &amp;Salon…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Ajouter un Contact</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Ajouter un Contact…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Editer le Contact Sélectionné</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Editer le Contact Sélectionné…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Démarrer une &amp;Discussion</translation>
     </message>
     <message>
diff --git a/Swift/Translations/swift_gl.ts b/Swift/Translations/swift_gl.ts
index 00540a3..c189a1d 100644
--- a/Swift/Translations/swift_gl.ts
+++ b/Swift/Translations/swift_gl.ts
@@ -1441,27 +1441,27 @@
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Editar &amp;perfil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Editar &amp;perfil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>Entrar á &amp;sala</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Entrar á &amp;sala…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Engadir contacto</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Engadir contacto…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Editar contacto seleccionado</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Editar contacto seleccionado…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Comezar &amp;conversa</translation>
     </message>
     <message>
diff --git a/Swift/Translations/swift_hu.ts b/Swift/Translations/swift_hu.ts
index 30f98ec..54167e2 100644
--- a/Swift/Translations/swift_hu.ts
+++ b/Swift/Translations/swift_hu.ts
@@ -1136,23 +1136,23 @@
         <translation>&amp;Műveletek</translation>
     </message>
     <message>
-        <source>Edit &amp;Profile</source>
-        <translation>&amp;Profil szerkesztése</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>&amp;Profil szerkesztése…</translation>
     </message>
     <message>
-        <source>Enter &amp;Room</source>
-        <translation>Belépés &amp;szobába</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Belépés &amp;szobába…</translation>
     </message>
     <message>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Partner felvétele</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Partner felvétele…</translation>
     </message>
     <message>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Kiválasztott partner szerkesztése</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Kiválasztott partner szerkesztése…</translation>
     </message>
     <message>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Bes&amp;zélgetés kezdeményezése</translation>
     </message>
     <message>
diff --git a/Swift/Translations/swift_nl.ts b/Swift/Translations/swift_nl.ts
index 7e8bfbd..706fe41 100644
--- a/Swift/Translations/swift_nl.ts
+++ b/Swift/Translations/swift_nl.ts
@@ -1189,15 +1189,15 @@ afbeelding</translation>
         <translation>&amp;Toon offline contacten</translation>
     </message>
     <message>
-        <source>&amp;Add Contact</source>
-        <translation>Contact &amp;toevoegen</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>Contact &amp;toevoegen…</translation>
     </message>
     <message>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>Geselecteerde contact &amp;bewerken</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>Geselecteerde contact &amp;bewerken…</translation>
     </message>
     <message>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>&amp;Conversatie starten</translation>
     </message>
     <message>
@@ -1205,12 +1205,12 @@ afbeelding</translation>
         <translation>&amp;Afmelden</translation>
     </message>
     <message>
-        <source>Edit &amp;Profile</source>
-        <translation>Bewerk &amp;profiel</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Bewerk &amp;profiel…</translation>
     </message>
     <message>
-        <source>Enter &amp;Room</source>
-        <translation>&amp;Kamer betreden</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>&amp;Kamer betreden…</translation>
     </message>
     <message>
         <source>Run Server Command</source>
diff --git a/Swift/Translations/swift_pl.ts b/Swift/Translations/swift_pl.ts
index f471f4a..cc461a1 100644
--- a/Swift/Translations/swift_pl.ts
+++ b/Swift/Translations/swift_pl.ts
@@ -1437,27 +1437,27 @@
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Edytuj &amp;profil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Edytuj &amp;profil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>&amp;Wejdź do pokoju</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>&amp;Wejdź do pokoju…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Dodaj kontakt</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Dodaj kontakt…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Edytuj wybrany kontakt</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Edytuj wybrany kontakt…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>&amp;Rozpocznij rozmowę</translation>
     </message>
     <message>
diff --git a/Swift/Translations/swift_ru.ts b/Swift/Translations/swift_ru.ts
index c1a9a6c..059bb69 100644
--- a/Swift/Translations/swift_ru.ts
+++ b/Swift/Translations/swift_ru.ts
@@ -1504,27 +1504,27 @@
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Редактировать &amp;профиль</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Редактировать &amp;профиль…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>&amp;Войти в комнату</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>&amp;Войти в комнату…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Добавить контакт</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Добавить контакт…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Редактировать выделенный контакт</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Редактировать выделенный контакт…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Начать &amp;чат</translation>
     </message>
     <message>
diff --git a/Swift/Translations/swift_sk.ts b/Swift/Translations/swift_sk.ts
index 18c78e7..03f1e2c 100644
--- a/Swift/Translations/swift_sk.ts
+++ b/Swift/Translations/swift_sk.ts
@@ -2043,28 +2043,28 @@
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="102"/>
-        <source>Edit &amp;Profile</source>
-        <translation>Upraviť &amp;profil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>Upraviť &amp;profil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="105"/>
-        <source>Enter &amp;Room</source>
-        <translation>Vstúpiť do &amp;miestnosti</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>Vstúpiť do &amp;miestnosti…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="108"/>
-        <source>&amp;Add Contact</source>
-        <translation>Pridať &amp;kontakt</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>Pridať &amp;kontakt…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="111"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Upraviť vybraný kontakt</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Upraviť vybraný kontakt…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="115"/>
-        <source>Start &amp;Chat</source>
-        <translation>Začať &amp;rozhovor</translation>
+        <source>Start &amp;Chat…</source>
+        <translation>Začať &amp;rozhovor…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="121"/>
diff --git a/Swift/Translations/swift_sv.ts b/Swift/Translations/swift_sv.ts
index fdd0c98..b979dab 100644
--- a/Swift/Translations/swift_sv.ts
+++ b/Swift/Translations/swift_sv.ts
@@ -1445,27 +1445,27 @@
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="86"/>
-        <source>Edit &amp;Profile</source>
-        <translation>&amp;Redigera profil</translation>
+        <source>Edit &amp;Profile…</source>
+        <translation>&amp;Redigera profil…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="89"/>
-        <source>Enter &amp;Room</source>
-        <translation>&amp;Anslut till rum</translation>
+        <source>Enter &amp;Room…</source>
+        <translation>&amp;Anslut till rum…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="92"/>
-        <source>&amp;Add Contact</source>
-        <translation>&amp;Lägg till kontakt</translation>
+        <source>&amp;Add Contact…</source>
+        <translation>&amp;Lägg till kontakt…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="95"/>
-        <source>&amp;Edit Selected Contact</source>
-        <translation>&amp;Redigera markerad kontakt</translation>
+        <source>&amp;Edit Selected Contact…</source>
+        <translation>&amp;Redigera markerad kontakt…</translation>
     </message>
     <message>
         <location filename="../QtUI/QtMainWindow.cpp" line="99"/>
-        <source>Start &amp;Chat</source>
+        <source>Start &amp;Chat…</source>
         <translation>Starta &amp;chat</translation>
     </message>
     <message>
-- 
cgit v0.10.2-6-g49f6