Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bram Chen
2014-02-21 00:44:34 +08:00
9 changed files with 16 additions and 60 deletions
-3
View File
@@ -1,3 +0,0 @@
title: $:/language/ControlPanel/
Basics/Language/Prompt: Hiya! Current language:
-8
View File
@@ -1,8 +0,0 @@
{
"title": "$:/languages/en-US",
"name": "en-US",
"plugin-type": "language",
"description": "English (US)",
"author": "JeremyRuston",
"core-version": ">=5.0.0"
}
-3
View File
@@ -1,3 +0,0 @@
title: $:/language/ControlPanel/
Basics/Language/Prompt: Bonjour! Langage courant:
-8
View File
@@ -1,8 +0,0 @@
{
"title": "$:/languages/fr-FR",
"name": "fr-FR",
"plugin-type": "language",
"description": "French (France)",
"author": "JeremyRuston",
"core-version": ">=5.0.0"
}