From 77138c48d2af8cf8c1bf835a7b76dff33466754e Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Sat, 10 Jan 2015 17:55:46 +0100 Subject: [PATCH] Fix a conflict in php lang files after merge from upstream master --- web/lang/big5_big5.php | 2 +- web/lang/cn_zh.php | 2 +- web/lang/cs_cz.php | 2 +- web/lang/de_de.php | 2 +- web/lang/dk_dk.php | 2 +- web/lang/en_gb.php | 2 +- web/lang/es_ar.php | 2 +- web/lang/es_es.php | 2 +- web/lang/et_ee.php | 4 +++- web/lang/he_il.php | 2 +- web/lang/hu_hu.php | 2 +- web/lang/it_it.php | 2 +- web/lang/ja_jp.php | 2 +- web/lang/nl_nl.php | 2 +- web/lang/pl_pl.php | 2 +- web/lang/pt_br.php | 2 +- web/lang/ro_ro.php | 2 +- web/lang/ru_ru.php | 2 +- web/lang/se_se.php | 2 +- 19 files changed, 21 insertions(+), 19 deletions(-) diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php index cc5aac827..1879298b2 100644 --- a/web/lang/big5_big5.php +++ b/web/lang/big5_big5.php @@ -92,7 +92,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => 'Alarm Px', 'AlarmRGBUnset' => 'You must set an alarm RGB colour', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => '警告', 'All' => '全部', 'Apply' => '確定', diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php index 5c1281f63..890a77b3f 100644 --- a/web/lang/cn_zh.php +++ b/web/lang/cn_zh.php @@ -88,7 +88,7 @@ $SLANG = array( 'AlarmMaximumFPS' => '报警最大帧率FPS', 'AlarmPx' => '报警像素', 'AlarmRGBUnset' => '你必须设置一个报警颜色(RGB)', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => '警报', 'All' => '全部', 'Apply' => '应用', diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php index f7d382dc3..048b15c09 100644 --- a/web/lang/cs_cz.php +++ b/web/lang/cs_cz.php @@ -88,7 +88,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => 'Alarm Px', 'AlarmRGBUnset' => 'You must set an alarm RGB colour', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Pozor', 'All' => 'Vechny', 'Apply' => 'Pout', diff --git a/web/lang/de_de.php b/web/lang/de_de.php index 26025e4df..f73dbe774 100644 --- a/web/lang/de_de.php +++ b/web/lang/de_de.php @@ -88,7 +88,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm-Maximum-FPS', 'AlarmPx' => 'Alarm-Pixel', 'AlarmRGBUnset' => 'Sie müssen eine RGB-Alarmfarbe setzen', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Alarm', 'All' => 'Alle', 'Apply' => 'OK', diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php index 6c72d7e62..0626d39f0 100644 --- a/web/lang/dk_dk.php +++ b/web/lang/dk_dk.php @@ -89,7 +89,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => 'Alarm Px', 'AlarmRGBUnset' => 'You must set an alarm RGB colour', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Alarm', 'All' => 'Alle', 'Apply' => 'Aktiver', diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index 235b76223..2010a2f8e 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -97,7 +97,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => 'Alarm Px', 'AlarmRGBUnset' => 'You must set an alarm RGB colour', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Alert', 'All' => 'All', 'Apply' => 'Apply', diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php index 1e1313a9d..be1fec7a5 100644 --- a/web/lang/es_ar.php +++ b/web/lang/es_ar.php @@ -39,7 +39,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => 'Alarm Px', 'AlarmRGBUnset' => 'You must set an alarm RGB colour', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Alerta', 'All' => 'Todo', 'Apply' => 'Aplicar', diff --git a/web/lang/es_es.php b/web/lang/es_es.php index 16421c9c5..c68ae8201 100644 --- a/web/lang/es_es.php +++ b/web/lang/es_es.php @@ -87,7 +87,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Máximos MPS alarma', 'AlarmPx' => 'Px alarma', 'AlarmRGBUnset' => 'Debe establecer un color RGB para alarma', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Alerta', 'All' => 'Todo', 'Apply' => 'Aplicar', diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php index 4e4927f50..efbb1b216 100644 --- a/web/lang/et_ee.php +++ b/web/lang/et_ee.php @@ -89,7 +89,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarmi Maksimaalne FPS', 'AlarmPx' => 'Alarm Px', 'AlarmRGBUnset' => 'Sa pead panema alarmi RGB värvi', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Hoiatus', 'All' => 'All', 'Apply' => 'Apply', @@ -545,6 +545,7 @@ $SLANG = array( 'Play' => 'Play', 'PlayAll' => 'Play Kõike', 'PleaseWait' => 'Palun Oota', + 'Plugin' => 'Plugin', 'Plugins' => 'Pluginad', 'Point' => 'Punkt', 'PostEventImageBuffer' => 'Post Event Image Count', @@ -677,6 +678,7 @@ $SLANG = array( 'UpdateNotNecessary' => 'Uuendus ei ole vajalik.', 'Updated' => 'Uuendatud', // Added - 2011-06-16 'Upload' => 'Üles laadimine', // Added - 2011-08-23 + 'UsedPlugins' => 'Used Plugins', 'UseFilter' => 'Kasuta Filtrit', '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' diff --git a/web/lang/he_il.php b/web/lang/he_il.php index d67a2fa6e..2208b162e 100644 --- a/web/lang/he_il.php +++ b/web/lang/he_il.php @@ -88,7 +88,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => ' Px', 'AlarmRGBUnset' => ' ', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => '', 'All' => '', 'Apply' => '', diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php index 437a40edd..e66fec00a 100644 --- a/web/lang/hu_hu.php +++ b/web/lang/hu_hu.php @@ -130,7 +130,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Maximális FPS riasztott állapotban', 'AlarmPx' => 'Riasztó képpont', 'AlarmRGBUnset' => 'Be kell állítani egy RGB színt a riasztáshoz', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Figyelem', 'All' => 'Mind', 'Apply' => 'Alkalmaz', diff --git a/web/lang/it_it.php b/web/lang/it_it.php index 9ac1b4d91..556134b59 100644 --- a/web/lang/it_it.php +++ b/web/lang/it_it.php @@ -93,7 +93,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'FPS massimi durante l\'allarme', 'AlarmPx' => 'Pixel Allarme', 'AlarmRGBUnset' => 'Devi settare un colore RGB di allarme', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Attenzione', 'All' => 'Tutto', 'Apply' => 'Applica', diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php index 9449bc063..b75c1e066 100644 --- a/web/lang/ja_jp.php +++ b/web/lang/ja_jp.php @@ -88,7 +88,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => 'װ Px', 'AlarmRGBUnset' => 'You must set an alarm RGB colour', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'x', 'All' => 'S', 'Apply' => 'Kp', diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php index 2810ef049..b3423ef33 100644 --- a/web/lang/nl_nl.php +++ b/web/lang/nl_nl.php @@ -87,7 +87,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => 'Alarm Px', 'AlarmRGBUnset' => 'U moet een RGB alarm kleur keizen', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Waarschuwing', 'All' => 'Alle', 'Apply' => 'Voer uit', diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php index 43b16c131..1c26cb6b0 100644 --- a/web/lang/pl_pl.php +++ b/web/lang/pl_pl.php @@ -88,7 +88,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => 'Alarm Px', 'AlarmRGBUnset' => 'You must set an alarm RGB colour', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Gotowosc', 'All' => 'Wszystko', 'Apply' => 'Zastosuj', diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php index 0b36944bb..d24de2a22 100644 --- a/web/lang/pt_br.php +++ b/web/lang/pt_br.php @@ -28,7 +28,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => 'Pixel de Alarme', 'AlarmRGBUnset' => 'You must set an alarm RGB colour', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Alerta', 'All' => 'Tudo', 'Apply' => 'Aplicar', diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php index a81ffdb12..e29d18fd5 100644 --- a/web/lang/ro_ro.php +++ b/web/lang/ro_ro.php @@ -59,7 +59,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => 'Alarm Px', 'AlarmRGBUnset' => 'You must set an alarm RGB colour', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Alert', 'All' => 'Toate', 'Apply' => 'Accept', diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php index de86a53c0..27ca1ccb1 100644 --- a/web/lang/ru_ru.php +++ b/web/lang/ru_ru.php @@ -88,7 +88,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Alarm Maximum FPS', 'AlarmPx' => ' .', 'AlarmRGBUnset' => 'You must set an alarm RGB colour', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => '', 'All' => '', 'Apply' => '', diff --git a/web/lang/se_se.php b/web/lang/se_se.php index 8a48addf5..ddf9d046b 100644 --- a/web/lang/se_se.php +++ b/web/lang/se_se.php @@ -89,7 +89,7 @@ $SLANG = array( 'AlarmMaximumFPS' => 'Max. ramar/s fr larm', 'AlarmPx' => 'Larmpunkter', 'AlarmRGBUnset' => 'Du mste stta en frg fr RGB-larm', - 'AlarmScore' => 'Alarme Score', + 'AlarmScore' => 'Alarm Score', 'Alert' => 'Varning', 'All' => 'Alla', 'Apply' => 'Lgg till',