diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade
index ef946136..5476d254 100644
--- a/app/ui/dialogs.glade
+++ b/app/ui/dialogs.glade
@@ -49,6 +49,7 @@ Author: Dmitriy Yefremov
Подробнее в <a href="http://opensource.org/licenses/mit-license.php">The MIT License (MIT)</a>.
Dmitriy Yefremov
+ translator-credits
accessories-text-editor
True
mit-x11
diff --git a/app/ui/lang/nl/LC_MESSAGES/demon-editor.mo b/app/ui/lang/nl/LC_MESSAGES/demon-editor.mo
new file mode 100644
index 00000000..a9079f3b
Binary files /dev/null and b/app/ui/lang/nl/LC_MESSAGES/demon-editor.mo differ
diff --git a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo
index 9f1fa6dc..c9d97920 100644
Binary files a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo and b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo differ
diff --git a/deb/usr/share/locale/nl/LC_MESSAGES/demon-editor.mo b/deb/usr/share/locale/nl/LC_MESSAGES/demon-editor.mo
new file mode 100644
index 00000000..a9079f3b
Binary files /dev/null and b/deb/usr/share/locale/nl/LC_MESSAGES/demon-editor.mo differ
diff --git a/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo b/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo
index 9f1fa6dc..c9d97920 100644
Binary files a/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo and b/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo differ
diff --git a/po/nl/demon-editor.mo b/po/nl/demon-editor.mo
new file mode 100644
index 00000000..a9079f3b
Binary files /dev/null and b/po/nl/demon-editor.mo differ
diff --git a/po/nl/demon-editor.po b/po/nl/demon-editor.po
new file mode 100644
index 00000000..66d937e0
--- /dev/null
+++ b/po/nl/demon-editor.po
@@ -0,0 +1,571 @@
+# Copyright (C) 2018 Frank Neirynck
+# This file is distributed under the MIT license.
+#
+#Frank Neirynck , 2018.
+#
+msgid ""
+msgstr ""
+"Last-Translator: Frank Neirynck\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "translator-credits"
+msgstr "Frank Neirynck "
+
+# Main
+msgid "Service"
+msgstr "Dienst"
+
+msgid "Package"
+msgstr "Pakket"
+
+msgid "Type"
+msgstr "Type"
+
+msgid "Picon"
+msgstr "Picon"
+
+msgid "Freq"
+msgstr "Freq."
+
+msgid "Rate"
+msgstr "Rate"
+
+msgid "Pol"
+msgstr "Pol."
+
+msgid "System"
+msgstr "Systeem"
+
+msgid "Pos"
+msgstr "Pos."
+
+msgid "Num"
+msgstr "Nr"
+
+msgid "Current IP:"
+msgstr "Huidig IP:"
+
+msgid "Assign"
+msgstr "Toekennen"
+
+msgid "Bouquet details"
+msgstr "Details Boeket"
+
+msgid "Bouquets"
+msgstr "Boeketten"
+
+msgid "Copy"
+msgstr "Kopieer"
+
+msgid "Copy reference"
+msgstr "Referentiekopie"
+
+msgid "Download"
+msgstr "Download"
+
+msgid "Edit"
+msgstr "Wijzig"
+
+msgid "Edit "
+msgstr "Wijzig "
+
+msgid "Edit mаrker text"
+msgstr "Wijzil mаrker tekst"
+
+msgid "FTP-transfer"
+msgstr "FTP-overdracht"
+
+msgid "Global search"
+msgstr "Globale zoekopdracht"
+
+msgid "Hide"
+msgstr "Verberg"
+
+msgid "Hide/Skip On/Off Ctrl + H"
+msgstr "verberg/Overalaan Aan/Uit Ctrl + H"
+
+msgid "Add IPTV or stream service"
+msgstr "Voeg IPTV of stream dienst toe"
+
+msgid "Import m3u"
+msgstr "Importeer m3u"
+
+msgid "Import m3u file"
+msgstr "Importeer m3u file"
+
+msgid "List configuration"
+msgstr "Lijst configuratie"
+
+msgid "Rename for this bouquet"
+msgstr "Hernoem dit boeket"
+
+msgid "Set default name"
+msgstr "Stel standaard naam in"
+
+msgid "Insert marker"
+msgstr "Inserteer marker"
+
+msgid "Locate in services"
+msgstr "Zoek in diensten"
+
+msgid "Locked"
+msgstr "Gesloten"
+
+msgid "Move"
+msgstr "Verplaats"
+
+msgid "New"
+msgstr "Nieuw"
+
+msgid "New bouquet"
+msgstr "Nieuw boeket"
+
+msgid "Create bouquet"
+msgstr "Creeer boeket"
+
+msgid "For current satellite"
+msgstr "Voor huidige satelliet"
+
+msgid "For current package"
+msgstr "Voor huidig pakket"
+
+msgid "For current type"
+msgstr "Voor huidig type"
+
+msgid "For each satellite"
+msgstr "Voor elke satelliet"
+
+msgid "For each package"
+msgstr "Voor elk pakket"
+
+msgid "For each type"
+msgstr "Voor elk type"
+
+msgid "Open"
+msgstr "Open"
+
+msgid "Parent lock On/Off Ctrl + L"
+msgstr "Ouderlijk slot aan/uit Ctrl + L"
+
+msgid "Picons"
+msgstr "Picons"
+
+msgid "Picons downloader"
+msgstr "Загрузчик пиконов"
+
+msgid "Satellites downloader"
+msgstr "Picons downloader"
+
+msgid "Remove"
+msgstr "Verwijder"
+
+msgid "Remove all unavailable"
+msgstr "Verwijder alle onbeschikbare"
+
+msgid "Satellites editor"
+msgstr "Satelliet editor"
+
+msgid "Save"
+msgstr "Opslaan"
+
+msgid "Search"
+msgstr "Zoek"
+
+msgid "Services"
+msgstr "Diensten"
+
+msgid "Services filter"
+msgstr "Diensten filter"
+
+msgid "Settings"
+msgstr "Instellingen"
+
+msgid "Up"
+msgstr "Boven"
+
+msgid "Down"
+msgstr "Onder"
+
+msgid "Active profile:"
+msgstr "Actief profiel:"
+
+msgid "All"
+msgstr "Alle"
+
+msgid "Are you sure?"
+msgstr "Ben je zeker?"
+
+msgid "Current data path:"
+msgstr "Huidig datapad:"
+
+msgid "Data:"
+msgstr "Data:"
+
+msgid "Enigma2 channel and satellites list editor for GNU/Linux"
+msgstr "Enigma2 kanaal and satelliet lijst editor voor GNU/Linux"
+
+msgid "Host:"
+msgstr "Host:"
+
+msgid "Loading data..."
+msgstr "Laden data..."
+
+msgid "Receive"
+msgstr "Ontvangen"
+
+msgid "Receive files from receiver"
+msgstr "Ophalen files van uw ontvanger"
+
+msgid "Receiver IP:"
+msgstr "Ontvanger IP:"
+
+msgid "Remove unused bouquets"
+msgstr "Verwijder ongebruikte boeketten"
+
+msgid "Reset profile"
+msgstr "Profiel terugzetten"
+
+msgid "Satellites"
+msgstr "Satellieten"
+
+msgid "Satellites.xml file:"
+msgstr "Satellites.xml bestand:"
+
+msgid "Selected"
+msgstr "Geselecteerd"
+
+msgid "Send"
+msgstr "Verzend"
+
+msgid "Send files to receiver"
+msgstr "Verzend bestanden naar ontvanger"
+
+msgid "Services and Bouquets files:"
+msgstr "Diensten en Boeketten bestanden:"
+
+msgid "User bouquet files:"
+msgstr "Importeer boeket bestanden:"
+
+msgid "Extra:"
+msgstr "Extra:"
+
+# Filter bar
+msgid "Only free"
+msgstr "Enkel gratis"
+
+msgid "All positions"
+msgstr "Alle posities"
+
+msgid "All types"
+msgstr "Alle types"
+
+# Streams player
+msgid "Play"
+msgstr "Play"
+
+msgid "Stop playback"
+msgstr "Stop afspelen"
+
+msgid "Previous stream in the list"
+msgstr "Vorige stream in de lijst"
+
+msgid "Next stream in the list"
+msgstr "Volgende stream in de lijst"
+
+msgid "Toggle in fullscreen"
+msgstr "Wissel naar volledig scherm"
+
+msgid "Close"
+msgstr "Afsluiten"
+
+# Picons dialog
+msgid "Load providers"
+msgstr "Laad leveranciers"
+
+msgid "Providers"
+msgstr "leveranciers"
+
+msgid "Receive picons"
+msgstr "Ontvang picons"
+
+msgid "Picons name format:"
+msgstr "Picons naam formaat:"
+
+msgid "Resize:"
+msgstr "Verklein/vergroot:"
+
+msgid "Current picons path:"
+msgstr "Huidig picon pad:"
+
+msgid "Receiver picons path:"
+msgstr "Ontvanger picon pad:"
+
+msgid "Picons download tool"
+msgstr "Picons download gereedschap"
+
+msgid "Transfer to receiver"
+msgstr "Transfereren naar ontvanger"
+
+msgid "Downloader"
+msgstr "Downloader"
+
+msgid "Converter"
+msgstr "Omvormer"
+
+msgid "Convert"
+msgstr "Converteer"
+
+msgid "Path to save:"
+msgstr "Pad om op te slaan:"
+
+msgid "Path to Enigma2 picons:"
+msgstr "Pad naar Enigma2 picons:"
+
+msgid "Specify the correct position value for the provider!"
+msgstr "Geeft de juiste positie waarde voor de provider!"
+
+msgid "Converter between name formats"
+msgstr "Omvormer tussen naam formaten"
+
+msgid "Receive picons for providers"
+msgstr "Ontvang picons voor leveranciers"
+
+msgid "Load satellite providers."
+msgstr "Laad satelliet leveranciers."
+
+msgid "To automatically set the identifiers for picons,\nfirst load the required services list into the main application window."
+msgstr "Om automatisch de ID in te stellen voor picons,\nlaad eerst de vereiste serviceslijst in via het hoofdvenster van het programma."
+
+# Satellites editor
+msgid "Satellites edit tool"
+msgstr "Satelliet wijzingingsgereedschap"
+
+msgid "Add"
+msgstr "Voeg toe"
+
+msgid "Satellite"
+msgstr "Satelliet"
+
+msgid "Transponder"
+msgstr "Transponder"
+
+msgid "Satellite properties:"
+msgstr "Satelliet eigenschappen:"
+
+msgid "Transponder properties:"
+msgstr "Transponder eigenschappen:"
+
+msgid "Name"
+msgstr "Naam"
+
+msgid "Position"
+msgstr "Positie"
+
+# Satellites update dialog
+msgid "Satellites update"
+msgstr "Actualiseren Satelliet"
+
+msgid "Remove selection"
+msgstr "Verwijder selectie"
+
+# Service details dialog
+msgid "Service data:"
+msgstr "Gegevens Dienst:"
+
+msgid "Transponder data:"
+msgstr "Gegevens Transponder:"
+
+msgid "Service data"
+msgstr "Gegevens Dienst"
+
+msgid "Transponder details"
+msgstr "Details Transponder"
+
+msgid "Changes will be applied to all services of this transponder!\nContinue?"
+msgstr "Wijzigingen zullen worden doorgevoerd op alle diensten van deze transponder!\nDoorgaan?"
+
+msgid "Reference"
+msgstr "Referentie"
+
+msgid "Namespace"
+msgstr "Namespace"
+
+msgid "Flags:"
+msgstr "Flags:"
+
+msgid "Delays (ms):"
+msgstr "Vertraging (mc)"
+
+msgid "Bitstream"
+msgstr "Bitstream"
+
+msgid "Description"
+msgstr "Omschrijving"
+
+msgid "Source:"
+msgstr "Bron:"
+
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgid "Update"
+msgstr "Bijwerken"
+
+msgid "Filter"
+msgstr "Filteren"
+
+msgid "Find"
+msgstr "Zoeken"
+
+# IPTV dialog
+msgid "Stream data"
+msgstr "Gegevens stream"
+
+# IPTV list configuration dialog
+msgid "Starting values"
+msgstr "Start waardes"
+
+msgid "Reset to default"
+msgstr "Reset naar standaard"
+
+msgid "IPTV streams list configuration"
+msgstr "Configureren IPTV Streamlijst"
+
+#Settings dialog
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+msgid "Profile:"
+msgstr "Profiel:"
+
+msgid "Timeout between commands in seconds"
+msgstr "Time-out tussen opdrachten in seconden"
+
+msgid "Timeout:"
+msgstr "Time-out:"
+
+msgid "Login:"
+msgstr "Log in:"
+
+msgid "Options"
+msgstr "Opties"
+
+msgid "Password:"
+msgstr "Paswoord:"
+
+msgid "Picons:"
+msgstr "Picons:"
+
+msgid "Port:"
+msgstr "Poort:"
+
+msgid "Data path:"
+msgstr "Gegevenspad:"
+
+msgid "Picons path:"
+msgstr "Picons pad:"
+
+msgid "Network settings:"
+msgstr "Netwerk instellingen:"
+
+msgid "STB file paths:"
+msgstr "STB bestandspad:"
+
+msgid "Local file paths:"
+msgstr "Lokaal bestandspad:"
+
+# Dialogs messages
+msgid "Error. No bouquet is selected!"
+msgstr "Fout. Er is geen boeket geselecteerd!"
+
+msgid "This item is not allowed to be removed!"
+msgstr "Dit item kan niet verwijderd worden!"
+
+msgid "This item is not allowed to edit!"
+msgstr "Dit item kan niet gewijzigd worden!"
+
+msgid "Not allowed in this context!"
+msgstr "Niet toegelaten in deze contekst!"
+
+msgid "Please, download files from receiver or setup your path for read data!"
+msgstr "Download alstublieft bestanden van de ontvanger of stel het pad in voor het lezen van gegevens!"
+
+msgid "Reading data error!"
+msgstr "Fout tijdens het legezen van gegevens!"
+
+msgid "No m3u file is selected!"
+msgstr "Geen m3u bestand geslecteerd!"
+
+msgid "Not implemented yet!"
+msgstr "Nog niet geïmplementeerd!"
+
+msgid "The text of marker is empty, please try again!"
+msgstr "De tekst van de marker is leeg. Probeer opnieuw!"
+
+msgid "Please, select only one item!"
+msgstr "Kies maar 1 item graag!"
+
+msgid "No png file is selected!"
+msgstr "Geen png bestand geselecteerd!"
+
+msgid "No reference is present!"
+msgstr "Geen referentie aanwezig!"
+
+msgid "No selected item!"
+msgstr "Geen item geseleceerd!"
+
+msgid "The task is already running!"
+msgstr "Deze taak is al bezig!"
+
+msgid "Done!"
+msgstr "Gedaan!"
+
+msgid "Please, wait..."
+msgstr "Even geduld, aub..."
+
+msgid "Resizing..."
+msgstr "Verkleinen/Vergroten..."
+
+msgid "Select paths!"
+msgstr "Selecteer paden!"
+
+msgid "No satellite is selected!"
+msgstr "Geen satelliet geselecteerd!"
+
+msgid "Please, select only one satellite!"
+msgstr "Selecteer alstublieft slechts één satelliet!"
+
+msgid "Please check your parameters and try again."
+msgstr "Controleer aub uw parameters en probeer opnieuw!"
+
+msgid "No satellites.xml file is selected!"
+msgstr "Geen satellites.xml geselecteerd!"
+
+msgid "Error. Verify the data!"
+msgstr "Fout. Controleer de gegevens!"
+
+msgid "Operation not allowed in this context!"
+msgstr "Opdracht niet toegestaan in deze context!"
+
+msgid "No VLC is found. Check that it is installed!"
+msgstr "Geen VLC gevonden. Controleer of VLC gïnstalleerd is!"
+
+# Search unavailable streams dialog
+msgid "Please wait, streams testing in progress..."
+msgstr "Even geduld, test van streams bezig ..."
+
+msgid "Found"
+msgstr "Gevonden"
+
+msgid "unavailable streams."
+msgstr "Steams niet aanwegig."
+
+msgid "No changes required!"
+msgstr "Geen wijzigingen vereist!"
+
+msgid "This list does not contains IPTV streams!"
+msgstr "Deze lijst bevat geen IPTV streams!"
+
diff --git a/po/ru/demon-editor.mo b/po/ru/demon-editor.mo
index 9f1fa6dc..c9d97920 100644
Binary files a/po/ru/demon-editor.mo and b/po/ru/demon-editor.mo differ
diff --git a/po/ru/demon-editor.po b/po/ru/demon-editor.po
index 2e42258d..3daba19a 100644
--- a/po/ru/demon-editor.po
+++ b/po/ru/demon-editor.po
@@ -1,13 +1,17 @@
# Copyright (C) 2018 Dmitriy Yefremov
# This file is distributed under the MIT license.
-# Dmitriy Yefremov , 2018.
+#
+#
msgid ""
msgstr ""
+"Last-Translator: Dmitry Yefremov\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+msgid "translator-credits"
+msgstr ""
# Main
msgid "Service"
@@ -564,6 +568,9 @@ msgstr "Изменений не требуется!"
msgid "This list does not contains IPTV streams!"
msgstr "Текущий список не содержит потоков IPTV!"
+msgid "New empty configuration"
+msgstr "Новая конфигурация"
+