Merge branch 'dev' of github.com:colobot/colobot into dev

Conflicts:
	po/de.po
	po/fr.po
	po/pl.po
	po/ru.po
dev-mp
krzys-h 2014-07-10 17:41:22 +02:00
commit 9ac578d5f2
5 changed files with 96 additions and 88 deletions

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-07-10 17:39+0200\n"
"POT-Creation-Date: 2014-07-10 16:50+0200\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"
@ -110,6 +110,9 @@ msgstr ""
msgid " Missions on this level:"
msgstr ""
msgid " Free game on this chapter:"
msgstr ""
msgid " Summary:"
msgstr ""

View File

@ -1,11 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-07-10 17:39+0200\n"
"POT-Creation-Date: 2014-07-10 16:50+0200\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"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Translate Toolkit 1.11.0\n"
"X-Language: de_DE\n"
"X-Source-Language: en_US\n"
@ -24,6 +34,9 @@ msgstr " Driver:"
msgid " Exercises in the chapter:"
msgstr " Liste der Übungen des Kapitels:"
msgid " Free game on this chapter:"
msgstr " Liste der freien Levels des Kapitel:"
msgid " Free game on this planet:"
msgstr " Liste der freien Levels des Planeten:"
@ -200,9 +213,8 @@ msgstr "Baut einen Geschützturm"
msgid "Build a derrick"
msgstr "Baut einen Bohrturm"
#, fuzzy
msgid "Build a destroyer"
msgstr "Gebäude zerstört"
msgstr ""
msgid "Build a exchange post"
msgstr "Baut einen Infoserver"
@ -453,9 +465,8 @@ msgstr "Bohrturm"
msgid "Descend\\Reduces the power of the jet"
msgstr "Sinken\\Leistung des Triebwerks drosseln"
#, fuzzy
msgid "Destroy"
msgstr "Einstampfer"
msgstr ""
msgid "Destroy the building"
msgstr "Gebäude sprengen"
@ -536,9 +547,8 @@ msgstr "Programmieren\\Programmierübungen"
msgid "Exit film\\Film at the exit of exercises"
msgstr "Zurücksetzen \\Kleine Show beim Zurücksetzen in den Übungen"
#, fuzzy
msgid "Explode (\\key action;)"
msgstr "Recyceln (\\key action;)"
msgstr ""
msgid "Explosive"
msgstr "Sprengstoff"
@ -706,9 +716,8 @@ msgstr "Roboter ungeeignet"
msgid "Inappropriate cell type"
msgstr "Falscher Batterietyp"
#, fuzzy
msgid "Inappropriate object"
msgstr "Roboter ungeeignet"
msgstr ""
msgid "Incorrect index type"
msgstr "Falscher Typ für einen Index"
@ -926,9 +935,8 @@ msgstr "Nicht genug Energie"
msgid "Not enough energy yet"
msgstr "Noch nicht genug Energie"
#, fuzzy
msgid "Not found anything to destroy"
msgstr "Nichts abzulegen"
msgstr ""
msgid "Not yet enough energy"
msgstr "Noch nicht genug Energie"
@ -1828,9 +1836,6 @@ msgstr ""
msgid "www.epsitec.com"
msgstr "www.epsitec.com"
#~ msgid " Free game on this chapter:"
#~ msgstr " Liste der freien Levels des Kapitel:"
#~ msgid "< none >"
#~ msgstr "< keine >"

View File

