Fixing Weblate merge conflicts

1 files changed, 193 insertions, 167 deletions

diff --git a/po/sk.po b/po/sk.po
index 2171c3e38..eb0171c7a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,5 +1,5 @@
 # Slovak translation for remmina
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Copyright © 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the remmina package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: remmina\n"
 "Report-Msgid-Bugs-To: l10n@lists.remmina.org\n"
-"POT-Creation-Date: 2019-12-05 20:28+0000\n"
+"POT-Creation-Date: 2019-12-07 11:16+0000\n"
 "PO-Revision-Date: 2013-05-09 08:38+0000\n"
 "Last-Translator: DanoTT <dano.nagy@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -33,14 +33,13 @@ msgid "Executing external commands…"
 msgstr ""
 
 #: src/remmina_protocol_widget.c:289
-#, c-format
-msgid "Connecting to '%s'…"
+#, fuzzy, c-format
+msgid "Connecting to \"%s\"…"
 msgstr "Pripájanie k '%s'…"
 
 #: src/remmina_protocol_widget.c:717 src/remmina_protocol_widget.c:805
-#: src/remmina_protocol_widget.c:979
 #, fuzzy, c-format
-msgid "Connecting to %s via SSH…"
+msgid "Connecting to \"%s\" via SSH…"
 msgstr "Pripájanie k '%s'…"
 
 #: src/remmina_protocol_widget.c:855
@@ -50,23 +49,29 @@ msgstr "Čaká sa na prichádzajúci SSH tunel na porte %i…"
 
 #: src/remmina_protocol_widget.c:900
 #, fuzzy, c-format
-msgid "Could not find %s command on the SSH server"
+msgid "The \"%s\" command is not available on the SSH server."
 msgstr "Príkaz %s nenájdený na SSH serveri"
 
 #: src/remmina_protocol_widget.c:904
 #, fuzzy, c-format
-msgid "Could not run %s command on the SSH server (status = %i)."
+msgid "Could not run the \"%s\" command on the SSH server (status = %i)."
 msgstr "Príkaz %s zlyhal na SSH serveri (stav = %i)."
 
 #. TRANSLATORS: %s is a placeholder for an error message
 #: src/remmina_protocol_widget.c:912
 #, fuzzy, c-format
-msgid "Could not run command: %s"
+msgid "Could not run command. %s"
 msgstr "Zlyhalo vykonávanie príkazu: %s"
 
+#: src/remmina_protocol_widget.c:979
+#, fuzzy, c-format
+msgid "Connecting to %s via SSH…"
+msgstr "Pripájanie k '%s'…"
+
 #: src/remmina_protocol_widget.c:1339 src/remmina_protocol_widget.c:1358
 #: src/remmina_ssh_plugin.c:958 src/remmina_sftp_plugin.c:317
-#: src/remmina_file_editor.c:926 plugins/www/www_plugin.c:793
+#: src/remmina_sftp_plugin.c:350 src/remmina_file_editor.c:926
+#: plugins/www/www_plugin.c:793 plugins/rdp/rdp_plugin.c:1937
 #: data/ui/remmina_unlock.glade:116 data/ui/remmina_mpc.glade:116
 #: data/ui/remmina_preferences.glade:1533
 msgid "Password"
@@ -238,9 +243,8 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: src/remmina_ssh_plugin.c:1058 src/remmina_sftp_plugin.c:350
-#: plugins/vnc/vnc_plugin.c:1833 plugins/vnc/vnc_plugin.c:1853
-#: plugins/spice/spice_plugin.c:437 plugins/rdp/rdp_plugin.c:1937
+#: src/remmina_ssh_plugin.c:1058 plugins/vnc/vnc_plugin.c:1833
+#: plugins/vnc/vnc_plugin.c:1853 plugins/spice/spice_plugin.c:437
 #: plugins/nx/nx_plugin.c:722
 msgid "User password"
 msgstr ""
