From 428fea45cd1f6738e326ea76302bdcac3c1c7642 Mon Sep 17 00:00:00 2001 From: Diego Esmerio Date: Mon, 2 Apr 2018 15:45:29 -0300 Subject: [PATCH] Fix merge mistake --- src/fsharp/xlf/FSComp.txt.cs.xlf | 1 + src/fsharp/xlf/FSComp.txt.de.xlf | 1 + src/fsharp/xlf/FSComp.txt.en.xlf | 1 + src/fsharp/xlf/FSComp.txt.es.xlf | 1 + src/fsharp/xlf/FSComp.txt.fr.xlf | 1 + src/fsharp/xlf/FSComp.txt.it.xlf | 1 + src/fsharp/xlf/FSComp.txt.ja.xlf | 1 + src/fsharp/xlf/FSComp.txt.ko.xlf | 1 + src/fsharp/xlf/FSComp.txt.pl.xlf | 1 + src/fsharp/xlf/FSComp.txt.pt-BR.xlf | 1 + src/fsharp/xlf/FSComp.txt.ru.xlf | 1 + src/fsharp/xlf/FSComp.txt.tr.xlf | 1 + src/fsharp/xlf/FSComp.txt.zh-Hans.xlf | 1 + src/fsharp/xlf/FSComp.txt.zh-Hant.xlf | 1 + 14 files changed, 14 insertions(+) diff --git a/src/fsharp/xlf/FSComp.txt.cs.xlf b/src/fsharp/xlf/FSComp.txt.cs.xlf index 50cec18afdf..48551dd8d78 100644 --- a/src/fsharp/xlf/FSComp.txt.cs.xlf +++ b/src/fsharp/xlf/FSComp.txt.cs.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.de.xlf b/src/fsharp/xlf/FSComp.txt.de.xlf index 0ae007d2eb0..fa06658aacd 100644 --- a/src/fsharp/xlf/FSComp.txt.de.xlf +++ b/src/fsharp/xlf/FSComp.txt.de.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.en.xlf b/src/fsharp/xlf/FSComp.txt.en.xlf index c3030cb6058..689c3880bc2 100644 --- a/src/fsharp/xlf/FSComp.txt.en.xlf +++ b/src/fsharp/xlf/FSComp.txt.en.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index 073759576ef..fb41d7452d4 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index fd11f998c69..c1b7d0749f3 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.it.xlf b/src/fsharp/xlf/FSComp.txt.it.xlf index 3a82c999ccc..0f1a878c2ca 100644 --- a/src/fsharp/xlf/FSComp.txt.it.xlf +++ b/src/fsharp/xlf/FSComp.txt.it.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index 2413eb73c42..0301bb7ebfb 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index cc887d502eb..e1f26bc7b92 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.pl.xlf b/src/fsharp/xlf/FSComp.txt.pl.xlf index 6466dc0e1f1..0440399497d 100644 --- a/src/fsharp/xlf/FSComp.txt.pl.xlf +++ b/src/fsharp/xlf/FSComp.txt.pl.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf index 3e240284000..0889af5eb85 100644 --- a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf +++ b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.ru.xlf b/src/fsharp/xlf/FSComp.txt.ru.xlf index 1c9a0730d04..448824b2175 100644 --- a/src/fsharp/xlf/FSComp.txt.ru.xlf +++ b/src/fsharp/xlf/FSComp.txt.ru.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.tr.xlf b/src/fsharp/xlf/FSComp.txt.tr.xlf index 95ccfc0186a..068d2f761c4 100644 --- a/src/fsharp/xlf/FSComp.txt.tr.xlf +++ b/src/fsharp/xlf/FSComp.txt.tr.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index a57e6ff2268..ab158b1cd43 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload. diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index fb43a7843b4..04fa8115763 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -6985,6 +6985,7 @@ Used in computation expressions to pattern match directly over the result of another computation expression. Used in computation expressions to pattern match directly over the result of another computation expression. + The file '{0}' changed on disk unexpectedly, please reload.