diff options
| -rw-r--r-- | htroot/ConfigBasic.html | 1 | ||||
| -rw-r--r-- | locales/de.lng | 6 | ||||
| -rw-r--r-- | locales/el.lng | 6 | ||||
| -rw-r--r-- | locales/es.lng | 8 | ||||
| -rw-r--r-- | locales/fr.lng | 6 | ||||
| -rw-r--r-- | locales/hi.lng | 6 | ||||
| -rw-r--r-- | locales/it.lng | 6 | ||||
| -rw-r--r-- | locales/ja.lng | 10 | ||||
| -rw-r--r-- | locales/ko.lng | 10 | ||||
| -rw-r--r-- | locales/master.lng.xlf | 6 | ||||
| -rw-r--r-- | locales/pl.lng | 12 | ||||
| -rw-r--r-- | locales/ru.lng | 12 | ||||
| -rw-r--r-- | locales/sk.lng | 6 | ||||
| -rw-r--r-- | locales/source-master.lng.xlf | 6 | ||||
| -rw-r--r-- | locales/tr.lng | 12 | ||||
| -rw-r--r-- | locales/uk.lng | 4 | ||||
| -rw-r--r-- | locales/zh.lng | 12 | ||||
| -rw-r--r-- | source/net/yacy/htroot/ConfigBasic.java | 64 |
18 files changed, 67 insertions, 126 deletions
diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.html index c2026b3e8..7d3f470eb 100644 --- a/htroot/ConfigBasic.html +++ b/htroot/ConfigBasic.html @@ -40,7 +40,6 @@ <li> <img src="env/grafics/ok.png" height="16" width="16" alt="ok" /> Select a language for the interface:<br /> <fieldset> - <input type="radio" name="language" value="browser" id="lang_browser" onchange="this.form.submit()" #(lang_browser)#::checked="checked"#(/lang_browser)# /><label for="lang_browser" title="Use the browser preferred language if available">Browser</label> <input type="radio" name="language" value="default" id="lang_en" onchange="this.form.submit()" #(lang_en)#::checked="checked"#(/lang_en)# /><label for="lang_en" #(active_en)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_en)#>English</label> <input type="radio" name="language" value="de" id="lang_de" onchange="this.form.submit()" #(lang_de)#::checked="checked"#(/lang_de)# /><label for="lang_de" #(active_de)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_de)#>Deutsch</label> <input type="radio" name="language" value="fr" id="lang_fr" onchange="this.form.submit()" #(lang_fr)#::checked="checked"#(/lang_fr)# /><label for="lang_fr" #(active_fr)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_fr)#>Français</label> diff --git a/locales/de.lng b/locales/de.lng index dbec48805..cb0461e54 100644 --- a/locales/de.lng +++ b/locales/de.lng @@ -428,11 +428,10 @@ Select one of the default skins. <b>After selection it might be required to relo #--------------------------- Your port has changed. Please wait 10 seconds.==Ihr Port wurde geändert. Bitte warten Sie 10 Sekunden. Deutsch==Deutsch -Browser==Browser Basic Configuration==Grundkonfiguration Your YaCy Peer needs some basic information to operate properly==Ihr YaCy-Peer benötigt einige Grundinformationen, um korrekt zu funktionieren -English==Englisch -Français==Französisch +English==English +Français==Français Use Case: what do you want to do with YaCy:==Anwendungsfall: Was Sie mit YaCy tun wollen: Community-based web search==Gemeinschafts-basierte Web Suche Join and support the global network 'freeworld', search the web with an uncensored user-owned search network==Treten Sie dem globalen Netzwerk 'freeworld' bei und unterstützen Sie es, durchsuchen Sie das Internet mit einem unzensierten, von den Benutzern gestalteten Suchnetzwerk @@ -451,7 +450,6 @@ Your Peer name is a default name; please set an individual peer name.==Ihr Peer- "Active : translated pages are available"=="Aktiv: übersetzte Seiten sind verfügbar" "Click to generate translated pages"=="Klicken, um übersetzte Seiten zu generieren" "Set Configuration"=="Konfiguration setzen" -"Use the browser preferred language if available"=="Wenn verfügbar, die bevorzugte Sprache des Browsers verwenden" "Usecase Freeworld"=="Anwendungsfall Freeworld" "Usecase Intranet"=="Anwendungsfall Intranet" "Usecase Portal"=="Anwendungsfall Portal" diff --git a/locales/el.lng b/locales/el.lng index 41013e715..080073df6 100644 --- a/locales/el.lng +++ b/locales/el.lng @@ -548,7 +548,6 @@ Error saving the skin.==Σφάλμα αποθήκευσης του δέρματ #File: ConfigBasic.html #--------------------------- "ok"=="Εντάξει" -"Use the browser preferred language if available"=="Χρησιμοποιήστε την προτιμώμενη γλώσσα του προγράμματος περιήγησης, εάν είναι διαθέσιμη" "Click to generate translated pages"=="Κάντε κλικ για να δημιουργήσετε μεταφρασμένες σελίδες" "Active : translated pages are available"=="Ενεργό: μεταφρασμένες σελίδες είναι διαθέσιμες" "Usecase Freeworld"=="Usecase Freeworld" @@ -561,11 +560,10 @@ Your port has changed. Please wait 10 seconds.==Η θύρα σας άλλαξε. <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>WARNING</b> Αυτή η περίπτωση YaCy μπορεί να διαχειρίζεται με τον λογαριασμό "admin" και τον προεπιλεγμένο κωδικό πρόσβασης "yacy". Your YaCy Peer needs some basic information to operate properly==Ο ομότιμος YaCy σας χρειάζεται κάποιες βασικές πληροφορίες για να λειτουργήσει σωστά Select a language for the interface:==Επιλέξτε μια γλώσσα για τη διεπαφή: -Browser==Πρόγραμμα περιήγησης -English==αγγλικός +English==English Deutsch==Deutsch Français==Français -Italiano==ιταλικό +Italiano==Italiano Español==Español Polski==Polski Türkçe==Türkçe diff --git a/locales/es.lng b/locales/es.lng index 41801f98b..7ac4b3c8b 100644 --- a/locales/es.lng +++ b/locales/es.lng @@ -427,12 +427,11 @@ Select one of the default skins. <b>After selection it might be required to relo #File: ConfigBasic.html #--------------------------- Your port has changed. Please wait 10 seconds.==Your port has changed. Please wait 10 seconds. -Deutsch==Alemán -Browser==Navegador +Deutsch==Deutsch Basic Configuration==Configuración básica Your YaCy Peer needs some basic information to operate properly==Tu Nodo YaCy necesita información básica para funcionar correctamente -English==Inglés -Français==Francés +English==English +Français==Français Use Case: what do you want to do with YaCy:==Modo de uso: ¿qué quieres hacer con YaCy? Community-based web search==Búsqueda web basada en la comunidad Join and support the global network 'freeworld', search the web with an uncensored user-owned search network==Únase y apoye la red global 'freeworld', busque en la web con una red de búsqueda sin censura controlado por el usuario @@ -451,7 +450,6 @@ Your Peer name is a default name; please set an individual peer name.==Tu nombre "Active : translated pages are available"=="Activo: las páginas traducidas están disponibles" "Click to generate translated pages"=="Haga clic para generar páginas traducidas" "Set Configuration"=="Configuración del conjunto" -"Use the browser preferred language if available"=="Utilice el idioma preferido del navegador si está disponible" "Usecase Freeworld"=="Usecase Freeworld" "Usecase Intranet"=="Usecase Intranet" "Usecase Portal"=="Portal de la usuaria" diff --git a/locales/fr.lng b/locales/fr.lng index bd06c9add..9fad61f14 100644 --- a/locales/fr.lng +++ b/locales/fr.lng @@ -404,18 +404,16 @@ Configure your router for YaCy using UPnP:==Configurer votre routeur pour YaCy e Configuration was not successful. This may take a moment.== Échec de la configuration. Cela peut prendre un moment. What you should do next:==Ce que vous devriez faire ensuite: Your Peer name is a default name; please set an individual peer name.== Le nom de votre noeud est un nom par défaut. Veuillez lui donner un nom individuel. -Deutsch==Allemand +Deutsch==Deutsch "Active : translated pages are available"=="Active: les pages traduites sont disponibles" "Click to generate translated pages"=="Cliquez pour générer des pages traduites" "Set Configuration"=="Définir la configuration" -"Use the browser preferred language if available"=="Utilisez la langue préférée du navigateur si disponible" "Usecase Freeworld"=="Cas d'utilisation Freeworld" "Usecase Intranet"=="Intranet Usecase" "Usecase Portal"=="Portail Usecase" "ok"=="ok" "warning"=="avertissement" <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>AVERTISSEMENT</b> Cette instance YaCy peut être administrée avec le compte "admin" et le mot de passe par défaut "yacy". -Browser==Navigateur Can not leave from Intranet Indexing : one or more remote Solr instances are attached and may contain private documents indexed.==Impossible de quitter l'Intranet Indexing: une ou plusieurs instances Solr distantes sont jointes et peuvent contenir des documents privés indexés. Create a search portal for your intranet or web pages or your (shared) file system. URLs may be used with http/https/ftp and a local domain name or IP, or with an URL of the form file:///<path> or smb://<server>/<path>==Créer un portail de recherche pour votre intranet, vos pages web ou votre système de fichiers partagé. Les URLs peuvent utiliser http/https/ftp avec un nom de domaine ou une adresse IP locale, ou une URL de la forme file:///<path> ou smb://<server>/<path> English==English @@ -423,7 +421,7 @@ Español==Español Polski==Polski Türkçe==Türkçe Slovenčina==Slovenčina -Français==Fran ç ais +Français==Français Italiano==Italiano One or more remote Solr instances are attached and may contain indexed public documents irrelevant to your local domain.==Une ou plusieurs instances Solr distantes sont jointes et peuvent contenir des documents publics indexés non pertinents à votre domaine local. One or more remote Solr instances are attached.==Une ou plusieurs instances Solr distantes sont jointes. diff --git a/locales/hi.lng b/locales/hi.lng index 244253962..afc0c1be1 100644 --- a/locales/hi.lng +++ b/locales/hi.lng @@ -538,7 +538,6 @@ Error saving the skin.==एरर सेविंग स्किन्स. #File: ConfigBasic.html #--------------------------- "ok"=="ठीक है" -"Use the browser preferred language if available"=="यदि उपलब्ध हो तो ब्राउज़र की पसंदीदा भाषा का उपयोग करें" "Click to generate translated pages"=="अनुवादित पृष्ठ बनाने के लिए क्लिक करें" "Active : translated pages are available"=="सक्रिय : अनुवादित पृष्ठ उपलब्ध हैं" "Usecase Freeworld"=="यूज़केस फ्रीवर्ल्ड" @@ -551,9 +550,8 @@ Your port has changed. Please wait 10 seconds.==आपका पोर्ट ब <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>WARNING</b> इस YaCy उदाहरण को खाता "एडमिन" और डिफ़ॉल्ट पासवर्ड "yacy" के साथ प्रशासित किया जा सकता है। Your YaCy Peer needs some basic information to operate properly==आपकी YaCy पीअर को ठीक से संचालित करने के लिए कुछ बुनियादी जानकारी की जरूरत है Select a language for the interface:==इंटरफ़ेस के लिए एक भाषा चुनें: -Browser==ब्राउज़र -English==अंग्रेज़ी -Deutsch==deutsch +English==English +Deutsch==Deutsch Français==Français Italiano==Italiano Español==Español diff --git a/locales/it.lng b/locales/it.lng index f4cf819b7..a3b39da34 100644 --- a/locales/it.lng +++ b/locales/it.lng @@ -434,11 +434,10 @@ Select one of the default skins. <b>After selection it might be required to relo #--------------------------- Your port has changed. Please wait 10 seconds.==La porta e stata modificata. Attendi 10 secondi. Deutsch==Deutsch -Browser==Browser Basic Configuration==Configurazione di base Your YaCy Peer needs some basic information to operate properly==Il tuo nodo YaCy ha bisogno di una semplice configurazione per poter funzionare correttamente -English==Inglese -Français==Francese +English==English +Français==Français Use Case: what do you want to do with YaCy:==Modo d'uso: come userai YaCy Community-based web search==Ricerca web comunitaria Join and support the global network 'freeworld', search the web with an uncensored user-owned search network==Unisciti e supporta la rete globale 'freeworld', cerca nel web con una rete di ricerca non censurata di proprietà dell'utente @@ -457,7 +456,6 @@ Your Peer name is a default name; please set an individual peer name.==Il nome d "Active : translated pages are available"=="Attivo: le pagine tradotte sono disponibili" "Click to generate translated pages"=="Clicca per generare pagine tradotte" "Set Configuration"=="Configurazione di set" -"Use the browser preferred language if available"=="Usare la lingua preferita del browser se disponibile" "Usecase Freeworld"=="Usecase Freeworld" "Usecase Intranet"=="Usecase Intranet" "Usecase Portal"=="Portale delle maiuscole" diff --git a/locales/ja.lng b/locales/ja.lng index bc4285baa..018541998 100644 --- a/locales/ja.lng +++ b/locales/ja.lng @@ -543,7 +543,6 @@ Error saving the skin.==スキンの保存でのエラー. #File: ConfigBasic.html #--------------------------- "ok"=="わかりました" -"Use the browser preferred language if available"=="可能な場合はブラウザの優先言語を使用します" "Click to generate translated pages"=="クリックして翻訳されたページを生成します" "Active : translated pages are available"=="アクティブ : 翻訳されたページが利用可能です" "Usecase Freeworld"=="ユースケース フリーワールド" @@ -556,12 +555,11 @@ Your port has changed. Please wait 10 seconds.==ポートが変更されまし <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>WARNING</b> この YaCy インスタンスは、アカウント「admin」とデフォルトのパスワード「yacy」を使用して管理できます。 Your YaCy Peer needs some basic information to operate properly==あなたのYaCy ピアは正常に動作する為に幾つかの基本的な情報を必要とします Select a language for the interface:==インターフェースの言語を選択します。 -Browser==ブラウザ -English==英語 -Deutsch==ドイツ語 +English==English +Deutsch==Deutsch Français==Français -Italiano==イタリアーノ -Español==スペイン語 +Italiano==Italiano +Español==Español Polski==Polski Türkçe==Türkçe Slovenčina==Slovenčina diff --git a/locales/ko.lng b/locales/ko.lng index c205d3a29..6eae3e8d8 100644 --- a/locales/ko.lng +++ b/locales/ko.lng @@ -538,7 +538,6 @@ Error saving the skin.==스킨을 저장하는 중에 오류가 발생했습니 #File: ConfigBasic.html #--------------------------- "ok"=="좋아요" -"Use the browser preferred language if available"=="가능한 경우 브라우저 기본 언어를 사용하세요." "Click to generate translated pages"=="번역된 페이지를 생성하려면 클릭하세요." "Active : translated pages are available"=="활성: 번역된 페이지를 사용할 수 있습니다." "Usecase Freeworld"=="사용 사례 Freeworld" @@ -551,12 +550,11 @@ Your port has changed. Please wait 10 seconds.==포트가 변경되었습니다. <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>WARNING</b> 이 YaCy 인스턴스는 "admin" 계정과 기본 비밀번호 "yacy"로 관리할 수 있습니다. Your YaCy Peer needs some basic information to operate properly==YaCy 피어가 제대로 작동하려면 몇 가지 기본 정보가 필요합니다. Select a language for the interface:==인터페이스 언어를 선택하세요: -Browser==브라우저 -English==영어 -Deutsch==독일어 +English==English +Deutsch==Deutsch Français==Français -Italiano==이탈리아노 -Español==스페인어 +Italiano==Italiano +Español==Español Polski==Polski Türkçe==Türkçe Slovenčina==Slovenčina diff --git a/locales/master.lng.xlf b/locales/master.lng.xlf index c4a71d252..740cd0b31 100644 --- a/locales/master.lng.xlf +++ b/locales/master.lng.xlf @@ -1482,9 +1482,6 @@ <trans-unit id="112264" xml:space="preserve" approved="no" translate="yes"> <source>"ok"</source> </trans-unit> - <trans-unit id="fe8f5c15" xml:space="preserve" approved="no" translate="yes"> - <source>"Use the browser preferred language if available"</source> - </trans-unit> <trans-unit id="6708b628" xml:space="preserve" approved="no" translate="yes"> <source>"Click to generate translated pages"</source> </trans-unit> @@ -1521,9 +1518,6 @@ <trans-unit id="4ae2f3ec" xml:space="preserve" approved="no" translate="yes"> <source>Select a language for the interface:</source> </trans-unit> - <trans-unit id="6c37c308" xml:space="preserve" approved="no" translate="yes"> - <source>Browser</source> - </trans-unit> <trans-unit id="3a13250" xml:space="preserve" approved="no" translate="yes"> <source>English</source> </trans-unit> diff --git a/locales/pl.lng b/locales/pl.lng index 04c23125a..167db3c48 100644 --- a/locales/pl.lng +++ b/locales/pl.lng @@ -553,7 +553,6 @@ Error saving the skin.==Błąd podczas zapisywania skórki. #File: ConfigBasic.html #--------------------------- "ok"=="ok" -"Use the browser preferred language if available"=="Użyj preferowanego języka przeglądarki, jeśli jest dostępny" "Click to generate translated pages"=="Kliknij, aby wygenerować przetłumaczone strony" "Active : translated pages are available"=="Aktywne: przetłumaczone strony są dostępne" "Usecase Freeworld"=="Przypadek użycia Freeworld" @@ -566,12 +565,11 @@ Your port has changed. Please wait 10 seconds.==Twój port został zmieniony. Po <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>OSTRZEŻENIE</b> Tą instancją YaCy można administrować za pomocą konta "admin" i domyślnego hasła "yacy". Your YaCy Peer needs some basic information to operate properly==Twój peer YaCy potrzebuje kilku podstawowych informacji, aby działać poprawnie Select a language for the interface:==Wybierz język interfejsu: -Browser==Przeglądarka -English==Angielski -Deutsch==Niemiecki -Français==Francuski -Italiano==Włoski -Español==Hiszpański +English==English +Deutsch==Deutsch +Français==Français +Italiano==Italiano +Español==Español Polski==Polski Türkçe==Türkçe Slovenčina==Slovenčina diff --git a/locales/ru.lng b/locales/ru.lng index 5c1c17f3a..632d999a1 100644 --- a/locales/ru.lng +++ b/locales/ru.lng @@ -414,7 +414,6 @@ Your Peer name is a default name; please set an individual peer name.==Ваше #----------------------------- "ok"=="хорошо" -"Use the browser preferred language if available"=="Используйте предпочитаемый язык браузера, если он доступен." "Click to generate translated pages"=="Нажмите, чтобы создать переведенные страницы" "Active : translated pages are available"=="Активно: доступны переведенные страницы." "Usecase Freeworld"=="Вариант использования «Свободный мир" @@ -424,12 +423,11 @@ Your Peer name is a default name; please set an individual peer name.==Ваше "Set Configuration"=="Установить конфигурацию" <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>WARNING</b> Этот экземпляр YaCy можно администрировать с помощью учетной записи «admin» и пароля по умолчанию «yacy». Select a language for the interface:==Выберите язык интерфейса: -Browser==Браузер -English==Английский -Deutsch==немецкий -Français==Франция -Italiano==Итальяно -Español==испанский +English==English +Deutsch==Deutsch +Français==Français +Italiano==Italiano +Español==Español Polski==Polski Türkçe==Türkçe Slovenčina==Slovenčina diff --git a/locales/sk.lng b/locales/sk.lng index ca5ee30de..12d13c2e2 100644 --- a/locales/sk.lng +++ b/locales/sk.lng @@ -547,7 +547,6 @@ Error saving the skin.==Chyba pri ukladaní vzhľadu. #File: ConfigBasic.html #--------------------------- "ok"=="ok" -"Use the browser preferred language if available"=="Použite preferovaný jazyk prehliadača, ak je k dispozícii" "Click to generate translated pages"=="Kliknutím vygenerujete preložené stránky" "Active : translated pages are available"=="Aktívne: k dispozícii sú preložené stránky" "Usecase Freeworld"=="Usecase Freeworld" @@ -560,12 +559,11 @@ Your port has changed. Please wait 10 seconds.==Váš port sa zmenil. Počkajte <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>WARNING</b> Túto inštanciu YaCy možno spravovať pomocou účtu „admin“ a predvoleného hesla „yacy“. Your YaCy Peer needs some basic information to operate properly==Vase YaCy vyzaduje pre spravne fungovanie niekolko zakladnych udajov Select a language for the interface:==Vyberte jazyk rozhrania: -Browser==Prehliadač -English==angličtina +English==English Deutsch==Deutsch Français==Français Italiano==Italiano -Español==Španielčina +Español==Español Polski==Polski Türkçe==Türkçe Slovenčina==Slovenčina diff --git a/locales/source-master.lng.xlf b/locales/source-master.lng.xlf index e19e78dda..039b4045c 100644 --- a/locales/source-master.lng.xlf +++ b/locales/source-master.lng.xlf @@ -1482,9 +1482,6 @@ <trans-unit id="112264" xml:space="preserve" approved="no" translate="yes"> <source>"ok"</source> </trans-unit> - <trans-unit id="fe8f5c15" xml:space="preserve" approved="no" translate="yes"> - <source>"Use the browser preferred language if available"</source> - </trans-unit> <trans-unit id="6708b628" xml:space="preserve" approved="no" translate="yes"> <source>"Click to generate translated pages"</source> </trans-unit> @@ -1521,9 +1518,6 @@ <trans-unit id="4ae2f3ec" xml:space="preserve" approved="no" translate="yes"> <source>Select a language for the interface:</source> </trans-unit> - <trans-unit id="6c37c308" xml:space="preserve" approved="no" translate="yes"> - <source>Browser</source> - </trans-unit> <trans-unit id="3a13250" xml:space="preserve" approved="no" translate="yes"> <source>English</source> </trans-unit> diff --git a/locales/tr.lng b/locales/tr.lng index f7a6f5459..325be245a 100644 --- a/locales/tr.lng +++ b/locales/tr.lng @@ -555,7 +555,6 @@ Error saving the skin.==Tema kaydedilirken hata oluştu. #File: ConfigBasic.html #--------------------------- "ok"=="Tamam" -"Use the browser preferred language if available"=="Varsa tarayıcının tercih ettiği dili kullanın" "Click to generate translated pages"=="Çevrilmiş sayfalar oluşturmak için tıklayın" "Active : translated pages are available"=="Aktif: çevrilmiş sayfalar mevcut" "Usecase Freeworld"=="Kullanım Örneği Freeworld" @@ -568,12 +567,11 @@ Your port has changed. Please wait 10 seconds.==Bağlantı noktanız değişti. <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>WARNING</b> Bu YaCy örneği "admin" hesabı ve varsayılan şifre "yacy" ile yönetilebilir. Your YaCy Peer needs some basic information to operate properly==YaCy Eşinizin düzgün çalışabilmesi için bazı temel bilgilere ihtiyacı vardır Select a language for the interface:==Arayüz için bir dil seçin: -Browser==Tarayıcı -English==İngilizce -Deutsch==Almanca -Français==Fransızca -Italiano==İtalyan -Español==İspanyolca +English==English +Deutsch==Deutsch +Français==Français +Italiano==Italiano +Español==Español Polski==Polski Türkçe==Türkçe Slovenčina==Slovenčina diff --git a/locales/uk.lng b/locales/uk.lng index 03a1f989d..462ed9afa 100644 --- a/locales/uk.lng +++ b/locales/uk.lng @@ -374,7 +374,6 @@ Your Peer name is a default name; please set an individual peer name.==Ім’я #----------------------------- "ok"=="добре" -"Use the browser preferred language if available"=="Використовуйте бажану мову браузера, якщо вона доступна" "Click to generate translated pages"=="Натисніть, щоб створити перекладені сторінки" "Active : translated pages are available"=="Активний : доступні перекладені сторінки" "Usecase Freeworld"=="Випадок використання Freeworld" @@ -385,8 +384,7 @@ Your Peer name is a default name; please set an individual peer name.==Ім’я Your port has changed. Please wait 10 seconds.==Ваш порт змінився. Зачекайте 10 секунд. <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>WARNING</b> Цим екземпляром YaCy можна керувати за допомогою облікового запису «admin» і пароля за умовчанням «yacy». Select a language for the interface:==Виберіть мову для інтерфейсу: -Browser==Браузер -English==англійська +English==English Deutsch==Deutsch Français==Français Italiano==Italiano diff --git a/locales/zh.lng b/locales/zh.lng index 93fdeb13a..e80cb2e9d 100644 --- a/locales/zh.lng +++ b/locales/zh.lng @@ -548,7 +548,6 @@ Error saving the skin.==保存皮肤时出错. #File: ConfigBasic.html #--------------------------- "ok"=="好的" -"Use the browser preferred language if available"=="使用浏览器首选语言（如果可用）" "Click to generate translated pages"=="点击生成翻译页面" "Active : translated pages are available"=="活动：已翻译的页面可用" "Usecase Freeworld"=="用例自由世界" @@ -561,12 +560,11 @@ Your port has changed. Please wait 10 seconds.==你的端口已更改。 请等 <b>WARNING</b> This YaCy instance can be administered with the account "admin" and the default password "yacy".==<b>警告</b> 此 YaCy 实例可以使用帐户“admin”和默认密码“yacy”进行管理。 Your YaCy Peer needs some basic information to operate properly==你的YaCy节点需要一些基本信息才能有效工作 Select a language for the interface:==选择界面语言： -Browser==浏览器 -English==英语 -Deutsch==德语 -Français==弗朗çais -Italiano==意大利人 -Español==西班牙语 +English==English +Deutsch==Deutsch +Français==Français +Italiano==Italiano +Español==Español Polski==Polski Türkçe==Türkçe Slovenčina==Slovenčina diff --git a/source/net/yacy/htroot/ConfigBasic.java b/source/net/yacy/htroot/ConfigBasic.java index faff9713b..63d1d5629 100644 --- a/source/net/yacy/htroot/ConfigBasic.java +++ b/source/net/yacy/htroot/ConfigBasic.java @@ -33,13 +33,11 @@ package net.yacy.htroot; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.util.List; import java.util.regex.Pattern; import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.RequestHeader; import net.yacy.data.TransactionManager; -import net.yacy.data.Translator; import net.yacy.data.WorkTables; import net.yacy.http.YaCyHttpServer; import net.yacy.peers.OnePeerPingBusyThread; @@ -60,6 +58,7 @@ public class ConfigBasic { private static final int NEXTSTEP_PEERNAME = 2; private static final int NEXTSTEP_PEERPORT = 3; private static final int NEXTSTEP_RECONNECT = 4; + private static final Pattern CONFIG_BASIC_LANGUAGE_PATTERN = Pattern.compile("default|de|el|es|fr|hi|it|ja|ko|pl|ru|sk|tr|uk|zh"); public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) throws FileNotFoundException, IOException { @@ -67,7 +66,7 @@ public class ConfigBasic { final Switchboard sb = (Switchboard) env; final serverObjects prop = new serverObjects(); final File langPath = new File(sb.getAppPath("locale.source", "locales").getAbsolutePath()); - String lang = env.getConfig("locale.language", "browser"); + String lang = env.getConfig("locale.language", "default"); /* For authenticated users only : acquire a transaction token for the next POST form submission */ try { @@ -105,8 +104,9 @@ public class ConfigBasic { } // language settings - if(post.containsKey("language") && !lang.equals(post.get("language", "default"))) { - if(new TranslatorXliff().changeLang(env, langPath, post.get("language", "default") + ".lng")) { + final String postLanguage = post.get("language", "default"); + if(post.containsKey("language") && CONFIG_BASIC_LANGUAGE_PATTERN.matcher(postLanguage).matches() && !lang.equals(postLanguage)) { + if(new TranslatorXliff().changeLang(env, langPath, postLanguage + ".lng")) { prop.put("changedLanguage", "1"); } } @@ -329,7 +329,6 @@ public class ConfigBasic { prop.put("defaultPort", env.getLocalPort()); prop.put("withsslenabled", env.getConfigBool("server.https", false) ? 1 : 0); lang = env.getConfig("locale.language", "default"); // re-assign lang, may have changed - prop.put("lang_browser", "0"); // for client browser language dependent prop.put("lang_de", "0"); prop.put("lang_el", "0"); prop.put("lang_es", "0"); @@ -345,47 +344,30 @@ public class ConfigBasic { prop.put("lang_uk", "0"); prop.put("lang_zh", "0"); prop.put("lang_en", "0"); + if (!CONFIG_BASIC_LANGUAGE_PATTERN.matcher(lang).matches()) { + lang = "default"; + } if ("default".equals(lang)) { prop.put("lang_en", "1"); } else { prop.put("lang_" + lang, "1"); } // set label class (green background) for active translation - if (lang.equals("browser")) { - final List<String> l = Translator.activeTranslations(); - prop.put("active_de", l.contains("de") ? "2" : "1"); - prop.put("active_el", l.contains("el") ? "2" : "1"); - prop.put("active_es", l.contains("es") ? "2" : "1"); - prop.put("active_fr", l.contains("fr") ? "2" : "1"); - prop.put("active_hi", l.contains("hi") ? "2" : "1"); - prop.put("active_it", l.contains("it") ? "2" : "1"); - prop.put("active_ja", l.contains("ja") ? "2" : "1"); - prop.put("active_ko", l.contains("ko") ? "2" : "1"); - prop.put("active_pl", l.contains("pl") ? "2" : "1"); - prop.put("active_ru", l.contains("ru") ? "2" : "1"); - prop.put("active_sk", l.contains("sk") ? "2" : "1"); - prop.put("active_tr", l.contains("tr") ? "2" : "1"); - prop.put("active_uk", l.contains("uk") ? "2" : "1"); - prop.put("active_zh", l.contains("zh") ? "2" : "1"); - prop.put("active_en", "2"); - - } else { - prop.put("active_de", "0"); - prop.put("active_el", "0"); - prop.put("active_es", "0"); - prop.put("active_fr", "0"); - prop.put("active_hi", "0"); - prop.put("active_it", "0"); - prop.put("active_ja", "0"); - prop.put("active_ko", "0"); - prop.put("active_pl", "0"); - prop.put("active_ru", "0"); - prop.put("active_sk", "0"); - prop.put("active_tr", "0"); - prop.put("active_uk", "0"); - prop.put("active_zh", "0"); - prop.put("active_en", "0"); - } + prop.put("active_de", "0"); + prop.put("active_el", "0"); + prop.put("active_es", "0"); + prop.put("active_fr", "0"); + prop.put("active_hi", "0"); + prop.put("active_it", "0"); + prop.put("active_ja", "0"); + prop.put("active_ko", "0"); + prop.put("active_pl", "0"); + prop.put("active_ru", "0"); + prop.put("active_sk", "0"); + prop.put("active_tr", "0"); + prop.put("active_uk", "0"); + prop.put("active_zh", "0"); + prop.put("active_en", "0"); return prop; } } |