@ -1,18 +1,20 @@
# Didier Raboud <odyx@debian.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-07-10 17:39+0200\n"
"POT-Creation-Date: 2014-07-10 16:50+0200\n"
"PO-Revision-Date: 2012-12-27 14:07+0100\n"
"Last-Translator: Didier Raboud <odyx@debian.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 1.4\n"
"X-Language: fr_FR\n"
"X-Source-Language: en_US\n"
"X-Generator: Lokalize 1.4\n"
msgid " "
msgstr " "
@ -29,6 +31,9 @@ msgstr " Pilotes :"
msgid " Exercises in the chapter:"
msgstr " Liste des exercices du chapitre :"
msgid " Free game on this chapter:"
msgstr " Liste des jeux libres du chapitre :"
msgid " Free game on this planet:"
msgstr " Liste des jeux libres du chapitre :"
@ -204,9 +209,8 @@ msgstr "Construit une tour"
msgid "Build a derrick"
msgstr "Construit un derrick"
#, fuzzy
msgid "Build a destroyer"
msgstr "Bâtiment détruit"
msgstr ""
msgid "Build a exchange post"
msgstr "Construit une borne d'information"
@ -457,9 +461,8 @@ msgstr "Derrick"
msgid "Descend\\Reduces the power of the jet"
msgstr "Descendre\\Diminuer la puissance du réacteur"
#, fuzzy
msgid "Destroy"
msgstr "Destructeur"
msgstr ""
msgid "Destroy the building"
msgstr "Démolit le bâtiment"
@ -540,9 +543,8 @@ msgstr "Programmation\\Exercices de programmation"
msgid "Exit film\\Film at the exit of exercises"
msgstr "Retour animé\\Retour animé dans les exercices"
#, fuzzy
msgid "Explode (\\key action;)"
msgstr "Recycle (\\key action;)"
msgstr ""
msgid "Explosive"
msgstr "Explosif"
@ -710,9 +712,8 @@ msgstr "Robot inadapté"
msgid "Inappropriate cell type"
msgstr "Pas le bon type de pile"
#, fuzzy
msgid "Inappropriate object"
msgstr "Robot inadapté"
msgstr ""
msgid "Incorrect index type"
msgstr "Mauvais type d'index"
@ -932,9 +933,8 @@ msgstr "Pas assez d'énergie"
msgid "Not enough energy yet"
msgstr "Pas encore assez d'énergie"
#, fuzzy
msgid "Not found anything to destroy"
msgstr "Rien à déposer"
msgstr ""
msgid "Not yet enough energy"
msgstr "Pas encore assez d'énergie"
@ -1835,9 +1835,6 @@ msgstr ""
msgid "www.epsitec.com"
msgstr "www.epsitec.com"
#~ msgid " Free game on this chapter:"
#~ msgstr " Liste des jeux libres du chapitre :"
#~ msgid "< none >"
#~ msgstr "< aucune >"

View File

