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

Fix a conflict in php lang files after merge from upstream master

This commit is contained in:
Emmanuel Papin 2015-01-10 17:55:46 +01:00
parent b5ab290e78
commit 77138c48d2
19 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/lang/big5_big5.php
View File

@ -92,7 +92,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'Alarm Px', 'AlarmPx' => 'Alarm Px',
'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'AlarmRGBUnset' => 'You must set an alarm RGB colour',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => '警告', 'Alert' => '警告',
'All' => '全部', 'All' => '全部',
'Apply' => '確定', 'Apply' => '確定',

2
web/lang/cn_zh.php
View File

@ -88,7 +88,7 @@ $SLANG = array(
'AlarmMaximumFPS' => '报警最大帧率FPS', 'AlarmMaximumFPS' => '报警最大帧率FPS',
'AlarmPx' => '报警像素', 'AlarmPx' => '报警像素',
'AlarmRGBUnset' => '你必须设置一个报警颜色(RGB)', 'AlarmRGBUnset' => '你必须设置一个报警颜色(RGB)',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => '警报', 'Alert' => '警报',
'All' => '全部', 'All' => '全部',
'Apply' => '应用', 'Apply' => '应用',

2
web/lang/cs_cz.php
View File

@ -88,7 +88,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'Alarm Px', 'AlarmPx' => 'Alarm Px',
'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'AlarmRGBUnset' => 'You must set an alarm RGB colour',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Pozor', 'Alert' => 'Pozor',
'All' => 'V¹echny', 'All' => 'V¹echny',
'Apply' => 'Pou¾ít', 'Apply' => 'Pou¾ít',

2
web/lang/de_de.php
View File

@ -88,7 +88,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm-Maximum-FPS', 'AlarmMaximumFPS' => 'Alarm-Maximum-FPS',
'AlarmPx' => 'Alarm-Pixel', 'AlarmPx' => 'Alarm-Pixel',
'AlarmRGBUnset' => 'Sie müssen eine RGB-Alarmfarbe setzen', 'AlarmRGBUnset' => 'Sie müssen eine RGB-Alarmfarbe setzen',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Alarm', 'Alert' => 'Alarm',
'All' => 'Alle', 'All' => 'Alle',
'Apply' => 'OK', 'Apply' => 'OK',

2
web/lang/dk_dk.php
View File

@ -89,7 +89,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'Alarm Px', 'AlarmPx' => 'Alarm Px',
'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'AlarmRGBUnset' => 'You must set an alarm RGB colour',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Alarm', 'Alert' => 'Alarm',
'All' => 'Alle', 'All' => 'Alle',
'Apply' => 'Aktiver', 'Apply' => 'Aktiver',

2
web/lang/en_gb.php
View File

@ -97,7 +97,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'Alarm Px', 'AlarmPx' => 'Alarm Px',
'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'AlarmRGBUnset' => 'You must set an alarm RGB colour',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Alert', 'Alert' => 'Alert',
'All' => 'All', 'All' => 'All',
'Apply' => 'Apply', 'Apply' => 'Apply',

2
web/lang/es_ar.php
View File

@ -39,7 +39,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'Alarm Px', 'AlarmPx' => 'Alarm Px',
'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'AlarmRGBUnset' => 'You must set an alarm RGB colour',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Alerta', 'Alert' => 'Alerta',
'All' => 'Todo', 'All' => 'Todo',
'Apply' => 'Aplicar', 'Apply' => 'Aplicar',

2
web/lang/es_es.php
View File

@ -87,7 +87,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Máximos MPS alarma', 'AlarmMaximumFPS' => 'Máximos MPS alarma',
'AlarmPx' => 'Px alarma', 'AlarmPx' => 'Px alarma',
'AlarmRGBUnset' => 'Debe establecer un color RGB para alarma', 'AlarmRGBUnset' => 'Debe establecer un color RGB para alarma',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Alerta', 'Alert' => 'Alerta',
'All' => 'Todo', 'All' => 'Todo',
'Apply' => 'Aplicar', 'Apply' => 'Aplicar',

4
web/lang/et_ee.php
View File

@ -89,7 +89,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarmi Maksimaalne FPS', 'AlarmMaximumFPS' => 'Alarmi Maksimaalne FPS',
'AlarmPx' => 'Alarm Px', 'AlarmPx' => 'Alarm Px',
'AlarmRGBUnset' => 'Sa pead panema alarmi RGB värvi', 'AlarmRGBUnset' => 'Sa pead panema alarmi RGB värvi',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Hoiatus', 'Alert' => 'Hoiatus',
'All' => 'All', 'All' => 'All',
'Apply' => 'Apply', 'Apply' => 'Apply',
@ -545,6 +545,7 @@ $SLANG = array(
'Play' => 'Play', 'Play' => 'Play',
'PlayAll' => 'Play Kõike', 'PlayAll' => 'Play Kõike',
'PleaseWait' => 'Palun Oota', 'PleaseWait' => 'Palun Oota',
'Plugin' => 'Plugin',
'Plugins' => 'Pluginad', 'Plugins' => 'Pluginad',
'Point' => 'Punkt', 'Point' => 'Punkt',
'PostEventImageBuffer' => 'Post Event Image Count', 'PostEventImageBuffer' => 'Post Event Image Count',
@ -677,6 +678,7 @@ $SLANG = array(
'UpdateNotNecessary' => 'Uuendus ei ole vajalik.', 'UpdateNotNecessary' => 'Uuendus ei ole vajalik.',
'Updated' => 'Uuendatud', // Added - 2011-06-16 'Updated' => 'Uuendatud', // Added - 2011-06-16
'Upload' => 'Üles laadimine', // Added - 2011-08-23 'Upload' => 'Üles laadimine', // Added - 2011-08-23
'UsedPlugins' => 'Used Plugins',
'UseFilter' => 'Kasuta Filtrit', 'UseFilter' => 'Kasuta Filtrit',
'UseFilterExprsPost' => ' filter expressions', // This is used at the end of the phrase 'use N filter expressions' 'UseFilterExprsPost' => ' filter expressions', // This is used at the end of the phrase 'use N filter expressions'
'UseFilterExprsPre' => 'Use ', // This is used at the beginning of the phrase 'use N filter expressions' 'UseFilterExprsPre' => 'Use ', // This is used at the beginning of the phrase 'use N filter expressions'

2
web/lang/he_il.php
View File

@ -88,7 +88,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'àæò÷ú Px', 'AlarmPx' => 'àæò÷ú Px',
'AlarmRGBUnset' => 'äéğê çééá ìàúçì àæò÷ú öáò', 'AlarmRGBUnset' => 'äéğê çééá ìàúçì àæò÷ú öáò',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'äúøàä', 'Alert' => 'äúøàä',
'All' => 'äëì', 'All' => 'äëì',
'Apply' => 'äçì', 'Apply' => 'äçì',

2
web/lang/hu_hu.php
View File

@ -130,7 +130,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Maximális FPS riasztott állapotban', 'AlarmMaximumFPS' => 'Maximális FPS riasztott állapotban',
'AlarmPx' => 'Riasztó képpont', 'AlarmPx' => 'Riasztó képpont',
'AlarmRGBUnset' => 'Be kell állítani egy RGB színt a riasztáshoz', 'AlarmRGBUnset' => 'Be kell állítani egy RGB színt a riasztáshoz',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Figyelem', 'Alert' => 'Figyelem',
'All' => 'Mind', 'All' => 'Mind',
'Apply' => 'Alkalmaz', 'Apply' => 'Alkalmaz',

2
web/lang/it_it.php
View File

@ -93,7 +93,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'FPS massimi durante l\'allarme', 'AlarmMaximumFPS' => 'FPS massimi durante l\'allarme',
'AlarmPx' => 'Pixel Allarme', 'AlarmPx' => 'Pixel Allarme',
'AlarmRGBUnset' => 'Devi settare un colore RGB di allarme', 'AlarmRGBUnset' => 'Devi settare un colore RGB di allarme',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Attenzione', 'Alert' => 'Attenzione',
'All' => 'Tutto', 'All' => 'Tutto',
'Apply' => 'Applica', 'Apply' => 'Applica',

2
web/lang/ja_jp.php
View File

@ -88,7 +88,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'ｱﾗｰﾑ Px', 'AlarmPx' => 'ｱﾗｰﾑ Px',
'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'AlarmRGBUnset' => 'You must set an alarm RGB colour',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => '警告', 'Alert' => '警告',
'All' => '全て', 'All' => '全て',
'Apply' => '適用', 'Apply' => '適用',

2
web/lang/nl_nl.php
View File

@ -87,7 +87,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'Alarm Px', 'AlarmPx' => 'Alarm Px',
'AlarmRGBUnset' => 'U moet een RGB alarm kleur keizen', 'AlarmRGBUnset' => 'U moet een RGB alarm kleur keizen',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Waarschuwing', 'Alert' => 'Waarschuwing',
'All' => 'Alle', 'All' => 'Alle',
'Apply' => 'Voer uit', 'Apply' => 'Voer uit',

2
web/lang/pl_pl.php
View File

@ -88,7 +88,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'Alarm Px', 'AlarmPx' => 'Alarm Px',
'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'AlarmRGBUnset' => 'You must set an alarm RGB colour',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Gotowosc', 'Alert' => 'Gotowosc',
'All' => 'Wszystko', 'All' => 'Wszystko',
'Apply' => 'Zastosuj', 'Apply' => 'Zastosuj',

2
web/lang/pt_br.php
View File

@ -28,7 +28,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'Pixel de Alarme', 'AlarmPx' => 'Pixel de Alarme',
'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'AlarmRGBUnset' => 'You must set an alarm RGB colour',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Alerta', 'Alert' => 'Alerta',
'All' => 'Tudo', 'All' => 'Tudo',
'Apply' => 'Aplicar', 'Apply' => 'Aplicar',

2
web/lang/ro_ro.php
View File

@ -59,7 +59,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'Alarm Px', 'AlarmPx' => 'Alarm Px',
'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'AlarmRGBUnset' => 'You must set an alarm RGB colour',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Alert', 'Alert' => 'Alert',
'All' => 'Toate', 'All' => 'Toate',
'Apply' => 'Accept', 'Apply' => 'Accept',

2
web/lang/ru_ru.php
View File

@ -88,7 +88,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmMaximumFPS' => 'Alarm Maximum FPS',
'AlarmPx' => 'ğËÓ ÔÒÅ×.', 'AlarmPx' => 'ğËÓ ÔÒÅ×.',
'AlarmRGBUnset' => 'You must set an alarm RGB colour', 'AlarmRGBUnset' => 'You must set an alarm RGB colour',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'îÁÓÔÏÒÏÖÅ', 'Alert' => 'îÁÓÔÏÒÏÖÅ',
'All' => '÷ÓÅ', 'All' => '÷ÓÅ',
'Apply' => 'ğÒÉÍÅÎÉÔØ', 'Apply' => 'ğÒÉÍÅÎÉÔØ',

2
web/lang/se_se.php
View File

@ -89,7 +89,7 @@ $SLANG = array(
'AlarmMaximumFPS' => 'Max. ramar/s för larm', 'AlarmMaximumFPS' => 'Max. ramar/s för larm',
'AlarmPx' => 'Larmpunkter', 'AlarmPx' => 'Larmpunkter',
'AlarmRGBUnset' => 'Du måste sätta en färg för RGB-larm', 'AlarmRGBUnset' => 'Du måste sätta en färg för RGB-larm',
'AlarmScore' => 'Alarme Score', 'AlarmScore' => 'Alarm Score',
'Alert' => 'Varning', 'Alert' => 'Varning',
'All' => 'Alla', 'All' => 'Alla',
'Apply' => 'Lägg till', 'Apply' => 'Lägg till',