ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed untranslated "Font size" from language files, corrected white 

space and make font size a const int
This commit is contained in:
Robin Daermann 2015-08-10 15:23:06 +02:00
parent 078e18e6c5
commit 3368d4f474
18 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_image.cpp
View File

@ -1697,7 +1697,7 @@ const Coord Image::centreCoord( const char *text ) const
} }
/* RGB32 compatible: complete */ /* RGB32 compatible: complete */
void Image::Annotate( const char *p_text, const Coord &coord, int size, const Rgb fg_colour, const Rgb bg_colour ) void Image::Annotate( const char *p_text, const Coord &coord, const int size, const Rgb fg_colour, const Rgb bg_colour )
{ {
strncpy( text, p_text, sizeof(text) ); strncpy( text, p_text, sizeof(text) );

4
src/zm_image.h
View File

@ -122,7 +122,7 @@ protected:
} }
public: public:
enum { CHAR_HEIGHT=11, CHAR_WIDTH=6 }; enum { CHAR_HEIGHT=11, CHAR_WIDTH=6 };
enum { LINE_HEIGHT=CHAR_HEIGHT+0 }; enum { LINE_HEIGHT=CHAR_HEIGHT+0 };
protected: protected:
@ -226,7 +226,7 @@ public:
void Delta( const Image &image, Image* targetimage) const; void Delta( const Image &image, Image* targetimage) const;
const Coord centreCoord( const char *text ) const; const Coord centreCoord( const char *text ) const;
void Annotate( const char *p_text, const Coord &coord, int size=1, const Rgb fg_colour=RGB_WHITE, const Rgb bg_colour=RGB_BLACK ); void Annotate( const char *p_text, const Coord &coord, const int size=1, const Rgb fg_colour=RGB_WHITE, const Rgb bg_colour=RGB_BLACK );
Image *HighlightEdges( Rgb colour, unsigned int p_colours, unsigned int p_subpixelorder, const Box *limits=0 ); Image *HighlightEdges( Rgb colour, unsigned int p_colours, unsigned int p_subpixelorder, const Box *limits=0 );
//Image *HighlightEdges( Rgb colour, const Polygon &polygon ); //Image *HighlightEdges( Rgb colour, const Polygon &polygon );
void Timestamp( const char *label, const time_t when, const Coord &coord, const int size ); void Timestamp( const char *label, const time_t when, const Coord &coord, const int size );

1
web/lang/big5_big5.php
View File