@ -1,14 +1,25 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-07-10 17:39+0200\n"
"POT-Creation-Date: 2014-07-10 16:50+0200\n"
"PO-Revision-Date: 2014-07-10 15:23+0200\n"
"Last-Translator: krzys_h <krzys_h@interia.pl>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: pl\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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.5.1.1\n"
"X-Language: pl_PL\n"
"X-Source-Language: en_US\n"
"X-POOTLE-MTIME: 1405002225.000000\n"
msgid " "
msgstr " "
@ -25,6 +36,9 @@ msgstr " Sterowniki:"
msgid " Exercises in the chapter:"
msgstr " Ćwiczenia w tym rozdziale:"
msgid " Free game on this chapter:"
msgstr " Swobodna gra na tej planecie:"
msgid " Free game on this planet:"
msgstr " Swobodna gra na tej planecie:"
@ -57,10 +71,10 @@ msgstr "Brak \" ] \""
#, c-format
msgid "\"%s\" missing in this exercise"
msgstr "It misses \"%s\" in this exercise"
msgstr "Brakuje \"%s\" w tym ćwiczeniu"
msgid "%1"
msgstr ""
msgstr "%1"
msgid "..behind"
msgstr "..za"
@ -202,9 +216,8 @@ msgstr "Zbuduj wieżę obronną"
msgid "Build a derrick"
msgstr "Zbuduj kopalnię"
#, fuzzy
msgid "Build a destroyer"
msgstr "Budynek zniszczony"
msgstr "Zbuduj niszczarkę"
msgid "Build a exchange post"
msgstr "Zbuduj stację przekaźnikową"
@ -342,10 +355,10 @@ msgid "Can not create this; there are too many objects"
msgstr "Nie można tego utworzyć, za dużo obiektów"
msgid "Can not produce not researched object"
msgstr ""
msgstr "Nie można wyprodukować nie odkrytego obiektu"
msgid "Can not produce this object in this mission"
msgstr ""
msgstr "Nie można utworzyć tego obiektu w tej misji"
msgid "Can't open file"
msgstr "Nie można otworzyć pliku"
@ -455,9 +468,8 @@ msgstr "Kopalnia"
msgid "Descend\\Reduces the power of the jet"
msgstr "W dół\\Zmniejsza moc silnika"
#, fuzzy
msgid "Destroy"
msgstr "Destroyer"
msgstr "Zniszcz"
msgid "Destroy the building"
msgstr "Zniszcz budynek"
@ -538,9 +550,8 @@ msgstr "Ćwiczenia\\Ćwiczenia programistyczne"
msgid "Exit film\\Film at the exit of exercises"
msgstr "Końcowy film\\Film na zakończenie ćwiczeń"
#, fuzzy
msgid "Explode (\\key action;)"
msgstr "Odzyskaj (\\key action;)"
msgstr "Wysadź (\\key action;)"
msgid "Explosive"
msgstr "Materiały wybuchowe"
@ -709,9 +720,8 @@ msgstr "Nieodpowiedni robot"
msgid "Inappropriate cell type"
msgstr "Nieodpowiedni rodzaj ogniw"
#, fuzzy
msgid "Inappropriate object"
msgstr "Nieodpowiedni robot"
msgstr "Nieodpowiedni objekt"
msgid "Incorrect index type"
msgstr "Nieprawidłowy typ indeksu"
@ -750,7 +760,7 @@ msgid "Instructions\\Shows the instructions for the current mission"
msgstr "Rozkazy\\Pokazuje rozkazy dotyczące bieżącej misji"
msgid "Internal error - tell the developers"
msgstr ""
msgstr "Błąd wewnętrzny - powiadom twórców gry"
msgid "Jet temperature"
msgstr "Temperatura silnika"
@ -931,9 +941,8 @@ msgstr "Za mało energii"
msgid "Not enough energy yet"
msgstr "Wciąż za mało energii"
#, fuzzy
msgid "Not found anything to destroy"
msgstr "Nie ma nic do upuszczenia"
msgstr "Nie znaleziono nic do zniszczenia"
msgid "Not yet enough energy"
msgstr "Wciąż za mało energii"
@ -1605,7 +1614,7 @@ msgid "Wheeled sniffer"
msgstr "Szperacz na kołach"
msgid "Win"
msgstr ""
msgstr "Win"
msgid "Winged grabber"
msgstr "Transporter latający"
@ -1773,74 +1782,71 @@ msgid "\\c; (none)\\n;\n"
msgstr "\\c; (brak)\\n;\n"
msgid "action;"
msgstr ""
msgstr "action;"
msgid "away;"
msgstr ""
msgstr "away;"
msgid "camera;"
msgstr ""
msgstr "camera;"
msgid "cbot;"
msgstr ""
msgstr "cbot;"
msgid "desel;"
msgstr ""
msgstr "desel;"
msgid "down;"
msgstr ""
msgstr "down;"
msgid "gdown;"
msgstr ""
msgstr "gdown;"
msgid "gup;"
msgstr ""
msgstr "gup;"
msgid "help;"
msgstr ""
msgstr "help;"
msgid "human;"
msgstr ""
msgstr "human;"
msgid "left;"
msgstr ""
msgstr "left;"
msgid "near;"
msgstr ""
msgstr "near;"
msgid "next;"
msgstr ""
msgstr "next;"
msgid "prog;"
msgstr ""
msgstr "prog;"
msgid "quit;"
msgstr ""
msgstr "quit;"
msgid "right;"
msgstr ""
msgstr "right;"
msgid "speed10;"
msgstr ""
msgstr "speed10;"
msgid "speed15;"
msgstr ""
msgstr "speed15;"
msgid "speed20;"
msgstr ""
msgstr "speed20;"
msgid "up;"
msgstr ""
msgstr "up;"
msgid "visit;"
msgstr ""
msgstr "visit;"
msgid "www.epsitec.com"
msgstr "www.epsitec.com"
#~ msgid " Free game on this chapter:"
#~ msgstr " Swobodna gra na tej planecie:"
#~ msgid "< none >"
#~ msgstr "< brak >"
@ -1967,6 +1973,9 @@ msgstr "www.epsitec.com"
#~ msgid "F9"
#~ msgstr "F9"
#~ msgid "GetResource event num out of range: %d\n"
#~ msgstr "GetResource numer zdarzenia poza zakresem: %d\n"
#~ msgid "Help"
#~ msgstr "Pomoc"

