Merge remote-tracking branch 'origin/master'

main/src/com/google/refine/expr/functions/ToDate.java

@@ -196,7 +196,7 @@ public class ToDate implements Function {
     
     @Override
     public String getDescription() {
-        return "Returns the inputted object converted to a date object. Without arguments, it returns the ISO 8601 extended format. With arguments, you can control the output format. With monthFirst: set false if the date is formatted with the day before the month. With formatN: attempt to parse the date using an ordered list of possible formats. Supply formats based on the SimpleDateFormat syntax: http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html.";
+        return "Returns the inputted object converted to a date object. Without arguments, it returns the ISO 8601 extended format. With arguments, you can control the output format. With monthFirst: set false if the date is formatted with the day before the month. With formatN: attempt to parse the date using an ordered list of possible formats. Supply formats based on the SimpleDateFormat syntax: <a href=\"http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html\">SimpleDateFormat</a>";
     }
     
     @Override

main/webapp/modules/core/langs/translation-de.json

@@ -189,7 +189,7 @@
     "core-dialogs/rows-in-cluster": "# Zeilen im Cluster",
     "core-dialogs/content": "Inhalt",
     "core-dialogs/use-this-val": "Diesen Wert verwenden",
-    "core-dialogs/cells-of-row": "Die Zellen der aktuellen Zeile. Dies ist eine Abkürzung für 'row.cells'. Eine bestimmte Zelle kann mit 'cells.<column name>' abgerufen werden, wenn der <column name> ein einzelnes Wort ist, oder andernfalls mit 'cells[\"<column name>\"].",
+    "core-dialogs/cells-of-row": "Die Zellen der aktuellen Zeile. Dies ist eine Abkürzung für 'row.cells'. Eine bestimmte Zelle kann mit 'cells.&lt;column name>' abgerufen werden, wenn der &lt;column name> ein einzelnes Wort ist, oder andernfalls mit 'cells[\"&lt;column name>\"].",
     "core-dialogs/for-include-drop-statement-checkbox": "Drop-Anweisung einbinden",
     "core-dialogs/ngram-radius": "Radius&nbsp;",
     "core-dialogs/cell-fields": "Die aktuelle Zelle. Es hat einige Felder: 'value', 'recon' und 'errorMessage'.",
@@ -721,7 +721,7 @@
     "core-index/license": "Lizenz:",
     "core-index/homepage": "Homepage:",
     "core-index/image": "Bild:",
-    "core-dialogs/record-fields": "eine oder mehrere Zeilen, die zu einem Datensatz zusammengefasst sind; das Objekt hat mehrere Felder, Details unter https://github.com/OpenRefine/OpenRefine/wiki/Variables#record",
+    "core-dialogs/record-fields": "eine oder mehrere Zeilen, die zu einem Datensatz zusammengefasst sind; das Objekt hat mehrere Felder, Details unter <a href=\"https://github.com/OpenRefine/OpenRefine/wiki/Variables#record\">Records</a>",
     "core-views/join-col": "Spalten verbinden",
     "core-views/column-join": "Spalten verbinden",
     "core-views/column-join-before-column-picker": "Wähle und ordne Spalten zum verbinden",

main/webapp/modules/core/langs/translation-en.json

@@ -228,9 +228,9 @@
     "core-dialogs/cell-fields": "The current cell. It has a few fields: 'value', 'recon' and 'errorMessage'.",
     "core-dialogs/cell-value": "The current cell's value. This is a shortcut for 'cell.value'.",
     "core-dialogs/row-fields": "The current row. It has 5 fields: 'flagged', 'starred', 'index', 'cells', and 'record'.",
-    "core-dialogs/cells-of-row": "The cells of the current row. This is a shortcut for 'row.cells'. A particular cell can be retrieved with 'cells.<column name>' if the <column name> is a single word, or with 'cells[\"<column name>\"] otherwise.",
+    "core-dialogs/cells-of-row": "The cells of the current row. This is a shortcut for 'row.cells'. A particular cell can be retrieved with 'cells.&lt;column name>' if the &lt;column name> is a single word, or with 'cells[\"&lt;column name>\"] otherwise.",
     "core-dialogs/row-index": "The current row's index. This is a shortcut for 'row.index'.",
-    "core-dialogs/record-fields": "one or more rows grouped together to form a record; object has more fields, details at https://github.com/OpenRefine/OpenRefine/wiki/Variables#record",
+    "core-dialogs/record-fields": "one or more rows grouped together to form a record; object has more fields, details at <a href=\"https://github.com/OpenRefine/OpenRefine/wiki/Variables#record\">Records</a>",
     "core-dialogs/returns": "returns",
     "core-dialogs/from": "From",
     "core-dialogs/expression": "Expression",

main/webapp/modules/core/langs/translation-es.json

@@ -188,7 +188,7 @@
     "core-dialogs/rows-in-cluster": "# Filas en la agrupación",
     "core-dialogs/content": "Contenido",
     "core-dialogs/use-this-val": "Usar este valor",
-    "core-dialogs/cells-of-row": "Las celdas de la fila actual. Es una abreviación para «row.cells». Puede recuperarse una celda concreta con «cells.<nombre de la columna>» si el <nombre de la columna> es una única palabra; de lo contrario con «cells[\"<nombre de la columna>\"]».",
+    "core-dialogs/cells-of-row": "Las celdas de la fila actual. Es una abreviación para «row.cells». Puede recuperarse una celda concreta con «cells.&lt;nombre de la columna>» si el &lt;nombre de la columna> es una única palabra; de lo contrario con «cells[\"&lt;nombre de la columna>\"]».",
     "core-dialogs/method": "Método&nbsp;",
     "core-dialogs/ngram-radius": "Radio&nbsp;",
     "core-dialogs/processing": "Procesando…",
@@ -720,7 +720,7 @@
     "core-views/choose-reconciliation-service": "Elija un servicio de cotejo",
     "core-recon/add-std-srv": "Añadir un servicio estándar",
     "core-dialogs/lb-formats-quotation": "Siempre citar el texto",
-    "core-dialogs/record-fields": "una o más filas agrupadas para formar un registro; el objeto tiene más campos. Más detalles en https://github.com/OpenRefine/OpenRefine/wiki/Variables#record",
+    "core-dialogs/record-fields": "una o más filas agrupadas para formar un registro; el objeto tiene más campos. Más detalles en '<a href=\"https://github.com/OpenRefine/OpenRefine/wiki/Variables#record\">Records</a>'",
     "core-dialogs/no-clustering-functions-and-distances": "No se pudieron cargar las funciones de agrupamiento y las distancias.",
     "core-views/replace-dont-escape": "utilice \\n para saltos de renglón, \\t para tabuladores, \\\\n para \\n, \\\\t para \\t.",
     "core-views/replacement-info": "Si se marca la opción «Expresión regular» y el modelo de búsqueda contiene grupos delimitados por paréntesis, $0 devolverá la cadena completa encontrada por el modelo, y $1, $2…, los grupos primero y segundo, respectivamente.",

main/webapp/modules/core/langs/translation-fr.json

@@ -193,7 +193,7 @@
     "core-dialogs/rows-in-cluster": "# Lignes dans le groupe",
     "core-dialogs/content": "Contenu",
     "core-dialogs/use-this-val": "Utiliser cette valeur",
-    "core-dialogs/cells-of-row": "Les cellules de la ligne en cours. C’est un alias de 'row.cells'. Une cellule spécifique peut être retrouvée avec 'cells.<nom de la colonne>' lorsque <nom de la colonne > est un mot simple et avec 'cells.[\"<nom de la colonne>\"]' dans les autres cas.",
+    "core-dialogs/cells-of-row": "Les cellules de la ligne en cours. C’est un alias de 'row.cells'. Une cellule spécifique peut être retrouvée avec 'cells.&lt;nom de la colonne>' lorsque &lt;nom de la colonne > est un mot simple et avec 'cells.[\"&lt;nom de la colonne>\"]' dans les autres cas.",
     "core-dialogs/for-include-drop-statement-checkbox": "Inclure les instructions DROP",
     "core-dialogs/ngram-radius": "Rayon&nbsp;",
     "core-dialogs/processing": "Traitement…",
@@ -735,7 +735,7 @@
     "core-views/column-join-copy-to-new-column": "Ecrire le résultat dans une nouvelle colonne nommée…",
     "core-views/column-join-delete-joined-columns": "Supprimer les colonnes jointes.",
     "core-views/column-join-dont-escape": "Dans les séparateurs et les substituts de valeurs nulles, utiliser \\n pour une nouvelle ligne, \\t pour une tabulation, \\\\n pour \\n, \\\\t pour \\t.",
-    "core-dialogs/record-fields": "un groupe d'une ou plusieurs lignes forme une entrée ; l'objet a plus d'attributs, voir les détails sur https://github.com/OpenRefine/OpenRefine/wiki/Variables#record",
+    "core-dialogs/record-fields": "un groupe d'une ou plusieurs lignes forme une entrée ; l'objet a plus d'attributs, voir les détails sur <a href=\"https://github.com/OpenRefine/OpenRefine/wiki/Variables#record\">Records</a>",
     "core-views/blank-values": "Valeurs vides par colonne",
     "core-views/blank-records": "Entrées vides par colonne",
     "core-views/add-id-column": "Ajouter une colonne d'identifiants d'entités",

main/webapp/modules/core/langs/translation-it.json

@@ -188,7 +188,7 @@
     "core-dialogs/rows-in-cluster": "# Righe nel Cluster",
     "core-dialogs/content": "Contenuto",
     "core-dialogs/use-this-val": "Usa questo valore",
-    "core-dialogs/cells-of-row": "Le celle della riga corrente. Questa è una scorcatoia per 'row.cells'. Una particolare cella può essere recuperata con 'cells.<column name>' se <column name> è una unica parola, altrimenti con 'cells[\"<column name>\"].",
+    "core-dialogs/cells-of-row": "Le celle della riga corrente. Questa è una scorcatoia per 'row.cells'. Una particolare cella può essere recuperata con 'cells.&lt;column name>' se &lt;column name> è una unica parola, altrimenti con 'cells[\"&lt;column name>\"].",
     "core-dialogs/method": "Medoto&nbsp;",
     "core-dialogs/ngram-radius": "Radius&nbsp;",
     "core-dialogs/processing": "Elaborando…",
@@ -724,7 +724,7 @@
     "core-index/license": "Licenza:",
     "core-index/homepage": "Pagina web:",
     "core-index/image": "Immagine:",
-    "core-dialogs/record-fields": "una o più righe raggruppate per formare un record; l'oggetto ha più campi, dettagli su https://github.com/OpenRefine/OpenRefine/wiki/Variables#record",
+    "core-dialogs/record-fields": "una o più righe raggruppate per formare un record; l'oggetto ha più campi, dettagli su <a href=\"https://github.com/OpenRefine/OpenRefine/wiki/Variables#record\">Records</a>",
     "core-views/join-col": "Unisci colonne",
     "core-views/column-join": "Unisci colonne",
     "core-views/column-join-before-column-picker": "Seleziona e ordina le colonne da unire",

main/webapp/modules/core/langs/translation-jp.json

@@ -190,7 +190,7 @@
     "core-dialogs/rows-in-cluster": "# クラスタ内の行数",
     "core-dialogs/content": "内容",
     "core-dialogs/use-this-val": "この値を使う",
-    "core-dialogs/cells-of-row": "現在の行のcells: row.cellsの別名です。特定のセルは、cells.<column name>かcells[column name]でアクセスできます.",
+    "core-dialogs/cells-of-row": "現在の行のcells: row.cellsの別名です。特定のセルは、cells.&lt;column name>かcells[column name]でアクセスできます.",
     "core-dialogs/for-include-drop-statement-checkbox": "Drop文を含める",
     "core-dialogs/ngram-radius": "半径&nbsp;",
     "core-dialogs/processing": "処理中…",
@@ -727,7 +727,7 @@
     "core-index/license": "ライセンス:",
     "core-index/homepage": "ホームページ:",
     "core-index/image": "写真:",
-    "core-dialogs/record-fields": "１行以上の列がレコードを構成します。詳しくは、https://github.com/OpenRefine/OpenRefine/wiki/Variables#record",
+    "core-dialogs/record-fields": "１行以上の列がレコードを構成します。詳しくは、<a href=\"https://github.com/OpenRefine/OpenRefine/wiki/Variables#record\">Records</a>",
     "core-views/join-col": "カラムの結合",
     "core-views/column-join": "カラムの結合",
     "core-views/column-join-before-column-picker": "結合するカラムの選択",

main/webapp/modules/core/langs/translation-pt.json

@@ -64,7 +64,7 @@
     "core-index-import/match-count": "$1 {{plural:$1|corresponde|correspondem}}",
     "core-index-open/new-title": "Nome do novo projeto:",
     "core-index-import/project-tags": "Tags",
-    "core-dialogs/cells-of-row": "As células da linha atual. Este é um atalho para 'row.cells'. Uma célula em particular pode ser recuperada com 'cells. <Column name>' se o <column name> for uma única palavra, ou com 'cells [\"<column name>\"] caso contrário.",
+    "core-dialogs/cells-of-row": "As células da linha atual. Este é um atalho para 'row.cells'. Uma célula em particular pode ser recuperada com 'cells. &lt;Column name>' se o &lt;column name> for uma única palavra, ou com 'cells [\"&lt;column name>\"] caso contrário.",
     "core-index-parser/trim": "Cortar espaços no início e no final dos cadeias das células",
     "core-index-lang/send-req": "Alterar idioma",
     "core-views/warning-sel-judg": "Por favor, selecione ao menos um tipo de resultado para copiar.",
@@ -86,7 +86,7 @@
     "core-recon/pick-service": "Selecione um serviço ou extensão na esquerda",
     "core-views/new-topic2": "Marque para criar um novo item para cada célula nesta coluna para todas as linhas filtradas atuais",
     "core-views/first": "primeiro",
-    "core-dialogs/record-fields": "uma ou mais linhas mescladas para formar um registo; O objeto possui mais campos, detalhes em https://github.com/OpenRefine/OpenRefine/wiki/Variables#record",
+    "core-dialogs/record-fields": "uma ou mais linhas mescladas para formar um registo; O objeto possui mais campos, detalhes em <a href=\"https://github.com/OpenRefine/OpenRefine/wiki/Variables#record\">Records</a>",
     "core-dialogs/merge": "Unir?",
     "core-facets/facet-by-count": "Faceta pelo quantidade de opções",
     "core-index/name": "Nome do projeto:",

main/webapp/modules/core/langs/translation-pt_BR.json

@@ -186,7 +186,7 @@
     "core-dialogs/rows-in-cluster": "# Linhas no cluster",
     "core-dialogs/content": "Conteúdo",
     "core-dialogs/use-this-val": "Usar este valor",
-    "core-dialogs/cells-of-row": "As células da linha atual. Este é um atalho para 'row.cells'. Uma célula em particular pode ser recuperada com 'cells. <Column name>' se o <column name> for uma única palavra, ou com 'cells [\"<column name>\"] caso contrário.",
+    "core-dialogs/cells-of-row": "As células da linha atual. Este é um atalho para 'row.cells'. Uma célula em particular pode ser recuperada com 'cells. &lt;Column name>' se o &lt;column name> for uma única palavra, ou com 'cells [\"&lt;column name>\"] caso contrário.",
     "core-dialogs/method": "Método&nbsp;",
     "core-dialogs/ngram-radius": "Raio&nbsp;",
     "core-dialogs/processing": "Processando…",
@@ -722,7 +722,7 @@
     "core-index/license": "Licença:",
     "core-index/homepage": "Página inicial:",
     "core-index/image": "Imagem:",
-    "core-dialogs/record-fields": "uma ou mais linhas mescladas para formar um registro; O objeto possui mais campos, detalhes em https://github.com/OpenRefine/OpenRefine/wiki/Variables#record",
+    "core-dialogs/record-fields": "uma ou mais linhas mescladas para formar um registro; O objeto possui mais campos, detalhes em <a href=\"https://github.com/OpenRefine/OpenRefine/wiki/Variables#record\">Records</a>",
     "core-views/join-col": "Mesclar colunas",
     "core-views/column-join": "Mesclar colunas",
     "core-views/column-join-before-column-picker": "Selecione e ordene as colunas para mesclar",

main/webapp/modules/core/langs/translation-sv.json

@@ -206,7 +206,7 @@
     "core-dialogs/cell-fields": "Den aktuella cellen. Den har några fält: 'value', 'recon' och 'errorMessage'.",
     "core-dialogs/cell-value": "Den aktuella cellens värde. Detta är en genväg för 'cell.value'.",
     "core-dialogs/row-fields": "Den aktuella raden. Den har 5 fält: 'flagged', 'starred', 'index', 'cells' och 'record'.",
-    "core-dialogs/cells-of-row": "Cellerna i den aktuella raden. Detta är en genväg för 'row.cells'. En särskild cell kan hämtas med 'cells.<kolumnnamn>'om <kolumnnamn> är ett enda ord, eller annars med 'cells[\"<kolumnnamn>\"]'.",
+    "core-dialogs/cells-of-row": "Cellerna i den aktuella raden. Detta är en genväg för 'row.cells'. En särskild cell kan hämtas med 'cells.&lt;kolumnnamn>'om &lt;kolumnnamn> är ett enda ord, eller annars med 'cells[\"&lt;kolumnnamn>\"]'.",
     "core-dialogs/row-index": "Den aktuella radens index. Detta är en genväg för 'row.index'.",
     "core-dialogs/returns": "returnerar",
     "core-dialogs/from": "Från",
@@ -444,5 +444,5 @@
     "core-index/license": "Licens:",
     "core-index/homepage": "Hemsida:",
     "core-index/image": "Bild:",
-    "core-dialogs/record-fields": "En eller flera rader grupperas till en post; objektet har flera fält, detaljerna redovisas på https://github.com/OpenRefine/OpenRefine/wiki/Variables#record"
+    "core-dialogs/record-fields": "En eller flera rader grupperas till en post; objektet har flera fält, detaljerna redovisas på <a href=\"https://github.com/OpenRefine/OpenRefine/wiki/Variables#record\">Records</a>"
 }

main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js

@@ -210,7 +210,7 @@ ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) {
         var variable = vars[i];
         var tr = varTable.insertRow(varTable.rows.length);
         $(tr.insertCell(0)).addClass("expression-preview-doc-item-title").text(variable.name);
-        $(tr.insertCell(1)).addClass("expression-preview-doc-item-desc").text(variable.description);
+        $(tr.insertCell(1)).addClass("expression-preview-doc-item-desc").html(variable.description);
     }
     
     var renderEntry = function(table, name, entry) {
@@ -225,7 +225,7 @@ ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) {
         $(tr1.insertCell(1)).addClass("expression-preview-doc-item-returns").text($.i18n('core-dialogs/returns')+": " + entry.returns);
         
         $(tr2.insertCell(0));
-        $(tr2.insertCell(1)).addClass("expression-preview-doc-item-desc").text(entry.description);
+        $(tr2.insertCell(1)).addClass("expression-preview-doc-item-desc").html(entry.description);
     };
     var renderEntries = function(table, map) {
         var names = [];