From: Rudolf Polzer Date: Tue, 18 Jan 2011 16:07:10 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~318^2~31 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=61f66a5c0fdf3d16aeca9561f4c6d60ae4cd3977;hp=8ff442735589e4276cc3ed2b1626012f2d81f13c;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- diff --git a/menu.dat.de.po b/menu.dat.de.po index 71994f7c2..0065ae7c4 100644 --- a/menu.dat.de.po +++ b/menu.dat.de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1preview\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-18 15:53+0100\n" +"POT-Creation-Date: 2011-01-18 17:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Rudolf Polzer \n" "Language-Team: LANGUAGE \n" @@ -211,9 +211,8 @@ msgid "Use GLSL to handle color control" msgstr "GLSL für Farbregelung verwenden" #: qcsrc/menu/xonotic/dialog_settings_video.c:99 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:40 -msgid "Ambient:" -msgstr "Umgebung:" +msgid "LIT^Ambient:" +msgstr "Umgebungslicht:" #: qcsrc/menu/xonotic/dialog_settings_video.c:102 msgid "Intensity:" @@ -2197,6 +2196,10 @@ msgstr "Master:" msgid "Music:" msgstr "Musik:" +#: qcsrc/menu/xonotic/dialog_settings_audio.c:40 +msgid "VOL^Ambient:" +msgstr "Umgebung:" + #: qcsrc/menu/xonotic/dialog_settings_audio.c:48 msgid "Info:" msgstr "Info:" diff --git a/menu.dat.fr.po b/menu.dat.fr.po index 1c2da4560..c27a3f69a 100644 --- a/menu.dat.fr.po +++ b/menu.dat.fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic 0.1preview\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-18 15:53+0100\n" +"POT-Creation-Date: 2011-01-18 17:06+0100\n" "PO-Revision-Date: 2011-01-18 11:53+0100\t\n" "Last-Translator: Calinou \n" "Language-Team: LANGUAGE \n" @@ -226,8 +226,8 @@ msgid "Use GLSL to handle color control" msgstr "Utiliser GLSL pour gérer les couleurs" #: qcsrc/menu/xonotic/dialog_settings_video.c:99 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:40 -msgid "Ambient:" +#, fuzzy +msgid "LIT^Ambient:" msgstr "Ambience:" #: qcsrc/menu/xonotic/dialog_settings_video.c:102 @@ -2254,6 +2254,11 @@ msgstr "Général:" msgid "Music:" msgstr "Musique:" +#: qcsrc/menu/xonotic/dialog_settings_audio.c:40 +#, fuzzy +msgid "VOL^Ambient:" +msgstr "Ambience:" + #: qcsrc/menu/xonotic/dialog_settings_audio.c:48 msgid "Info:" msgstr "Information:" diff --git a/menu.dat.pt.po b/menu.dat.pt.po index 0f6fe249e..f6f0b9b24 100644 --- a/menu.dat.pt.po +++ b/menu.dat.pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Xontoic 0.1preview\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-18 15:53+0100\n" +"POT-Creation-Date: 2011-01-18 17:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Ricardo 'Hellgardia' Silva \n" "Language-Team: LANGUAGE \n" @@ -224,8 +224,8 @@ msgid "Use GLSL to handle color control" msgstr "Usar GLSL para o controlo de cores" #: qcsrc/menu/xonotic/dialog_settings_video.c:99 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:40 -msgid "Ambient:" +#, fuzzy +msgid "LIT^Ambient:" msgstr "Som Ambiente:" #: qcsrc/menu/xonotic/dialog_settings_video.c:102 @@ -2253,6 +2253,11 @@ msgstr "Principal:" msgid "Music:" msgstr "Música:" +#: qcsrc/menu/xonotic/dialog_settings_audio.c:40 +#, fuzzy +msgid "VOL^Ambient:" +msgstr "Som Ambiente:" + #: qcsrc/menu/xonotic/dialog_settings_audio.c:48 msgid "Info:" msgstr "Informação:" diff --git a/menu.dat.ru.po b/menu.dat.ru.po index ad7f0f7fc..7932b93f4 100644 --- a/menu.dat.ru.po +++ b/menu.dat.ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1preview\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-18 15:53+0100\n" +"POT-Creation-Date: 2011-01-18 17:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Lord Canistra \n" "Language-Team: LANGUAGE \n" @@ -222,8 +222,8 @@ msgid "Use GLSL to handle color control" msgstr "Использовать GLSL для контроля цвета" #: qcsrc/menu/xonotic/dialog_settings_video.c:99 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:40 -msgid "Ambient:" +#, fuzzy +msgid "LIT^Ambient:" msgstr "Фоновое освещение:" #: qcsrc/menu/xonotic/dialog_settings_video.c:102 @@ -2252,6 +2252,11 @@ msgstr "Главный:" msgid "Music:" msgstr "Музыка:" +#: qcsrc/menu/xonotic/dialog_settings_audio.c:40 +#, fuzzy +msgid "VOL^Ambient:" +msgstr "Фоновое освещение:" + #: qcsrc/menu/xonotic/dialog_settings_audio.c:48 msgid "Info:" msgstr "Инфо:" diff --git a/qcsrc/menu/i18n-badwords.txt b/qcsrc/menu/i18n-badwords.txt index 8e5083656..e3c4374c1 100644 --- a/qcsrc/menu/i18n-badwords.txt +++ b/qcsrc/menu/i18n-badwords.txt @@ -31,3 +31,4 @@ Few Many Lots Both +Ambient: diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c index 2fee6d4d9..e38a87be6 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.c +++ b/qcsrc/menu/xonotic/dialog_settings_audio.c @@ -37,7 +37,7 @@ void XonoticAudioSettingsTab_fill(entity me) me.TR(me); me.TDempty(me, 0.2); s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_staticvolume"); - me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Ambient:"))); + me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, ZCTX(_("VOL^Ambient:")))); makeMulti(s, "snd_entchannel2volume"); me.TD(me, 1, 2, s); setDependentStringNotEqual(e, "mastervolume", "0"); diff --git a/qcsrc/menu/xonotic/dialog_settings_video.c b/qcsrc/menu/xonotic/dialog_settings_video.c index 229687d51..1093535f5 100644 --- a/qcsrc/menu/xonotic/dialog_settings_video.c +++ b/qcsrc/menu/xonotic/dialog_settings_video.c @@ -96,7 +96,7 @@ void XonoticVideoSettingsTab_fill(entity me) setDependent(e, "vid_gl20", 1, 1); me.TR(me); me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Ambient:"))); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, ZCTX(_("LIT^Ambient:")))); me.TD(me, 1, 2, e = makeXonoticSlider(0, 20.0, 1.0, "r_ambient")); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Intensity:")));