@@ -256,7 +260,7 @@ msgid "Identity file"
 msgstr "Identifikujte súbor"
 
 #: src/remmina_ssh_plugin.c:1061 src/remmina_sftp_plugin.c:353
-msgid "Private key passphrase"
+msgid "Password to unlock private key"
 msgstr ""
 
 #: src/remmina_ssh_plugin.c:1062 plugins/xdmcp/xdmcp_plugin.c:370
@@ -289,29 +293,30 @@ msgid "Preferred server host key types"
 msgstr ""
 
 #: src/remmina_ssh_plugin.c:1085
-msgid "SSH session log folder"
-msgstr ""
+#, fuzzy
+msgid "Folder for SSH session log"
+msgstr "Zlyhalo spustenie SSH relácie: %s"
 
 #: src/remmina_ssh_plugin.c:1086
-msgid "SSH session log file name"
+msgid "Filename for SSH session log"
 msgstr ""
 
 #: src/remmina_ssh_plugin.c:1087
-msgid "Enable SSH session logging at exit"
+msgid "Log SSH session when exiing Remmina"
 msgstr ""
 
 #: src/remmina_ssh_plugin.c:1088
-msgid "Enable terminal audible bell"
+msgid "Audible terminal bell"
 msgstr ""
 
 #: src/remmina_ssh_plugin.c:1089
-msgid "Enable SSH compression"
+msgid "SSH compression"
 msgstr ""
 
-#: src/remmina_ssh_plugin.c:1090 plugins/vnc/vnc_plugin.c:1876
-#: plugins/spice/spice_plugin.c:456 plugins/nx/nx_plugin.c:743
-msgid "Disable password storing"
-msgstr ""
+#: src/remmina_ssh_plugin.c:1090
+#, fuzzy
+msgid "Don't remember passwords"
+msgstr "Uložiť heslo"
 
 #: src/remmina_ssh_plugin.c:1091
 msgid "Strict host key checking"
@@ -544,7 +549,7 @@ msgstr ""
 
 #. TRANSLATORS: Shown in terminal. Do not use charcters that may be not supported on a terminal
 #: src/remmina.c:113
-msgid "Modify connection profile, (requires --set-option)"
+msgid "Modify connection profile (requires --set-option)"
 msgstr ""
 
 #. TRANSLATORS: Shown in terminal. Do not use charcters that may be not supported on a terminal
@@ -665,7 +670,7 @@ msgstr "Odpojenie"
 
 #: src/rcw.c:3774
 #, c-format
-msgid "The file %s is corrupted, unreadable, or could not be found."
+msgid "The file \"%s\" is corrupted, unreadable, or could not be found."
 msgstr ""
 
 #: src/rcw.c:3936
@@ -732,7 +737,7 @@ msgstr[2] "Celkovo %i položky"
 
 #: src/remmina_main.c:828
 #, fuzzy, c-format
-msgid "Are you sure you want to delete '%s'?"
+msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Ste si istý, že chcete odstrániť „%s“?"
 
 #: src/remmina_main.c:928
@@ -790,77 +795,74 @@ msgstr ""
 
 #. TRANSLATORS: The placeholder %s is a directory path
 #: src/remmina_sftp_client.c:171
-#, c-format
-msgid "Error creating directory %s."
-msgstr "Chyba pri vytváraní adresára %s."
+#, fuzzy, c-format
+msgid "Could not create the folder \"%s\"."
+msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #. TRANSLATORS: The placeholder %s is a file path
 #: src/remmina_sftp_client.c:179 src/remmina_sftp_client.c:200
-#, c-format
-msgid "Error creating file %s."
-msgstr "Chyba pri vytváraní súboru %s."
+#, fuzzy, c-format
+msgid "Could not create the file \"%s\"."
+msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #. TRANSLATORS: The placeholders %s are a file path and a server name
 #: src/remmina_sftp_client.c:218
-#, c-format
-msgid "Error opening file %s on server. %s"
+#, fuzzy, c-format
+msgid "Could not open the file \"%s\" on the server. %s"
 msgstr "Chyba pri otváraní súboru %s na serveri. %s"
 
 #: src/remmina_sftp_client.c:240
