Hello community, here is the log from the commit of package gbrainy for openSUSE:Factory checked in at 2015-01-07 09:38:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gbrainy (Old) and /work/SRC/openSUSE:Factory/.gbrainy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gbrainy" Changes: -------- --- /work/SRC/openSUSE:Factory/gbrainy/gbrainy.changes 2014-08-11 10:07:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gbrainy.new/gbrainy.changes 2015-01-07 09:38:38.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 1 17:49:40 UTC 2015 - [email protected] + +- Update to version 2.3.4: + + 2 bug fixes. + + Mono 3.0 or higher required. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gbrainy-2.2.3.tar.gz New: ---- gbrainy-2.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gbrainy.spec ++++++ --- /var/tmp/diff_new_pack.gtRqS5/_old 2015-01-07 09:38:39.000000000 +0100 +++ /var/tmp/diff_new_pack.gtRqS5/_new 2015-01-07 09:38:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gbrainy # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gbrainy -Version: 2.2.3 +Version: 2.2.4 Release: 0 Summary: A brain teaser game and trainer License: GPL-2.0+ @@ -32,7 +32,7 @@ BuildRequires: intltool BuildRequires: librsvg-devel BuildRequires: mono-addins -BuildRequires: mono-devel +BuildRequires: mono-devel >= 3.0.0 BuildRequires: translation-update-upstream BuildRequires: pkgconfig(libcanberra-gtk) >= 0.26 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ gbrainy-2.2.3.tar.gz -> gbrainy-2.2.4.tar.gz ++++++ ++++ 2172 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/NEWS new/gbrainy-2.2.4/NEWS --- old/gbrainy-2.2.3/NEWS 2014-06-28 12:42:58.000000000 +0200 +++ new/gbrainy-2.2.4/NEWS 2015-01-01 11:24:29.000000000 +0100 @@ -1,5 +1,10 @@ gbrainy NEWS +Version 2.2.4 +* 2 bug fixes +* Updated & new translations +* Mono 3.0 or higher required + Version 2.2.3 * 2 bug fixes * Updated & new translations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/configure.ac new/gbrainy-2.2.4/configure.ac --- old/gbrainy-2.2.3/configure.ac 2014-06-11 07:26:15.000000000 +0200 +++ new/gbrainy-2.2.4/configure.ac 2014-12-28 00:20:10.000000000 +0100 @@ -1,7 +1,7 @@ # Define gbrainy version m4_define([gbrainy_version_major], [2]) m4_define([gbrainy_version_minor], [2]) -m4_define([gbrainy_version_revision], [3]) +m4_define([gbrainy_version_revision], [4]) m4_define([concat], $1$2$3$4) @@ -60,13 +60,6 @@ AC_MSG_RESULT([found]) fi -if ! pkg-config --atleast-version=2.11 mono; then - CSC_DEFINES="$CSC_DEFINES -d:CSHARP_STATIC" - csharp_static="yes" -else - csharp_static="no" -fi - dnl -- check for various mono assemblies that we need. @@ -87,7 +80,7 @@ dnl --- Required libraries GTKSHARP_REQUIRED=2.10 -MONO_REQUIRED=1.1.7 +MONO_REQUIRED=3.0.0 MONO_ADDINS=0.3 CANBERRA_GTK_REQUIRED=0.26 @@ -180,7 +173,7 @@ BUILD_TIME=`date +"%F %T %Z"` AC_SUBST(BUILD_TIME) -COPYRIGHT="(c) 2007-2014 Jordi Mas i Hernandez" +COPYRIGHT="(c) 2007-2015 Jordi Mas i Hernandez" AC_SUBST(COPYRIGHT) dnl --- Prologue @@ -226,6 +219,5 @@ echo "Mono-addins: ${enable_addins_sharp}" echo "NUnit: ${enable_tests}" echo "Debug enabled: ${enable_debug}" -echo "Mono.CSharp static: ${csharp_static}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/help/pt_BR/gameplay.page new/gbrainy-2.2.4/help/pt_BR/gameplay.page --- old/gbrainy-2.2.3/help/pt_BR/gameplay.page 2014-06-28 12:44:57.000000000 +0200 +++ new/gbrainy-2.2.4/help/pt_BR/gameplay.page 2015-01-01 11:25:01.000000000 +0100 @@ -20,13 +20,7 @@ <p><app>gbrainy</app> é um jogo de treino e quebra-cabeças para se divertir e manter seu cérebro treinado.</p> <p>Ele possui diferentes tipos de jogos de quebra-cabeças lógicos, jogos de cálculo mental, treinamentos de memória e analogias verbais, projetadas para testar diferentes habilidades cognitivas.</p> - <p> - You can choose different difficulty levels making <app>gbrainy</app> - enjoyable for kids, adults or senior citizens. It also features a game history, - personal records, tips and fullscreen mode support. <app>gbrainy</app> can also - be <link href="https://wiki.gnome.org/Apps/gbrainy/Extending";>extended</link> easily - with new games developed by third parties. - </p> + <p>Você pode escolher diferentes níveis de dificuldade, tornando <app>gbrainy</app> um divertimento para crianças, adultos ou idosos. Ele também possui suporte a histórico de jogos, recordes pessoais, dicas e modo de tela cheia. O <app>gbrainy</app> também pode ser <link href="https://wiki.gnome.org/Apps/gbrainy/Extending";>estendido</link> facilmente com novos jogos desenvolvido por terceiros.</p> <p><app>gbrainy</app> depende muito do trabalho de mestres anteriores do quebra-cabeça, desde quebra-cabeças clássicos de tempos antigos a trabalhos mais recentes como os quebra-cabeças do <link href="http://en.wikipedia.org/wiki/Terry_Stickels";>Terry Stickels</link> ou o clássico jogo do <link href="http://en.wikipedia.org/wiki/Dr._Brain";>Dr. Brain</link>.</p> <note> <p>Tem havido discussões recentes na comunidade científica sobre o software de treinamento do cérebro melhorar a performance cognitiva. A maioria dos estudos mostram que há pouco ou nenhum melhoramento, mas isso não significa que você não possa se divertir jogando jogos como <app>gbrainy</app>!</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/help/pt_BR/pt_BR.po new/gbrainy-2.2.4/help/pt_BR/pt_BR.po --- old/gbrainy-2.2.3/help/pt_BR/pt_BR.po 2014-06-28 12:44:58.000000000 +0200 +++ new/gbrainy-2.2.4/help/pt_BR/pt_BR.po 2015-01-01 11:25:01.000000000 +0100 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gbrainy master\n" -"POT-Creation-Date: 2013-06-01 15:37+0000\n" -"PO-Revision-Date: 2013-06-09 02:35-0300\n" +"POT-Creation-Date: 2013-12-18 18:10+0000\n" +"PO-Revision-Date: 2014-12-29 12:31-0300\n" "Last-Translator: Rafael Ferreira <[email protected]>\n" "Language-Team: Brazilian Portuguese <[email protected]>\n" "Language: pt_BR\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Poedit 1.7.1\n" #: C/export.page:7(desc) msgid "Export the games for playing off-line." @@ -365,15 +365,15 @@ "You can choose different difficulty levels making <app>gbrainy</app> " "enjoyable for kids, adults or senior citizens. It also features a game " "history, personal records, tips and fullscreen mode support. <app>gbrainy</" -"app> can also be <link href=\"http://live.gnome.org/gbrainy/Extending"; +"app> can also be <link href=\"https://wiki.gnome.org/Apps/gbrainy/Extending"; "\">extended</link> easily with new games developed by third parties." msgstr "" "Você pode escolher diferentes níveis de dificuldade, tornando <app>gbrainy</" "app> um divertimento para crianças, adultos ou idosos. Ele também possui " "suporte a histórico de jogos, recordes pessoais, dicas e modo de tela cheia. " -"O <app>gbrainy</app> também pode ser <link href=\"http://live.gnome.org/"; -"gbrainy/Extending\">estendido</link> facilmente com novos jogos desenvolvido " -"por terceiros." +"O <app>gbrainy</app> também pode ser <link href=\"https://wiki.gnome.org/"; +"Apps/gbrainy/Extending\">estendido</link> facilmente com novos jogos " +"desenvolvido por terceiros." #: C/gameplay.page:37(p) msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/po/ca.po new/gbrainy-2.2.4/po/ca.po --- old/gbrainy-2.2.3/po/ca.po 2014-06-13 13:34:15.000000000 +0200 +++ new/gbrainy-2.2.4/po/ca.po 2014-12-28 00:12:00.000000000 +0100 @@ -635,7 +635,7 @@ "gbrainy is a game to train memory, arithmetical and logical capabilities " "with many sorts of exercises of different difficulty levels." msgstr "" -"gbrainy és una joc per exercitar la memòria, i les vostres " +"gbrainy és un joc per exercitar la memòria, i les vostres " "habilitats aritmètiques i lògiques amb molts tipus d'exercicis de diferents " "nivells de dificultat." @@ -646,9 +646,9 @@ "form or just try it out for fun, older people that might need to do some " "memory exercises, etc." msgstr "" -"És útils per a totes les edats i propòsits: nens els quals els seus pares " +"És útil per a totes les edats i propòsits: nens els quals els seus pares " "volen que desenvolupin les seves habilitats, adults que volen mantenir la " -"seva ment en format, o simplement per passar-ho bé, o gent gran que vulgui " +"seva ment en forma, o simplement per passar-ho bé, o gent gran que vulgui " "fer exercicis de memòria." #: ../data/gbrainy.desktop.in.h:1 ../src/Clients/Classical/gbrainy.ui.h:1 @@ -2335,7 +2335,7 @@ #: ../src/Clients/Classical/CommandLine.cs:100 #, csharp-format msgid "Unknown command line parameter {0}" -msgstr "El paràmetre de línia de comandes {0} és desconegut" +msgstr "El paràmetre de la línia d'ordres {0} és desconegut" #. Translators: {0} is a date #: ../src/Clients/Classical/CommandLine.cs:110 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/po/de.po new/gbrainy-2.2.4/po/de.po --- old/gbrainy-2.2.3/po/de.po 2014-06-13 12:51:36.000000000 +0200 +++ new/gbrainy-2.2.4/po/de.po 2014-12-19 21:12:08.000000000 +0100 @@ -11,8 +11,8 @@ "Project-Id-Version: gbrainy master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=gbrainy&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-05-27 21:47+0000\n" -"PO-Revision-Date: 2014-05-31 18:46+0100\n" +"POT-Creation-Date: 2014-06-01 17:26+0000\n" +"PO-Revision-Date: 2014-07-04 11:40+0100\n" "Last-Translator: Wolfgang Stoeggl <[email protected]>\n" "Language-Team: Deutsch <[email protected]>\n" "Language: de\n" @@ -20,7 +20,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.5\n" +"X-Generator: Poedit 1.5.4\n" #: ../data/games.xml.h:1 msgid "Clock rotation" @@ -949,7 +949,7 @@ #: ../data/verbal_analogies.xml.h:73 msgid "Hectogram" -msgstr "Sechseck" +msgstr "Hektogramm" #: ../data/verbal_analogies.xml.h:74 msgid "Liter" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/po/hu.po new/gbrainy-2.2.4/po/hu.po --- old/gbrainy-2.2.3/po/hu.po 2014-06-13 12:51:36.000000000 +0200 +++ new/gbrainy-2.2.4/po/hu.po 2014-12-28 00:12:00.000000000 +0100 @@ -4,14 +4,14 @@ # # Gabor Kelemen <kelemeng at gnome dot hu>, 2010, 2011, 2012, 2013. # Richard Somloi <ricsipontaz at googlemail dot com>, 2010. -# Balázs Úr <[email protected]>, 2014. +# Balázs Úr <urbalazs at gmail dot com>, 2014. msgid "" msgstr "" "Project-Id-Version: gbrainy master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=gbrainy&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-01-31 13:59+0000\n" -"PO-Revision-Date: 2014-03-20 15:04+0100\n" +"POT-Creation-Date: 2014-05-27 21:47+0000\n" +"PO-Revision-Date: 2014-12-24 10:10+0100\n" "Last-Translator: Balázs Úr <[email protected]>\n" "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" "Language: hu\n" @@ -619,6 +619,27 @@ msgid "It is the result of the operation: ([three] * 3) - ([two] * 2)." msgstr "A válasz a következő művelet eredménye: ([three] * 3) - ([two] * 2)." +#: ../data/gbrainy.appdata.xml.in.h:1 +msgid "" +"gbrainy is a game to train memory, arithmetical and logical capabilities " +"with many sorts of exercises of different difficulty levels." +msgstr "" +"A gbrainy a memória edzéséhez, aritmetikai és logikai képességek " +"fejlesztéséhez használható játék különböző nehézségi szinteken lévő sokféle " +"gyakorlattal." + +#: ../data/gbrainy.appdata.xml.in.h:2 +msgid "" +"It should have something for all ages and purposes: kids whose parents want " +"them to develop their capabilities, adults that want to keep their mind in " +"form or just try it out for fun, older people that might need to do some " +"memory exercises, etc." +msgstr "" +"Minden korosztály és célközönség számára tartogat valamit: gyermekeknek, akik " +"szülei a képességeiket szeretnék fejleszteni; felnőtteknek, akik formában " +"szeretnék tartani az elméjüket vagy csak szórakozásból próbálják ki; idősebb " +"embereknek, akiknek valamilyen memóriafeladatot kell elvégezniük, stb." + #: ../data/gbrainy.desktop.in.h:1 ../src/Clients/Classical/gbrainy.ui.h:1 msgid "gbrainy" msgstr "gbrainy" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/po/nl.po new/gbrainy-2.2.4/po/nl.po --- old/gbrainy-2.2.3/po/nl.po 2014-06-13 12:51:37.000000000 +0200 +++ new/gbrainy-2.2.4/po/nl.po 2014-12-19 21:12:08.000000000 +0100 @@ -9,17 +9,18 @@ # Reinout van Schouwen <[email protected]>, 2007-2009. # Benno Schulenberg <[email protected]>, 2008. # Erwin Poeze <[email protected]>, 2009. -# Hannie Dumoleyn <[email protected]>, 2010, 2011, 2013. # Redmar <[email protected]>, 2010, 2011, 2013. +# Hannie Dumoleyn <[email protected]>, 2010, 2011, 2013, 2014. + msgid "" msgstr "" "Project-Id-Version: gbrainy\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=gbrainy&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-08-28 22:37+0000\n" -"PO-Revision-Date: 2013-09-13 10:47+0200\n" +"POT-Creation-Date: 2014-05-27 21:47+0000\n" +"PO-Revision-Date: 2014-12-12 10:08+0100\n" "Last-Translator: Hannie Dumoleyn <[email protected]>\n" -"Language-Team: Dutch <[email protected]>\n" +"Language-Team: Dutch <[email protected]>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,6 @@ "X-Generator: Lokalize 1.5\n" #: ../data/games.xml.h:1 -#| msgid "Clock Rotation" msgid "Clock rotation" msgstr "Klokrotatie" @@ -105,9 +105,6 @@ "totale aantal uitkomsten is 2 tot de [games]e macht." #: ../data/games.xml.h:13 -#| msgid "" -#| "In every match you eliminate one player, you need the total number of " -#| "games minus 1 to find out the winner." msgid "" "In every match you eliminate one player. Therefore, the result is the total " "number of player minus one." @@ -470,7 +467,6 @@ msgstr "[option_prefix] r < q" #: ../data/games.xml.h:83 -#| msgid "If x > y, then x > q < and y > r so r < q is true." msgid "If x > y, then r < y < x < q, so r < q is true." msgstr "Als x > y, dan x > q < en y > r dus r < q is waar." @@ -504,10 +500,6 @@ msgstr "[option_prefix] (x - y) * 2" #: ../data/games.xml.h:90 -#| msgid "" -#| "Since x is always an even number, multiplying it by 2 always produces an " -#| "even number. Adding an even number to an odd number (y) always produces " -#| "an odd number." msgid "" "Multiplication of two even numbers always produces an even number, so x " "multiplied by 2 is even. Adding an odd number (y) to that even number always " @@ -648,6 +640,27 @@ msgid "It is the result of the operation: ([three] * 3) - ([two] * 2)." msgstr "Is het resultaat van de berekening: ([three] * 3) - ([two] * 2)." +#: ../data/gbrainy.appdata.xml.in.h:1 +msgid "" +"gbrainy is a game to train memory, arithmetical and logical capabilities " +"with many sorts of exercises of different difficulty levels." +msgstr "" +"gbrainy is een spel om het geheugen, logische en rekenkundige vaardigheden te " +"trainen door middel van een groot aantal oefeningen met verschillende " +"moeilijkheidsgraden." + +#: ../data/gbrainy.appdata.xml.in.h:2 +msgid "" +"It should have something for all ages and purposes: kids whose parents want " +"them to develop their capabilities, adults that want to keep their mind in " +"form or just try it out for fun, older people that might need to do some " +"memory exercises, etc." +msgstr "" +"Het heeft iets voor alle leeftijden en doeleinden: kinderen waarvan de ouders " +"willen dat ze hun vaardigheden ontwikkelen, volwassenen die hun geest in vorm " +"willen houden, of het gewoon voor hun plezier willen uitproberen, ouderen die " +"behoefte hebben aan geheugentraining, enz." + #: ../data/gbrainy.desktop.in.h:1 ../src/Clients/Classical/gbrainy.ui.h:1 msgid "gbrainy" msgstr "gbrainy" @@ -673,7 +686,7 @@ msgstr "Notebook" #. -#. Translators, please check these recommendations when translating gbrainy: http://live.gnome.org/gbrainy/Localizing +#. Translators, please check these recommendations when translating gbrainy: https://wiki.gnome.org/Apps/gbrainy/Localizing #. #: ../data/verbal_analogies.xml.h:4 msgid "Which of the following sports does not belong in this group?" @@ -1293,7 +1306,6 @@ msgstr "Algemeen" #: ../data/verbal_analogies.xml.h:163 -#| msgid "Related" msgid "Plate" msgstr "Bord" @@ -1311,7 +1323,6 @@ msgstr "Schaal" #: ../data/verbal_analogies.xml.h:168 -#| msgid "It is the only one that is not a fruit." msgid "It is the only one that is not used to storage liquids." msgstr "" "Het is de enige die niet wordt gebruikt voor de opslag van vloeistoffen." @@ -1326,35 +1337,28 @@ msgstr "Macadamia" #: ../data/verbal_analogies.xml.h:172 -#| msgid "chest" msgid "Chestnut" msgstr "Kastanje" #: ../data/verbal_analogies.xml.h:173 -#| msgid "It is the only one that is not a fruit." msgid "It is the only one that is not a nut." msgstr "Het is de enige die geen noot is." #: ../data/verbal_analogies.xml.h:174 -#| msgid "" -#| "Which of the following words is closest to the meaning of 'asceticism'?" msgid "Which of the following words is closest to the meaning of 'acclaim'?" msgstr "" "Welk van de volgende woorden komt het dichtst in de buurt van de betekenis " "van 'bijval'?" #: ../data/verbal_analogies.xml.h:175 -#| msgid "Apple" msgid "Applause" msgstr "Applaus" #: ../data/verbal_analogies.xml.h:176 -#| msgid "Ostentation" msgid "Commendation" msgstr "Lof" #: ../data/verbal_analogies.xml.h:177 -#| msgid "Fixation" msgid "Citation" msgstr "Citaat" @@ -1364,8 +1368,6 @@ msgstr "Bezwering" #: ../data/verbal_analogies.xml.h:180 -#| msgid "" -#| "Which of the following words is closest to the meaning of 'negligent'?" msgid "Which of the following words is closest to the meaning of 'grief'?" msgstr "" "Welk van de volgende woorden komt het dichtst in de buurt van de betekenis " @@ -1389,8 +1391,6 @@ msgstr "Risico" #: ../data/verbal_analogies.xml.h:186 -#| msgid "" -#| "Which of the following words is closest to the meaning of 'specific'?" msgid "Which of the following words is closest to the meaning of 'phlegmatic'?" msgstr "" "Welk van de volgende woorden komt het dichtst in de buurt van de betekenis " @@ -1406,7 +1406,6 @@ msgstr "Authentiek" #: ../data/verbal_analogies.xml.h:190 -#| msgid "Lever" msgid "Clever" msgstr "Slim" @@ -1415,7 +1414,6 @@ msgstr "Gespannen" #: ../data/verbal_analogies.xml.h:192 -#| msgid "Concert hall" msgid "Concert" msgstr "Concert" @@ -1428,12 +1426,10 @@ msgstr "Spreekwoord" #: ../data/verbal_analogies.xml.h:195 -#| msgid "Enneagram" msgid "Epigram" msgstr "Epigram" #: ../data/verbal_analogies.xml.h:196 -#| msgid "It is the only one that is not related to architecture." msgid "It is the only one that is not related to literature." msgstr "Het is de enige die geen relatie heeft met literatuur." @@ -1454,7 +1450,6 @@ msgstr "Trigonometrie" #: ../data/verbal_analogies.xml.h:201 -#| msgid "It is the only one that is not related to architecture." msgid "It is the only one that is not related with triangles." msgstr "Het is de enige die geen relatie heeft met driehoeken." @@ -1476,7 +1471,6 @@ msgstr "Lamp" #: ../data/verbal_analogies.xml.h:207 -#| msgid "It is the only one that is not a fruit." msgid "It is the only one that does not produce light." msgstr "Het is de enige die geen licht produceert." @@ -1499,7 +1493,6 @@ msgstr "Kruisboog" #: ../data/verbal_analogies.xml.h:214 -#| msgid "It is the only one that is not a reptile." msgid "It is the only one that is not used for protection." msgstr "Het is de enige die niet wordt gebruikt voor de verdediging." @@ -1521,7 +1514,6 @@ msgstr "Boom" #: ../data/verbal_analogies.xml.h:220 -#| msgid "It is the only one that is not related to architecture." msgid "It is the only one that is not related to rocks." msgstr "Het is de enige die geen relatie heeft met stenen." @@ -1535,7 +1527,6 @@ msgstr "Biet" #: ../data/verbal_analogies.xml.h:224 -#| msgid "Radius" msgid "Radish" msgstr "Radijs" @@ -1544,7 +1535,6 @@ msgstr "Tomaat" #: ../data/verbal_analogies.xml.h:226 -#| msgid "It is the only one that is not a fruit." msgid "It is the only one that does not have roots." msgstr "Het is de enige die geen wortels heeft." @@ -1563,7 +1553,6 @@ #. Translator: 'keys' as the ones found in a keyboard #: ../data/verbal_analogies.xml.h:232 -#| msgid "It is the only one that is not a metal." msgid "It is the only instrument that does not have keys." msgstr "Het is het enige instrument dat geen toetsen heeft." @@ -1880,7 +1869,6 @@ #. Translators: like 'he burst the balloon' #: ../data/verbal_analogies.xml.h:312 -#| msgid "Bursts" msgid "Burst" msgstr "Knallen" @@ -2018,39 +2006,32 @@ msgstr "Stoutmoedig" #: ../data/verbal_analogies.xml.h:350 -#| msgid "pessimist / optimist | poor" msgid "pessimistic / optimistic | suspicious" msgstr "pessimistisch / optimistisch | achterdochtig" #. Translator: Used as an adjective in English #: ../data/verbal_analogies.xml.h:352 -#| msgid "Interesting" msgid "Trusting" msgstr "Vertrouwend" #: ../data/verbal_analogies.xml.h:353 -#| msgid "Obvious" msgid "Dubious" msgstr "Onzeker" #. Translator: compass as the instrument used for finding direction #: ../data/verbal_analogies.xml.h:355 -#| msgid "thermometer / temperature | clock" msgid "thermometer / temperature | compass" msgstr "thermometer / temperatuur | kompas" #: ../data/verbal_analogies.xml.h:356 -#| msgid "Fractions" msgid "Direction" msgstr "Richting" #: ../data/verbal_analogies.xml.h:357 -#| msgid "Equation" msgid "Elevation" msgstr "Elevatie" #: ../data/verbal_analogies.xml.h:358 -#| msgid "Positivism" msgid "Position" msgstr "Positie" @@ -2312,7 +2293,6 @@ msgstr "auto / weg | trein" #: ../data/verbal_analogies.xml.h:433 -#| msgid "track | railway | rails" msgid "track | railway | rails | railroad" msgstr "spoor | spoorweg | rails | spoorbaan" @@ -2508,7 +2488,6 @@ msgstr "Een hersenkrakerspel voor vermaak en om uw brein fit te houden." #: ../src/Clients/Classical/Dialogs/AboutDialog.cs:80 -#| msgid "gbrainy project web site: {0}" msgid "gbrainy project web site" msgstr "Website van het gbrainy-project" @@ -2730,7 +2709,6 @@ msgstr "Zoeken naar en laden van uitbreidingen bij opstarten" #: ../src/Clients/Classical/Dialogs/ui/PreferencesDialog.ui.h:6 -#| msgid "Enabled" msgid "Enable sounds" msgstr "Geluiden inschakelen" @@ -3271,7 +3249,6 @@ #: ../src/Core/Main/Game.cs:138 #: ../src/Core/Main/Verbal/AnalogiesPairOfWordsCompare.cs:67 #, csharp-format -#| msgid "The correct answer is {0}." msgid "The correct answer is {0}." msgid_plural "The possible correct answers are {0}." msgstr[0] "Het juiste antwoord is {0}." @@ -3433,8 +3410,8 @@ "When you go shopping, try to perform calculations without the use of a " "calculator." msgstr "" -"Wanneer u gaat winkelen, probeer de berekeningen uit te voeren " -"zonder rekenmachine." +"Wanneer u gaat winkelen, probeer de berekeningen uit te voeren zonder " +"rekenmachine." #: ../src/Core/Main/Memory.cs:53 msgid "Memorize the objects below in the given time" @@ -3798,7 +3775,6 @@ #: ../src/Games/Calculation/CalculationPrimes.cs:86 #, csharp-format -#| msgid "The number {0} is a primer number." msgid "The number {0} is a prime number." msgstr "Het getal {0} is een priemgetal." @@ -3853,15 +3829,11 @@ msgstr "hebben een verhouding van {0} staat tot {1}" #: ../src/Games/Calculation/CalculationSelectedNumbers.cs:48 -#| msgid "Related numbers" msgid "Selected numbers" msgstr "Geselecteerde getallen" #: ../src/Games/Calculation/CalculationSelectedNumbers.cs:61 #, csharp-format -#| msgid "" -#| "Given the numbers: {0}. Which of the following numbers is the nearest to " -#| "the average? Answer {1}, {2}, {3} or {4}." msgid "" "In the list of numbers below, what is the sum of all the numbers with a " "value greater than {0}? Answer {1}, {2}, {3} or {4}." @@ -3871,16 +3843,12 @@ #: ../src/Games/Calculation/CalculationSelectedNumbers.cs:66 #, csharp-format -#| msgid "" -#| "Given the numbers: {0}. Which of the following numbers is the nearest to " -#| "the average? Answer {1}, {2}, {3} or {4}." msgid "" "In the list of numbers below, what is the product of all the numbers with a " "value greater than {0}? Answer {1}, {2}, {3} or {4}." msgstr "" "Wat is uit onderstaande lijst met getallen het product van alle getallen met " -"een " -"waarde groter dan {0}. Antwoord {1}, {2}, {3} of {4}." +"een waarde groter dan {0}. Antwoord {1}, {2}, {3} of {4}." #: ../src/Games/Calculation/CalculationTwoNumbers.cs:40 msgid "Two numbers" @@ -4338,9 +4306,6 @@ msgstr "Figuren en tekst" #: ../src/Games/Logic/PuzzleFigureLetter.cs:44 -#| msgid "" -#| "The figures and the text are related. What text should go under the last " -#| "figure?" msgid "" "The figures and the texts are related. What text should go under the last " "figure?" @@ -4412,7 +4377,6 @@ "ze te herhalen." #: ../src/Games/Logic/PuzzleFindTheNumber.cs:45 -#| msgid "Figures with numbers" msgid "Find the number" msgstr "Vind het getal" @@ -4427,13 +4391,13 @@ "the number {0} places away from itself multiplied by 2 and {1} places away " "from itself plus 2?" msgstr[0] "" -"Kijkend naar de horizontale en verticale lijnen in onderstaand raster, wat is " -"het getal {0} plaats verwijderd van zichzelf vermenigvuldigd met 2 en {1} " +"Kijkend naar de horizontale en verticale lijnen in onderstaand raster, wat " +"is het getal {0} plaats verwijderd van zichzelf vermenigvuldigd met 2 en {1} " "plaats verwijderd van zichzelf plus 2?" msgstr[1] "" -"Kijkend naar de horizontale en verticale lijnen in onderstaand raster, wat is " -"het getal {0} plaatsen verwijderd van zichzelf vermenigvuldigd met 2 en {1} " -"plaatsen verwijderd van zichzelf plus 2?" +"Kijkend naar de horizontale en verticale lijnen in onderstaand raster, wat " +"is het getal {0} plaatsen verwijderd van zichzelf vermenigvuldigd met 2 en " +"{1} plaatsen verwijderd van zichzelf plus 2?" #: ../src/Games/Logic/PuzzleFindTheNumber.cs:62 #, csharp-format @@ -4442,9 +4406,6 @@ #: ../src/Games/Logic/PuzzleFindTheNumber.cs:71 #, csharp-format -#| msgid "" -#| "The fourth row is calculated by multiplying the first two rows and adding " -#| "the third." msgid "The number is located within the first {0} row of the grid." msgid_plural "The number is located within the first {0} rows of the grid." msgstr[0] "Het getal bevindt zich in de eerste {0} rij van het raster." @@ -4609,9 +4570,9 @@ "people, the second n-2 people, etc. The result is the sum of the first n-1 " "consecutive numbers: 1+2+3+...+(n-1)." msgstr "" -"Met n als totaal aantal personen, drukt de eerste persoon n-1 personen " -"de hand, de tweede n-2 personen, enz. Het resultaat is de som van de " -"eerste n-1 opeenvolgende nummers: 1+2+3+...+(n-1)." +"Met n als totaal aantal personen, drukt de eerste persoon n-1 personen de " +"hand, de tweede n-2 personen, enz. Het resultaat is de som van de eerste n-1 " +"opeenvolgende nummers: 1+2+3+...+(n-1)." #: ../src/Games/Logic/PuzzleLargerShape.cs:113 msgid "Larger shape" @@ -4627,15 +4588,11 @@ "Antwoord {0}, {1}, {2} of {3}." #: ../src/Games/Logic/PuzzleLargestArea.cs:241 -#| msgid "Larger shape" msgid "Largest area" msgstr "Grootste oppervlakte" #: ../src/Games/Logic/PuzzleLargestArea.cs:246 #, csharp-format -#| msgid "" -#| "Which of the following figures does not belong to the group? Answer {0}, " -#| "{1}, {2}, {3}, {4} or {5}." msgid "" "Which of the following figures has the largest area? Answer {0}, {1}, {2} or " "{3}." @@ -4653,8 +4610,8 @@ "If the circles represented by the arcs below were completed, which circle " "would have the largest diameter? Answer {0}, {1}, {2} or {3}." msgstr "" -"Als van onderstaande bogen cirkels worden gemaakt, welke cirkel " -"zou dan de grootste diameter hebben? Antwoord {0}, {1}, {2} or {3}." +"Als van onderstaande bogen cirkels worden gemaakt, welke cirkel zou dan de " +"grootste diameter hebben? Antwoord {0}, {1}, {2} or {3}." #: ../src/Games/Logic/PuzzleLargestDiameter.cs:58 msgid "Less curved is the arc, the larger the circle is." @@ -4662,7 +4619,6 @@ #: ../src/Games/Logic/PuzzleLargestDiameter.cs:101 #, csharp-format -#| msgid "Answer {0}" msgid "Arc {0}" msgstr "Boog {0}" @@ -4957,9 +4913,6 @@ #: ../src/Games/Logic/PuzzlePeopleTable.cs:49 #, csharp-format -#| msgid "" -#| "A group of people are sitting at a round table spaced out evenly. How " -#| "many people are there if the {0} person is across from the {1}?" msgid "" "A group of people, spaced out evenly, are sitting at a round table. How many " "people are there if the {0} person sits directly across from the {1}?" @@ -5002,7 +4955,6 @@ msgstr "22e" #: ../src/Games/Logic/PuzzlePeopleTable.cs:85 -#| msgid "Two people in the table sitting across each other" msgid "Two people in the table sitting across from each other" msgstr "Twee mensen zitten tegenover elkaar aan de tafel" @@ -5277,7 +5229,6 @@ msgstr "Wie niet naar buiten gaat om een stukje te lopen voelt zich niet beter" #: ../src/Games/Logic/PuzzlePredicateLogic.cs:134 -#| msgid "Predicate Logic" msgid "Predicate logic" msgstr "Predikatenlogica" @@ -5415,10 +5366,8 @@ "corner." msgstr "" "Een heel vierkant blad papier (geel), 3/4 van een heel blad (blauw) in de " -"hoek rechtsonder, " -"3/4 van een heel blad (groen) in de hoek linksboven en 1/4 van een heel blad " -"(rood) " -"linksboven." +"hoek rechtsonder, 3/4 van een heel blad (groen) in de hoek linksboven en 1/4 " +"van een heel blad (rood) linksboven." #: ../src/Games/Logic/PuzzleTetris.cs:34 msgid "Tetris" @@ -5655,14 +5604,10 @@ "met getallen." #: ../src/Games/Memory/MemoryFaces.cs:52 -#| msgid "Memorize facts" msgid "Memorize faces" msgstr "Gezichten onthouden" #: ../src/Games/Memory/MemoryFaces.cs:57 -#| msgid "" -#| "In which cell is the other figure like the one shown below? Answer the " -#| "cell number." msgid "" "In which cell is the other face like the one shown below? Answer the cell " "number." @@ -5716,9 +5661,6 @@ #: ../src/Games/Memory/MemoryFacts.cs:123 #, csharp-format -#| msgid "" -#| "Shiny Cars sales fell {0}% this past December, the worst decline since " -#| "{1}." msgid "" "Shiny Cars sales fell {0}% this past December. This is the worst decline " "since which year?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/po/pl.po new/gbrainy-2.2.4/po/pl.po --- old/gbrainy-2.2.3/po/pl.po 2014-06-13 12:51:37.000000000 +0200 +++ new/gbrainy-2.2.4/po/pl.po 2014-12-19 21:12:08.000000000 +0100 @@ -8,14 +8,15 @@ # Bartosz Kosiorek <[email protected]>, 2010. # Piotr Sokół <[email protected]>, 2012. # Mateusz Kacprzak <[email protected]>, 2012-2013. -# Aviary.pl <[email protected]>, 2012-2013. +# Piotr Drąg <[email protected]>, 2014. +# Aviary.pl <[email protected]>, 2012-2014. msgid "" msgstr "" "Project-Id-Version: gbrainy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-29 01:13+0200\n" -"PO-Revision-Date: 2013-08-28 23:26+0100\n" -"Last-Translator: Mateusz Kacprzak <[email protected]>\n" +"POT-Creation-Date: 2014-09-07 02:35+0200\n" +"PO-Revision-Date: 2014-09-07 02:37+0200\n" +"Last-Translator: Piotr Drąg <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" "MIME-Version: 1.0\n" @@ -649,6 +650,26 @@ msgid "It is the result of the operation: ([three] * 3) - ([two] * 2)." msgstr "Wynik działania jest następujący: ([three] * 3) - ([two] * 2)." +#: ../data/gbrainy.appdata.xml.in.h:1 +msgid "" +"gbrainy is a game to train memory, arithmetical and logical capabilities " +"with many sorts of exercises of different difficulty levels." +msgstr "" +"gbrainy to gra trenująca pamięć, umiejętności arytmetyczne i logiczne za " +"pomocą wielu zadań o różnych poziomach trudności." + +#: ../data/gbrainy.appdata.xml.in.h:2 +msgid "" +"It should have something for all ages and purposes: kids whose parents want " +"them to develop their capabilities, adults that want to keep their mind in " +"form or just try it out for fun, older people that might need to do some " +"memory exercises, etc." +msgstr "" +"gbrainy posiada coś dla osób w każdym wieku i w każdym celu: dzieci, których " +"rodzice chcą rozwijać ich umiejętności, dorośli chcący zachować swój umysł w " +"formie lub po prostu się zabawić, osoby starsze, które mogą potrzebować " +"ćwiczeń umysłowych itd." + #: ../data/gbrainy.desktop.in.h:1 ../src/Clients/Classical/gbrainy.ui.h:1 msgid "gbrainy" msgstr "Łamigłówka" @@ -672,7 +693,7 @@ msgstr "Notatnik" #. -#. Translators, please check these recommendations when translating gbrainy: http://live.gnome.org/gbrainy/Localizing +#. Translators, please check these recommendations when translating gbrainy: https://wiki.gnome.org/Apps/gbrainy/Localizing #. #: ../data/verbal_analogies.xml.h:4 msgid "Which of the following sports does not belong in this group?" @@ -2067,7 +2088,7 @@ msgid "tear | rip" msgstr "podrzeć | rozedrzeć" -#. Translators: the concept 'toe' (http://en.wikipedia.org/wiki/Toe) does not exist in all languages. Feel free to change it to 'fingers' and adapt the answer accordingly +#. Translators: the concept 'toe' (http://en.wikipedia.org/wiki/Toe) does not exist in all languages. It means 'digits of the foot'. Feel free to change it to 'fingers' and adapt the answer accordingly #: ../data/verbal_analogies.xml.h:375 msgid "feet / two | toes" msgstr "stopy / dwie | palce" @@ -2409,7 +2430,8 @@ "Bartosz Kosiorek <[email protected]>, 2010\n" "Piotr Sokół <[email protected]>, 2012\n" "Mateusz Kacprzak <[email protected]>, 2012-2013\n" -"Aviary.pl <[email protected]>, 2012-2013" +"Piotr Drąg <[email protected]>, 2014\n" +"Aviary.pl <[email protected]>, 2012-2014" #: ../src/Clients/Classical/Dialogs/AboutDialog.cs:66 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/po/sl.po new/gbrainy-2.2.4/po/sl.po --- old/gbrainy-2.2.3/po/sl.po 2014-06-13 15:21:49.000000000 +0200 +++ new/gbrainy-2.2.4/po/sl.po 2014-12-19 21:12:08.000000000 +0100 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the gbrainy package. # # Andrej Žnidaršič <[email protected]>, 2009-2011. -# Matej Urbančič <[email protected]>, 2012-2013. +# Matej Urbančič <[email protected]>, 2012-2014. # msgid "" msgstr "" "Project-Id-Version: gbrainy master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=gbrainy&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-08-14 12:09+0000\n" -"PO-Revision-Date: 2013-08-17 15:31+0100\n" +"POT-Creation-Date: 2014-08-06 04:52+0000\n" +"PO-Revision-Date: 2014-08-06 14:49+0100\n" "Last-Translator: Matej Urbančič <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" "Language: sl\n" @@ -640,6 +640,24 @@ msgid "It is the result of the operation: ([three] * 3) - ([two] * 2)." msgstr "Je rezultat izračuna ([three] * 3) - ([two] * 2)." +#: ../data/gbrainy.appdata.xml.in.h:1 +msgid "" +"gbrainy is a game to train memory, arithmetical and logical capabilities " +"with many sorts of exercises of different difficulty levels." +msgstr "" +"Gbrainy je igra za urjenje spomina, logike, aritmetike in drugega z " +"različnimi vajami različnih zahtevnostnih ravni." + +#: ../data/gbrainy.appdata.xml.in.h:2 +msgid "" +"It should have something for all ages and purposes: kids whose parents want " +"them to develop their capabilities, adults that want to keep their mind in " +"form or just try it out for fun, older people that might need to do some " +"memory exercises, etc." +msgstr "" +"Namenjen je različnim uporabnikom. Z igro se lahko učijo otroci, starši in " +"starejši, da ostanejo zbrani in ostri v razmišljanju." + #: ../data/gbrainy.desktop.in.h:1 ../src/Clients/Classical/gbrainy.ui.h:1 msgid "gbrainy" msgstr "gbrainy" @@ -665,7 +683,7 @@ msgstr "Beležnica" #. -#. Translators, please check these recommendations when translating gbrainy: http://live.gnome.org/gbrainy/Localizing +#. Translators, please check these recommendations when translating gbrainy: https://wiki.gnome.org/Apps/gbrainy/Localizing #. #: ../data/verbal_analogies.xml.h:4 msgid "Which of the following sports does not belong in this group?" @@ -2038,7 +2056,7 @@ msgid "tear | rip" msgstr "strgati | odtrgati | raztrgati | zmečkati" -#. Translators: the concept 'toe' (http://en.wikipedia.org/wiki/Toe) does not exist in all languages. Feel free to change it to 'fingers' and adapt the answer accordingly +#. Translators: the concept 'toe' (http://en.wikipedia.org/wiki/Toe) does not exist in all languages. It means 'digits of the foot'. Feel free to change it to 'fingers' and adapt the answer accordingly #: ../data/verbal_analogies.xml.h:375 msgid "feet / two | toes" msgstr "noga / dve | prsti" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/po/sr.po new/gbrainy-2.2.4/po/sr.po --- old/gbrainy-2.2.3/po/sr.po 2014-06-13 12:51:37.000000000 +0200 +++ new/gbrainy-2.2.4/po/sr.po 2014-12-19 21:12:08.000000000 +0100 @@ -1,15 +1,15 @@ # Serbian translation for gbrainy # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 # This file is distributed under the same license as the gbrainy package. -# Мирослав Николић <[email protected]>, 2010, 2011,, 2012, 2013. +# Мирослав Николић <[email protected]>, 2010—2014. # Милош Поповић <[email protected]>, 2010. msgid "" msgstr "" "Project-Id-Version: gbrainy\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gbrain"; -"y&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-08-28 22:37+0000\n" -"PO-Revision-Date: 2013-09-08 08:09+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gbrainy"; +"&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-05-27 21:47+0000\n" +"PO-Revision-Date: 2014-10-24 22:03+0200\n" "Last-Translator: Мирослав Николић <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr\n" @@ -637,6 +637,26 @@ msgid "It is the result of the operation: ([three] * 3) - ([two] * 2)." msgstr "То је резултат математичке операције: ([three] * 3) - ([two] * 2)." +#: ../data/gbrainy.appdata.xml.in.h:1 +msgid "" +"gbrainy is a game to train memory, arithmetical and logical capabilities " +"with many sorts of exercises of different difficulty levels." +msgstr "" +"г-кефало је игра за увежбавање меморијских, аритметичких и логичких " +"способности помоћу многих врста вежби различитих нивоа тежине." + +#: ../data/gbrainy.appdata.xml.in.h:2 +msgid "" +"It should have something for all ages and purposes: kids whose parents want " +"them to develop their capabilities, adults that want to keep their mind in " +"form or just try it out for fun, older people that might need to do some " +"memory exercises, etc." +msgstr "" +"Треба да има понешто за све узрасте и намене: за децу чији родитељи желе од " +"њих да развијају њихове способности, за одрасле који желе да одрже свој ум у " +"форми или само да га испробају забаве ради, за старије који можда желе да " +"ураде по неку мемориску вежбицу, итд." + #: ../data/gbrainy.desktop.in.h:1 ../src/Clients/Classical/gbrainy.ui.h:1 msgid "gbrainy" msgstr "г-кефало" @@ -662,7 +682,7 @@ msgstr "Бележница" #. -#. Translators, please check these recommendations when translating gbrainy: http://live.gnome.org/gbrainy/Localizing +#. Translators, please check these recommendations when translating gbrainy: https://wiki.gnome.org/Apps/gbrainy/Localizing #. #: ../data/verbal_analogies.xml.h:4 msgid "Which of the following sports does not belong in this group?" @@ -2389,7 +2409,7 @@ "\n" msgstr "" "Овај програм је слободан софтвер; можете га прослеђивати и/или мењати под " -"условима ГНУ Опште Јавне Лиценце коју је објавила Задужбина Слободног " +"условима Гнуове Опште јавне лиценце коју је објавила Задужбина Слободног " "Софтвера; било верзије 2 Лиценце или (по вашем избору) било које новије " "верзије.\n" "\n" @@ -6126,17 +6146,17 @@ "John cleans at the speed of 1 / [john_time] per hour and his friend at 1 / " "[friend]. Together they will need [answer_a] hours." msgstr[0] "" -"Јован чисти брзином од 1 / [john_time] на сат а његов пријатељ брзином од " -"1 / [friend], заједно им је потребан [answer_a] сат." +"Јован чисти брзином од 1 / [john_time] на сат а његов пријатељ брзином од 1 /" +" [friend], заједно им је потребан [answer_a] сат." msgstr[1] "" -"Јован чисти брзином од 1 / [john_time] на сат а његов пријатељ брзином од " -"1 / [friend], заједно су им потребна [answer_a] сата." +"Јован чисти брзином од 1 / [john_time] на сат а његов пријатељ брзином од 1 /" +" [friend], заједно су им потребна [answer_a] сата." msgstr[2] "" -"Јован чисти брзином од 1 / [john_time] на сат а његов пријатељ брзином од " -"1 / [friend], заједно им је потребно [answer_a] сати." +"Јован чисти брзином од 1 / [john_time] на сат а његов пријатељ брзином од 1 /" +" [friend], заједно им је потребно [answer_a] сати." msgstr[3] "" -"Јован чисти брзином од 1 / [john_time] на сат а његов пријатељ брзином од " -"1 / [friend], заједно им је потребан један сат." +"Јован чисти брзином од 1 / [john_time] на сат а његов пријатељ брзином од 1 /" +" [friend], заједно им је потребан један сат." #: ../tools/GameXmlGetString.cs:73 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/po/[email protected] new/gbrainy-2.2.4/po/[email protected] --- old/gbrainy-2.2.3/po/[email protected] 2014-06-13 12:51:37.000000000 +0200 +++ new/gbrainy-2.2.4/po/[email protected] 2014-12-19 21:12:08.000000000 +0100 @@ -1,15 +1,15 @@ # Serbian translation for gbrainy # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 # This file is distributed under the same license as the gbrainy package. -# Miroslav Nikolić <[email protected]>, 2010, 2011,, 2012, 2013. +# Miroslav Nikolić <[email protected]>, 2010—2014. # Miloš Popović <[email protected]>, 2010. msgid "" msgstr "" "Project-Id-Version: gbrainy\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gbrain"; -"y&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-08-28 22:37+0000\n" -"PO-Revision-Date: 2013-09-08 08:09+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gbrainy"; +"&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-05-27 21:47+0000\n" +"PO-Revision-Date: 2014-10-24 22:03+0200\n" "Last-Translator: Miroslav Nikolić <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr\n" @@ -637,6 +637,26 @@ msgid "It is the result of the operation: ([three] * 3) - ([two] * 2)." msgstr "To je rezultat matematičke operacije: ([three] * 3) - ([two] * 2)." +#: ../data/gbrainy.appdata.xml.in.h:1 +msgid "" +"gbrainy is a game to train memory, arithmetical and logical capabilities " +"with many sorts of exercises of different difficulty levels." +msgstr "" +"g-kefalo je igra za uvežbavanje memorijskih, aritmetičkih i logičkih " +"sposobnosti pomoću mnogih vrsta vežbi različitih nivoa težine." + +#: ../data/gbrainy.appdata.xml.in.h:2 +msgid "" +"It should have something for all ages and purposes: kids whose parents want " +"them to develop their capabilities, adults that want to keep their mind in " +"form or just try it out for fun, older people that might need to do some " +"memory exercises, etc." +msgstr "" +"Treba da ima ponešto za sve uzraste i namene: za decu čiji roditelji žele od " +"njih da razvijaju njihove sposobnosti, za odrasle koji žele da održe svoj um u " +"formi ili samo da ga isprobaju zabave radi, za starije koji možda žele da " +"urade po neku memorisku vežbicu, itd." + #: ../data/gbrainy.desktop.in.h:1 ../src/Clients/Classical/gbrainy.ui.h:1 msgid "gbrainy" msgstr "g-kefalo" @@ -662,7 +682,7 @@ msgstr "Beležnica" #. -#. Translators, please check these recommendations when translating gbrainy: http://live.gnome.org/gbrainy/Localizing +#. Translators, please check these recommendations when translating gbrainy: https://wiki.gnome.org/Apps/gbrainy/Localizing #. #: ../data/verbal_analogies.xml.h:4 msgid "Which of the following sports does not belong in this group?" @@ -2389,7 +2409,7 @@ "\n" msgstr "" "Ovaj program je slobodan softver; možete ga prosleđivati i/ili menjati pod " -"uslovima GNU Opšte Javne Licence koju je objavila Zadužbina Slobodnog " +"uslovima Gnuove Opšte javne licence koju je objavila Zadužbina Slobodnog " "Softvera; bilo verzije 2 Licence ili (po vašem izboru) bilo koje novije " "verzije.\n" "\n" @@ -6126,17 +6146,17 @@ "John cleans at the speed of 1 / [john_time] per hour and his friend at 1 / " "[friend]. Together they will need [answer_a] hours." msgstr[0] "" -"Jovan čisti brzinom od 1 / [john_time] na sat a njegov prijatelj brzinom od " -"1 / [friend], zajedno im je potreban [answer_a] sat." +"Jovan čisti brzinom od 1 / [john_time] na sat a njegov prijatelj brzinom od 1 /" +" [friend], zajedno im je potreban [answer_a] sat." msgstr[1] "" -"Jovan čisti brzinom od 1 / [john_time] na sat a njegov prijatelj brzinom od " -"1 / [friend], zajedno su im potrebna [answer_a] sata." +"Jovan čisti brzinom od 1 / [john_time] na sat a njegov prijatelj brzinom od 1 /" +" [friend], zajedno su im potrebna [answer_a] sata." msgstr[2] "" -"Jovan čisti brzinom od 1 / [john_time] na sat a njegov prijatelj brzinom od " -"1 / [friend], zajedno im je potrebno [answer_a] sati." +"Jovan čisti brzinom od 1 / [john_time] na sat a njegov prijatelj brzinom od 1 /" +" [friend], zajedno im je potrebno [answer_a] sati." msgstr[3] "" -"Jovan čisti brzinom od 1 / [john_time] na sat a njegov prijatelj brzinom od " -"1 / [friend], zajedno im je potreban jedan sat." +"Jovan čisti brzinom od 1 / [john_time] na sat a njegov prijatelj brzinom od 1 /" +" [friend], zajedno im je potreban jedan sat." #: ../tools/GameXmlGetString.cs:73 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/po/uk.po new/gbrainy-2.2.4/po/uk.po --- old/gbrainy-2.2.3/po/uk.po 2014-06-13 12:51:37.000000000 +0200 +++ new/gbrainy-2.2.4/po/uk.po 2014-12-28 00:12:05.000000000 +0100 @@ -2,22 +2,23 @@ # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 # This file is distributed under the same license as the gbrainy package. # FIRST AUTHOR <EMAIL@ADDRESS>, 2010. -# +# Daniel Korostil <[email protected]>, 2014. msgid "" msgstr "" "Project-Id-Version: gbrainy\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-01-13 21:48+0000\n" -"PO-Revision-Date: 2012-07-10 08:44+0000\n" -"Last-Translator: Dima Alexeenko <[email protected]>\n" -"Language-Team: Ukrainian <[email protected]>\n" +"PO-Revision-Date: 2014-12-26 23:35+0300\n" +"Last-Translator: Daniel Korostil <[email protected]>\n" +"Language-Team: linux.org.ua\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Virtaal 0.7.1\n" "X-Launchpad-Export-Date: 2012-10-05 05:40+0000\n" -"X-Generator: Launchpad (build 16061)\n" #: ../data/games.xml.h:1 msgid "" @@ -4877,14 +4878,14 @@ "John is 46 years old. His son is [difference] years younger than half of " "John's age. How old is John's son?" msgstr[0] "" -"Джону 46 років. Різниця між його віком, та віком його сина складає половину " -"віку Джона. Скільки років Джоновому сину?" +"Джону 46 років. Його сину на [difference] рік менше за половинку віку Джона. " +"Скільки років Джоновому сину?" msgstr[1] "" -"Джону 46 років. Різниця між його віком, та віком його сина складає половину " -"віку Джона. Скільки років Джоновому сину?" +"Джону 46 років. Його сину на [difference] ріки менше за половинку віку " +"Джона. Скільки років Джоновому сину?" msgstr[2] "" -"Джону 46 років. Різниця між його віком, та віком його сина складає половину " -"віку Джона. Скільки років Джоновому сину?" +"Джону 46 років. Його сину на [difference] років менше за половинку віку " +"Джона. Скільки років Джоновому сину?" #: ../tools/GameXmlGetString.cs:37 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/src/Clients/Classical/gbrainy.cs new/gbrainy-2.2.4/src/Clients/Classical/gbrainy.cs --- old/gbrainy-2.2.3/src/Clients/Classical/gbrainy.cs 2014-05-27 22:20:10.000000000 +0200 +++ new/gbrainy-2.2.4/src/Clients/Classical/gbrainy.cs 2014-12-28 00:34:36.000000000 +0100 @@ -51,7 +51,6 @@ [GtkBeans.Builder.Object] Gtk.Button tip_button; [GtkBeans.Builder.Object] Gtk.Button next_button; [GtkBeans.Builder.Object] Gtk.Statusbar statusbar; - [GtkBeans.Builder.Object] Gtk.MenuBar menubar; [GtkBeans.Builder.Object] Gtk.MenuItem pause_menuitem; [GtkBeans.Builder.Object] Gtk.MenuItem finish_menuitem; [GtkBeans.Builder.Object] Gtk.MenuItem newgame_menuitem; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/src/Core/Libraries/CSharpCompiler.cs new/gbrainy-2.2.4/src/Core/Libraries/CSharpCompiler.cs --- old/gbrainy-2.2.3/src/Core/Libraries/CSharpCompiler.cs 2014-05-27 22:20:10.000000000 +0200 +++ new/gbrainy-2.2.4/src/Core/Libraries/CSharpCompiler.cs 2014-12-28 00:12:37.000000000 +0100 @@ -17,8 +17,6 @@ * Boston, MA 02111-1307, USA. */ -#if !CSHARP_STATIC - using System; using System.Text; using System.Text.RegularExpressions; @@ -115,4 +113,3 @@ } } -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/src/Core/Libraries/CSharpCompilerStatic.cs new/gbrainy-2.2.4/src/Core/Libraries/CSharpCompilerStatic.cs --- old/gbrainy-2.2.3/src/Core/Libraries/CSharpCompilerStatic.cs 2014-05-27 22:20:10.000000000 +0200 +++ new/gbrainy-2.2.4/src/Core/Libraries/CSharpCompilerStatic.cs 1970-01-01 01:00:00.000000000 +0100 @@ -1,169 +0,0 @@ -/* - * Copyright (C) 2010 Jordi Mas i Hernàndez <[email protected]> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#if CSHARP_STATIC - -using System; -using System.Text; -using System.Text.RegularExpressions; - -using Mono.CSharp; -using System.Reflection; -using gbrainy.Core.Services; - -namespace gbrainy.Core.Libraries -{ - // This encapsulates Mono.CSharp previous to Mono 2.10 when it was a static class - public class CSharpCompilerStatic : ICSharpCompiler - { - static bool? monofix_needed; - static string stored_vars; - static int unload_domain = 0; - static AppDomain tempDomain; - const int maximum_uses = 50; - - public void EvaluateCode (string c) - { - if (tempDomain == null) - tempDomain = AppDomain.CreateDomain ("MonoCSharpDomain"); - - // Load the Mono Compiler service in a separate domain then - // we can recycle it to reduce memory consumption - // - // After Mono 2.12 this is no longer need - // http://tirania.org/blog/archive/2011/Feb-24.html - IConfiguration config = ServiceLocator.Instance.GetService <IConfiguration> (); - string asm_dir = config.Get <string> (ConfigurationKeys.AssembliesDir); - string full_name = System.IO.Path.Combine (asm_dir, "gbrainy.Core.dll"); - AssemblyName aname = AssemblyName.GetAssemblyName (full_name); - Assembly asem = tempDomain.Load (aname); - - CSharpCompilerStaticDomainProxy proxy = (CSharpCompilerStaticDomainProxy) tempDomain.CreateInstanceAndUnwrap (asem.FullName, - typeof (CSharpCompilerStaticDomainProxy).FullName); - - proxy.SetCode (c); - tempDomain.DoCallBack (proxy.EvaluateVariables); - stored_vars = proxy.GetVars (); - stored_vars = FixGetVars (stored_vars); - - if (unload_domain > maximum_uses) - { - AppDomain.Unload (tempDomain); - unload_domain = 0; - tempDomain = null; - } - else - unload_domain++; - } - public string GetAllVariables () - { - return stored_vars; - } - - public string GetVariableValue (string _var) - { - const string exp = "([a-z0-9._%+-]+) ([a-z0-9._%+-]+) (=) ([0-9]+)"; - Match match; - int idx, cur, newline_len; - string line; - string vars; - - vars = GetAllVariables (); - Regex regex = new Regex (exp, RegexOptions.IgnoreCase); - - newline_len = System.Environment.NewLine.Length; - cur = 0; - - do - { - // Process a line - idx = vars.IndexOf (System.Environment.NewLine, cur); - if (idx == -1) idx = vars.Length; - - line = vars.Substring (cur, idx - cur); - cur = idx + newline_len; - match = regex.Match (line); - - // "int num = 2"; - // group 1 -> int, group 2 -> num, group 3 -> =, group 4 -> 2 - if (match.Groups.Count == 5) - { - if (match.Groups[2].Value == _var) - return match.Groups[4].Value; - } - - } while (cur < vars.Length); - - return string.Empty; - } - - - // Before Mono 2.6 (rev. 156533) there is no line separator between variables - static string FixGetVars (string str) - { - if (monofix_needed == null) - { - string eval, vars; - - eval = "int a = 1; int b = 1;"; - Evaluator.Run (eval); - vars = Evaluator.GetVars (); - - monofix_needed = vars.IndexOf (System.Environment.NewLine) == -1; - } - - if (monofix_needed == false) - return str; - - // We just guarantee that int, doubles, and float are separated as modern Mono versions do - StringBuilder output = new StringBuilder (); - string [] keywords = new string [] {"int", "double", "float"}; - int pos = 0, cur = 0, tmp_pos, keyword; - - while (pos != -1) - { - pos = keyword = -1; - // Look for the nearest of these keywords - for (int i = 0; i < keywords.Length; i++) - { - tmp_pos = str.IndexOf (keywords [i], cur); - if (tmp_pos == -1) - continue; - - if (pos == -1 || pos > 0 && tmp_pos < pos) { - keyword = i; - pos = tmp_pos; - } - } - - if (pos == -1) - continue; - - output.Append (str.Substring (cur, pos - cur)); - output.AppendLine (); - output.Append (str.Substring (pos, keywords[keyword].Length)); - cur = pos + keywords[keyword].Length; - } - - output.Append (str.Substring (cur, str.Length - cur)); - return output.ToString (); - } - } -} -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/src/Core/Libraries/CSharpCompilerStaticDomainProxy.cs new/gbrainy-2.2.4/src/Core/Libraries/CSharpCompilerStaticDomainProxy.cs --- old/gbrainy-2.2.3/src/Core/Libraries/CSharpCompilerStaticDomainProxy.cs 2014-05-27 22:20:10.000000000 +0200 +++ new/gbrainy-2.2.4/src/Core/Libraries/CSharpCompilerStaticDomainProxy.cs 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2010 Jordi Mas i Hernàndez <[email protected]> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#if CSHARP_STATIC - -using System; -using Mono.CSharp; - -using gbrainy.Core.Services; - -namespace gbrainy.Core.Libraries -{ - // This class proxys data from one domain to another - internal class CSharpCompilerStaticDomainProxy : MarshalByRefObject - { - string code; - - public void SetCode (string c) - { - code = c; - } - - public string GetVars () - { - return Evaluator.GetVars (); - } - - public void EvaluateVariables () - { - string eval; - - try - { - // Using's for the variables section - // We need to evaluate either declarations (like using) or expression/statements separately - eval = "using System;\n"; - Mono.CSharp.Evaluator.Run (eval); - - // Infrastructure for the user available - eval = "Random random = new Random ();\n"; - - // As Mono 2.4.4 this call is killing in terms of memory leaking - Mono.CSharp.Evaluator.Run (eval + code); - } - - catch (Exception e) - { - Console.WriteLine ("CSharpCompilerStaticDomainProxy. Error {0} when evaluating variable definition [{1}]", e.Message, code); - } - } - } -} - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/src/Core/Makefile.am new/gbrainy-2.2.4/src/Core/Makefile.am --- old/gbrainy-2.2.3/src/Core/Makefile.am 2014-05-27 22:20:10.000000000 +0200 +++ new/gbrainy-2.2.4/src/Core/Makefile.am 2014-12-28 00:20:10.000000000 +0100 @@ -76,8 +76,6 @@ $(srcdir)/Services/MemoryConfiguration.cs \ $(srcdir)/Services/DefaultServices.cs \ $(srcdir)/Services/ICSharpCompiler.cs \ - $(srcdir)/Libraries/CSharpCompilerStatic.cs \ - $(srcdir)/Libraries/CSharpCompilerStaticDomainProxy.cs \ $(srcdir)/Libraries/CSharpCompiler.cs CSFILES = $(CSDISTFILES) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gbrainy-2.2.3/src/Core/Services/DefaultServices.cs new/gbrainy-2.2.4/src/Core/Services/DefaultServices.cs --- old/gbrainy-2.2.3/src/Core/Services/DefaultServices.cs 2014-05-27 22:20:10.000000000 +0200 +++ new/gbrainy-2.2.4/src/Core/Services/DefaultServices.cs 2014-12-28 00:12:37.000000000 +0100 @@ -36,12 +36,7 @@ // Default services services.Add (typeof (ITranslations), new TranslationsCatalog ()); services.Add (typeof (IConfiguration), new MemoryConfiguration ()); - -#if CSHARP_STATIC - services.Add (typeof (ICSharpCompiler), new CSharpCompilerStatic ()); -#else services.Add (typeof (ICSharpCompiler), new CSharpCompiler ()); -#endif } public void RemoveService <T> () where T : class, IService -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