View File

@ -2,20 +2,19 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-07-10 17:39+0200\n"
"POT-Creation-Date: 2014-07-10 16:50+0200\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"
"Language: \n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.11.0\n"
"X-Language: ru_RU\n"
"X-Source-Language: en_US\n"
@ -34,6 +33,9 @@ msgstr " Драйверы:"
msgid " Exercises in the chapter:"
msgstr " Упражнения в разделе:"
msgid " Free game on this chapter:"
msgstr " Свободная игра на этой главе:"
msgid " Free game on this planet:"
msgstr " Свободная игра на этой планете:"
@ -207,9 +209,8 @@ msgstr "Построить защитную башню"
msgid "Build a derrick"
msgstr "Построить буровую вышку"
#, fuzzy
msgid "Build a destroyer"
msgstr "Здание разрушено"
msgstr ""
msgid "Build a exchange post"
msgstr "Построить пост по обмену сообщениями"
@ -460,9 +461,8 @@ msgstr "Космический корабль"
msgid "Descend\\Reduces the power of the jet"
msgstr "Снижение и посадка\\Понижение мощности реактивного двигателя"
#, fuzzy
msgid "Destroy"
msgstr "Уничтожитель"
msgstr ""
msgid "Destroy the building"
msgstr "Уничтожить здание"
@ -543,9 +543,8 @@ msgstr "Упражнения\\Упражнения по программиров
msgid "Exit film\\Film at the exit of exercises"
msgstr "Ролик при выходе\\Ролик во время выхода из упражнения"
#, fuzzy
msgid "Explode (\\key action;)"
msgstr "Утилизация (\\key action;)"
msgstr ""
msgid "Explosive"
msgstr "Взрывчатка"
@ -713,9 +712,8 @@ msgstr "Неверный бот"
msgid "Inappropriate cell type"
msgstr "Батарея не подходит"
#, fuzzy
msgid "Inappropriate object"
msgstr "Неверный бот"
msgstr ""
msgid "Incorrect index type"
msgstr "Неверный тип индекса"
@ -933,9 +931,8 @@ msgstr "Не хватает энергии"
msgid "Not enough energy yet"
msgstr "Не хватает энергии"
#, fuzzy
msgid "Not found anything to destroy"
msgstr "Нечего бросить"
msgstr ""
msgid "Not yet enough energy"
msgstr "Не хватает энергии"
@ -1839,9 +1836,6 @@ msgstr "посетить"
msgid "www.epsitec.com"
msgstr "www.epsitec.com"
#~ msgid " Free game on this chapter:"
#~ msgstr " Свободная игра на этой главе:"
#~ msgid "GetResource event num out of range: %d\n"
#~ msgstr "событие GetResource, число вне диапазона: %d\n"