-#, c-format
-msgid "Error writing file %s."
-msgstr "Chyba pri zápise do súboru %s."
+#, fuzzy, c-format
+msgid "Could not save the file \"%s\"."
+msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
-#: src/remmina_sftp_client.c:279
-#, c-format
-msgid "Error opening directory %s. %s"
-msgstr "Chyba otvárania adresára %s. %s"
+#: src/remmina_sftp_client.c:279 src/remmina_sftp_client.c:733
+#, fuzzy, c-format
+msgid "Could not open the folder \"%s\". %s"
+msgstr "Zlyhalo otvorenia adresára %s. %s"
 
 #: src/remmina_sftp_client.c:383
-#, c-format
-msgid "Error creating folder %s on server. %s"
+#, fuzzy, c-format
+msgid "Could not create the folder \"%s\" on the server. %s"
 msgstr "Chyba vytvárania adresára %s na severi. %s"
 
 #: src/remmina_sftp_client.c:411 src/remmina_sftp_client.c:433
-#, c-format
-msgid "Error creating file %s on server. %s"
+#, fuzzy, c-format
+msgid "Could not create the file \"%s\" on the server. %s"
 msgstr "Chyba vytvárania súboru %s na serveri. %s"
 
 #: src/remmina_sftp_client.c:454
-#, c-format
-msgid "Error opening file %s."
-msgstr "Chyba otvárania súboru %s."
+#, fuzzy, c-format
+msgid "Could not open the file \"%s\"."
+msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #: src/remmina_sftp_client.c:474
-#, c-format
-msgid "Error writing file %s on server. %s"
+#, fuzzy, c-format
+msgid "Could not write to the file \"%s\" on the server. %s"
 msgstr "Chyba pri zápise súboru %s na serveri. %s"
 
-#: src/remmina_sftp_client.c:670 src/remmina_sftp_client.c:733
-#, c-format
-msgid "Failed to open directory %s. %s"
+#: src/remmina_sftp_client.c:670
+#, fuzzy, c-format
+msgid "Could not open the folder  \"%s\". %s"
 msgstr "Zlyhalo otvorenia adresára %s. %s"
 
 #: src/remmina_sftp_client.c:688
-#, c-format
-msgid "Failed reading directory. %s"
-msgstr "Zlyhalo načítanie adresára. %s"
+#, fuzzy, c-format
+msgid "Could not read from the folder. %s"
+msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #: src/remmina_sftp_client.c:795
-msgid ""
-"File transfer currently in progress.\n"
-"Are you sure to cancel it?"
-msgstr ""
-"Prebieha prenos súborov.\n"
-"Ste si istý, že ho chcete prerušiť?"
+#, fuzzy
+msgid "Are you sure you want to cancel the file transfer in progress?"
+msgstr "Ste si istý, že chcete odstrániť „%s“?"
 
 #: src/remmina_sftp_client.c:829
-#, c-format
-msgid "Failed to delete '%s'. %s"
+#, fuzzy, c-format
+msgid "Could not delete \"%s\". %s"
 msgstr "Nebolo možné zmazať '%s'. %s"
 
 #: src/remmina_sftp_client.c:910
-msgid "File exists"
+msgid "The file exists already"
 msgstr ""
 
 #: src/remmina_sftp_client.c:913
@@ -952,15 +954,15 @@ msgstr ""
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:203
-#, c-format
-msgid "SSH password authentication failed: %s"
-msgstr "Autentifikácia SSH hesla zlyhala: %s"
+#, fuzzy, c-format
+msgid "Could not authenticate with SSH password. %s"
+msgstr "Zlyhalo spustenie SSH relácie: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:224 src/remmina_ssh.c:248 src/remmina_ssh.c:257
 #, c-format
