Swiftdiff options
| -rw-r--r-- | Swift/Controllers/EventNotifier.cpp | 3 | ||||
| -rw-r--r-- | Swift/QtUI/QtStrings.h | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtSubscriptionRequestWindow.cpp | 2 | ||||
| -rw-r--r-- | Swift/Translations/swift_nl.ts | 21 |
4 files changed, 26 insertions, 2 deletions
diff --git a/Swift/Controllers/EventNotifier.cpp b/Swift/Controllers/EventNotifier.cpp index 055ed3e..645ee3c 100644 --- a/Swift/Controllers/EventNotifier.cpp +++ b/Swift/Controllers/EventNotifier.cpp @@ -9,6 +9,7 @@ #include <boost/bind.hpp> #include <Swift/Controllers/Intl.h> +#include <Swiften/Base/format.h> #include "Swift/Controllers/XMPPEvents/EventController.h" #include "SwifTools/Notifier/Notifier.h" #include "Swiften/Avatars/AvatarManager.h" @@ -47,7 +48,7 @@ void EventNotifier::handleEventAdded(boost::shared_ptr<StanzaEvent> event) { else if(boost::shared_ptr<SubscriptionRequestEvent> subscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(event)) { JID jid = subscriptionEvent->getJID(); std::string title = ""; - std::string message = nickResolver->jidToNick(jid) + " wants to add you to his/her roster"; + std::string message = str(format(QT_TRANSLATE_NOOP("", "%1% wants to add you to his/her contact list")) % nickResolver->jidToNick(jid)); notifier->showMessage(Notifier::SystemMessage, title, message, boost::filesystem::path(), boost::function<void()>()); } else if(boost::shared_ptr<ErrorEvent> errorEvent = boost::dynamic_pointer_cast<ErrorEvent>(event)) { diff --git a/Swift/QtUI/QtStrings.h b/Swift/QtUI/QtStrings.h index 13fdd73..39e6a80 100644 --- a/Swift/QtUI/QtStrings.h +++ b/Swift/QtUI/QtStrings.h @@ -16,6 +16,8 @@ QT_TRANSLATE_NOOP3("QApplication", "QT_LAYOUT_DIRECTION", "Translate this to LTR for left-to-right or RTL for right-to-left languages"); +QT_TRANSLATE_NOOP("QWebPage", "Copy Link"); + QT_TRANSLATE_NOOP("QWizard", "< &Back"); QT_TRANSLATE_NOOP("QWizard", "&Finish"); QT_TRANSLATE_NOOP("QWizard", "&Help"); diff --git a/Swift/QtUI/QtSubscriptionRequestWindow.cpp b/Swift/QtUI/QtSubscriptionRequestWindow.cpp index 83b8b31..7828103 100644 --- a/Swift/QtUI/QtSubscriptionRequestWindow.cpp +++ b/Swift/QtUI/QtSubscriptionRequestWindow.cpp @@ -15,7 +15,7 @@ namespace Swift { QtSubscriptionRequestWindow::QtSubscriptionRequestWindow(boost::shared_ptr<SubscriptionRequestEvent> event, QWidget* parent) : QDialog(parent), event_(event) { - QString text = QString("%1 would like to add you to their roster.\n Would you like to add them to your roster and share your status when you're online? \n\nIf you choose to defer this choice, you'll be asked again when you next login.").arg(event->getJID().toString().c_str()); + QString text = QString(tr("%1 would like to add you to their contact list.\n Would you like to add them to your contact list and share your status when you're online? \n\nIf you choose to defer this choice, you will be asked again when you next login.")).arg(event->getJID().toString().c_str()); QVBoxLayout* layout = new QVBoxLayout(); QLabel* label = new QLabel(text, this); layout->addWidget(label); diff --git a/Swift/Translations/swift_nl.ts b/Swift/Translations/swift_nl.ts index 091631b..1e2fcef 100644 --- a/Swift/Translations/swift_nl.ts +++ b/Swift/Translations/swift_nl.ts @@ -408,6 +408,10 @@ <source>Error</source> <translation>Fout</translation> </message> + <message> + <source>%1% wants to add you to his/her contact list</source> + <translation>%1% wil u aan zijn/haar contactenlijst toevoegen</translation> + </message> </context> <context> <name>QApplication</name> @@ -460,6 +464,13 @@ </message> </context> <context> + <name>QWebPage</name> + <message> + <source>Copy Link</source> + <translation>Kopieer koppeling</translation> + </message> +</context> +<context> <name>QWizard</name> <message> <source>< &Back</source> @@ -1036,6 +1047,16 @@ afbeelding</translation> <source>Defer</source> <translation>Uitstellen</translation> </message> + <message> + <source>%1 would like to add you to their contact list. + Would you like to add them to your contact list and share your status when you're online? + +If you choose to defer this choice, you will be asked again when you next login.</source> + <translation>%1 wil u aan zijn/haar contactenlijst toevoegen. +Wilt u dit contact toevoegen aan uw contactenlijst, en uw aanwezigheid delen wanneer u aanwezig bent? + +Als u deze keuze uitstelt, zal deze vraag opnieuw gesteld worden wanneer u zich opnieuw aanmeldt.</translation> + </message> </context> <context> <name>Swift::QtTreeWidget</name> |