Merge origin/master

This commit is contained in:
honfika@gmail.com
2015-01-30 07:48:16 +01:00
2 changed files with 23 additions and 1 deletions

View File

@@ -46,7 +46,7 @@ public class SelectLanguageDialog extends AppDialog implements ActionListener {
public String languageCode = null;
protected static final String[] languages = new String[]{"en", "ca", "cs", "zh", "de", "es", "fr", "hu", "nl", "pl", "pt", "pt-BR", "ru", "sv", "uk"};
protected static final String[] languages = new String[]{"en", "ca", "cs", "zh", "da", "de", "es", "fr", "hu", "nl", "pl", "pt", "pt-BR", "ru", "sv", "uk"};
public SelectLanguageDialog() {
setSize(350, 130);

View File

@@ -0,0 +1,22 @@
# Copyright (C) 2010-2015 JPEXS
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
button.ok = OK
button.cancel = Cancel
#after version 1.7.0:
# This language name translated (e. g. \u010ce\u0161tina for Czech,...)
language = Dansk
language.label = Language:
dialog.title = Select language