-msgid "SSH public key authentication failed: %s"
-msgstr "Autentifikácia verejného kľúča SSH zlyhala: %s"
+msgid "Could not authenticate with public SSH key. %s"
+msgstr ""
 
 #: src/remmina_ssh.c:225
 msgid "SSH Key file not yet set."
@@ -969,7 +971,7 @@ msgstr "Súbor SSH kľúča ešte nebol nastavený."
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:236
 #, c-format
-msgid "SSH public key cannot be imported: %s"
+msgid "Public SSH key cannot be imported. %s"
 msgstr ""
 
 #: src/remmina_ssh.c:279 src/remmina_ssh.c:587 src/remmina_ssh.c:606
@@ -978,26 +980,25 @@ msgid "SSH credentials"
 msgstr ""
 
 #: src/remmina_ssh.c:282 src/remmina_ssh.c:563 src/remmina_ssh.c:590
-#: plugins/nx/nx_plugin.c:205
 msgid "SSH private key passphrase"
 msgstr "Heslo k osobnému kľúču SSH"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:299
 #, c-format
-msgid "SSH automatic public key authentication failed: %s"
-msgstr "Automatická autentifikácia SSH verejného kľúča zlyhala: %s"
+msgid "Could not authenticate automatically with public SSH key. %s"
+msgstr ""
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:316
 #, c-format
-msgid "SSH public key authentication with SSH agent failed: %s"
+msgid "Could not authenticate with public SSH key using SSH agent. %s"
 msgstr ""
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:336
 #, c-format
-msgid "SSH Kerberos/GSSAPI authentication failed: %s"
+msgid "Could not authenticate with SSH Kerberos/GSSAPI. %s"
 msgstr ""
 
 #: src/remmina_ssh.c:365
@@ -1007,20 +1008,20 @@ msgstr ""
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:492
 #, c-format
-msgid "ssh_get_server_publickey() has failed: %s"
+msgid "Could not fetch the server's public SSH key. %s"
 msgstr ""
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:499
-#, c-format
-msgid "ssh_get_publickey() has failed: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Could not fetch public SSH key. %s"
+msgstr "Zlyhalo pripojenie k cieľovému SSH tunelu: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:507
-#, c-format
-msgid "ssh_get_publickey_hash() has failed: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Could not fetch checksum for public SSH key. %s"
+msgstr "Zlyhalo spustenie SSH relácie: %s"
 
 #: src/remmina_ssh.c:520
 msgid "The server is unknown. The public key fingerprint is:"
@@ -1040,7 +1041,7 @@ msgstr ""
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:550
 #, fuzzy, c-format
-msgid "Could not check list of known SSH hosts: %s"
+msgid "Could not check list of known SSH hosts. %s"
 msgstr "Zlyhalo spustenie SSH relácie: %s"
 
 #: src/remmina_ssh.c:557
@@ -1059,26 +1060,26 @@ msgstr "SSH autentifikácia"
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:747
 #, fuzzy, c-format
-msgid "Could not start SSH session: %s"
+msgid "Could not start SSH session. %s"
 msgstr "Zlyhalo spustenie SSH relácie: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1106 src/remmina_ssh.c:1168
 #, fuzzy, c-format
-msgid "Could not create channel: %s"
+msgid "Could not create channel. %s"
 msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1117
 #, fuzzy, c-format
-msgid "Could not connect to SSH tunnel: %s"
+msgid "Could not connect to SSH tunnel. %s"
 msgstr "Zlyhalo pripojenie k cieľovému SSH tunelu: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1183 src/remmina_ssh.c:1781
-#, c-format
-msgid "Could not open channel: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Could not open channel. %s"
+msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #: src/remmina_ssh.c:1189
 #, fuzzy, c-format
@@ -1088,7 +1089,7 @@ msgstr "Zlyhalo spustenie %s na SSH serveri: %%s"
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1227 src/remmina_ssh.c:1248 src/remmina_ssh.c:1257
 #, fuzzy, c-format
