summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-03-21 09:24:59 -0400
committerUnknwon <u@gogs.io>2015-03-21 09:24:59 -0400
commit75cbb32b1e9e32093ccb7e2495da7e2eca57e6c9 (patch)
tree478266d404785a717b8376113f6cd045605d5bfe /conf
parentb6f8b486c79a46219dd1d2f3136c411594cc8f6d (diff)
downloadgitea-75cbb32b1e9e32093ccb7e2495da7e2eca57e6c9.tar.gz
gitea-75cbb32b1e9e32093ccb7e2495da7e2eca57e6c9.zip
UI compatibility
Diffstat (limited to 'conf')
-rw-r--r--conf/app.ini2
-rwxr-xr-xconf/locale/locale_fr-FR.ini (renamed from conf/locale/locale_fr-CA.ini)0
2 files changed, 1 insertions, 1 deletions
diff --git a/conf/app.ini b/conf/app.ini
index c2f7495da4..fe1c798b84 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -286,5 +286,5 @@ INTERVAL = 24
ARGS =
[i18n]
-LANGS = en-US,zh-CN,zh-HK,de-DE,fr-CA,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR
+LANGS = en-US,zh-CN,zh-HK,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR
NAMES = English,简体中文,繁體中文,Deutsch,Français,Nederlands,Latviešu,Русский,日本语,Español,Português
diff --git a/conf/locale/locale_fr-CA.ini b/conf/locale/locale_fr-FR.ini
index b388884d33..b388884d33 100755
--- a/conf/locale/locale_fr-CA.ini
+++ b/conf/locale/locale_fr-FR.ini