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

@ -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 */