-msgid "Could not request port forwarding: %s"
+msgid "Could not request port forwarding. %s"
 msgstr "Zlyhalo spustenie SSH relácie: %s"
 
 #: src/remmina_ssh.c:1292
@@ -1103,31 +1104,31 @@ msgstr ""
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1385
 #, fuzzy, c-format
-msgid "Could not run ssh_channel_write(): %s"
-msgstr "Zlyhalo vykonávanie príkazu: %s"
+msgid "Could not write to SSH channel. %s"
+msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1392
 #, fuzzy, c-format
-msgid "Could not read from tunnel listening socket: %s"
+msgid "Could not read from tunnel listening socket. %s"
 msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1412
 #, fuzzy, c-format
-msgid "Could not run ssh_channel_poll(): %s"
-msgstr "Zlyhalo vykonávanie príkazu: %s"
+msgid "Could not poll SSH channel. %s"
+msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1419
-#, c-format
-msgid "Could not run ssh_channel_read_nonblocking(): %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Could not read SSH channel in a non-blocking way. %s"
+msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1438
 #, fuzzy, c-format
-msgid "Could not send data to tunnel listening socket: %s"
+msgid "Could not send data to tunnel listening socket. %s"
 msgstr "Zlyhalo pripojenie k cieľovému SSH tunelu: %s"
 
 #: src/remmina_ssh.c:1517
@@ -1147,16 +1148,11 @@ msgid "Could not listen to local port."
 msgstr ""
 
 #. TRANSLATORS: Do not translate pthread
-#: src/remmina_ssh.c:1550
+#: src/remmina_ssh.c:1550 src/remmina_ssh.c:1567 src/remmina_ssh.c:1602
 msgid "Could not start pthread."
 msgstr ""
 
 #. TRANSLATORS: Do not translate pthread
-#: src/remmina_ssh.c:1567 src/remmina_ssh.c:1602
-msgid "Could not initialize pthread."
-msgstr ""
-
-#. TRANSLATORS: Do not translate pthread
 #: src/remmina_ssh.c:1584
 msgid "Failed to initialize pthread."
 msgstr ""
@@ -1164,20 +1160,20 @@ msgstr ""
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1691
 #, fuzzy, c-format
-msgid "Could not create SFTP session: %s"
+msgid "Could not create SFTP session. %s"
 msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1696
 #, fuzzy, c-format
-msgid "Could not initialize SFTP session: %s"
-msgstr "Zlyhala inicializácia SFTP relácie: %s"
+msgid "Could not start SFTP session. %s"
+msgstr "Zlyhalo spustenie SSH relácie: %s"
 
 #. TRANSLATORS: The placeholder %s is an error message
 #: src/remmina_ssh.c:1811
-#, c-format
-msgid "Could not request shell: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Could not request shell. %s"
+msgstr "Zlyhalo vytvorenie SFTP relácie: %s"
 
 #: src/remmina_ssh.c:1904
 msgid "Could not create PTY device."
@@ -1279,11 +1275,12 @@ msgid "SSH Authentication"
 msgstr "SSH autentifikácia"
 
 #: src/remmina_file_editor.c:920
-msgid "SSH Agent (automatic)"
-msgstr ""
+#, fuzzy
+msgid "SSH agent (automatic)"
+msgstr "Verejný kľúč (automaticky)"
 
 #: src/remmina_file_editor.c:994
-msgid "Turn on autostart for this profile"
+msgid "Turn on \"Autostart\" for this profile"
 msgstr ""
 
 #: src/remmina_file_editor.c:1002
@@ -1332,17 +1329,17 @@ msgid "Use '%s' as subgroup delimiter"
 msgstr "Použiť „%s“ ako oddeľovač podskupiny"
 
 #: src/remmina_file_editor.c:1486
-msgid "Pre Command"
+msgid "Pre-command"
 msgstr ""
 
 #: src/remmina_file_editor.c:1504
-msgid "Post Command"
+msgid "Post-command"
 msgstr ""
 
 #: src/remmina_file_editor.c:1569 src/remmina_file_editor.c:1587
 #, c-format
