From a763610db1b2f8325c68c9bab7dfdced64ae94d5 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Sat, 15 Feb 2014 11:36:00 +0000
Subject: [PATCH] Get rid of the separate language prompt tiddler

More consistent to stick with .tids files
---
 core/language/en-GB/ControlPanel.tids  | 1 +
 core/language/en-GB/languageprompt.tid | 3 ---
 languages/de-AT/ControlPanel.tids      | 3 +++
 languages/de-AT/languageprompt.tid     | 3 ---
 languages/en-US/ControlPanel.tids      | 3 +++
 languages/en-US/languageprompt.tid     | 3 ---
 languages/fr-FR/ControlPanel.tids      | 3 +++
 languages/fr-FR/languageprompt.tid     | 3 ---
 8 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 core/language/en-GB/languageprompt.tid
 create mode 100644 languages/de-AT/ControlPanel.tids
 delete mode 100644 languages/de-AT/languageprompt.tid
 create mode 100644 languages/en-US/ControlPanel.tids
 delete mode 100644 languages/en-US/languageprompt.tid
 create mode 100644 languages/fr-FR/ControlPanel.tids
 delete mode 100644 languages/fr-FR/languageprompt.tid

diff --git a/core/language/en-GB/ControlPanel.tids b/core/language/en-GB/ControlPanel.tids
index 2006bc5fc..7652c313b 100644
--- a/core/language/en-GB/ControlPanel.tids
+++ b/core/language/en-GB/ControlPanel.tids
@@ -15,3 +15,4 @@ Basics/SystemTiddlers: Number of system tiddlers
 Basics/ShadowTiddlers: Number of shadow tiddlers
 Basics/OverriddenShadowTiddlers: Number of overridden shadow tiddlers
 Appearance/Caption: Appearance
+Language/prompt: Hello! Current language:
diff --git a/core/language/en-GB/languageprompt.tid b/core/language/en-GB/languageprompt.tid
deleted file mode 100644
index 1c9a742f9..000000000
--- a/core/language/en-GB/languageprompt.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/language/ControlPanel/Language/prompt
-
-Hello! Current language:
\ No newline at end of file
diff --git a/languages/de-AT/ControlPanel.tids b/languages/de-AT/ControlPanel.tids
new file mode 100644
index 000000000..71a07f53e
--- /dev/null
+++ b/languages/de-AT/ControlPanel.tids
@@ -0,0 +1,3 @@
+title: $:/language/ControlPanel/
+
+Language/prompt: Hallo! Aktuelle Sprache:
diff --git a/languages/de-AT/languageprompt.tid b/languages/de-AT/languageprompt.tid
deleted file mode 100644
index ec895ed5e..000000000
--- a/languages/de-AT/languageprompt.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/language/ControlPanel/Language/prompt
-
-Hallo! Aktuelle Sprache:
\ No newline at end of file
diff --git a/languages/en-US/ControlPanel.tids b/languages/en-US/ControlPanel.tids
new file mode 100644
index 000000000..a52ab1787
--- /dev/null
+++ b/languages/en-US/ControlPanel.tids
@@ -0,0 +1,3 @@
+title: $:/language/ControlPanel/
+
+Language/prompt: Hiya! Current language:
diff --git a/languages/en-US/languageprompt.tid b/languages/en-US/languageprompt.tid
deleted file mode 100644
index 4e588833c..000000000
--- a/languages/en-US/languageprompt.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/language/ControlPanel/Language/prompt
-
-Hiya! Current language:
\ No newline at end of file
diff --git a/languages/fr-FR/ControlPanel.tids b/languages/fr-FR/ControlPanel.tids
new file mode 100644
index 000000000..d487efacf
--- /dev/null
+++ b/languages/fr-FR/ControlPanel.tids
@@ -0,0 +1,3 @@
+title: $:/language/ControlPanel/
+
+Language/prompt: Bonjour! Langage courant:
diff --git a/languages/fr-FR/languageprompt.tid b/languages/fr-FR/languageprompt.tid
deleted file mode 100644
index 528435b96..000000000
--- a/languages/fr-FR/languageprompt.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/language/ControlPanel/Language/prompt
-
-Bonjour! Langage courant:
\ No newline at end of file