浏览代码

Merge branch 'master' into dev

Source commit: 7e94236db6f12f06a606820efeefe03564edc702
Martin Prikryl 7 年之前
父节点
当前提交
55518d4bce
共有 5 个文件被更改,包括 17 次插入17 次删除
  1. 3 3
      translations/DE.ini
  2. 4 4
      translations/FR.ini
  3. 3 3
      translations/PTG.ini
  4. 3 3
      translations/SK.ini
  5. 4 4
      translations/version.ini

+ 3 - 3
translations/DE.ini

@@ -2183,9 +2183,9 @@ MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.Caption="Herunterlade
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledLabel.Caption="Erlaubt das direkte Herunterladen in reguläre lokale Verzeichnisse (z.B. Windows Explorer). Erlaubt nicht das direkte Herunterladen in andere Ziele (ZIP-Archive, FTP., etc.)"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledLabel.Caption="Erlaubt das direkte Herunterladen in reguläre lokale Verzeichnisse (z.B. Windows Explorer). Erlaubt nicht das direkte Herunterladen in andere Ziele (ZIP-Archive, FTP., etc.)"
 ; "Allows downloads to any destinations (regular folders, ZIP archives,  FTP, etc.). Files are downloaded first to temporary folder, from where they are delivered to the destination."
 ; "Allows downloads to any destinations (regular folders, ZIP archives,  FTP, etc.). Files are downloaded first to temporary folder, from where they are delivered to the destination."
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledLabel.Caption="Erlaubt das direkte Herunterladen in beliebige Ziele (Ordner, ZIP-Archive, FTP etc.). Die Dateien werden dabei zunächst in ein temporäres Verzeichnis gespeichert und von dort dem Ziel zugeführt."
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledLabel.Caption="Erlaubt das direkte Herunterladen in beliebige Ziele (Ordner, ZIP-Archive, FTP etc.). Die Dateien werden dabei zunächst in ein temporäres Verzeichnis gespeichert und von dort dem Ziel zugeführt."
-; "Use &shell extension"
+; "Determine drop target by dragging a &fake file"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledButton.Caption="Benutze &Shell-Erweiterung"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledButton.Caption="Benutze &Shell-Erweiterung"
-; "Use &temporary folder"
+; "Download files via &temporary folder"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledButton.Caption="Benutze &temporäres Verzeichnis"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledButton.Caption="Benutze &temporäres Verzeichnis"
 ; "&Warn when there is not enough free space"
 ; "&Warn when there is not enough free space"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledPanel.DDWarnLackOfTempSpaceCheck.Caption="Warnen, wenn dort zuwenig Speicherplatz vorhanden ist"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledPanel.DDWarnLackOfTempSpaceCheck.Caption="Warnen, wenn dort zuwenig Speicherplatz vorhanden ist"
@@ -5574,7 +5574,7 @@ FUNCTIONS_INTEGRATION="Integration in Windows (Ziehen und Fallenlassen, URL, Ver
 ; "Translated into many languages"
 ; "Translated into many languages"
 FUNCTIONS_TRANSLATIONS="Übersetzt in viele Sprachen"
 FUNCTIONS_TRANSLATIONS="Übersetzt in viele Sprachen"
 ; "Batch file scripting, command-line interface, .NET assembly"
 ; "Batch file scripting, command-line interface, .NET assembly"
-FUNCTIONS_AUTOMATION="Batch file scripting, command-line interface, .NET assembly"
+FUNCTIONS_AUTOMATION="Stapelverarbeitung, Kommandozeilen-Schnittstelle, .NET assembly"
 ; "Directory synchronization in several semi or fully automatic ways"
 ; "Directory synchronization in several semi or fully automatic ways"
 FUNCTIONS_SYNCHRONIZATION="Verzeichnissynchronisation in verschiedenen halb- und vollautomatischen Varianten"
 FUNCTIONS_SYNCHRONIZATION="Verzeichnissynchronisation in verschiedenen halb- und vollautomatischen Varianten"
 ; "Integrated text editor and support for external text editors"
 ; "Integrated text editor and support for external text editors"

+ 4 - 4
translations/FR.ini

@@ -1762,7 +1762,7 @@ ExplorerActions.RemoteCreateDirAction2.Hint="Créer un répertoire|Créer un nou
 ; "&Delete"
 ; "&Delete"
 ExplorerActions.RemoteDeleteAction.Caption="Effacer"
 ExplorerActions.RemoteDeleteAction.Caption="Effacer"
 ; "Delete|Delete selected remote file(s)"
 ; "Delete|Delete selected remote file(s)"
-ExplorerActions.RemoteDeleteAction.Hint="Effacer|Effache les fichiers distants sélectionnés"
+ExplorerActions.RemoteDeleteAction.Hint="Effacer|Efface les fichiers distants sélectionnés"
 ; "&Properties"
 ; "&Properties"
 ExplorerActions.RemotePropertiesAction.Caption="Propriétés"
 ExplorerActions.RemotePropertiesAction.Caption="Propriétés"
 ; "Properties|Display/change permissions, ownership or other properties of selected remote file(s) "
 ; "Properties|Display/change permissions, ownership or other properties of selected remote file(s) "