-msgid "File %s not found."
-msgstr "Súbor %s nenájdený."
+msgid "Could not find the file \"%s\"."
+msgstr ""
 
 #: src/remmina_chat_window.c:178
 #, c-format
@@ -1437,7 +1434,7 @@ msgid "Turn on Web Inspector"
 msgstr ""
 
 #: plugins/www/www_config.h:43
-msgid "Remmina Browser Plugin"
+msgid "Remmina web-browser plugin"
 msgstr ""
 
 #: plugins/secret/src/glibsecret_plugin.c:188
@@ -1477,22 +1474,22 @@ msgstr ""
 
 #: plugins/vnc/vnc_plugin.c:919
 #, c-format
-msgid "Unknown authentication scheme from VNC server: %s"
+msgid "The VNC server requested an unknown authentication method. %s"
 msgstr ""
 
 #: plugins/vnc/vnc_plugin.c:921
-msgid "Please retry after enabling encryption on this profile."
+msgid "Please retry after turning on encryption for this profile."
 msgstr ""
 
-#: plugins/vnc/vnc_plugin.c:1803 plugins/rdp/rdp_plugin.c:1880
+#: plugins/vnc/vnc_plugin.c:1803
 msgid "256 colors (8 bpp)"
 msgstr ""
 
-#: plugins/vnc/vnc_plugin.c:1804 plugins/rdp/rdp_plugin.c:1878
+#: plugins/vnc/vnc_plugin.c:1804
 msgid "High color (16 bpp)"
 msgstr ""
 
-#: plugins/vnc/vnc_plugin.c:1805 plugins/rdp/rdp_plugin.c:1876
+#: plugins/vnc/vnc_plugin.c:1805
 msgid "True color (32 bpp)"
 msgstr ""
 
@@ -1521,7 +1518,6 @@ msgid "Repeater"
 msgstr ""
 
 #: plugins/vnc/vnc_plugin.c:1834 plugins/vnc/vnc_plugin.c:1854
-#: plugins/xdmcp/xdmcp_plugin.c:369 plugins/rdp/rdp_plugin.c:1940
 msgid "Color depth"
 msgstr ""
 
@@ -1556,6 +1552,11 @@ msgstr ""
 msgid "Disable server input"
 msgstr ""
 
+#: plugins/vnc/vnc_plugin.c:1876 plugins/spice/spice_plugin.c:456
+#: plugins/nx/nx_plugin.c:743
+msgid "Disable password storing"
+msgstr ""
+
 #: plugins/vnc/vnc_plugin.c:1890
 msgid "Open Chat…"
 msgstr ""
@@ -1592,16 +1593,16 @@ msgid "Enter SPICE password"
 msgstr "SSH heslo"
 
 #: plugins/spice/spice_plugin.c:274
-#, c-format
-msgid "Disconnected from SPICE server %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Disconnected from the SPICE server \"%s\"."
+msgstr "Zlyhalo pripojenie k cieľovému SSH tunelu: %s"
 
 #: plugins/spice/spice_plugin.c:290
 msgid "TLS connection error."
 msgstr ""
 
 #: plugins/spice/spice_plugin.c:296
-msgid "Connection to SPICE server failed."
+msgid "Connection to the SPICE server dropped."
 msgstr ""
 
 #: plugins/spice/spice_plugin.c:438
@@ -1660,7 +1661,8 @@ msgstr ""
 
 #: plugins/xdmcp/xdmcp_plugin.c:264 plugins/nx/nx_plugin.c:608
 #, c-format
-msgid "Protocol %s is unavailable because GtkSocket only works under X.Org"
+msgid ""
+"The protocol \"%s\" is unavailable because GtkSocket only works under X.Org."
 msgstr ""
 
 #: plugins/xdmcp/xdmcp_plugin.c:348
@@ -1672,15 +1674,19 @@ msgid "Grayscale"
 msgstr ""
 
 #: plugins/xdmcp/xdmcp_plugin.c:350
