瀏覽代碼

Avoiding re-translation of CUSTOM_COMMAND_PATTERNS_HINT5 imposed by 326733491

Source commit: 1ee3395b31214bbc0c5a117917648d97eaaa3afd
Martin Prikryl 6 年之前
父節點
當前提交
f502599b3e
共有 3 個文件被更改,包括 7 次插入3 次删除
  1. 3 1
      source/forms/CustomCommand.cpp
  2. 2 1
      source/resource/TextsWin.h
  3. 2 1
      source/resource/TextsWin1.rc

+ 3 - 1
source/forms/CustomCommand.cpp

@@ -47,7 +47,9 @@ __fastcall TCustomCommandDialog::TCustomCommandDialog(TComponent* Owner,
   FCustomCommandList = CustomCommandList;
   FMode = Mode;
   FOnValidate = OnValidate;
-  HintLabel(HintText, LoadStr(CUSTOM_COMMAND_PATTERNS_HINT6));
+  std::unique_ptr<TStrings> HintStrings(TextToStringList(LoadStr(CUSTOM_COMMAND_PATTERNS_HINT5)));
+  HintStrings->Insert(6, LoadStr(CUSTOM_COMMAND_PATTERNS_HINT6));
+  HintLabel(HintText, TrimRight(StringsToText(HintStrings.get())));
 
   int CaptionRes;
   switch (FMode)

+ 2 - 1
source/resource/TextsWin.h

@@ -199,7 +199,7 @@
 #define EXTERNAL_EDITOR_HINT    1488
 #define MASK_HINT2              1489
 #define PATH_MASK_HINT2         1490
-#define CUSTOM_COMMAND_PATTERNS_HINT6 1491
+#define CUSTOM_COMMAND_PATTERNS_HINT5 1491
 #define CLOSED_ON_QUEUE_EMPTY   1492
 #define DIRECTORY_READING_CANCELLED 1493
 #define SYNC_DIR_BROWSE_TOGGLE  1494
@@ -289,6 +289,7 @@
 #define LOCATION_PROFILE_HINT   1580
 #define USAGE_INFO              1581
 #define USAGE_RAWTRANSFERSETTINGS 1582
+#define CUSTOM_COMMAND_PATTERNS_HINT6 1583
 
 #define WIN_FORMS_STRINGS       1600
 #define COPY_FILE               1605

+ 2 - 1
source/resource/TextsWin1.rc

@@ -204,7 +204,7 @@ BEGIN
         EXTERNAL_EDITOR_HINT, "Edit (external)|Edit selected file(s) using external editor '%s'"
         MASK_HINT2, "* matches any number of characters.\n? matches exactly one character.\n[abc] matches one character from the set.\n[a-z] matches one character from the range.\nExample: *.html; photo??.png"
         PATH_MASK_HINT2, "Mask can be extended with path mask.\nExample: */public_html/*.html"
-        CUSTOM_COMMAND_PATTERNS_HINT6, "Patterns:\n!! expands to exclamation mark\n! expands to file name\n!& expands to list of selected files (quoted, space-delimited)\n!/ expands to current remote path\n!S expands to current session URL\n!E expands to serialized connection data of current session\n!@ expands to current session hostname\n!U expands to current session username\n!P expands to current session password\n!# expands to current session port number\n!N expands to current session name\n!?prompt[\\]?default! expands to user-entered value with given prompt and default (optional \\ avoids escaping)\n!`command` expands to output of local command\n \nLocal command patterns:\n!^! expands to file name from local panel\n \nExample:\ngrep \"!?Pattern:?!\" !&"
+        CUSTOM_COMMAND_PATTERNS_HINT5, "Patterns:\n!! expands to exclamation mark\n! expands to file name\n!& expands to list of selected files (quoted, space-delimited)\n!/ expands to current remote path\n!S expands to current session URL\n!@ expands to current session hostname\n!U expands to current session username\n!P expands to current session password\n!# expands to current session port number\n!N expands to current session name\n!?prompt[\\]?default! expands to user-entered value with given prompt and default (optional \\ avoids escaping)\n!`command` expands to output of local command\n \nLocal command patterns:\n!^! expands to file name from local panel\n \nExample:\ngrep \"!?Pattern:?!\" !&"
         CLOSED_ON_QUEUE_EMPTY, "All background transfers were finished. Connection was closed."
         DIRECTORY_READING_CANCELLED, "Reading of remote directory was cancelled."
         SYNC_DIR_BROWSE_TOGGLE, "Synchronized browsing was turned %s.|on|off"
@@ -294,6 +294,7 @@ BEGIN
         LOCATION_PROFILE_HINT, "Open location profile \"%s\".|Local directory:\n  %s|Remote directory:\n  %s"
         USAGE_INFO, "Prints list of supported ciphers and algorithms."
         USAGE_RAWTRANSFERSETTINGS, "Configures any transfer settings using a raw format as in an INI file."
+        CUSTOM_COMMAND_PATTERNS_HINT6, "!E expands to serialized connection data of current session"
 
         WIN_FORMS_STRINGS, "WIN_FORMS_STRINGS"
         COPY_FILE, "%s file '%s' to %s:"