X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=scriptlib%2Fvbslib%2FSyncFilesMenuLib.trans;fp=scriptlib%2Fvbslib%2FSyncFilesMenuLib.trans;h=f9e072d7f0a011ab903c9c71e44b9036cbb52831;hb=a8fbbed66473aeefd39572b4e73add0cbdf9ba39;hp=38921cf81fd36e7814b9e025514b358a7e981cfd;hpb=dd0cb37955bb57eddf077bca2981ee877b32e4f6;p=vbslib%2Fmain.git
diff --git a/scriptlib/vbslib/SyncFilesMenuLib.trans b/scriptlib/vbslib/SyncFilesMenuLib.trans
index 38921cf..f9e072d 100644
--- a/scriptlib/vbslib/SyncFilesMenuLib.trans
+++ b/scriptlib/vbslib/SyncFilesMenuLib.trans
@@ -16,6 +16,20 @@
+
+
+
+
+
+
+
+
+
+ ã¯ã¼ã¯
+ Work
+ 0
+ (NotFoundFile)
+
ãã¹ã¦ã®ãã©ã«ãã¼ã«åå¨ãã¾ãã
There is not in all folders.
227
@@ -87,7 +101,7 @@
SyncFilesMenuLib.vbs
Me.OldCaption +"ãããã¡ã¤ã«ã®ä¸è¦§ï¼"
- Me.OldCaption +" file list:
+ Me.OldCaption +" file list:"
556
SyncFilesMenuLib.vbs
@@ -305,7 +319,7 @@
"If there are settings that you do not want to reset, adjust with the adjustment menu after continuing below. "+_
"Compatible settings will continue to be used (later shown as =)."+ _
"In the Adjustment menu, you can list the configuration files changed by the user."+ _
- "Therefore, if you select "Finish", installation will be executed with the contents of "+ _
+ "Therefore, if you select ""Finish"", installation will be executed with the contents of "+ _
"""User setting"" of ""New version""."+ _
"You can restart the adjustment menu by closing the window in the middle or even double "+ _
"clicking the following script file even after installation."+ vbCRLF + _
@@ -414,7 +428,7 @@
SyncFilesMenuLib.vbs
â
ãåãå
容ãã«ãªãã¹ããã¡ã¤ã«ãåãå
容ã«ãã
- * Make the same contents of files that should be "same content"
+ * Make the same contents of files that should be ""same content""
1930
SyncFilesMenuLib.vbs
@@ -483,16 +497,21 @@
2098
SyncFilesMenuLib.vbs
- ãã¡ã¤ã«
- file
+ 以ä¸ã®ãã¡ã¤ã«ãæ°ããæ¹ã®å
容ã«ãªãããã«ã³ãã¼ãã¦ã³ããããã¾ãã
+ Would you like to copy the files above to the new content and commit?
2123
SyncFilesMenuLib.vbs
- ãã¼ã¹
- Base
+ 以ä¸ã®ãã¡ã¤ã«ããã¼ã¹ããã³ãã¼ãã¦ã³ããããã¾ãã
+ Do you copy the above files from the base and do you commit them?
2144
SyncFilesMenuLib.vbs
+ "ååã®"
+ "Previous "
+ 2212
+ SyncFilesMenuLib.vbs
+
ï¼
:
2212
@@ -503,31 +522,66 @@
2229
SyncFilesMenuLib.vbs
- ã³ããããã¦
- Commit and
+ "次ã®ã¡ãã¥ã¼ã® 1.ã§éãï¼ã¤ã®ãã¡ã¤ã«ãæåã§"+ Me.OldCaption +"ããããã³ããããã¦ãã ããã"
+ "Please manually "+ Me.OldCaption +" the two files that open in 1. in the next menu and commit."
2232
SyncFilesMenuLib.vbs
+ "ååã³ãããæã®"
+ "Previous commit "
+ 2241
+ SyncFilesMenuLib.vbs
+
â
**
2244
SyncFilesMenuLib.vbs
+ ï¼æ¸ï¼
+ ( Done )
+ 2250
+ SyncFilesMenuLib.vbs
+
+ ï¼æªï¼
+ (NotYet)
+ 2252
+ SyncFilesMenuLib.vbs
+
ï¼
)
- 2250
+ 2256
+ SyncFilesMenuLib.vbs
+
+ "1. Diff ã§éãï¼"+ Me.CustomCaption + Me.OldCaption +"ãã"+
+ "1. Open by Diff: "+ Me.CustomCaption + Me.OldCaption +
+ 2262
+ SyncFilesMenuLib.vbs
+
+ "2. Diff ã§éãï¼"+ Me.CommittedCaption +"ã®"+ Me.OldCaption +"å
容 ("
+ "2. Open by Diff: "+ Me.CommittedCaption +" - "+ Me.OldCaption +" ("
+ 2265
SyncFilesMenuLib.vbs
Diff ã§éãï¼
Open by Diff:
- 2262
+ 2268
SyncFilesMenuLib.vbs
- ä¸å¨
- Not Exist
+ "ã®"+ Me.WorkCaption
+ " - "+ Me.WorkCaption
+ 2275
+ SyncFilesMenuLib.vbs
+
+ (å¾ã¯ä¸å¨)
+ (Afterwards absent)
2280
SyncFilesMenuLib.vbs
+ å·¦å³
+ L/R
+ 2292
+ SyncFilesMenuLib.vbs
+
ãã©ã«ãã¼ãéã
Open the folder
2302
@@ -538,16 +592,41 @@
2304
SyncFilesMenuLib.vbs
- ã¯ã¼ã¯
- Work
+ 3ã¦ã§ã¤ ãã¼ã¸ãã
+ Do 3 way merge
+ 2307
+ SyncFilesMenuLib.vbs
+
+ Diff ã§éã [ ã¯ã¼ã¯ã®ããã¯ã¢ãã / 3ã¦ã§ã¤ ãã¼ã¸å¾ã®ã¯ã¼ã¯ ]
+ Open by Diff [ Back up of Work / Work after 3 way merge ]
2310
SyncFilesMenuLib.vbs
+ Diff ã§éã [ ãã¼ã¹ã®ããã¯ã¢ãã / ãã¼ã¸å¾ã®ãã¼ã¹ ]
+ Open by Diff [ Back up of Base / Base after merge ]
+ 2313
+ SyncFilesMenuLib.vbs
+
Enterã®ã¿
Enter only
2316
SyncFilesMenuLib.vbs
+ "8. "+ Me.OldCaption +"ãã³ããããã"
+ "8. Commit "+ Me.OldCaption
+ 2317
+ SyncFilesMenuLib.vbs
+
+ â
æ¹åã»çµåã»åé¢ã»é¨å移åããã£ãã¨ãã® SyncFilesX ã®èª¬æãåèã
+ * Refer to the explanation of SyncFilesX when rename, join, separation, partial move.
+ 2324
+ SyncFilesMenuLib.vbs
+
+ ä¸å¨
+ Not Exist
+ 2404
+ SyncFilesMenuLib.vbs
+
ãã¡ã¤ã«ãéã
Open the file
2406
@@ -558,19 +637,79 @@
2567
SyncFilesMenuLib.vbs
- åé¤
- Deleted
+ ã¯ã¼ã¯ã®ããã¯ã¢ãããä½æãã¾ããï¼
+ Created a work backup:
+ 2587
+ SyncFilesMenuLib.vbs
+
+ ããã¯ã¢ããã¯ã³ãããæã«åé¤ããã¾ãã
+ The backup will be deleted on commit.
2588
SyncFilesMenuLib.vbs
- ç°ãªã
- Not Same
- 2646
+ 3ã¦ã§ã¤ ãã¼ã¸ãè¡ãã¾ãã çµæãã¯ã¼ã¯ã«æ ¼ç´ãã¾ãã
+ Do 3-way merge. Store the result in the work.
+ 2593
SyncFilesMenuLib.vbs
- åã
- Same
- 2646
+ Enter ã®ã¿ï¼ãã¼ã¸ã®è¨å®ãã¡ã¤ã«ã使ããªãã
+ Enter only: Do not use the merge configuration file.
+ 2598
+ SyncFilesMenuLib.vbs
+
+ ãã¼ã¸ã®è¨å®ãã¡ã¤ã«
+ Setting of merge
+ 2599
+ SyncFilesMenuLib.vbs
+
+ ãã¼ã¹ã®ããã¯ã¢ãããä½æãã¾ããï¼
+ Made a backup of the base:
+ 2625
+ SyncFilesMenuLib.vbs
+
+ 4ã¦ã§ã¤ ãã¼ã¸ãè¡ãã¾ãã çµæãã¯ã¼ã¯ã¨ãã¼ã¹ã«æ ¼ç´ãã¾ãã
+ Do 4-way merge. Store the result in the work.
+ 2630
+ SyncFilesMenuLib.vbs
+
+
+ 2645
+ SyncFilesMenuLib.vbs
+
+
+ 2651
+ SyncFilesMenuLib.vbs
+
+
+ 2657
+ SyncFilesMenuLib.vbs
+
+
+ 2662
SyncFilesMenuLib.vbs
è¦åãããã¾ããããããããã§ãã
@@ -578,26 +717,111 @@
2675
SyncFilesMenuLib.vbs
+ å³âåãå¾âå·¦ ã®ã³ãã¼ããã¾ããããããã§ãã
+ Copy right -> front, back -> left. Is it OK
+ 2684
+ SyncFilesMenuLib.vbs
+
+ 次ã®å
¥åã§ã¯ãæ¡å¼µåã®å
¥åããªãã§ãã ãããã³ãã¼å
ã®æ¡å¼µåã«ãªãã¾ãã
+ Please do not enter the extension at the next input. It becomes the extension of the copy destination.
+ 2719
+ SyncFilesMenuLib.vbs
+
+ ã³ãããå¾ã®å
容ãå
¥ã£ããã¡ã¤ã«ã®ãã¹
+ Path of file containing content after commit
+ 2720
+ SyncFilesMenuLib.vbs
+
åã¹ãã£ã³ã¯ãã¡ãã¥ã¼ã表示ããã¨ãã«è¡ã
2728
SyncFilesMenuLib.vbs
- ãã©ã«ãã¼
- folder
+ è¤æ°ã®ãã¡ã¤ã«ããããã©ã«ãã¼ã®ç§»åãã¾ã¨ããã 移åãã¿ã¼ã³ãã¨ã«ã¾ã¨ããã
+ Summarize movements of folders with multiple files. Summarize for each movement pattern.
2867
SyncFilesMenuLib.vbs
- ã¿ã°
- tag
+ ä¾ï¼"FolderX\A.txt" ã® "FolderX" 㨠"FolderX\B.txt" ã® "FolderX" ãåããã¼ã«é¢é£ããé
åã¸ã
+ Example: To "FolderX" of "FolderX \ A.txt" and "FolderX" of "FolderX \ B.txt" to the array related to the same key.
+ 2868
+ SyncFilesMenuLib.vbs
+
+ 移ååå¾ã®ãã¹ã®å³å´ã§å
±éã®è¦ªãã©ã«ãã¼ãã«ããããã
+ Cut the common parent folder on the right side of the path before and after the movement.
+ 2887
+ SyncFilesMenuLib.vbs
+
+ ä¾ï¼
+ Example:
+ 2888
+ SyncFilesMenuLib.vbs
+
+ 表示ãã
+ Show
+ 2893
+ SyncFilesMenuLib.vbs
+
+
+ 2944
+ SyncFilesMenuLib.vbs
+
+ å
±éã®ãµã ãã©ã«ãã¼ï¼
+ Common sub folders:
+ 2951
+ SyncFilesMenuLib.vbs
+
+
+ 2960
+ SyncFilesMenuLib.vbs
+
+ åèã«ãããã¡ã¤ã«ã®ååï¼
+ Name of reference file:
+ 2971
+ SyncFilesMenuLib.vbs
+
+ 追å ããã¿ã°ï¼
+ Tag to add:
2974
SyncFilesMenuLib.vbs
+ ãã¼ã¹ã移åããã追å ããã¿ã°ï¼
+ Add the tag when the base also moves Tags:
+ 3014
+ SyncFilesMenuLib.vbs
+
+ ã¯ã¼ã¯ã移åããã追å ããã¿ã°ï¼
+ Add work when work also moves Tags:
+ 3016
+ SyncFilesMenuLib.vbs
+
ãã©ã«ãã¼ã®ä¸ã®ãã¹ã¦ã®ãã¡ã¤ã«ã
All files in the folder are
3149
SyncFilesMenuLib.vbs
+ ãã©ã«ãã¼
+ folder
+ 3581
+ SyncFilesMenuLib.vbs
+
+ ãã¡ã¤ã«
+ file
+ 3583
+ SyncFilesMenuLib.vbs
+
BaseCaption +" "+ type_name +"ã¨"+ WorkCaption +" "+ type_name
BaseCaption +" "+ type_name +" and "+ WorkCaption +" "+ type_name
3602
@@ -648,6 +872,16 @@
4650
SyncFilesMenuLib.vbs
+ åã
+ Same
+ 4652
+ SyncFilesMenuLib.vbs
+
+ ç°ãªã
+ Not Same
+ 4654
+ SyncFilesMenuLib.vbs
+
ä¸å¤
Not Changed
4685
@@ -663,6 +897,11 @@
4687
SyncFilesMenuLib.vbs
+ åé¤
+ Deleted
+ 4689
+ SyncFilesMenuLib.vbs
+
以ä¸ã®å ´æã«ããããã¹ã ãã¡ã¤ã«ã®ä¸é¨ããã³ãã¬ã¼ããããããã¾ããã§ããã
The template did not match part of the text file in the following location.
4895
@@ -728,4 +967,9 @@
5043
SyncFilesMenuLib.vbs
+ ã¿ã°
+ tag
+ 5045
+ SyncFilesMenuLib.vbs
+