-msgid "256 colors"
+msgid "256 colours"
 msgstr ""
 
 #: plugins/xdmcp/xdmcp_plugin.c:351
-msgid "High color (16 bit)"
+msgid "High colour (16 bit)"
 msgstr ""
 
 #: plugins/xdmcp/xdmcp_plugin.c:352
-msgid "True color (24 bit)"
+msgid "True colour (24 bit)"
+msgstr ""
+
+#: plugins/xdmcp/xdmcp_plugin.c:369 plugins/rdp/rdp_plugin.c:1940
+msgid "Colour depth"
 msgstr ""
 
 #: plugins/xdmcp/xdmcp_plugin.c:371 plugins/nx/nx_plugin.c:742
@@ -1713,8 +1719,9 @@ msgid "Detached window"
 msgstr ""
 
 #: plugins/st/st_plugin_config.h:43
-msgid "Remmina Simple Terminal"
-msgstr ""
+#, fuzzy
+msgid "Remmina simple terminal"
+msgstr "Remmina aplet"
 
 #: plugins/rdp/rdp_plugin.c:577
 msgid "Enter RDP authentication credentials"
@@ -1774,57 +1781,59 @@ msgid ""
 msgstr ""
 
 #: plugins/rdp/rdp_plugin.c:1544
-#, c-format
-msgid "Connection to RDP server %s failed."
-msgstr ""
+#, fuzzy, c-format
+msgid "Lost connection to the RDP server \"%s\"."
+msgstr "Zlyhalo pripojenie k cieľovému SSH tunelu: %s"
 
 #: plugins/rdp/rdp_plugin.c:1547
-#, c-format
-msgid "Unable to find the address of RDP server %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Could not find the address for the RDP server \"%s\"."
+msgstr "Príkaz %s nenájdený na SSH serveri"
 
 #: plugins/rdp/rdp_plugin.c:1551
 #, c-format
 msgid ""
-"Error connecting to RDP server %s. TLS connection failed. Check that client "
-"and server support a common TLS version."
+"Could not connect to the RDP server \"%s\" via TLS. Check that client and "
+"server support a common TLS version."
 msgstr ""
 
 #: plugins/rdp/rdp_plugin.c:1554
-#, c-format
-msgid "Unable to establish a connection to RDP server %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection to the RDP server \"%s\"."
+msgstr "Zlyhalo pripojenie k cieľovému SSH tunelu: %s"
 
 #: plugins/rdp/rdp_plugin.c:1562
 #, fuzzy, c-format
-msgid "Cannot connect to RDP server %s."
+msgid "Cannot connect to the RDP server \"%s\"."
 msgstr "Zlyhalo pripojenie k cieľovému SSH tunelu: %s"
 
 #: plugins/rdp/rdp_plugin.c:1565
-msgid "Could not start libfreerdp-gdi"
+msgid "Could not start libfreerdp-gdi."
 msgstr ""
 
 #: plugins/rdp/rdp_plugin.c:1568
 #, c-format
 msgid ""
-"You requested a H.264 GFX mode for server %s, but your libfreerdp does not "
-"support H.264. Please use a non-AVC color depth setting."
+"You requested a H.264 GFX mode for the server \"%s\", but your libfreerdp "
+"does not support H.264. Please use a non-AVC colour depth setting."
 msgstr ""
 
 #: plugins/rdp/rdp_plugin.c:1575
 #, c-format
-msgid "The %s server denied the connection."
+msgid "The \"%s\" server refused the connection."
 msgstr ""
 
 #: plugins/rdp/rdp_plugin.c:1580
 #, c-format
-msgid "The remote desktop gateway %s denied user %s\\%s access due to policy."
+msgid ""
+"The Remote Desktop Gateway \"%s\" denied the user \"%s\"\\%s access due to "
+"policy."
 msgstr ""
 
 #: plugins/rdp/rdp_plugin.c:1590