@ -676,7 +676,6 @@ $SLANG = array(
'TimestampLabelFormat' => '時間標示格式', 'TimestampLabelFormat' => '時間標示格式',
'TimestampLabelX' => '時間標示 X', 'TimestampLabelX' => '時間標示 X',
'TimestampLabelY' => '時間標示 Y', 'TimestampLabelY' => '時間標示 Y',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Today', 'Today' => 'Today',
'Tools' => 'Tools', 'Tools' => 'Tools',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/cn_zh.php
View File

@ -672,7 +672,6 @@ $SLANG = array(
'TimestampLabelFormat' => '时间戳标签格式', 'TimestampLabelFormat' => '时间戳标签格式',
'TimestampLabelX' => '时间戳标签 X', 'TimestampLabelX' => '时间戳标签 X',
'TimestampLabelY' => '时间戳标签 Y', 'TimestampLabelY' => '时间戳标签 Y',
'TimestampLabelSize' => 'Font Size',
'Today' => '今天', 'Today' => '今天',
'Tools' => '工具', 'Tools' => '工具',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/cs_cz.php
View File

@ -672,7 +672,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Formát èasového razítka', 'TimestampLabelFormat' => 'Formát èasového razítka',
'TimestampLabelX' => 'Èasové razítko X', 'TimestampLabelX' => 'Èasové razítko X',
'TimestampLabelY' => 'Èasové razítko Y', 'TimestampLabelY' => 'Èasové razítko Y',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Dnes', 'Today' => 'Dnes',
'Tools' => 'Nástroje', 'Tools' => 'Nástroje',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/dk_dk.php
View File

@ -673,7 +673,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Tidsstempel Mærkning´s Format', 'TimestampLabelFormat' => 'Tidsstempel Mærkning´s Format',
'TimestampLabelX' => 'Tidsstempel Mærkning X', 'TimestampLabelX' => 'Tidsstempel Mærkning X',
'TimestampLabelY' => 'Tidsstempel Mærkning Y', 'TimestampLabelY' => 'Tidsstempel Mærkning Y',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Idag', 'Today' => 'Idag',
'Tools' => 'Tools', 'Tools' => 'Tools',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/es_ar.php
View File

@ -623,7 +623,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Formato Etiqueta Hora', 'TimestampLabelFormat' => 'Formato Etiqueta Hora',
'TimestampLabelX' => 'Eje X Etiqueta Hora', 'TimestampLabelX' => 'Eje X Etiqueta Hora',
'TimestampLabelY' => 'Eje Y Etiqueta Hora', 'TimestampLabelY' => 'Eje Y Etiqueta Hora',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Today', 'Today' => 'Today',
'Tools' => 'Herra.', 'Tools' => 'Herra.',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/et_ee.php
View File

@ -673,7 +673,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Timestamp Label Format', 'TimestampLabelFormat' => 'Timestamp Label Format',
'TimestampLabelX' => 'Timestamp Label X', 'TimestampLabelX' => 'Timestamp Label X',
'TimestampLabelY' => 'Timestamp Label Y', 'TimestampLabelY' => 'Timestamp Label Y',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Täna', 'Today' => 'Täna',
'Tools' => 'Tööriistad', 'Tools' => 'Tööriistad',
'Total' => 'Summa', // Added - 2011-06-16 'Total' => 'Summa', // Added - 2011-06-16

1
web/lang/he_il.php
View File

@ -672,7 +672,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Timestamp Label Format', 'TimestampLabelFormat' => 'Timestamp Label Format',
'TimestampLabelX' => 'Timestamp Label X', 'TimestampLabelX' => 'Timestamp Label X',
'TimestampLabelY' => 'Timestamp Label Y', 'TimestampLabelY' => 'Timestamp Label Y',
'TimestampLabelSize' => 'Font Size',
'Today' => 'äéåí', 'Today' => 'äéåí',
'Tools' => 'ëìéí', 'Tools' => 'ëìéí',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/hu_hu.php
View File

@ -715,7 +715,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Időbélyeg formátuma', 'TimestampLabelFormat' => 'Időbélyeg formátuma',
'TimestampLabelX' => 'Elhelyezés X pozició', 'TimestampLabelX' => 'Elhelyezés X pozició',
'TimestampLabelY' => 'Elhelyezés Y pozició', 'TimestampLabelY' => 'Elhelyezés Y pozició',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Ma', 'Today' => 'Ma',
'Tools' => 'Eszközök', 'Tools' => 'Eszközök',
'Total' => 'Összes', 'Total' => 'Összes',

1
web/lang/it_it.php
View File

@ -677,7 +677,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Formato etichetta timestamp', 'TimestampLabelFormat' => 'Formato etichetta timestamp',
'TimestampLabelX' => 'coordinata X etichetta', 'TimestampLabelX' => 'coordinata X etichetta',
'TimestampLabelY' => 'coordinata Y etichetta', 'TimestampLabelY' => 'coordinata Y etichetta',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Oggi ', 'Today' => 'Oggi ',
'Tools' => 'Strumenti', 'Tools' => 'Strumenti',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/ja_jp.php
View File

@ -672,7 +672,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'À²Ñ½ÀÝÌß ×ÍÞÙ Ì«°Ï¯Ä', 'TimestampLabelFormat' => 'À²Ñ½ÀÝÌß ×ÍÞÙ Ì«°Ï¯Ä',
'TimestampLabelX' => 'À²Ñ½ÀÝÌß ×ÍÞÙ X', 'TimestampLabelX' => 'À²Ñ½ÀÝÌß ×ÍÞÙ X',
'TimestampLabelY' => 'À²Ñ½ÀÝÌß ×ÍÞÙ Y', 'TimestampLabelY' => 'À²Ñ½ÀÝÌß ×ÍÞÙ Y',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Today', 'Today' => 'Today',
'Tools' => '°Ù', 'Tools' => '°Ù',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/nl_nl.php
View File

@ -672,7 +672,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Tijdstempel Label Format', 'TimestampLabelFormat' => 'Tijdstempel Label Format',
'TimestampLabelX' => 'Tijdstempel Label X', 'TimestampLabelX' => 'Tijdstempel Label X',
'TimestampLabelY' => 'Tijdstempel Label Y', 'TimestampLabelY' => 'Tijdstempel Label Y',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Vandaag', 'Today' => 'Vandaag',
'Tools' => 'Gereedschappen', 'Tools' => 'Gereedschappen',
'Total' => 'Totaal', // Added - 2011-06-16 'Total' => 'Totaal', // Added - 2011-06-16

1
web/lang/pl_pl.php
View File

@ -672,7 +672,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Format etykiety czasu', 'TimestampLabelFormat' => 'Format etykiety czasu',
'TimestampLabelX' => 'Wsp. X etykiety czasu', 'TimestampLabelX' => 'Wsp. X etykiety czasu',
'TimestampLabelY' => 'Wsp. Y etykiety czasu', 'TimestampLabelY' => 'Wsp. Y etykiety czasu',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Today', 'Today' => 'Today',
'Tools' => 'Narzêdzia', 'Tools' => 'Narzêdzia',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/pt_br.php
View File

@ -612,7 +612,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Formato de etiqueta de tempo', 'TimestampLabelFormat' => 'Formato de etiqueta de tempo',
'TimestampLabelX' => 'posição de etiqueta X', 'TimestampLabelX' => 'posição de etiqueta X',
'TimestampLabelY' => 'posição de etiqueta Y', 'TimestampLabelY' => 'posição de etiqueta Y',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Today', 'Today' => 'Today',
'Tools' => 'Ferramentas', 'Tools' => 'Ferramentas',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/ro_ro.php
View File

@ -643,7 +643,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Format eticheta format timp', 'TimestampLabelFormat' => 'Format eticheta format timp',
'TimestampLabelX' => 'Format timp eticheta X', 'TimestampLabelX' => 'Format timp eticheta X',
'TimestampLabelY' => 'Format timp eticheta Y', 'TimestampLabelY' => 'Format timp eticheta Y',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Azi', 'Today' => 'Azi',
'Tools' => 'Unelte', 'Tools' => 'Unelte',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/ru_ru.php
View File

@ -672,7 +672,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'æÏÒÍÁÔ ÍÅÔËÉ', 'TimestampLabelFormat' => 'æÏÒÍÁÔ ÍÅÔËÉ',
'TimestampLabelX' => 'X-ËÏÏÒÄÉÎÁÔÁ ÍÅÔËÉ', 'TimestampLabelX' => 'X-ËÏÏÒÄÉÎÁÔÁ ÍÅÔËÉ',
'TimestampLabelY' => 'Y-ËÏÏÒÄÉÎÁÔÁ ÍÅÔËÉ', 'TimestampLabelY' => 'Y-ËÏÏÒÄÉÎÁÔÁ ÍÅÔËÉ',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Today', 'Today' => 'Today',
'Tools' => 'éÎÓÔÒÕÍÅÎÔÙ', 'Tools' => 'éÎÓÔÒÕÍÅÎÔÙ',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16

1
web/lang/se_se.php
View File

@ -673,7 +673,6 @@ $SLANG = array(
'TimestampLabelFormat' => 'Format på tidsstämpel', 'TimestampLabelFormat' => 'Format på tidsstämpel',
'TimestampLabelX' => 'Värde på tidsstämpel X', 'TimestampLabelX' => 'Värde på tidsstämpel X',
'TimestampLabelY' => 'Värde på tidsstämpel Y', 'TimestampLabelY' => 'Värde på tidsstämpel Y',
'TimestampLabelSize' => 'Font Size',
'Today' => 'Idag', 'Today' => 'Idag',
'Tools' => 'Verktyg', 'Tools' => 'Verktyg',
'Total' => 'Total', // Added - 2011-06-16 'Total' => 'Total', // Added - 2011-06-16