@@ -2183,9 +2183,9 @@ MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.Caption="Glisser-dép
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledLabel.Caption="Permet les téléchargements directs dans des dossiers locaux (ex: Explorateur Window). Ne permet pas d'autre destination (archives ZIP, FTP, etc.)"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledLabel.Caption="Permet les téléchargements directs dans des dossiers locaux (ex: Explorateur Window). Ne permet pas d'autre destination (archives ZIP, FTP, etc.)"
 ; "Allows downloads to any destinations (regular folders, ZIP archives,  FTP, etc.). Files are downloaded first to temporary folder, from where they are delivered to the destination."
 ; "Allows downloads to any destinations (regular folders, ZIP archives,  FTP, etc.). Files are downloaded first to temporary folder, from where they are delivered to the destination."
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledLabel.Caption="Permet les téléchargements directs dans toutes les destinations (Dossiers, archives ZIP, FTP, etc.). Les fichiers sont téléchargés dans un répertoire temporaire puis acheminer à leur destination."
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledLabel.Caption="Permet les téléchargements directs dans toutes les destinations (Dossiers, archives ZIP, FTP, etc.). Les fichiers sont téléchargés dans un répertoire temporaire puis acheminer à leur destination."
-; "Use &shell extension"
+; "Determine drop target by dragging a &fake file"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledButton.Caption="Utiliser les extensions du &Shell"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledButton.Caption="Utiliser les extensions du &Shell"
-; "Use &temporary folder"
+; "Download files via &temporary folder"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledButton.Caption="Utiliser un répertoire &temporaire"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledButton.Caption="Utiliser un répertoire &temporaire"
 ; "&Warn when there is not enough free space"
 ; "&Warn when there is not enough free space"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledPanel.DDWarnLackOfTempSpaceCheck.Caption="&Avertir quand il n'y pas assez d'espace libre"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledPanel.DDWarnLackOfTempSpaceCheck.Caption="&Avertir quand il n'y pas assez d'espace libre"
@@ -5904,7 +5904,7 @@ UserInfoNameRequired="Vous devez entrer un nom."
 ; "Select Destination Location"
 ; "Select Destination Location"
 WizardSelectDir="Répertoire de l'installation"
 WizardSelectDir="Répertoire de l'installation"
 ; "Where should [name] be installed?"
 ; "Where should [name] be installed?"
-SelectDirDesc="Où dois être installé [name] ?"
+SelectDirDesc="Où doit-être installé [name] ?"
 ; "Setup will install [name] into the following folder."
 ; "Setup will install [name] into the following folder."
 SelectDirLabel3="L'installation de [name] va s'effectuer dans le répertoire suivant."
 SelectDirLabel3="L'installation de [name] va s'effectuer dans le répertoire suivant."
 ; "To continue, click Next. If you would like to select a different folder, click Browse."
 ; "To continue, click Next. If you would like to select a different folder, click Browse."

+ 3 - 3
translations/PTG.ini

@@ -2183,9 +2183,9 @@ MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.Caption="Modo de desc
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledLabel.Caption="Permitir descargas directos para pastas locais regulares(ex: Explorador do Windows). Não permitir descargas para outros destinos(arquivos ZIP,FTP,etc,)"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledLabel.Caption="Permitir descargas directos para pastas locais regulares(ex: Explorador do Windows). Não permitir descargas para outros destinos(arquivos ZIP,FTP,etc,)"
 ; "Allows downloads to any destinations (regular folders, ZIP archives,  FTP, etc.). Files are downloaded first to temporary folder, from where they are delivered to the destination."
 ; "Allows downloads to any destinations (regular folders, ZIP archives,  FTP, etc.). Files are downloaded first to temporary folder, from where they are delivered to the destination."
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledLabel.Caption="Permite transferências para qualquer destino (pastas comuns, arquivos ZIP, FTP, etc.). Os ficheiros são transferidos primeiramente para uma pasta temporária, de onde são movidos para o destino."
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledLabel.Caption="Permite transferências para qualquer destino (pastas comuns, arquivos ZIP, FTP, etc.). Os ficheiros são transferidos primeiramente para uma pasta temporária, de onde são movidos para o destino."
-; "Use &shell extension"
+; "Determine drop target by dragging a &fake file"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledButton.Caption="Usar a extensão da shell"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledButton.Caption="Usar a extensão da shell"
-; "Use &temporary folder"
+; "Download files via &temporary folder"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledButton.Caption="Usar pasta temporária"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledButton.Caption="Usar pasta temporária"
 ; "&Warn when there is not enough free space"
 ; "&Warn when there is not enough free space"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledPanel.DDWarnLackOfTempSpaceCheck.Caption="&Avisar quando não houver espaço livre suficiente"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledPanel.DDWarnLackOfTempSpaceCheck.Caption="&Avisar quando não houver espaço livre suficiente"