-#, c-format
-msgid "Cannot connect to the %s RDP server."
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to the \"%s\" RDP server."
+msgstr "Zlyhalo pripojenie k cieľovému SSH tunelu: %s"
 
 #: plugins/rdp/rdp_plugin.c:1872
 msgid "GFX AVC444 (32 bpp)"
@@ -1842,12 +1851,24 @@ msgstr ""
 msgid "RemoteFX (32 bpp)"
 msgstr ""
 
+#: plugins/rdp/rdp_plugin.c:1876
+msgid "True colour (32 bpp)"
+msgstr ""
+
 #: plugins/rdp/rdp_plugin.c:1877
-msgid "True color (24 bpp)"
+msgid "True colour (24 bpp)"
+msgstr ""
+
+#: plugins/rdp/rdp_plugin.c:1878
+msgid "High colour (16 bpp)"
 msgstr ""
 
 #: plugins/rdp/rdp_plugin.c:1879
-msgid "High color (15 bpp)"
+msgid "High colour (15 bpp)"
+msgstr ""
+
+#: plugins/rdp/rdp_plugin.c:1880
+msgid "256 colours (8 bpp)"
 msgstr ""
 
 #: plugins/rdp/rdp_plugin.c:1897 data/ui/remmina_preferences.glade:658
@@ -1965,7 +1986,7 @@ msgid "Share serial ports"
 msgstr ""
 
 #: plugins/rdp/rdp_plugin.c:1977
-msgid "Serial ports permissive mode"
+msgid "(SELinux) permissive mode for serial ports"
 msgstr ""
 
 #: plugins/rdp/rdp_plugin.c:1978
@@ -2119,7 +2140,7 @@ msgid "Reconnection attempt %d of %d…"
 msgstr "Pripájanie k '%s'…"
 
 #: plugins/nx/nx_session_manager.c:98
-msgid "Terminating"
+msgid "Terminating…"
 msgstr ""
 
 #: plugins/nx/nx_session_manager.c:143
@@ -2151,6 +2172,10 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#: plugins/nx/nx_plugin.c:205
+msgid "Password for private SSH key"
+msgstr ""
+
 #: plugins/nx/nx_plugin.c:367
 msgid "Enter NX authentication credentials"
 msgstr ""
@@ -2160,8 +2185,9 @@ msgid "NX - NX Technology"
 msgstr ""
 
 #: plugins/kwallet/src/kwallet_plugin_main.c:118
-msgid "Secure passwords storing in the KDE Wallet"
-msgstr ""
+#, fuzzy
+msgid "Secure passwords storage in KWallet"
+msgstr "%s heslo"
 
 #: plugins/telepathy/telepathy_channel_handler.c:237
 #, c-format
@@ -2217,7 +2243,7 @@ msgid "Toggle view"
 msgstr ""
 
 #: data/ui/remmina_main.glade:168
-msgid "search string or server name/ip address for quick connect"
+msgid "Search string or server name/IP address for \"\\Quick Connect\\\""
 msgstr ""
 
 #: data/ui/remmina_main.glade:172 data/ui/remmina_main.glade:174
@@ -2506,7 +2532,7 @@ msgstr ""
 msgid ""
 "%G Group name (slash will be converted to - automatically)\n"
 "%P Protocol name\n"
-"%N Connection Name\n"
+"%N Connection name\n"
 "%h Hostname/IP\n"
 "\n"
 "\n"
@@ -2790,13 +2816,13 @@ msgid "Bright colours"
 msgstr ""
 
 #: data/ui/remmina_preferences.glade:1876
-msgid "Load colour scheme"
+msgid "Load colour theme"
 msgstr ""
 
 #: data/ui/remmina_preferences.glade:1917
 msgid ""
 "Choose a colour scheme file. Usually available in /usr/share/remmina/theme. "
-"More details in https://github.com/mbadolato/iTerm2-Color-Schemes."
+"https://github.com/mbadolato/iTerm2-Color-Schemes has more details."
 msgstr ""
 
 #: data/ui/remmina_preferences.glade:1920