This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository springlobby.
commit a95faaa4c79a1ce241f8898ab3708e92b1163fea Author: Markus Koschany <[email protected]> Date: Sun Oct 11 13:35:07 2015 +0200 Drop spelling.patch. Merged upstream. --- debian/patches/series | 1 - debian/patches/spelling.patch | 727 ------------------------------------------ 2 files changed, 728 deletions(-) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 5299247..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -spelling.patch diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch deleted file mode 100644 index ec4d82a..0000000 --- a/debian/patches/spelling.patch +++ /dev/null @@ -1,727 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Thu, 1 Oct 2015 13:50:41 +0200 -Subject: spelling - -Forwarded: https://github.com/springlobby/springlobby/pull/569/ ---- - po/ar.po | 6 +++--- - po/cs.po | 8 ++++---- - po/da.po | 6 +++--- - po/de.po | 6 +++--- - po/el.po | 8 ++++---- - po/es.po | 6 +++--- - po/fi.po | 6 +++--- - po/fr.po | 8 ++++---- - po/it.po | 6 +++--- - po/pl.po | 6 +++--- - po/pt.po | 6 +++--- - po/ro.po | 8 ++++---- - po/ru.po | 6 +++--- - po/springlobby.pot | 6 +++--- - po/sv.po | 6 +++--- - po/uk.po | 6 +++--- - po/zh_CN.po | 8 ++++---- - src/autohost.cpp | 2 +- - src/crashreport.cpp | 2 +- - src/downloader/downloadsobserver.h | 2 +- - src/gui/hosting/battleroommmoptionstab.h | 2 +- - src/gui/options/chatoptionstab.cpp | 2 +- - src/lsl/src/lslunitsync/optionswrapper.cpp | 4 ++-- - src/lsl/src/lslunitsync/optionswrapper.h | 4 ++-- - src/springsettings/tab_simple.cpp | 2 +- - 25 files changed, 66 insertions(+), 66 deletions(-) - -diff --git a/po/ar.po b/po/ar.po -index c661ff4..c2c4742 100644 ---- a/po/ar.po -+++ b/po/ar.po -@@ -1019,7 +1019,7 @@ msgid "(Full country name not found)" - msgstr "" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "" - - #: src/crashreport.cpp:156 -@@ -3466,7 +3466,7 @@ msgid "Words to highlight in chat:" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5396,7 +5396,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/cs.po b/po/cs.po -index c81b92f..1879216 100644 ---- a/po/cs.po -+++ b/po/cs.po -@@ -1023,7 +1023,7 @@ msgid "(Full country name not found)" - msgstr "Plné jméno země nenalezeno" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "Systémové informace" - - #: src/crashreport.cpp:156 -@@ -3566,7 +3566,7 @@ msgid "Words to highlight in chat:" - msgstr "Slova k zvýraznění v chatu:" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "vložte ; rozdělený list" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5550,7 +5550,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -@@ -6542,7 +6542,7 @@ msgstr "" - #~ msgstr "Nebyl vybrán žádný mod." - - #, fuzzy --#~ msgid "you can also enter a ';' seperated list of usernames:" -+#~ msgid "you can also enter a ';' separated list of usernames:" - #~ msgstr "vložte ; rozdělený list" - - #, fuzzy -diff --git a/po/da.po b/po/da.po -index 2b4b463..db52826 100644 ---- a/po/da.po -+++ b/po/da.po -@@ -1022,7 +1022,7 @@ msgid "(Full country name not found)" - msgstr "(Hele landenavnet ikke fundet)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "System informationer" - - #: src/crashreport.cpp:156 -@@ -3472,7 +3472,7 @@ msgid "Words to highlight in chat:" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5410,7 +5410,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/de.po b/po/de.po -index 7bae1f3..469bab5 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -1020,7 +1020,7 @@ msgid "(Full country name not found)" - msgstr "(Vollen Ländernamen nicht gefunden)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "System Informationen" - - #: src/crashreport.cpp:156 -@@ -3540,7 +3540,7 @@ msgid "Words to highlight in chat:" - msgstr "Wörter die im Chat hervorgehoben werden sollen:" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "gib eine Liste mit ; als Trennzeichen ein" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5599,7 +5599,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/el.po b/po/el.po -index 2ab72c3..cfc67ba 100644 ---- a/po/el.po -+++ b/po/el.po -@@ -1024,7 +1024,7 @@ msgid "(Full country name not found)" - msgstr "(Δεν βρέθηκε ονομασία κράτους)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "Πληροφορίες συστήματος" - - #: src/crashreport.cpp:156 -@@ -3587,7 +3587,7 @@ msgid "Words to highlight in chat:" - msgstr "Λέξεις προς επισήμανση σε συνομιλίες:" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "Εισάγετε λίστα χωρισμένη με \";\"" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5671,7 +5671,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -@@ -7018,7 +7018,7 @@ msgstr "Καταγωγή" - #~ msgstr "Δεν επιλέχθηκε mod." - - #, fuzzy --#~ msgid "you can also enter a ';' seperated list of usernames:" -+#~ msgid "you can also enter a ';' separated list of usernames:" - #~ msgstr "Εισάγετε λίστα χωρισμένη με \";\"" - - #, fuzzy -diff --git a/po/es.po b/po/es.po -index f1f97a7..c8c1387 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -1023,7 +1023,7 @@ msgid "(Full country name not found)" - msgstr "(No se encontró el nombre completo del país)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "Información del sistema" - - #: src/crashreport.cpp:156 -@@ -3476,7 +3476,7 @@ msgid "Words to highlight in chat:" - msgstr "Palabras que se resaltarán en el chat:" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "ingrese una lista separada por ;" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5415,7 +5415,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/fi.po b/po/fi.po -index b9065c8..4b1d240 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -1023,7 +1023,7 @@ msgid "(Full country name not found)" - msgstr "(Täyttä maan nimeä ei löytynyt)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "Järjestelmän tiedot" - - #: src/crashreport.cpp:156 -@@ -3537,7 +3537,7 @@ msgid "Words to highlight in chat:" - msgstr "Sanat jotka korostetaan keskusteluissa:" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5510,7 +5510,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/fr.po b/po/fr.po -index ac577ed..3195545 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -1023,7 +1023,7 @@ msgid "(Full country name not found)" - msgstr "(nom complet du pays non trouvé)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "Information sur le système" - - #: src/crashreport.cpp:156 -@@ -3556,7 +3556,7 @@ msgid "Words to highlight in chat:" - msgstr "Mots à surligner dans le chat" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "entre une liste séparée par des ;" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -4228,7 +4228,7 @@ msgid "" - "information about a command." - msgstr "" - " \"/help [sujet]\" - Ajoutez \"sujet\" si vous voulez obtenir des " --"informations plus spécifiques sur une commande." -+"information plus spécifiques sur une commande." - - #: src/gui/ui.cpp:394 - #, fuzzy -@@ -5588,7 +5588,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/it.po b/po/it.po -index 39b2ba0..678128f 100644 ---- a/po/it.po -+++ b/po/it.po -@@ -1023,7 +1023,7 @@ msgid "(Full country name not found)" - msgstr "(Nome completo della nazione non trovato)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "Informazioni di sistema" - - #: src/crashreport.cpp:156 -@@ -3558,7 +3558,7 @@ msgid "Words to highlight in chat:" - msgstr "Parole da evidenziare nella chat:" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5568,7 +5568,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/pl.po b/po/pl.po -index 4cee149..e115565 100644 ---- a/po/pl.po -+++ b/po/pl.po -@@ -1019,7 +1019,7 @@ msgid "(Full country name not found)" - msgstr "" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "" - - #: src/crashreport.cpp:156 -@@ -3475,7 +3475,7 @@ msgid "Words to highlight in chat:" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5399,7 +5399,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/pt.po b/po/pt.po -index 3d13599..6a9b511 100644 ---- a/po/pt.po -+++ b/po/pt.po -@@ -1023,7 +1023,7 @@ msgid "(Full country name not found)" - msgstr "(Nome do país não encontrado)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "Informações do sistema" - - #: src/crashreport.cpp:156 -@@ -3467,7 +3467,7 @@ msgid "Words to highlight in chat:" - msgstr "Palavras a realçar nas conversas:" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "introduza uma lista separada por ;" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5377,7 +5377,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/ro.po b/po/ro.po -index a5be564..9a94d21 100644 ---- a/po/ro.po -+++ b/po/ro.po -@@ -1023,7 +1023,7 @@ msgid "(Full country name not found)" - msgstr "(Numele complet al ţării nu a fost găsit)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "Informaţii de sistem" - - #: src/crashreport.cpp:156 -@@ -3586,7 +3586,7 @@ msgid "Words to highlight in chat:" - msgstr "Cuvinte de evidențiat în chat:" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "introduceţi o listă separată prin \";\"" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5645,7 +5645,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "Alegeţi rezoluţia pentru monitorul/arele dvs." -@@ -6930,7 +6930,7 @@ msgstr "" - #~ msgstr "Nici un mod ales." - - #, fuzzy --#~ msgid "you can also enter a ';' seperated list of usernames:" -+#~ msgid "you can also enter a ';' separated list of usernames:" - #~ msgstr "introduceţi o listă separată prin \";\"" - - #, fuzzy -diff --git a/po/ru.po b/po/ru.po -index 7c18c97..9304662 100644 ---- a/po/ru.po -+++ b/po/ru.po -@@ -1020,7 +1020,7 @@ msgid "(Full country name not found)" - msgstr "(Имя страны не найдено)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "Информация об системе" - - #: src/crashreport.cpp:156 -@@ -3482,7 +3482,7 @@ msgid "Words to highlight in chat:" - msgstr "Слова для подсветки в разговоре:" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "введите ; разделённый список" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5478,7 +5478,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/springlobby.pot b/po/springlobby.pot -index c6a34a7..5e9f3bc 100644 ---- a/po/springlobby.pot -+++ b/po/springlobby.pot -@@ -1018,7 +1018,7 @@ msgid "(Full country name not found)" - msgstr "" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "" - - #: src/crashreport.cpp:156 -@@ -3341,7 +3341,7 @@ msgid "Words to highlight in chat:" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5206,7 +5206,7 @@ msgstr "" - msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually in expert mode.\n" -+"\t\t\tIf the appropriate resolution is not available you can set it manually in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" - -diff --git a/po/sv.po b/po/sv.po -index 4050c22..02b3bdc 100644 ---- a/po/sv.po -+++ b/po/sv.po -@@ -1023,7 +1023,7 @@ msgid "(Full country name not found)" - msgstr "(Helt landsnamn ej funnet)" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "System information" - - #: src/crashreport.cpp:156 -@@ -3539,7 +3539,7 @@ msgid "Words to highlight in chat:" - msgstr "Ord som ska bli markerade" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5514,7 +5514,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/uk.po b/po/uk.po -index 3b33cea..73cafe1 100644 ---- a/po/uk.po -+++ b/po/uk.po -@@ -1019,7 +1019,7 @@ msgid "(Full country name not found)" - msgstr "" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "" - - #: src/crashreport.cpp:156 -@@ -3443,7 +3443,7 @@ msgid "Words to highlight in chat:" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5349,7 +5349,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -diff --git a/po/zh_CN.po b/po/zh_CN.po -index b3250be..52ed485 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -1022,7 +1022,7 @@ msgid "(Full country name not found)" - msgstr "（国家名称未找到）" - - #: src/crashreport.cpp:154 --msgid "System informations" -+msgid "System information" - msgstr "系统信息" - - #: src/crashreport.cpp:156 -@@ -3502,7 +3502,7 @@ msgid "Words to highlight in chat:" - msgstr "聊天中高亮显示字：" - - #: src/gui/options/chatoptionstab.cpp:329 --msgid "enter a ; seperated list" -+msgid "enter a ; separated list" - msgstr "输入一个由 ; 分隔开的列表" - - #: src/gui/options/chatoptionstab.cpp:333 -@@ -5523,7 +5523,7 @@ msgid "" - "Select the resolution fitting your monitor(s).\n" - "\t\t\tSelecting a dual screen resolution will automatically enable dual " - "screen mode.\n" --"\t\t\tIf the appropiate resolution is not available you can set it manually " -+"\t\t\tIf the appropriate resolution is not available you can set it manually " - "in expert mode.\n" - "\t\t\tPlease also contact the author so it can be added in future releases." - msgstr "" -@@ -7041,7 +7041,7 @@ msgstr "语言" - #~ msgstr "模组未选择。" - - #, fuzzy --#~ msgid "you can also enter a ';' seperated list of usernames:" -+#~ msgid "you can also enter a ';' separated list of usernames:" - #~ msgstr "输入一个由 ; 分隔开的列表" - - #, fuzzy -diff --git a/src/autohost.cpp b/src/autohost.cpp -index fc72c60..9294cde 100644 ---- a/src/autohost.cpp -+++ b/src/autohost.cpp -@@ -211,7 +211,7 @@ void AutoHost::OnSaidBattle(const wxString& /*unused*/, const wxString& msg) - DoAction("cannot find start box " + STD_STRING(params)); - } - } else { -- DoAction("has recieved an invalid param to !removebox command" ); -+ DoAction("has received an invalid param to !removebox command" ); - } - } else - return; -diff --git a/src/crashreport.cpp b/src/crashreport.cpp -index 043ba99..e3cac0c 100644 ---- a/src/crashreport.cpp -+++ b/src/crashreport.cpp -@@ -151,7 +151,7 @@ void CrashReport::GenerateReport() - SystemInfos += _T( "SpringLobby version " ) + TowxString(getSpringlobbyVersion()) + _T( "\n" ); - SystemInfos += _T( "Built from " ) + wxString(wxVERSION_STRING) + _T(" on ") + wxPlatformInfo::Get().GetOperatingSystemIdName() + _T( "\n" ); - -- report->AddText(_T( "SystemInfos.txt" ), SystemInfos, _("System informations")); -+ report->AddText(_T( "SystemInfos.txt" ), SystemInfos, _("System information")); - #if wxUSE_STD_IOSTREAM - report->AddText(_T( "AppLog.txt" ), TowxString(crashlog.str()), _("Application verbose log")); - #endif -diff --git a/src/downloader/downloadsobserver.h b/src/downloader/downloadsobserver.h -index 687561e..49afb11 100644 ---- a/src/downloader/downloadsobserver.h -+++ b/src/downloader/downloadsobserver.h -@@ -65,7 +65,7 @@ public: - //! Fill out map with downloads (Key: Original name) - void GetMap(std::map<wxString, ObserverDownloadInfo>& map); - -- //! Delete all informations about finished downloads -+ //! Delete all information about finished downloads - void ClearFinished(); - - bool IsEmpty(); -diff --git a/src/gui/hosting/battleroommmoptionstab.h b/src/gui/hosting/battleroommmoptionstab.h -index d20d565..715b400 100644 ---- a/src/gui/hosting/battleroommmoptionstab.h -+++ b/src/gui/hosting/battleroommmoptionstab.h -@@ -108,7 +108,7 @@ private: - - /** \brief generate Gui elements from loaded MMoptions - * for all values in all option maps create a control (pointer), -- * set the controls name to the option key and add it to the appropiate map and sizer. -+ * set the controls name to the option key and add it to the appropriate map and sizer. - * \return the total num of controls in the sizer - */ - int setupOptionsSectionSizer(const LSL::mmOptionSection& section, wxBoxSizer* parent_sizer, -diff --git a/src/gui/options/chatoptionstab.cpp b/src/gui/options/chatoptionstab.cpp -index e8d3cab..fb497b0 100644 ---- a/src/gui/options/chatoptionstab.cpp -+++ b/src/gui/options/chatoptionstab.cpp -@@ -325,7 +325,7 @@ ChatOptionsTab::ChatOptionsTab(wxWindow* parent) - sbHighlightSizer->Add(0, 0, 1, wxEXPAND, 5); - - m_highlight_words = new wxTextCtrl(this, ID_HIWORDS, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); -- m_highlight_words->SetToolTip(_("enter a ; seperated list")); -+ m_highlight_words->SetToolTip(_("enter a ; separated list")); - - sbHighlightSizer->Add(m_highlight_words, 0, wxALL | wxEXPAND, 5); - -diff --git a/src/lsl/src/lslunitsync/optionswrapper.cpp b/src/lsl/src/lslunitsync/optionswrapper.cpp -index f9757fe..edb2cbc 100644 ---- a/src/lsl/src/lslunitsync/optionswrapper.cpp -+++ b/src/lsl/src/lslunitsync/optionswrapper.cpp -@@ -367,7 +367,7 @@ bool LSL::OptionsWrapper::setSingleOptionTypeSwitch(const std::string& key, cons - case Enum::opt_bool: { - const long l_val = Util::FromIntString(value); - if (l_val != 1 && l_val != 0) { -- LslWarning("recieved bool option that is neither 0 or 1"); -+ LslWarning("received bool option that is neither 0 or 1"); - return false; - } else - (gameoptions.bool_map)[key].value = bool(l_val); -@@ -377,7 +377,7 @@ bool LSL::OptionsWrapper::setSingleOptionTypeSwitch(const std::string& key, cons - // test if maxlength isn't exceeded - unsigned int max_length = (gameoptions.string_map)[key].max_len; - if ((max_length != 0) && (value.length() > max_length)) { -- LslWarning("recieved string option exceeds max_len"); -+ LslWarning("received string option exceeds max_len"); - return false; - } else - (gameoptions.string_map)[key].value = value; -diff --git a/src/lsl/src/lslunitsync/optionswrapper.h b/src/lsl/src/lslunitsync/optionswrapper.h -index 9d49acc..195ee48 100644 ---- a/src/lsl/src/lslunitsync/optionswrapper.h -+++ b/src/lsl/src/lslunitsync/optionswrapper.h -@@ -44,7 +44,7 @@ public: - //! load corresponding options through unitsync calls - /*! - * the containers for corresponding flag are recreated and then gets the number of options from unitsync -- * and adds them one by one to the appropiate container -+ * and adds them one by one to the appropriate container - * \param flag decides which type of option to load - * \param name Mod/Mapname - * \return true if load successful, false otherwise -@@ -71,7 +71,7 @@ public: - * \return they container section - */ - LSL::Enum::GameOption GetSection(const std::string& key) const; -- //! given a vector of key/value pairs sets the appropiate options to new values -+ //! given a vector of key/value pairs sets the appropriate options to new values - /*! Every new value is tested for meeting boundary conditions, type, etc. - * If test fails error is logged and false is returned. - * \param values the std::stringPairVec containing key / new value pairs -diff --git a/src/springsettings/tab_simple.cpp b/src/springsettings/tab_simple.cpp -index f14b8de..04d0731 100644 ---- a/src/springsettings/tab_simple.cpp -+++ b/src/springsettings/tab_simple.cpp -@@ -77,7 +77,7 @@ void tab_simple::initOptSizer(wxFlexGridSizer* sizer) - getSetUpResolutionCBX(); - videoMode_CBX->SetToolTip(_("Select the resolution fitting your monitor(s).\n\ - Selecting a dual screen resolution will automatically enable dual screen mode.\n\ -- If the appropiate resolution is not available you can set it manually in expert mode.\n\ -+ If the appropriate resolution is not available you can set it manually in expert mode.\n\ - Please also contact the author so it can be added in future releases.")); - sizer->Add(videoMode_CBX, 0, wxBOTTOM, 15); - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
