Permalink
Browse files

Merge branch 'master' of https://github.com/clintbellanger/flare-engine

  • Loading branch information...
clintbellanger committed Dec 30, 2012
2 parents 2d54dfa + 6531a68 commit 26f62d531e93d621acb827bd6bd6be1c8b8ee8c7
View
@@ -2,10 +2,9 @@ language: cpp
compiler:
- gcc
- clang
- - /usr/lib/gcc-snapshot/bin/gcc
before_install:
- sudo apt-get update -qq
- - sudo apt-get install -qq libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev cppcheck gcc-snapshot
+ - sudo apt-get install -qq libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev cppcheck
script: cmake . && make
after_script: cppcheck --verbose --enable=all --std=posix --std=c++11 --quiet `git ls-files src/\*.cpp`
notifications:
View
@@ -32,10 +32,10 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-pg")
set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-pg")
else()
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -pg")
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-pg")
- set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-pg")
- set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-pg")
+ set(CMAKE_CXX_FLAGS "-g3 -pg")
+ set(CMAKE_EXE_LINKER_FLAGS "-pg")
+ set(CMAKE_SHARED_LINKER_FLAGS "-pg")
+ set(CMAKE_MODULE_LINKER_FLAGS "-pg")
endif()
set(BINDIR "games" CACHE STRING "Directory from CMAKE_INSTALL_PREFIX where game executable will be installed.")
@@ -9,6 +9,7 @@ fr=Français
gl=Galego
it=Italiano
ja=Nihongo
+nb=Norsk Bokmål
nl=Nederlands
pl=Polski
ru=Русский
@@ -7,9 +7,9 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-09-26 20:53+0300\n"
-"PO-Revision-Date: 2012-10-27 17:58+0200\n"
-"Last-Translator: Adrián Chaves Fernández <adriyetichaves@gmail.com>\n"
-"Language-Team: Galician <kde-i18n-doc@kde.org>\n"
+"PO-Revision-Date: 2012-12-26 18:30+0100\n"
+"Last-Translator: Adrian Chaves Fernandez <adriyetichaves@gmail.com>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr "Parabéns, chegaches ao nivel %d!"
#: ../../../src/Avatar.cpp:446
msgid "You may increase one attribute through the Character Menu."
-msgstr "Podes aumentar un atributo dende o menú da personaxe."
+msgstr "Podes aumentar un atributo desde o menú da personaxe."
#: ../../../src/Avatar.cpp:633
msgid "You are defeated. Game over! Press Enter to exit to Title."
@@ -771,7 +771,7 @@ msgstr "Prema Ctrl e un ítem para vendelo."
#: ../../../src/MenuInventory.cpp:387
msgid "This item can only be used from the action bar."
-msgstr "Este ítem só pode empregarse dende a barra de acción."
+msgstr "Este ítem só pode empregarse desde a barra de acción."
#: ../../../src/MenuLog.cpp:78
msgid "Notes"
Oops, something went wrong.

0 comments on commit 26f62d5

Please sign in to comment.