@@ -5574,7 +5574,7 @@ FUNCTIONS_INTEGRATION="Integração com o Windows (drag&drop, URL, atalho para i
 ; "Translated into many languages"
 ; "Translated into many languages"
 FUNCTIONS_TRANSLATIONS="Traduzido em muitas linguas"
 FUNCTIONS_TRANSLATIONS="Traduzido em muitas linguas"
 ; "Batch file scripting, command-line interface, .NET assembly"
 ; "Batch file scripting, command-line interface, .NET assembly"
-FUNCTIONS_AUTOMATION="Batch file scripting, command-line interface, .NET assembly"
+FUNCTIONS_AUTOMATION="Ficheiros de script, interface de linha de comando, assembly .NET"
 ; "Directory synchronization in several semi or fully automatic ways"
 ; "Directory synchronization in several semi or fully automatic ways"
 FUNCTIONS_SYNCHRONIZATION="Sincronização de diretorias de várias formas, semi ou completa automatização."
 FUNCTIONS_SYNCHRONIZATION="Sincronização de diretorias de várias formas, semi ou completa automatização."
 ; "Integrated text editor and support for external text editors"
 ; "Integrated text editor and support for external text editors"

+ 3 - 3
translations/SK.ini

@@ -2183,9 +2183,9 @@ MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.Caption="Sťahovanie
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledLabel.Caption="Umožňuje priame sťahovanie do regulérnych lokálnych priečinkov (napr. Prieskumníka). Neumožňuje sťahovať do iných cieľových umiestnení (ZIP archívy, FTP, atď.)"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledLabel.Caption="Umožňuje priame sťahovanie do regulérnych lokálnych priečinkov (napr. Prieskumníka). Neumožňuje sťahovať do iných cieľových umiestnení (ZIP archívy, FTP, atď.)"
 ; "Allows downloads to any destinations (regular folders, ZIP archives,  FTP, etc.). Files are downloaded first to temporary folder, from where they are delivered to the destination."
 ; "Allows downloads to any destinations (regular folders, ZIP archives,  FTP, etc.). Files are downloaded first to temporary folder, from where they are delivered to the destination."
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledLabel.Caption="Umožňuje sťahovanie do akýchkoľvek cieľových umiestnení (regulérne priečinky, ZIP archívy, FTP, atď.). Súbory sa stiahnu najskôr do dočasného priečinka, z ktorého sa doručia do cieľového umiestnenia."
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledLabel.Caption="Umožňuje sťahovanie do akýchkoľvek cieľových umiestnení (regulérne priečinky, ZIP archívy, FTP, atď.). Súbory sa stiahnu najskôr do dočasného priečinka, z ktorého sa doručia do cieľového umiestnenia."
-; "Use &shell extension"
+; "Determine drop target by dragging a &fake file"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledButton.Caption="Použiť &rozšírenie shellu"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtEnabledButton.Caption="Použiť &rozšírenie shellu"
-; "Use &temporary folder"
+; "Download files via &temporary folder"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledButton.Caption="Použiť &dočasný priečinok"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledButton.Caption="Použiť &dočasný priečinok"
 ; "&Warn when there is not enough free space"
 ; "&Warn when there is not enough free space"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledPanel.DDWarnLackOfTempSpaceCheck.Caption="&Upozorniť v prípade nedostatku miesta"
 MainPanel.PageControl.DragDropSheet.DragDropDownloadsGroup.DDExtDisabledPanel.DDWarnLackOfTempSpaceCheck.Caption="&Upozorniť v prípade nedostatku miesta"
@@ -4438,7 +4438,7 @@ SCRIPT_STAT_HELP="stat <súbor>\n  Získa a uvedie do zoznamu atribúty špecifi
 ; User interface strings
 ; User interface strings
 [TextsWin1.rc]
 [TextsWin1.rc]
 ; ""
 ; ""
-TRANSLATOR_URL="http://www.mojepreklady.net"
+TRANSLATOR_URL="https://www.mojepreklady.net"
 ; "Can't create folder '%s'."
 ; "Can't create folder '%s'."
 CREATE_LOCAL_DIR_ERROR="Nemožno vytvoriť priečinok '%s'."
 CREATE_LOCAL_DIR_ERROR="Nemožno vytvoriť priečinok '%s'."
 ; "%s\n \nWarning: Aborting this operation will close connection!"
 ; "%s\n \nWarning: Aborting this operation will close connection!"

+ 4 - 4
translations/version.ini

@@ -1,9 +1,9 @@
 [Version]
 [Version]
 CS=233
 CS=233
-DE=115
+DE=116
 ES=70
 ES=70
 FI=91
 FI=91
-FR=91
+FR=92
 HE=19
 HE=19
 HU=85
 HU=85
 IN=38
 IN=38
@@ -18,7 +18,7 @@ RU=82
 SV=72
 SV=72
 XXE=6
 XXE=6
 EL=15
 EL=15
-PTG=51
+PTG=52
 CHS=61
 CHS=61
 TH=4
 TH=4
 RO=55
 RO=55
@@ -29,7 +29,7 @@ KO=43
 AR=41
 AR=41
 DA=16
 DA=16
 ET=22
 ET=22
-SK=51
+SK=52
 CH=124
 CH=124
 SQ=2
 SQ=2
 TR=39
 TR=39