Merge pull request #495 from luca3s/main

new german translations
GyulyVGC · Apr 15, 2024 · 5b92515 · 5b92515
2 parents dea8ab8 + b0b73fc
commit 5b92515
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All Sniffnet releases with the relative changes are documented in this file.
 
+## [UNRELEASED]
+- Updated some of the existing translations to v1.3: 
+  - French - [#494](https://github.com/GyulyVGC/sniffnet/pull/494)
+  - German - [#495](https://github.com/GyulyVGC/sniffnet/pull/495)
+
 ## [1.3.0] - 2024-04-08
 - Introduced thumbnail mode, enabling users to keep an eye on Sniffnet while doing other tasks ([#484](https://github.com/GyulyVGC/sniffnet/pull/484))
 - Added support for ICMP connections and messages ([#417](https://github.com/GyulyVGC/sniffnet/pull/417) — fixes [#288](https://github.com/GyulyVGC/sniffnet/issues/288))

diff --git a/src/gui/pages/settings_general_page.rs b/src/gui/pages/settings_general_page.rs
@@ -12,6 +12,7 @@ use crate::gui::components::button::{button_open_file, row_open_link_tooltip};
 use crate::gui::components::tab::get_settings_tabs;
 use crate::gui::pages::settings_notifications_page::settings_header;
 use crate::gui::pages::types::settings_page::SettingsPage;
+use crate::gui::styles::button::ButtonType;
 use crate::gui::styles::container::ContainerType;
 use crate::gui::styles::style_constants::FONT_SIZE_SUBTITLE;
 use crate::gui::styles::text::TextType;
@@ -121,11 +122,12 @@ fn language_picklist(language: Language, font: Font) -> Container<'static, Messa
         .align_items(Alignment::Center)
         .spacing(10)
         .push(language.get_flag());
-    if ![Language::EN, Language::IT].contains(&language) {
+    if !language.is_up_to_date() {
         flag_row = flag_row.push(
             Tooltip::new(
                 button(
                     Text::new("!")
+                        .style(TextType::Danger)
                         .font(font)
                         .vertical_alignment(Vertical::Center)
                         .horizontal_alignment(Horizontal::Center)
@@ -135,7 +137,8 @@ fn language_picklist(language: Language, font: Font) -> Container<'static, Messa
                 .on_press(Message::OpenWebPage(WebPage::IssueLanguages))
                 .padding(2)
                 .height(20)
-                .width(20),
+                .width(20)
+                .style(ButtonType::Alert),
                 row_open_link_tooltip(
                     "The selected language is not\nfully updated to version 1.3",
                     font,

diff --git a/src/translations/translations.rs b/src/translations/translations.rs
@@ -12,7 +12,7 @@ pub fn choose_adapters_translation(language: Language) -> Text<'static, StyleTyp
         Language::FR => "Sélectionnez une carte réseau à inspecter",
         Language::ES => "Seleccione el adaptador de red que desea inspeccionar",
         Language::PL => "Wybierz adapter sieciowy do inspekcji",
-        Language::DE => "Wähle einen Netzwerkadapter zum inspizieren aus",
+        Language::DE => "Wähle einen Netzwerkadapter zum überwachen aus",
         Language::UK => "Вибрати мережевий адаптер для інспекції",
         Language::ZH => "选择需要监控的网络适配器",
         Language::RO => "Selectați adaptor de rețea pentru a inspecta",
@@ -383,7 +383,7 @@ pub fn clear_all_translation(language: Language) -> String {
         Language::FR => "Tout effacer".to_string(),
         Language::ES => "Borrar todo".to_string(),
         Language::PL => "Wyczyść wszystko".to_string(),
-        Language::DE => "Alle leeren".to_string(),
+        Language::DE => "Alle löschen".to_string(),
         Language::UK => "Видалити все".to_string(),
         Language::ZH => "清除所有".to_string(),
         Language::RO => "Ștergeți tot".to_string(),
@@ -529,7 +529,7 @@ pub fn waiting_translation(language: Language, adapter: &str) -> Text<'static, S
         Language::PL => format!("Nie zaobserowano żadnego ruchu sieciowego. Oczekiwanie na pakiety...\n\n\
                                  {network_adapter_translation}: {adapter}\n\n\
                                  Czy na pewno jesteś podłączony do internetu i wybrałeś właściwy adapter?"),
-        Language::DE => format!("Noch kein Netzwerkverkehr beobachtet. Warte auf Pakete...\n\n\
+        Language::DE => format!("Noch kein Netzwerkverkehr beobachtet. Warten auf Pakete...\n\n\
                                  {network_adapter_translation}: {adapter}\n\n\
                                  Bist du sicher, dass du mit dem Internet verbunden bist und den richtigen Adapter ausgewählt hast?"),
         Language::UK => format!("Не зафіксовано жодного мережевого трафіку. Очікування на пакети...\n\n\
@@ -594,7 +594,7 @@ pub fn some_observed_translation(language: Language, observed: u128) -> Text<'st
                                  Niektóre pakiety zostały przechwycone, ale żaden nie został wybrany zgodnie z wskazanymi filtrami..."),
         Language::DE => format!("Anzahl der empfangenen Pakete: {observed}\n\n\
                                  Gefilterte Pakete: 0\n\n\
-                                 Ein Paar Pakete wurden empfangen, aber es entsprechen noch keine den spezifizierten Filtern..."),
+                                 Ein Paar Pakete wurden empfangen, aber es entsprechen noch keine den gewählten Filtern..."),
         Language::UK => format!("Сума перехоплених пакетів: {observed}\n\n\
                                  Відфільтровані пакеті: 0\n\n\
                                  Деякі пакети були перехоплені, але жоден з них не був вибраний відповідно до вказаних фільтрів..."),
@@ -933,7 +933,7 @@ pub fn packets_translation(language: Language) -> &'static str {
         Language::FR => "paquets",
         Language::ES => "paquetes",
         Language::PL => "pakiety",
-        Language::DE => "pakete",
+        Language::DE => "Pakete",
         Language::UK => "пакети",
         Language::ZH => "数据包",
         Language::RO => "pachete",
@@ -956,7 +956,7 @@ pub fn packets_chart_translation(language: Language) -> &'static str {
         Language::FR => "paquets par seconde",
         Language::ES => "paquetes por segundo",
         Language::PL => "pakiety na sekundę",
-        Language::DE => "pakete pro Sekunde",
+        Language::DE => "Pakete pro Sekunde",
         Language::UK => "пакети на секунду",
         Language::ZH => "数据包",
         Language::RO => "pachete pe secundă",
@@ -975,9 +975,8 @@ pub fn packets_chart_translation(language: Language) -> &'static str {
 
 pub fn bytes_translation(language: Language) -> &'static str {
     match language {
-        Language::EN | Language::ES | Language::PT | Language::DE | Language::EL | Language::SV => {
-            "bytes"
-        }
+        Language::EN | Language::ES | Language::PT | Language::EL | Language::SV => "bytes",
+        Language::DE => "Bytes",
         Language::IT => "byte",
         Language::FR => "octets",
         Language::PL => "bajty",
@@ -1000,7 +999,7 @@ pub fn bytes_chart_translation(language: Language) -> &'static str {
         Language::FR => "octets par seconde",
         Language::ES | Language::PT => "bytes por segundo",
         Language::PL => "bajty na sekundę",
-        Language::DE => "bytes pro Sekunde",
+        Language::DE => "Bytes pro Sekunde",
         Language::UK => "байти на секунду",
         Language::ZH => "网络流量",
         Language::RO => "octeți pe secundă",
@@ -1116,7 +1115,7 @@ pub fn notifications_title_translation(language: Language) -> Text<'static, Styl
         Language::FR => "Personnalisez vos notifications",
         Language::ES => "Personaliza tus notificaciones",
         Language::PL => "Dostosuj powiadomienia",
-        Language::DE => "Personalisier deine Benachrichtigungen",
+        Language::DE => "Stell deine Benachrichtigungen ein",
         Language::UK => "Достосуй повідомлення",
         Language::ZH => "自定义通知",
         Language::RO => "Personalizați-vă notificările",
@@ -1188,7 +1187,7 @@ pub fn none_translation(language: Language) -> String {
         Language::FR => "aucun",
         Language::ES => "ninguno",
         Language::PL => "brak",
-        Language::DE => "keine",
+        Language::DE => "Keine",
         Language::UK => "бракує",
         Language::ZH => "无",
         Language::RO => "niciunul",
@@ -1284,7 +1283,7 @@ pub fn mon_amour_translation(language: Language) -> &'static str {
         Language::FR => "Thème romantique fait pour les rêveurs",
         Language::ES => "Tema encantador hecho para soñadores",
         Language::PL => "Uroczy motyw stworzony dla marzycieli",
-        Language::DE => "Liebevolles Design für Träumer",
+        Language::DE => "Schönes Design für Träumer",
         Language::UK => "Прекрасна тема для мрійників",
         Language::ZH => "梦想家的主题",
         Language::RO => "O temă minunată creată pentru visători",
@@ -1308,7 +1307,7 @@ pub fn incoming_translation(language: Language) -> &'static str {
         Language::FR => "Entrant",
         Language::ES => "Entrante",
         Language::PL => "Przychodzące",
-        Language::DE => "Ankommend",
+        Language::DE => "Eingehend",
         Language::UK => "Вхідні",
         Language::ZH => "入站",
         Language::RO => "de intrare",
@@ -1377,7 +1376,8 @@ pub fn style_translation(language: Language) -> &'static str {
         Language::IT => "Stile",
         Language::ES | Language::PT => "Estilo",
         Language::PL => "Styl",
-        Language::DE | Language::RO | Language::TR | Language::SV => "Stil",
+        Language::RO | Language::TR | Language::SV => "Stil",
+        Language::DE => "Design",
         Language::UK | Language::RU => "Стиль",
         Language::ZH => "主题",
         Language::KO => "스타일",
@@ -1514,7 +1514,7 @@ pub fn specify_multiples_translation(language: Language) -> &'static str {
         Language::FR => "vous pouvez également spécifier 'K', 'M' et 'G'",
         Language::ES => "también puede especificar 'K', 'M' y 'G'",
         Language::PL => "możesz również określić 'K', 'M' i 'G'",
-        Language::DE => "du kannst auch 'K', 'M' und 'G' festlegen",
+        Language::DE => "du kannst auch 'K', 'M' und 'G' verwenden",
         Language::UK => "можеш також вибрати 'K', 'M' i 'G'",
         Language::ZH => "您可指定 'K', 'M', 'G'",
         Language::RO => "puteți specifica 'K', 'M', 'G'",
@@ -1711,7 +1711,10 @@ pub fn packets_exceeded_value_translation(language: Language, value: u32) -> Str
         },
         Language::ES => format!("{value} paquete/s han sido intercambiado/s"),
         Language::PL => format!("Wymieniono {value} pakietów"),
-        Language::DE => format!("{value} Pakete wurden ausgetauscht"),
+        Language::DE => match value {
+            1 => "1 Paket wurde ausgetauscht".to_owned(),
+            npackets => format!("{npackets} Pakete wurden ausgetauscht"),
+        },
         Language::UK => format!("Обміняно {value} пакетів"),
         Language::ZH => format!("已交换数据包 {value}"),
         Language::RO => format!("au fost transferate {value} pachete"),
@@ -1747,7 +1750,7 @@ pub fn favorite_transmitted_translation(language: Language) -> &'static str {
         Language::FR => "Nouvel échange de donnée depuis un favori!",
         Language::ES => "¡Nuevos datos intercambiados de favoritos!",
         Language::PL => "Nowe dane wymienione z ulubionych!",
-        Language::DE => "Neue Daten mit den Favoriten ausgetauscht!",
+        Language::DE => "Neue Daten mit deinen Favoriten ausgetauscht!",
         Language::UK => "Нові дані обміняно з улюблених!",
         Language::ZH => "收藏夹内的连接有新活动!",
         Language::RO => "Date noi transferate de la favorite!",

diff --git a/src/translations/translations_2.rs b/src/translations/translations_2.rs
@@ -153,7 +153,7 @@ pub fn only_top_30_items_translation(language: Language) -> &'static str {
         Language::RU => "Тут показываются только первые 30 предметы",
         Language::SV => "Endast de 30 främsta föremål visas här",
         Language::FI => "Vain 30 parasta kohteita näytetään tässä",
-        Language::DE => "Nur die obersten 30 artikel werden hier angezeigt",
+        Language::DE => "Nur die obersten 30 Elemente werden hier angezeigt",
         Language::TR => "Sadece ilk 30 öğeler burda gösterilmektedir",
         // Language::FA => "تنها ۳۰ موارد برتر در اینجا نمایش داده شده اند",
         Language::ES => "Aquí sólo se muestran los 30 primeros elementos",
@@ -225,7 +225,7 @@ pub fn unknown_translation(language: Language) -> String {
         Language::RU => "Неизвестный регион",
         Language::SV => "Okänd plats",
         Language::FI => "Tuntematon sijanti",
-        Language::DE => "Ort unbekannt",
+        Language::DE => "Unbekannter Ort",
         Language::TR => "Bilinmeyen yer",
         // Language::FA => "محل نامعلوم",
         Language::ES => "Ubicación desconocida",
@@ -535,7 +535,7 @@ pub fn no_search_results_translation(language: Language) -> &'static str {
         Language::RU => "После применения выбранных фильтров результат поиска пустой",
         Language::SV => "Inga resultat tillgängliga utifrån de angivna sökfilterna",
         Language::FI => "Ei tuloksia saatavilla määritellyille hakusuodattimille",
-        Language::DE => "Keine Resultate für die spezifizierten Such-Filter verfügbar",
+        Language::DE => "Keine Resultate für die gewählten Filter verfügbar",
         Language::TR => "Belirtilen arama filtrelerine göre herhangi bir sonuç bulunmamaktadır",
         // Language::FA => "هیچ نتیجه ای بر اساس صافی های جستجوی تعیین شده وجود ندارد",
         Language::ES => "Los filtros de búsqueda especificados no generan ningún resultado",