Merge branch 'po-files'

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	po/nb_NO.po
	po/ru_RU.po
This commit is contained in:
Dirk Hohndel 2013-02-03 18:08:26 +11:00
commit de0cdf28b2
16 changed files with 171 additions and 30 deletions

View file

@ -1147,7 +1147,7 @@ static void add_waypoint_widgets(GtkWidget *box, int idx)
if (idx == 0) {
entry_depth[idx] = add_entry_to_box(hbox, _("Ending Depth"));
entry_duration[idx] = add_entry_to_box(hbox, _("Segment Time"));
entry_gas[idx] = add_gas_combobox_to_box(hbox, _("Gas Used"), idx);
entry_gas[idx] = add_gas_combobox_to_box(hbox, C_("Type of","Gas Used"), idx);
entry_po2[idx] = add_entry_to_box(hbox, _("CC SetPoint"));
} else {
entry_depth[idx] = add_entry_to_box(hbox, NULL);

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-11-10 16:27+0300\n"
"Last-Translator: Lubomir I. Ivanov <neolit123@gmail.com>>\n"
"Language-Team: Bulgarian\n"
@ -830,7 +830,15 @@ msgstr ""
msgid "GPS (WGS84 or GPS format)"
msgstr ""
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Използван Газ"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Използван Газ"
@ -1981,6 +1989,9 @@ msgstr "натовареност"
#~ "Продължителност\n"
#~ "Тотално"
#~ msgid "Gas Used"
#~ msgstr "Използван Газ"
#~ msgid "Pretty print"
#~ msgstr "Красив печат"

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-10-22 17:37+0100\n"
"Last-Translator: Martin Gysel <me@bearsh.org>\n"
"Language-Team: German\n"
@ -830,7 +830,15 @@ msgstr ""
msgid "GPS (WGS84 or GPS format)"
msgstr ""
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gasverbrauch"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gasverbrauch"
@ -1980,6 +1988,9 @@ msgstr "Arbeit"
#~ "Dauer\n"
#~ "Gesamt"
#~ msgid "Gas Used"
#~ msgstr "Gasverbrauch"
#~ msgid "Pretty print"
#~ msgstr "Schön drucken"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.9\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-10-10 16:27+0900\n"
"Last-Translator: Dirk Hohndel <dirk@hohndel.org>\n"
"Language-Team: German\n"
@ -864,7 +864,15 @@ msgstr "GFlow für Tauchplan"
msgid "GPS (WGS84 or GPS format)"
msgstr "GPS (WGS84 oder GPS Format)"
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gasverbrauch"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gasverbrauch"
@ -2005,6 +2013,9 @@ msgstr "Arbeit"
#~ "Dauer\n"
#~ "Gesamt"
#~ msgid "Gas Used"
#~ msgstr "Gasverbrauch"
#~ msgid "Pretty print"
#~ msgstr "Schön drucken"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-10-22 07:55-0300\n"
"Last-Translator: Sergio Schvezov <sergiusens@ieee.org>\n"
"Language-Team: Spanish\n"
@ -828,7 +828,15 @@ msgstr ""
msgid "GPS (WGS84 or GPS format)"
msgstr ""
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gas usado"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gas usado"
@ -1982,6 +1990,9 @@ msgstr "carga"
#~ "Duración\n"
#~ "Total"
#~ msgid "Gas Used"
#~ msgstr "Gas usado"
#~ msgid "Pretty print"
#~ msgstr "Impresión gráfica"

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-10-21 16:31+0200\n"
"Last-Translator: Miika Turkia <miika.turkia@gmail.com>\n"
"Language-Team: Finnish\n"
@ -828,7 +828,15 @@ msgstr ""
msgid "GPS (WGS84 or GPS format)"
msgstr ""
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Kulutus"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Kulutus"
@ -1965,6 +1973,9 @@ msgstr "työmäärä"
#~ msgid "Delete"
#~ msgstr "Poista"
#~ msgid "Gas Used"
#~ msgstr "Kulutus"
#~ msgid "Pretty print"
#~ msgstr "Hieno tuloste"

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-10-27 02:44+0200\n"
"Last-Translator: Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
"Language-Team: French\n"
@ -828,7 +828,15 @@ msgstr ""
msgid "GPS (WGS84 or GPS format)"
msgstr ""
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Air utilisé"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Air utilisé"
@ -1955,6 +1963,9 @@ msgstr "charge"
#~ msgid "Automatically group dives in trips"
#~ msgstr "Grouper automatiquement les plongées"
#~ msgid "Gas Used"
#~ msgstr "Air utilisé"
#~ msgid "Pretty print"
#~ msgstr "Impression mise en forme"

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-10-18 15:00+0100\n"
"Last-Translator: Ivan Habunek <ivan.habunek@gmail.com>\n"
"Language-Team: Croatian\n"
@ -827,7 +827,15 @@ msgstr ""
msgid "GPS (WGS84 or GPS format)"
msgstr ""
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Potrošeno plina"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Potrošeno plina"
@ -1977,6 +1985,9 @@ msgstr ""
#~ "Ukupno\n"
#~ "Trajanje"
#~ msgid "Gas Used"
#~ msgstr "Potrošeno plina"
#~ msgid "Pretty print"
#~ msgstr "Lijep ispis"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-10-20 16:23+0100\n"
"Last-Translator: Filippo Moser <filippom@gmail.com>\n"
"Language-Team: Italian\n"
@ -829,7 +829,15 @@ msgstr ""
msgid "GPS (WGS84 or GPS format)"
msgstr ""
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gas Usato"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gas Usato"
@ -1963,5 +1971,8 @@ msgstr ""
#~ msgid "Delete"
#~ msgstr "Cancella"
#~ msgid "Gas Used"
#~ msgstr "Gas Usato"
#~ msgid "Pretty print"
#~ msgstr "Stampa Formattata"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.9\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2013-02-01 12:30+0100\n"
"Last-Translator: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>\n"
"Language-Team: Norwegian Bokmål\n"
@ -862,7 +862,15 @@ msgstr "GFlow for plan"
msgid "GPS (WGS84 or GPS format)"
msgstr "GPS (WGS84- eller GPS-format)"
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gass brukt"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gass brukt"
@ -2010,6 +2018,9 @@ msgstr "arbeidsbelastning"
#~ "Varighet\n"
#~ "Total"
#~ msgid "Gas Used"
#~ msgstr "Gass brukt"
#~ msgid "Pretty print"
#~ msgstr "Pen utskrift"

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-10-28 20:24+0100\n"
"Last-Translator: Reinout Hoornweg <reinout@xs4all.nl>\n"
"Language-Team: Dutch\n"
@ -828,7 +828,15 @@ msgstr ""
msgid "GPS (WGS84 or GPS format)"
msgstr ""
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gas verbruikt"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gas verbruikt"
@ -1977,6 +1985,9 @@ msgstr "werklast"
#~ "Duur\n"
#~ "Totaal"
#~ msgid "Gas Used"
#~ msgstr "Gas verbruikt"
#~ msgid "Pretty print"
#~ msgstr "Mooi afdrukken"

View file

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.9\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2013-02-02 21:54+0300\n"
"Last-Translator: Sergey Starosek <sergey.starosek@gmail.com>\n"
"Language-Team: Russian\n"
@ -866,9 +866,15 @@ msgstr "нижний ГФ для плана"
msgid "GPS (WGS84 or GPS format)"
msgstr "GPS (формат WGS84 или GPS)"
#: planner.c:1141
#: print.c:205
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Расход"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Расход"
@ -2043,6 +2049,9 @@ msgstr "нагрузка"
#~ msgid "Delete"
#~ msgstr "Удалить"
#~ msgid "Gas Used"
#~ msgstr "Расход"
#~ msgid "Pretty print"
#~ msgstr "Профиль"

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-10-23 22:30+0100\n"
"Last-Translator: Ďoďo Ivanecký <dodo.sk@gmail.com>\n"
"Language-Team: Slovakian\n"
@ -828,7 +828,15 @@ msgstr ""
msgid "GPS (WGS84 or GPS format)"
msgstr ""
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Použitá zmes"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Použitá zmes"
@ -1978,6 +1986,9 @@ msgstr "záťaž"
#~ "Dĺžka\n"
#~ "Celková"
#~ msgid "Gas Used"
#~ msgstr "Použitá zmes"
#~ msgid "Pretty print"
#~ msgstr "Pekná tlač"

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-01 18:08+1100\n"
"POT-Creation-Date: 2013-02-03 18:00+1100\n"
"PO-Revision-Date: 2012-10-12 11:48+0900\n"
"Last-Translator: Linus Torvalds <torvalds@linux-foundation.org>\n"
"Language-Team: Swedish\n"
@ -828,7 +828,15 @@ msgstr ""
msgid "GPS (WGS84 or GPS format)"
msgstr ""
#: planner.c:1141 print.c:205 statistics.c:854
#: statistics.c:854
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gasanvändning"
#: planner.c:1141
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gasanvändning"
@ -1961,5 +1969,8 @@ msgstr ""
#~ msgid "Delete"
#~ msgstr "Radera"
#~ msgid "Gas Used"
#~ msgstr "Gasanvändning"
#~ msgid "Pretty print"
#~ msgstr "Prydlig utskrift"

View file

@ -202,7 +202,7 @@ static void print_tanks (struct dive *dive, cairo_t *cr, int maxwidth, int maxhe
int height, int tank_count, int first_tank, PangoFontDescription *font)
{
int curwidth, n, i, counter;
char buffer[80], dataheader1[3][80]= { N_("Cylinder"), N_("Gasmix"), N_("Gas Used")};
char buffer[80], dataheader1[3][80]= { N_("Cylinder"), N_("Gasmix"), NC_("Amount","Gas Used")};
PangoLayout *layout;
/* First create a header */

View file

@ -851,7 +851,7 @@ GtkWidget *single_stats_widget(void)
single_w.sac = new_info_label_in_frame(hbox, _("SAC"));
single_w.otu = new_info_label_in_frame(hbox, _("OTU"));
single_w.o2he = new_info_label_in_frame(hbox, "O" UTF8_SUBSCRIPT_2 " / He");
single_w.gas_used = new_info_label_in_frame(hbox, _("Gas Used"));
single_w.gas_used = new_info_label_in_frame(hbox, C_("Amount","Gas Used"));
return vbox;
}