diff options
| author | Piotr Dziwiński <piotrdz@gmail.com> | 2013-01-20 06:25:12 -0800 |
|---|---|---|
| committer | Piotr Dziwiński <piotrdz@gmail.com> | 2013-01-20 06:25:12 -0800 |
| commit | f03af31ceca9bfc0b52f039cb89c1105cb524db2 (patch) | |
| tree | ec12c1c0c21d8280dabf974361fb011e81eb15e2 | |
| parent | b50f9ae8b7efe9ae4b198a4f1072a384919c6c08 (diff) | |
| parent | 0ef831429a1988d6c0b303854a03d31f780eaa88 (diff) | |
| download | colobot-f03af31ceca9bfc0b52f039cb89c1105cb524db2.tar.gz colobot-f03af31ceca9bfc0b52f039cb89c1105cb524db2.tar.bz2 colobot-f03af31ceca9bfc0b52f039cb89c1105cb524db2.zip | |
Merge pull request #124 from OdyX/dev-OdyX-201301
Makes dev build again in Travis + manpage fix
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/desktop/colobot.pod | 2 | ||||
| -rw-r--r-- | src/desktop/po/colobot-desktop.pot | 4 | ||||
| -rw-r--r-- | src/desktop/po/fr.po | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 96a7443..af27ea3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,6 @@ before_install: - git submodule update --init --recursive - sudo add-apt-repository ppa:mapnik/boost -y - sudo apt-get update -qq - - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin + - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin libsndfile-dev notifications: email: false diff --git a/src/desktop/colobot.pod b/src/desktop/colobot.pod index 2fc3a00..ae67e72 100644 --- a/src/desktop/colobot.pod +++ b/src/desktop/colobot.pod @@ -1,6 +1,6 @@ =encoding utf8 -=head1 COLOBOT +=head1 NAME colobot - educational programming strategy game diff --git a/src/desktop/po/colobot-desktop.pot b/src/desktop/po/colobot-desktop.pot index 17e60c3..94eb85a 100644 --- a/src/desktop/po/colobot-desktop.pot +++ b/src/desktop/po/colobot-desktop.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-12-27 10:59+0100\n" +"POT-Creation-Date: 2013-01-20 14:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -33,7 +33,7 @@ msgstr "" #. type: =head1 #: colobot.pod:3 -msgid "COLOBOT" +msgid "NAME" msgstr "" #. type: textblock diff --git a/src/desktop/po/fr.po b/src/desktop/po/fr.po index 4709d49..40fa9e1 100644 --- a/src/desktop/po/fr.po +++ b/src/desktop/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-12-27 10:55+0100\n" +"POT-Creation-Date: 2013-01-20 14:26+0100\n" "PO-Revision-Date: 2012-12-27 11:00+0100\n" "Last-Translator: Didier Raboud <odyx@debian.org>\n" "Language-Team: none\n" @@ -33,8 +33,8 @@ msgstr "Colonise avec des roBots" #. type: =head1 #: colobot.pod:3 -msgid "COLOBOT" -msgstr "COLOBOT" +msgid "NAME" +msgstr "NOM" #. type: textblock #: colobot.pod:5 |