From 5a7f7781af9ad0f598f6442ffc0c7778afdd9104 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Tue, 23 Dec 2014 13:24:50 +0000 Subject: [PATCH 1/3] Some string fixes. --- src/main.cpp | 4 ++-- src/online/online_player_profile.cpp | 2 +- src/states_screens/main_menu_screen.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e6bbab2ae..a671e53e1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1131,8 +1131,8 @@ void askForInternetPermission() "anonymous hardware statistics to help with the development of STK. " "Would you like this feature to be enabled? (To change this setting " "at a later time, go to options, select tab " - "'User Interface', and edit \"Allow STK to connect to the " - "Internet\" and \"Allow STK to send anonymous HW statistics\")."), + "'User Interface', and edit \"Connect to the " + "Internet\" and \"Send anonymous HW statistics\")."), MessageDialog::MESSAGE_DIALOG_YESNO, new ConfirmServer(), true); } diff --git a/src/online/online_player_profile.cpp b/src/online/online_player_profile.cpp index 73d6682a9..78b6b993d 100644 --- a/src/online/online_player_profile.cpp +++ b/src/online/online_player_profile.cpp @@ -403,7 +403,7 @@ namespace Online } else if(to_notify.size() > 3) { - message = _("%d friends are now online.", + message = ngettext("%d friends are now online.", to_notify.size(), (int)to_notify.size()); } MessageQueue::add(MessageQueue::MT_FRIEND, message); diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp index e499568b0..da0dd1916 100644 --- a/src/states_screens/main_menu_screen.cpp +++ b/src/states_screens/main_menu_screen.cpp @@ -488,7 +488,7 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, new MessageDialog(_("You can not play online without internet access. " "If you want to play online, go to options, select " " tab 'User Interface', and edit " - "\"Allow STK to connect to the Internet\".")); + "\"Connect to the Internet\".")); return; } if (PlayerManager::getCurrentOnlineId()) @@ -513,7 +513,7 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, new MessageDialog(_("You can not download addons without internet access. " "If you want to download addons, go to options, select " " tab 'User Interface', and edit " - "\"Allow STK to connect to the Internet\".")); + "\"Connect to the Internet\".")); return; } AddonsScreen::getInstance()->push(); From ed56858321849014afee78a2b7fa1403c242a5a4 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Tue, 23 Dec 2014 16:21:47 +0100 Subject: [PATCH 2/3] Fixed a typo. --- data/gui/options_ui.stkgui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/gui/options_ui.stkgui b/data/gui/options_ui.stkgui index 479d369d1..1e7273744 100644 --- a/data/gui/options_ui.stkgui +++ b/data/gui/options_ui.stkgui @@ -58,7 +58,7 @@
-
From 38936fe79fe8dac3986fc8d2c55d2d6d6749b49f Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Wed, 24 Dec 2014 14:54:09 +0100 Subject: [PATCH 3/3] Removed ngettext, because tinygettext can't handle it. --- src/online/online_player_profile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/online/online_player_profile.cpp b/src/online/online_player_profile.cpp index 78b6b993d..73d6682a9 100644 --- a/src/online/online_player_profile.cpp +++ b/src/online/online_player_profile.cpp @@ -403,7 +403,7 @@ namespace Online } else if(to_notify.size() > 3) { - message = ngettext("%d friends are now online.", to_notify.size(), + message = _("%d friends are now online.", (int)to_notify.size()); } MessageQueue::add(MessageQueue::MT_FRIEND, message);