From c4e22ba8a79af007a27d624f9b04d0eceb26c1a7 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 25 May 2009 08:11:32 +0000 Subject: [PATCH] Renamed misleading label escapeCRLF to removeCRLF --- lang/afrikaans-utf-8.inc.php | 2 +- lang/albanian-utf-8.inc.php | 2 +- lang/arabic-utf-8.inc.php | 2 +- lang/azerbaijani-utf-8.inc.php | 2 +- lang/bangla-utf-8.inc.php | 2 +- lang/basque-utf-8.inc.php | 2 +- lang/belarusian_cyrillic-utf-8.inc.php | 2 +- lang/belarusian_latin-utf-8.inc.php | 2 +- lang/bosnian-utf-8.inc.php | 2 +- lang/brazilian_portuguese-utf-8.inc.php | 2 +- lang/bulgarian-utf-8.inc.php | 2 +- lang/catalan-utf-8.inc.php | 2 +- lang/chinese_simplified-utf-8.inc.php | 2 +- lang/chinese_traditional-utf-8.inc.php | 2 +- lang/croatian-utf-8.inc.php | 2 +- lang/czech-utf-8.inc.php | 2 +- lang/danish-utf-8.inc.php | 2 +- lang/dutch-utf-8.inc.php | 2 +- lang/english-utf-8.inc.php | 2 +- lang/estonian-utf-8.inc.php | 2 +- lang/finnish-utf-8.inc.php | 2 +- lang/french-utf-8.inc.php | 2 +- lang/galician-utf-8.inc.php | 2 +- lang/georgian-utf-8.inc.php | 2 +- lang/german-utf-8.inc.php | 2 +- lang/greek-utf-8.inc.php | 2 +- lang/hebrew-utf-8.inc.php | 2 +- lang/hindi-utf-8.inc.php | 2 +- lang/hungarian-utf-8.inc.php | 2 +- lang/indonesian-utf-8.inc.php | 2 +- lang/italian-utf-8.inc.php | 2 +- lang/japanese-utf-8.inc.php | 2 +- lang/korean-utf-8.inc.php | 2 +- lang/latvian-utf-8.inc.php | 2 +- lang/lithuanian-utf-8.inc.php | 2 +- lang/macedonian_cyrillic-utf-8.inc.php | 2 +- lang/malay-utf-8.inc.php | 2 +- lang/mongolian-utf-8.inc.php | 2 +- lang/norwegian-utf-8.inc.php | 2 +- lang/persian-utf-8.inc.php | 2 +- lang/polish-utf-8.inc.php | 2 +- lang/portuguese-utf-8.inc.php | 2 +- lang/romanian-utf-8.inc.php | 2 +- lang/russian-utf-8.inc.php | 2 +- lang/serbian_cyrillic-utf-8.inc.php | 2 +- lang/serbian_latin-utf-8.inc.php | 2 +- lang/sinhala-utf-8.inc.php | 2 +- lang/slovak-utf-8.inc.php | 2 +- lang/slovenian-utf-8.inc.php | 2 +- lang/spanish-utf-8.inc.php | 2 +- lang/swedish-utf-8.inc.php | 2 +- lang/tatarish-utf-8.inc.php | 2 +- lang/thai-utf-8.inc.php | 2 +- lang/turkish-utf-8.inc.php | 2 +- lang/ukrainian-utf-8.inc.php | 2 +- libraries/export/csv.php | 6 +++--- libraries/export/excel.php | 2 +- 57 files changed, 59 insertions(+), 59 deletions(-) diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 787fedc18..21dccdbd2 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1478,7 +1478,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 2f979f987..d0cd51cac 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1477,7 +1477,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 652370e5a..49d239161 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1479,7 +1479,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 780ec02be..c18bae4af 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1474,7 +1474,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 2c5f18641..767918cf6 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1453,7 +1453,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 61a3d7394..f85bb7137 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1471,7 +1471,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 654d8616a..ecdf5b163 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1453,7 +1453,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index ffc2342dd..62061a9e3 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1461,7 +1461,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 62eac267e..eb52f7492 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1477,7 +1477,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index bb7e7c522..fb0eb5229 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1451,7 +1451,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index f742c2e54..996e10eb4 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1474,7 +1474,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 079baf50b..8470a41e5 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1451,7 +1451,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 877086f60..41167e431 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -298,7 +298,7 @@ $strErrorRelationExists = '错误：关系已存在'; $strErrorRenamingTable = '将表 %1$s 改名为 %2$s 时发生错误'; $strErrorSaveTable = '保存设计器坐标时出错。'; $strError = '错误'; -$strEscapeCRLF = '删除字段中的换行符'; +$strRemoveCRLF = '删除字段中的换行符'; $strEscapeWildcards = '要使用通配符 _ 和 % 本身，应使用用 \ 转义'; $strEsperanto = '世界语'; $strEstonian = '爱沙尼亚语'; diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 976f095d7..dac73747c 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1458,7 +1458,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index d1a0fe17f..2444bc573 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1455,7 +1455,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 5d0c91bc1..1f3f78b47 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1459,7 +1459,7 @@ $strShowKeys = 'Only show keys'; //to translate $strStatic = 'static'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 64fb57794..946a09b69 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1453,7 +1453,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 36683af08..62e9d529f 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -295,7 +295,7 @@ $strErrorRelationAdded = 'Fout: Relatie niet toegevoegd.'; $strErrorRelationExists = 'Fout: relatie bestaat reeds.'; $strErrorRenamingTable = 'Fout bij het hernoemen van de tabel %1$s naar %2$s'; $strErrorSaveTable = 'Fout bij het opslaan van coördinaten voor de Designer.'; -$strEscapeCRLF = 'Verwijder CRLF tekens uit veld-waarden'; +$strRemoveCRLF = 'Verwijder CRLF tekens uit veld-waarden'; $strEscapeWildcards = 'Wildcards _ en % moeten worden ge-escaped met een \ om ze letterlijk te gebruiken'; $strEsperanto = 'Esperanto'; $strEstonian = 'Estlands'; diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index be502c694..cb6a05364 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -290,7 +290,7 @@ $strErrorRelationAdded = 'Error: Relation not added.'; $strErrorRelationExists = 'Error: relation already exists.'; $strErrorRenamingTable = 'Error renaming table %1$s to %2$s'; $strErrorSaveTable = 'Error saving coordinates for Designer.'; -$strEscapeCRLF = 'Remove CRLF characters within fields'; +$strRemoveCRLF = 'Remove CRLF characters within fields'; $strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; $strEsperanto = 'Esperanto'; $strEstonian = 'Estonian'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 78af823cb..042f6f5df 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1459,7 +1459,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 189d39922..322cc6d79 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1454,7 +1454,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 4688a547d..53301b91d 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -287,7 +287,7 @@ $strErrorRelationAdded = 'Erreur: relation non ajoutée.'; $strErrorRelationExists = 'Erreur: relation déjà existante.'; $strErrorRenamingTable = 'Erreur lors du renommage de %1$s en %2$s'; $strErrorSaveTable = 'Erreur lors de la sauvegarde des coordonnées Concepteur.'; -$strEscapeCRLF = 'Enlève les caractères de fin de ligne (CRLF) à l\'intérieur des colonnes'; +$strRemoveCRLF = 'Enlève les caractères de fin de ligne (CRLF) à l\'intérieur des colonnes'; $strEscapeWildcards = 'Préfixer avec \ les passepartouts _ et % pour un usage littéral'; $strEsperanto = 'Espéranto'; $strEstonian = 'estonien'; diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index ddda7d6d1..35697ef14 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1452,7 +1452,7 @@ $strHostTableExplanation = 'Cando se emprega a táboa Host, ignórase este campo $strGetMoreThemes = 'Obter máis temas!'; $strNoneDefault = 'Nengún'; $strConfigDirectoryWarning = 'O directory [code]config[/code], que é o que emprega o script de inicio, existe ainda no directorio de phpMyAdmin. Deberíao eliminar unha vez finalice a configuración do phpMyAdmin.'; -$strEscapeCRLF = 'Eliminar os caracteres CRLF dentros dos campos'; +$strRemoveCRLF = 'Eliminar os caracteres CRLF dentros dos campos'; $strDoNotAutoIncrementZeroValues = 'Non empregar AUTO_INCREMENT cos valores cero'; $strAndSmall = 'e'; $strReplicationStatus = 'Estado da replicación'; diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index f55608b65..c63994a3a 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1458,7 +1458,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index e946245a7..266b92dd6 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1472,7 +1472,7 @@ $strTexyText = 'Texy! text'; //to translate $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index cb17cb0ef..4509bb032 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1476,7 +1476,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index cefeb6612..e307a48e0 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1471,7 +1471,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index f278c049b..3a325dfaf 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1479,7 +1479,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 3a13b0eed..948307ced 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1456,7 +1456,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index d800dbb25..32a3f50ba 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1469,7 +1469,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 440e5a62b..a94e7aca3 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1458,7 +1458,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 711a378d0..01fc9ea94 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1459,7 +1459,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 38adc23de..f9c8810d3 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1474,7 +1474,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index f1dbfa9da..fce793768 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1476,7 +1476,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index afa9f1a13..7392ecb41 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1468,7 +1468,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index be272f207..7be760e32 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1454,7 +1454,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index d9c1d1ff3..b58072cf8 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1491,7 +1491,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index b08588bed..fd456e738 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1474,7 +1474,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index b345576d5..fce38c453 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -288,7 +288,7 @@ $strErrorRelationAdded = 'Feil: Relasjon ikke opprettet.'; $strErrorRelationExists = 'Feil: relasjoner eksisterer allerede.'; $strErrorRenamingTable = 'Feil oppstond med endring av tabellnavn fra %1$s til %2$s'; $strErrorSaveTable = 'Feil oppstod under lagring av Designerkoordinater.'; -$strEscapeCRLF = 'Fjern CRLF tegn i felter'; +$strRemoveCRLF = 'Fjern CRLF tegn i felter'; $strEscapeWildcards = 'Jokertegnene _ og % må beskyttes med en \ for å bruke dem direkte'; $strEsperanto = 'Esperanto'; $strEstonian = 'estisk'; diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index e6426dd13..e044a537f 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1505,7 +1505,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 219548b80..074584dc7 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1447,7 +1447,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Pobierz więcej motywów!'; $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index c5b5dfbc8..46b043f13 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1480,7 +1480,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 4f771b200..6b6d0c865 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1460,7 +1460,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index d4c43e445..fa2497260 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1464,7 +1464,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 04b0b0d23..582441b99 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1453,7 +1453,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 83571cc10..a9b961cdc 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1453,7 +1453,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index a4b002da5..12b750458 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1456,7 +1456,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 905133a57..483856a0c 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1454,7 +1454,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 04edd3d0c..f101861fa 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1473,7 +1473,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 66490ca4d..c24201525 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1449,7 +1449,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 098bc88f5..b3b7358bb 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -288,7 +288,7 @@ $strErrorRelationAdded = 'Fel: Relation inte tillagd.'; $strErrorRelationExists = 'Fel: Relation finns redan.'; $strErrorRenamingTable = 'Fel vid namnbyte på tabell %1$s till %2$s'; $strErrorSaveTable = 'Fel vid sparande av koordinater för Designer.'; -$strEscapeCRLF = 'Ta bort CRLF-tecken i fält'; +$strRemoveCRLF = 'Ta bort CRLF-tecken i fält'; $strEscapeWildcards = 'Jokertecknen _ och % måste föregås av ett \ för att användas i egentlig betydelse'; $strEsperanto = 'Esperanto'; $strEstonian = 'Estnisk'; diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 3e04821f9..ea59111ca 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1464,7 +1464,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index e50b463d9..b8472f195 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1475,7 +1475,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 4191f1c1c..69b0dc598 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1457,7 +1457,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 01ec3fbd7..e00d0a7e9 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1473,7 +1473,7 @@ $strHostTableExplanation = 'When Host table is used, this field is ignored and v $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strAndSmall = 'and'; //to translate $strReplicationStatus = 'Replication status'; //to translate diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 315c95e89..5df271247 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -23,7 +23,7 @@ if (isset($plugin_list)) { array('type' => 'text', 'name' => 'escaped', 'text' => 'strFieldsEscapedBy'), array('type' => 'text', 'name' => 'terminated', 'text' => 'strLinesTerminatedBy'), array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), - array('type' => 'bool', 'name' => 'escapeCRLF', 'text' => 'strEscapeCRLF'), + array('type' => 'bool', 'name' => 'removeCRLF', 'text' => 'strRemoveCRLF'), array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), array('type' => 'hidden', 'name' => 'data'), ), @@ -182,8 +182,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { if ($what == 'excel') { $row[$j] = preg_replace("/\015(\012)?/", "\012", $row[$j]); } - // escape CRLF characters within field - if ($GLOBALS[$what . '_escapeCRLF']) { + // remove CRLF characters within field + if ($GLOBALS[$what . '_removeCRLF']) { $row[$j] = str_replace("\n", "", str_replace("\r", "", $row[$j])); } if ($csv_enclosed == '') { diff --git a/libraries/export/excel.php b/libraries/export/excel.php index 74d2d8530..d4b8e1a4f 100644 --- a/libraries/export/excel.php +++ b/libraries/export/excel.php @@ -20,7 +20,7 @@ if (isset($plugin_list)) { 'mime_type' => 'text/comma-separated-values', 'options' => array( array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), - array('type' => 'bool', 'name' => 'escapeCRLF', 'text' => 'strEscapeCRLF'), + array('type' => 'bool', 'name' => 'removeCRLF', 'text' => 'strRemoveCRLF'), array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), array( 'type' => 'select',