From: terencehill <piuntn@gmail.com>
Date: Fri, 23 Oct 2015 18:47:30 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/menu_languages
X-Git-Tag: xonotic-v0.8.2~1688^2
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=3b8f792333c5c245e54bdf0612d2a442bcfe61dc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/menu_languages

Conflicts:
	languages.txt
---

3b8f792333c5c245e54bdf0612d2a442bcfe61dc
diff --cc languages.txt
index 498080ea5,a43c6cff4..9f0d1743b
--- a/languages.txt
+++ b/languages.txt
@@@ -1,19 -1,19 +1,19 @@@
- ast   Asturian "Asturianu" 61%
- de    German "Deutsch" 91%
- de_CH German "Deutsch (Schweiz)" 91%
 -ast Asturian "Asturianu (60%)"
 -de German "Deutsch (90%)"
 -de_CH German "Deutsch (Schweiz) (90%)"
 -en_AU en_AU "en_AU (77%)"
 -en English "English"
 -es Spanish "Español (68%)"
 -fr French "Français (98%)"
 -it Italian "Italiano (97%)"
 -hu Hungarian "Magyar (50%)"
 -nl Dutch "Nederlands (45%)"
 -pl Polish "Polski (60%)"
 -pt Portuguese "Português (42%)"
 -ro Romanian "Romana (90%)"
 -fi Finnish "Suomi (35%)"
 -el Greek "Ελληνική (25%)"
 -be Belarusian "Беларуская (65%)"
 -bg Bulgarian "Български (65%)"
 -ru Russian "Русский (93%)"
 -uk Ukrainian "Українська (60%)"
++ast   Asturian "Asturianu" 60%
++de    German "Deutsch" 90%
++de_CH German "Deutsch (Schweiz)" 90%
 +en    English "English"
- en_AU English "English (Australia)" 78%
++en_AU English "English (Australia)" 77%
 +es    Spanish "Español" 68%
 +fr    French "Français" 98%
- it    Italian "Italiano" 98%
++it    Italian "Italiano" 97%
 +hu    Hungarian "Magyar" 50%
 +nl    Dutch "Nederlands" 45%
- pl    Polish "Polski" 61%
++pl    Polish "Polski" 60%
 +pt    Portuguese "Português" 42%
 +ro    Romanian "Romana" 90%
 +fi    Finnish "Suomi" 35%
- el    Greek "Ελληνική" 26%
++el    Greek "Ελληνική" 25%
 +be    Belarusian "Беларуская" 65%
 +bg    Bulgarian "Български" 65%
 +ru    Russian "Русский" 93%
- uk    Ukrainian "Українська" 60%
++uk    Ukrainian "Українська" 60%