diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-30 15:01:00 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-30 15:23:05 +0100 |
| commit | e218dcfdf2c58f8841e7ebd220527d08e870a6d5 (patch) | |
| tree | a567db04a8a51e2db87f80e259faf222a7d4becd /src/desktop | |
| parent | bfc701e286259d9a7aa2ff8240704eab2ba3a237 (diff) | |
| parent | e607fed265070be8c518d4302d8b76f738421fb3 (diff) | |
| download | colobot-e218dcfdf2c58f8841e7ebd220527d08e870a6d5.tar.gz colobot-e218dcfdf2c58f8841e7ebd220527d08e870a6d5.tar.bz2 colobot-e218dcfdf2c58f8841e7ebd220527d08e870a6d5.zip | |
Merge branch 'dev'
Merging content from dev
Diffstat (limited to 'src/desktop')
| -rw-r--r-- | src/desktop/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/desktop/colobot.desktop.in | 1 | ||||
| -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 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/desktop/CMakeLists.txt b/src/desktop/CMakeLists.txt index ce4f48d..9a00dd4 100644 --- a/src/desktop/CMakeLists.txt +++ b/src/desktop/CMakeLists.txt @@ -39,7 +39,7 @@ endif() # Create manpage from pod-formatted file find_program(POD2MAN pod2man) -if(POD2MAN) +if(POD2MAN AND (NOT MSYS)) set(COLOBOT_MANPAGE_SECTION 6) macro(podman) diff --git a/src/desktop/colobot.desktop.in b/src/desktop/colobot.desktop.in index 74378fd..9b09803 100644 --- a/src/desktop/colobot.desktop.in +++ b/src/desktop/colobot.desktop.in @@ -3,3 +3,4 @@ Version=1.0 Type=Application Exec=colobot Icon=colobot +Categories=Education;Robotics;Game;AdventureGame;StrategyGame; 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 |