From 1d111e33e5a936cdf6f21e5a342003f1fcee95f0 Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Fri, 20 Sep 2013 23:21:26 +0100 Subject: [PATCH] Updated translation strings, files to get rid of trailing spaces. --- resources/l10n/es/LC_MESSAGES/boss.po | 65 +++++++++++------------ resources/l10n/ru/LC_MESSAGES/boss.po | 76 ++++++++++++++------------- resources/l10n/template.pot | 58 ++++++++++---------- resources/l10n/zh/LC_MESSAGES/boss.po | 74 +++++++++++++------------- src/backend/game.cpp | 14 ++--- src/backend/generators.h | 12 ++--- src/backend/network.cpp | 2 +- src/backend/parsers.h | 8 +-- src/gui/main.cpp | 7 ++- 9 files changed, 155 insertions(+), 161 deletions(-) diff --git a/resources/l10n/es/LC_MESSAGES/boss.po b/resources/l10n/es/LC_MESSAGES/boss.po index 85960a3e..10e20dd2 100644 --- a/resources/l10n/es/LC_MESSAGES/boss.po +++ b/resources/l10n/es/LC_MESSAGES/boss.po @@ -1,12 +1,12 @@ msgid "" msgstr "" -"Project-Id-Version: BOSS 2.1.0\n" +"Project-Id-Version: BOSS v3.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-20 22:40+0100\n" -"PO-Revision-Date: 2013-09-20 22:56+0100\n" +"POT-Creation-Date: 2013-09-20 23:15+0100\n" +"PO-Revision-Date: 2013-09-20 23:17+0100\n" "Last-Translator: \n" -"Language-Team: LANGUAGE \n" -"Language: spanish\n" +"Language-Team: \n" +"Language: Spanish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,24 +25,24 @@ msgstr "" #: backend/game.cpp:248 #: backend/game.cpp:307 -msgid "libloadorder failed to create a game handle. Details: " +msgid "libloadorder failed to create a game handle. Details:" msgstr "" #: backend/game.cpp:260 #: backend/game.cpp:319 -msgid "libloadorder failed to initialise game master file support. Details: " +msgid "libloadorder failed to initialise game master file support. Details:" msgstr "" #: backend/game.cpp:270 -msgid "libloadorder failed to get the active plugins list. Details: " +msgid "libloadorder failed to get the active plugins list. Details:" msgstr "" #: backend/game.cpp:341 -msgid "libloadorder failed to set the load order. Details: " +msgid "libloadorder failed to set the load order. Details:" msgstr "" #: backend/game.cpp:360 -msgid "Could not create BOSS folder for game. Details: " +msgid "Could not create BOSS folder for game. Details:" msgstr "" #: backend/helpers.cpp:140 @@ -78,7 +78,7 @@ msgid "Git operation failed. Error: %1%" msgstr "" #: backend/network.cpp:314 -msgid "Masterlist revision " +msgid "Masterlist revision" msgstr "" #: gui/settings.cpp:40 @@ -204,8 +204,8 @@ msgstr "" #: gui/main.cpp:960 #: gui/main.cpp:976 #: gui/main.cpp:991 -#: gui/main.cpp:1099 -#: gui/main.cpp:1144 +#: gui/main.cpp:1098 +#: gui/main.cpp:1143 #: gui/editor.cpp:393 #: gui/editor.cpp:425 #: gui/editor.cpp:446 @@ -289,11 +289,11 @@ msgid "Error: Settings parsing failed. %1%" msgstr "" #: gui/main.cpp:264 -msgid "Error: could not apply translation." +msgid "Error: Could not apply translation." msgstr "Error: No se pudo aplicar la traducción." #: gui/main.cpp:274 -msgid "Error: the selected language is not available on this system." +msgid "Error: The selected language is not available on this system." msgstr "" #: gui/main.cpp:287 @@ -438,30 +438,30 @@ msgstr "BOSS: Configuracion" msgid "Error: \"%1%\" cannot be found." msgstr "Error: \"%1%\" no se puede encontrar." -#: gui/main.cpp:1003 +#: gui/main.cpp:1002 msgid "A load order optimisation tool for games using the Elder Scrolls Plugin/Master system." msgstr "" -#: gui/main.cpp:1027 +#: gui/main.cpp:1026 msgid "Up" msgstr "" -#: gui/main.cpp:1028 +#: gui/main.cpp:1027 msgid "Down" msgstr "" -#: gui/main.cpp:1031 +#: gui/main.cpp:1030 msgid "Load Order" msgstr "" -#: gui/main.cpp:1053 +#: gui/main.cpp:1052 msgid "" "Please submit any alterations made for reasons other than user preference \n" "to the BOSS team so that they may include the changes in the masterlist." msgstr "" -#: gui/main.cpp:1098 -#: gui/main.cpp:1143 +#: gui/main.cpp:1097 +#: gui/main.cpp:1142 msgid "Error: Cannot load \"%1%\" before \"%2%\"." msgstr "Error: Ordenar %1% antes de %2%" @@ -714,11 +714,11 @@ msgstr "" #: backend/parsers.h:423 #: backend/parsers.h:506 -msgid "Invalid file path: " +msgid "Invalid file path:" msgstr "" #: backend/parsers.h:471 -msgid "Invalid folder path: " +msgid "Invalid folder path:" msgstr "" #: backend/parsers.h:488 @@ -730,20 +730,20 @@ msgid "Expected \"%1%\" at \"%2%\"." msgstr "" #: backend/generators.h:80 -msgid "Note: " +msgid "Note:" msgstr "Nota:" #: backend/generators.h:82 -msgid "Bash Tag Suggestion(s): " +msgid "Bash Tag Suggestion(s):" msgstr "Bash Sugerencia de Tag(s):" #: backend/generators.h:84 -msgid "Warning: " +msgid "Warning:" msgstr "Adverten:" #: backend/generators.h:86 -msgid "Error: " -msgstr "Errores: " +msgid "Error:" +msgstr "Errores:" #: backend/generators.h:155 msgid "BOSS Report" @@ -802,16 +802,11 @@ msgid "Number of Errors" msgstr "" #: backend/generators.h:364 -#, fuzzy msgid "Version:" msgstr "Version:" #: backend/generators.h:381 -msgid "Add " -msgstr "" - -#: backend/generators.h:383 -msgid "Remove " +msgid "Add %1%." msgstr "" #: backend/generators.h:419 diff --git a/resources/l10n/ru/LC_MESSAGES/boss.po b/resources/l10n/ru/LC_MESSAGES/boss.po index b7880a01..b706fd3d 100644 --- a/resources/l10n/ru/LC_MESSAGES/boss.po +++ b/resources/l10n/ru/LC_MESSAGES/boss.po @@ -1,11 +1,11 @@ msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: BOSS v3.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-20 22:40+0100\n" -"PO-Revision-Date: 2013-09-20 22:41+0100\n" +"POT-Creation-Date: 2013-09-20 23:15+0100\n" +"PO-Revision-Date: 2013-09-20 23:17+0100\n" "Last-Translator: \n" -"Language-Team: \n" +"Language-Team: Russian\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,25 +25,28 @@ msgstr "" #: backend/game.cpp:248 #: backend/game.cpp:307 -msgid "libloadorder failed to create a game handle. Details: " -msgstr "" +#, fuzzy +msgid "libloadorder failed to create a game handle. Details:" +msgstr "Не удалось получить замечания к выпуску. Детали: %1%" #: backend/game.cpp:260 #: backend/game.cpp:319 -msgid "libloadorder failed to initialise game master file support. Details: " -msgstr "" +#, fuzzy +msgid "libloadorder failed to initialise game master file support. Details:" +msgstr "Не удалось получить замечания к выпуску. Детали: %1%" #: backend/game.cpp:270 -msgid "libloadorder failed to get the active plugins list. Details: " -msgstr "" +#, fuzzy +msgid "libloadorder failed to get the active plugins list. Details:" +msgstr "Не удалось получить замечания к выпуску. Детали: %1%" #: backend/game.cpp:341 #, fuzzy -msgid "libloadorder failed to set the load order. Details: " +msgid "libloadorder failed to set the load order. Details:" msgstr "Не удалось получить замечания к выпуску. Детали: %1%" #: backend/game.cpp:360 -msgid "Could not create BOSS folder for game. Details: " +msgid "Could not create BOSS folder for game. Details:" msgstr "" #: backend/helpers.cpp:140 @@ -82,7 +85,7 @@ msgstr "Критическая ошибка: %1%" #: backend/network.cpp:314 #, fuzzy -msgid "Masterlist revision " +msgid "Masterlist revision" msgstr "Мастерлист" #: gui/settings.cpp:40 @@ -219,8 +222,8 @@ msgstr "" #: gui/main.cpp:960 #: gui/main.cpp:976 #: gui/main.cpp:991 -#: gui/main.cpp:1099 -#: gui/main.cpp:1144 +#: gui/main.cpp:1098 +#: gui/main.cpp:1143 #: gui/editor.cpp:393 #: gui/editor.cpp:425 #: gui/editor.cpp:446 @@ -315,11 +318,11 @@ msgstr "Ошибка: Передача данных не удалась." #: gui/main.cpp:264 #, fuzzy -msgid "Error: could not apply translation." +msgid "Error: Could not apply translation." msgstr "Ошибка: Невозможно применить перевод: %1%" #: gui/main.cpp:274 -msgid "Error: the selected language is not available on this system." +msgid "Error: The selected language is not available on this system." msgstr "" #: gui/main.cpp:287 @@ -475,31 +478,31 @@ msgstr "BOSS: Настройки" msgid "Error: \"%1%\" cannot be found." msgstr "Ошибка: \"%1%\" не найден" -#: gui/main.cpp:1003 +#: gui/main.cpp:1002 msgid "A load order optimisation tool for games using the Elder Scrolls Plugin/Master system." msgstr "" -#: gui/main.cpp:1027 +#: gui/main.cpp:1026 msgid "Up" msgstr "" -#: gui/main.cpp:1028 +#: gui/main.cpp:1027 msgid "Down" msgstr "" -#: gui/main.cpp:1031 +#: gui/main.cpp:1030 #, fuzzy msgid "Load Order" msgstr "Порядок загрузки восстановлен" -#: gui/main.cpp:1053 +#: gui/main.cpp:1052 msgid "" "Please submit any alterations made for reasons other than user preference \n" "to the BOSS team so that they may include the changes in the masterlist." msgstr "" -#: gui/main.cpp:1098 -#: gui/main.cpp:1143 +#: gui/main.cpp:1097 +#: gui/main.cpp:1142 #, fuzzy msgid "Error: Cannot load \"%1%\" before \"%2%\"." msgstr "Сортировать %1% перед %2%" @@ -775,12 +778,14 @@ msgstr "" #: backend/parsers.h:423 #: backend/parsers.h:506 -msgid "Invalid file path: " -msgstr "" +#, fuzzy +msgid "Invalid file path:" +msgstr "Установленные плагины" #: backend/parsers.h:471 -msgid "Invalid folder path: " -msgstr "" +#, fuzzy +msgid "Invalid folder path:" +msgstr "Установленные плагины" #: backend/parsers.h:488 #, fuzzy @@ -793,21 +798,22 @@ msgstr "" #: backend/generators.h:80 #, fuzzy -msgid "Note: " +msgid "Note:" msgstr "Примечание" #: backend/generators.h:82 #, fuzzy -msgid "Bash Tag Suggestion(s): " +msgid "Bash Tag Suggestion(s):" msgstr "Bash-теги" #: backend/generators.h:84 #, fuzzy -msgid "Warning: " +msgid "Warning:" msgstr "Предупреждение" #: backend/generators.h:86 -msgid "Error: " +#, fuzzy +msgid "Error:" msgstr "Ошибка: " #: backend/generators.h:155 @@ -879,11 +885,7 @@ msgid "Version:" msgstr "Версия: " #: backend/generators.h:381 -msgid "Add " -msgstr "" - -#: backend/generators.h:383 -msgid "Remove " +msgid "Add %1%." msgstr "" #: backend/generators.h:419 diff --git a/resources/l10n/template.pot b/resources/l10n/template.pot index 69427eef..60d6d6bc 100755 --- a/resources/l10n/template.pot +++ b/resources/l10n/template.pot @@ -2,10 +2,10 @@ msgid "" msgstr "" "Project-Id-Version: BOSS v3.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-20 22:40+0100\n" -"PO-Revision-Date: 2013-09-20 22:40+0100\n" +"POT-Creation-Date: 2013-09-20 23:15+0100\n" +"PO-Revision-Date: 2013-09-20 23:16+0100\n" "Last-Translator: \n" -"Language-Team: BOSS Team\n" +"Language-Team: \n" "Language: English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,24 +31,24 @@ msgstr "" #: backend/game.cpp:248 #: backend/game.cpp:307 -msgid "libloadorder failed to create a game handle. Details: " +msgid "libloadorder failed to create a game handle. Details:" msgstr "" #: backend/game.cpp:260 #: backend/game.cpp:319 -msgid "libloadorder failed to initialise game master file support. Details: " +msgid "libloadorder failed to initialise game master file support. Details:" msgstr "" #: backend/game.cpp:270 -msgid "libloadorder failed to get the active plugins list. Details: " +msgid "libloadorder failed to get the active plugins list. Details:" msgstr "" #: backend/game.cpp:341 -msgid "libloadorder failed to set the load order. Details: " +msgid "libloadorder failed to set the load order. Details:" msgstr "" #: backend/game.cpp:360 -msgid "Could not create BOSS folder for game. Details: " +msgid "Could not create BOSS folder for game. Details:" msgstr "" #: backend/helpers.cpp:140 @@ -84,7 +84,7 @@ msgid "Git operation failed. Error: %1%" msgstr "" #: backend/network.cpp:314 -msgid "Masterlist revision " +msgid "Masterlist revision" msgstr "" #: gui/settings.cpp:40 @@ -210,8 +210,8 @@ msgstr "" #: gui/main.cpp:960 #: gui/main.cpp:976 #: gui/main.cpp:991 -#: gui/main.cpp:1099 -#: gui/main.cpp:1144 +#: gui/main.cpp:1098 +#: gui/main.cpp:1143 #: gui/editor.cpp:393 #: gui/editor.cpp:425 #: gui/editor.cpp:446 @@ -295,11 +295,11 @@ msgid "Error: Settings parsing failed. %1%" msgstr "" #: gui/main.cpp:264 -msgid "Error: could not apply translation." +msgid "Error: Could not apply translation." msgstr "" #: gui/main.cpp:274 -msgid "Error: the selected language is not available on this system." +msgid "Error: The selected language is not available on this system." msgstr "" #: gui/main.cpp:287 @@ -444,30 +444,30 @@ msgstr "" msgid "Error: \"%1%\" cannot be found." msgstr "" -#: gui/main.cpp:1003 +#: gui/main.cpp:1002 msgid "A load order optimisation tool for games using the Elder Scrolls Plugin/Master system." msgstr "" -#: gui/main.cpp:1027 +#: gui/main.cpp:1026 msgid "Up" msgstr "" -#: gui/main.cpp:1028 +#: gui/main.cpp:1027 msgid "Down" msgstr "" -#: gui/main.cpp:1031 +#: gui/main.cpp:1030 msgid "Load Order" msgstr "" -#: gui/main.cpp:1053 +#: gui/main.cpp:1052 msgid "" "Please submit any alterations made for reasons other than user preference \n" "to the BOSS team so that they may include the changes in the masterlist." msgstr "" -#: gui/main.cpp:1098 -#: gui/main.cpp:1143 +#: gui/main.cpp:1097 +#: gui/main.cpp:1142 msgid "Error: Cannot load \"%1%\" before \"%2%\"." msgstr "" @@ -720,11 +720,11 @@ msgstr "" #: backend/parsers.h:423 #: backend/parsers.h:506 -msgid "Invalid file path: " +msgid "Invalid file path:" msgstr "" #: backend/parsers.h:471 -msgid "Invalid folder path: " +msgid "Invalid folder path:" msgstr "" #: backend/parsers.h:488 @@ -736,19 +736,19 @@ msgid "Expected \"%1%\" at \"%2%\"." msgstr "" #: backend/generators.h:80 -msgid "Note: " +msgid "Note:" msgstr "" #: backend/generators.h:82 -msgid "Bash Tag Suggestion(s): " +msgid "Bash Tag Suggestion(s):" msgstr "" #: backend/generators.h:84 -msgid "Warning: " +msgid "Warning:" msgstr "" #: backend/generators.h:86 -msgid "Error: " +msgid "Error:" msgstr "" #: backend/generators.h:155 @@ -812,11 +812,7 @@ msgid "Version:" msgstr "" #: backend/generators.h:381 -msgid "Add " -msgstr "" - -#: backend/generators.h:383 -msgid "Remove " +msgid "Add %1%." msgstr "" #: backend/generators.h:419 diff --git a/resources/l10n/zh/LC_MESSAGES/boss.po b/resources/l10n/zh/LC_MESSAGES/boss.po index 36864224..3ce4a7c0 100644 --- a/resources/l10n/zh/LC_MESSAGES/boss.po +++ b/resources/l10n/zh/LC_MESSAGES/boss.po @@ -1,9 +1,9 @@ msgid "" msgstr "" -"Project-Id-Version: Better Oblivion Mod Manager 2.1\n" +"Project-Id-Version: BOSS v3.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-20 22:40+0100\n" -"PO-Revision-Date: 2013-09-20 22:42+0100\n" +"POT-Creation-Date: 2013-09-20 23:15+0100\n" +"PO-Revision-Date: 2013-09-20 23:17+0100\n" "Last-Translator: \n" "Language-Team: 上古卷轴爱好者 \n" "Language: Simplified Chinese\n" @@ -25,25 +25,28 @@ msgstr "" #: backend/game.cpp:248 #: backend/game.cpp:307 -msgid "libloadorder failed to create a game handle. Details: " -msgstr "" +#, fuzzy +msgid "libloadorder failed to create a game handle. Details:" +msgstr "无法获取发行说明。详细信息：%1%" #: backend/game.cpp:260 #: backend/game.cpp:319 -msgid "libloadorder failed to initialise game master file support. Details: " -msgstr "" +#, fuzzy +msgid "libloadorder failed to initialise game master file support. Details:" +msgstr "无法获取发行说明。详细信息：%1%" #: backend/game.cpp:270 -msgid "libloadorder failed to get the active plugins list. Details: " -msgstr "" +#, fuzzy +msgid "libloadorder failed to get the active plugins list. Details:" +msgstr "无法获取发行说明。详细信息：%1%" #: backend/game.cpp:341 #, fuzzy -msgid "libloadorder failed to set the load order. Details: " +msgid "libloadorder failed to set the load order. Details:" msgstr "无法获取发行说明。详细信息：%1%" #: backend/game.cpp:360 -msgid "Could not create BOSS folder for game. Details: " +msgid "Could not create BOSS folder for game. Details:" msgstr "" #: backend/helpers.cpp:140 @@ -82,7 +85,7 @@ msgstr "严重错误：%1%" #: backend/network.cpp:314 #, fuzzy -msgid "Masterlist revision " +msgid "Masterlist revision" msgstr "masterlist" #: gui/settings.cpp:40 @@ -219,8 +222,8 @@ msgstr "" #: gui/main.cpp:960 #: gui/main.cpp:976 #: gui/main.cpp:991 -#: gui/main.cpp:1099 -#: gui/main.cpp:1144 +#: gui/main.cpp:1098 +#: gui/main.cpp:1143 #: gui/editor.cpp:393 #: gui/editor.cpp:425 #: gui/editor.cpp:446 @@ -315,11 +318,11 @@ msgstr "错误：Data转换失败。" #: gui/main.cpp:264 #, fuzzy -msgid "Error: could not apply translation." +msgid "Error: Could not apply translation." msgstr "错误：无法加载翻译包：%1%" #: gui/main.cpp:274 -msgid "Error: the selected language is not available on this system." +msgid "Error: The selected language is not available on this system." msgstr "" #: gui/main.cpp:287 @@ -475,31 +478,31 @@ msgstr "BOSS：设置" msgid "Error: \"%1%\" cannot be found." msgstr "错误：找不到\"%1%\"。" -#: gui/main.cpp:1003 +#: gui/main.cpp:1002 msgid "A load order optimisation tool for games using the Elder Scrolls Plugin/Master system." msgstr "" -#: gui/main.cpp:1027 +#: gui/main.cpp:1026 msgid "Up" msgstr "" -#: gui/main.cpp:1028 +#: gui/main.cpp:1027 msgid "Down" msgstr "" -#: gui/main.cpp:1031 +#: gui/main.cpp:1030 #, fuzzy msgid "Load Order" msgstr "已恢复排序" -#: gui/main.cpp:1053 +#: gui/main.cpp:1052 msgid "" "Please submit any alterations made for reasons other than user preference \n" "to the BOSS team so that they may include the changes in the masterlist." msgstr "" -#: gui/main.cpp:1098 -#: gui/main.cpp:1143 +#: gui/main.cpp:1097 +#: gui/main.cpp:1142 #, fuzzy msgid "Error: Cannot load \"%1%\" before \"%2%\"." msgstr "将%1%排在%2%前面" @@ -775,12 +778,14 @@ msgstr "" #: backend/parsers.h:423 #: backend/parsers.h:506 -msgid "Invalid file path: " -msgstr "" +#, fuzzy +msgid "Invalid file path:" +msgstr "已安装的插件" #: backend/parsers.h:471 -msgid "Invalid folder path: " -msgstr "" +#, fuzzy +msgid "Invalid folder path:" +msgstr "已安装的插件" #: backend/parsers.h:488 #, fuzzy @@ -793,21 +798,22 @@ msgstr "" #: backend/generators.h:80 #, fuzzy -msgid "Note: " +msgid "Note:" msgstr "注意" #: backend/generators.h:82 #, fuzzy -msgid "Bash Tag Suggestion(s): " +msgid "Bash Tag Suggestion(s):" msgstr "Bash标签建议" #: backend/generators.h:84 #, fuzzy -msgid "Warning: " +msgid "Warning:" msgstr "警告" #: backend/generators.h:86 -msgid "Error: " +#, fuzzy +msgid "Error:" msgstr "错误：" #: backend/generators.h:155 @@ -879,11 +885,7 @@ msgid "Version:" msgstr "版本：" #: backend/generators.h:381 -msgid "Add " -msgstr "" - -#: backend/generators.h:383 -msgid "Remove " +msgid "Add %1%." msgstr "" #: backend/generators.h:419 diff --git a/src/backend/game.cpp b/src/backend/game.cpp index 8ed311f8..6668fa50 100644 --- a/src/backend/game.cpp +++ b/src/backend/game.cpp @@ -245,7 +245,7 @@ namespace boss { const char * e; lo_get_error_message(&e); BOOST_LOG_TRIVIAL(error) << "libloadorder failed to create a game handle. Details: " << e; - string err = lc::translate("libloadorder failed to create a game handle. Details: ").str() + e; + string err = lc::translate("libloadorder failed to create a game handle. Details:").str() + " " + e; lo_cleanup(); throw error(error::liblo_error, err); } @@ -257,7 +257,7 @@ namespace boss { lo_get_error_message(&e); lo_destroy_handle(gh); BOOST_LOG_TRIVIAL(error) << "libloadorder failed to initialise game master file support. Details: " << e; - string err = lc::translate("libloadorder failed to initialise game master file support. Details: ").str() + e; + string err = lc::translate("libloadorder failed to initialise game master file support. Details:").str() + " " + e; lo_cleanup(); throw error(error::liblo_error, err); } @@ -267,7 +267,7 @@ namespace boss { lo_get_error_message(&e); lo_destroy_handle(gh); BOOST_LOG_TRIVIAL(error) << "libloadorder failed to get the active plugins list. Details: " << e; - string err = lc::translate("libloadorder failed to get the active plugins list. Details: ").str() + e; + string err = lc::translate("libloadorder failed to get the active plugins list. Details:").str() + " " + e; lo_cleanup(); throw error(error::liblo_error, err); } @@ -304,7 +304,7 @@ namespace boss { const char * e; lo_get_error_message(&e); BOOST_LOG_TRIVIAL(error) << "libloadorder failed to create a game handle. Details: " << e; - string err = lc::translate("libloadorder failed to create a game handle. Details: ").str() + e; + string err = lc::translate("libloadorder failed to create a game handle. Details:").str() + " " + e; lo_cleanup(); throw error(error::liblo_error, err); } @@ -316,7 +316,7 @@ namespace boss { lo_get_error_message(&e); lo_destroy_handle(gh); BOOST_LOG_TRIVIAL(error) << "libloadorder failed to initialise game master file support. Details: " << e; - string err = lc::translate("libloadorder failed to initialise game master file support. Details: ").str() + e; + string err = lc::translate("libloadorder failed to initialise game master file support. Details:").str() + " " + e; lo_cleanup(); throw error(error::liblo_error, err); } @@ -338,7 +338,7 @@ namespace boss { lo_get_error_message(&e); lo_destroy_handle(gh); BOOST_LOG_TRIVIAL(error) << "libloadorder failed to set the load order. Details: " << e; - string err = lc::translate("libloadorder failed to set the load order. Details: ").str() + e; + string err = lc::translate("libloadorder failed to set the load order. Details:").str() + " " + e; lo_cleanup(); throw error(error::liblo_error, err); } @@ -357,7 +357,7 @@ namespace boss { fs::create_directory(g_path_local / bossFolderName); } catch (fs::filesystem_error& e) { BOOST_LOG_TRIVIAL(error) << "Could not create BOSS folder for game. Details: " << e.what(); - throw error(error::path_write_fail, lc::translate("Could not create BOSS folder for game. Details: ").str() + e.what()); + throw error(error::path_write_fail, lc::translate("Could not create BOSS folder for game. Details:").str() + " " + e.what()); } } } diff --git a/src/backend/generators.h b/src/backend/generators.h index acfd4245..8184deca 100644 --- a/src/backend/generators.h +++ b/src/backend/generators.h @@ -77,13 +77,13 @@ namespace boss { inline void WriteMessage(pugi::xml_node& listItem, unsigned int type, std::string content) { if (type == g_message_say) - content = boost::locale::translate("Note: ").str() + content; + content = boost::locale::translate("Note:").str() + " " + content; else if (type == g_message_tag) { - content = boost::locale::translate("Bash Tag Suggestion(s): ").str() + content; + content = boost::locale::translate("Bash Tag Suggestion(s):").str() + " " + content; } else if (type == g_message_warn) - content = boost::locale::translate("Warning: ").str() + content; + content = boost::locale::translate("Warning:").str() + " " + content; else - content = boost::locale::translate("Error: ").str() + content; + content = boost::locale::translate("Error:").str() + " " + content; size_t pos1f = content.find("\"file:"); size_t pos1h = content.find("\"http"); @@ -378,9 +378,9 @@ namespace boss { remove += ", " + jt->Name(); } if (!add.empty()) - content += boost::locale::translate("Add ").str() + add.substr(2) + ". "; + content += (boost::format(boost::locale::translate("Add %1%.")) % add.substr(2)).str() + " "; if (!remove.empty()) - content += boost::locale::translate("Remove ").str() + remove.substr(2) + ". "; + content += (boost::format(boost::locale::translate("Remove")) % remove.substr(2)).str() + " "; messages.push_back(Message(g_message_tag, content)); //Special type just for tag suggestions. } diff --git a/src/backend/network.cpp b/src/backend/network.cpp index f626dac6..b500db8c 100644 --- a/src/backend/network.cpp +++ b/src/backend/network.cpp @@ -311,7 +311,7 @@ namespace boss { //Roll back one revision if there's an error. BOOST_LOG_TRIVIAL(error) << "Masterlist parsing failed. Masterlist revision " + string(revision) + ": " + e.what(); - parsingErrors.push_back(boss::Message(boss::g_message_error, boost::locale::translate("Masterlist revision ").str() + string(revision) + ": " + e.what())); + parsingErrors.push_back(boss::Message(boss::g_message_error, boost::locale::translate("Masterlist revision").str() + " " + string(revision) + ": " + e.what())); } } while (parsingFailed); diff --git a/src/backend/parsers.h b/src/backend/parsers.h index fa053a5d..ee2c8fa1 100644 --- a/src/backend/parsers.h +++ b/src/backend/parsers.h @@ -420,7 +420,7 @@ namespace boss { if (!IsSafePath(file)) { BOOST_LOG_TRIVIAL(error) << "Invalid file path: " << file; - throw boss::error(boss::error::invalid_args, boost::locale::translate("Invalid file path: ").str() + file); + throw boss::error(boss::error::invalid_args, boost::locale::translate("Invalid file path:").str() + " " + file); } if (IsPlugin(file)) @@ -468,7 +468,7 @@ namespace boss { if (boost::contains(parent, "../../")){ BOOST_LOG_TRIVIAL(error) << "Invalid folder path: " << parent; - throw boss::error(boss::error::invalid_args, boost::locale::translate("Invalid folder path: ").str() + parent); + throw boss::error(boss::error::invalid_args, boost::locale::translate("Invalid folder path:").str() + " " + parent); } //Now we have a valid parent path and a regex filename. Check that @@ -485,7 +485,7 @@ namespace boss { regex = boost::regex(filename, boost::regex::perl|boost::regex::icase); } catch (boost::regex_error& e) { BOOST_LOG_TRIVIAL(error) << "Invalid regex string:" << filename; - throw boss::error(boss::error::invalid_args, boost::locale::translate("Invalid regex string:").str() + filename); + throw boss::error(boss::error::invalid_args, boost::locale::translate("Invalid regex string:").str() + " " + filename); } for (boost::filesystem::directory_iterator itr(parent_path); itr != boost::filesystem::directory_iterator(); ++itr) { @@ -503,7 +503,7 @@ namespace boss { if (!IsSafePath(file)) { BOOST_LOG_TRIVIAL(error) << "Invalid file path: " << file; - throw boss::error(boss::error::invalid_args, boost::locale::translate("Invalid file path: ").str() + file); + throw boss::error(boss::error::invalid_args, boost::locale::translate("Invalid file path:").str() + " " + file); } uint32_t crc; diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 85c6a3b0..d0f1fba3 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -261,7 +261,7 @@ bool BossGUI::OnInit() { if (!wxLoc->IsOk()) { BOOST_LOG_TRIVIAL(error) << "Could not load translations."; wxMessageBox( - translate("Error: could not apply translation."), + translate("Error: Could not apply translation."), translate("BOSS: Error"), wxOK | wxICON_ERROR, NULL); @@ -271,7 +271,7 @@ bool BossGUI::OnInit() { BOOST_LOG_TRIVIAL(error) << "The selected language is not available on this system."; wxMessageBox( - translate("Error: the selected language is not available on this system."), + translate("Error: The selected language is not available on this system."), translate("BOSS: Error"), wxOK | wxICON_ERROR, NULL); @@ -999,8 +999,7 @@ void Launcher::OnAbout(wxCommandEvent& event) { wxAboutDialogInfo aboutInfo; aboutInfo.SetName("BOSS"); aboutInfo.SetVersion(IntToString(g_version_major)+"."+IntToString(g_version_minor)+"."+IntToString(g_version_patch)); - aboutInfo.SetDescription(translate( - "A load order optimisation tool for games using the Elder Scrolls Plugin/Master system.")); + aboutInfo.SetDescription(translate("A load order optimisation tool for games using the Elder Scrolls Plugin/Master system.")); aboutInfo.SetCopyright("Copyright (C) 2009-2013 BOSS Development Team."); aboutInfo.SetWebSite("http://boss-developers.github.io"); aboutInfo.SetLicence("This program is free software: you can redistribute it and/or modify\n"