コミット: 28697 - tortoisesvn (svn) - TortoiseSVN

R/O
SSH
HTTPS

tortoisesvn: コミット

コミットメタ情報

リビジョン	28697 (tree)
日時	2019-11-25 19:27:31
作者	luebbe

ログメッセージ

Pulled latest translations from transifex.com

変更サマリ

modified: trunk/Languages/be@tarask/TortoiseUI.po (diff)
modified: trunk/Languages/cs/TortoiseDoc.po (diff)
modified: trunk/Languages/de/TortoiseDoc.po (diff)
modified: trunk/Languages/de/TortoiseUI.po (diff)
modified: trunk/Languages/el/TortoiseUI.po (diff)
modified: trunk/Languages/es/TortoiseDoc.po (diff)
modified: trunk/Languages/fi/TortoiseDoc.po (diff)
modified: trunk/Languages/fr/TortoiseDoc.po (diff)
modified: trunk/Languages/fr/TortoiseUI.po (diff)
modified: trunk/Languages/hr/TortoiseUI.po (diff)
modified: trunk/Languages/id/TortoiseDoc.po (diff)
modified: trunk/Languages/it/TortoiseDoc.po (diff)
modified: trunk/Languages/ja/TortoiseDoc.po (diff)
modified: trunk/Languages/ja/TortoiseUI.po (diff)
modified: trunk/Languages/ko/TortoiseUI.po (diff)
modified: trunk/Languages/ml/TortoiseUI.po (diff)
modified: trunk/Languages/nb/TortoiseUI.po (diff)
modified: trunk/Languages/nl/TortoiseDoc.po (diff)
modified: trunk/Languages/nl/TortoiseUI.po (diff)
modified: trunk/Languages/pl/TortoiseDoc.po (diff)
modified: trunk/Languages/pt/TortoiseDoc.po (diff)
modified: trunk/Languages/pt_BR/TortoiseDoc.po (diff)
modified: trunk/Languages/ru/TortoiseDoc.po (diff)
modified: trunk/Languages/sk/TortoiseDoc.po (diff)
modified: trunk/Languages/sl/TortoiseDoc.po (diff)
modified: trunk/Languages/sq/TortoiseDoc.po (diff)
modified: trunk/Languages/sr/TortoiseDoc.po (diff)
modified: trunk/Languages/sr@latin/TortoiseDoc.po (diff)
modified: trunk/Languages/vi/TortoiseDoc.po (diff)
modified: trunk/Languages/zh_CN/TortoiseDoc.po (diff)

差分

--- trunk/Languages/be@tarask/TortoiseUI.po (revision 28696)

+++ trunk/Languages/be@tarask/TortoiseUI.po (revision 28697)

		@@ -15,15 +15,15 @@
15	15	# Volat <volatmail@gmail.com>, 2012
16	16	# Volat <volatmail@gmail.com>, 2012
17	17	# Раман, 2013
18		-# Раман, 2013
	18	+# Раман, 2013,2019
19	19	msgid ""
20	20	msgstr ""
21	21	"Project-Id-Version: TortoiseSVN\n"
22	22	"Report-Msgid-Bugs-To: \n"
23	23	"POT-Creation-Date: 1900-01-01 00:00+0000\n"
24		-"PO-Revision-Date: 2018-10-02 02:10+0000\n"
25		-"Last-Translator: luebbe <luebbe.opensource@gmail.com>\n"
26		-"Language-Team: Belarusian (Tarask) (http://www.transifex.com/luebbe/tortoisesvn/language/be%40tarask/)\n"
	24	+"PO-Revision-Date: 2019-10-08 10:40+0000\n"
	25	+"Last-Translator: Раман\n"
	26	+"Language-Team: Belarusian (Tarask) (http://www.transifex.com/luebbe/tortoisesvn/language/be@tarask/)\n"
27	27	"MIME-Version: 1.0\n"
28	28	"Content-Type: text/plain; charset=UTF-8\n"
29	29	"Content-Transfer-Encoding: 8bit\n"

		@@ -48,16 +48,16 @@
48	48	msgid "! %d"
49	49	msgstr "! %d"
50	50
51		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1262)
	51	+#. Resource IDs: (1262)
52	52	msgid "# authors shown individually:"
53	53	msgstr "# аўтараў паказалі індывідуальна:"
54	54
55		-#. Resource IDs: (IDS_SVN_PROGRESS_TOTALMBTRANSFERRED)
	55	+#. Resource IDs: (5702)
56	56	#, c-format
57	57	msgid "%.2f MBytes transferred"
58	58	msgstr "%.2f МБайтаў перададзена"
59	59
60		-#. Resource IDs: (IDS_SVN_PROGRESS_KBYTES_SEC)
	60	+#. Resource IDs: (5706)
61	61	#, c-format
62	62	msgid "%.2f kBytes/s"
63	63	msgstr "%.2f кБайтаў/с"

		@@ -87,77 +87,77 @@
87	87	msgid "%1 was not found."
88	88	msgstr "%1 ня знойдзены."
89	89
90		-#. Resource IDs: (IDS_COMMITDLG_STATISTICSFORMAT)
	90	+#. Resource IDs: (2701)
91	91	#, c-format
92	92	msgid "%1!d! files selected, %2!d! files total"
93	93	msgstr "%1!d! файлаў вылучана, %2!d! файлаў усяго"
94	94
95		-#. Resource IDs: (IDS_STATGRAPH_AUTHORSLIDER_TT)
	95	+#. Resource IDs: (3935)
96	96	#, c-format
97	97	msgid ""
98	98	"%1!d! most active author(s) with at least %2!d! commits each (%3!d! %%)"
99	99	msgstr "%1!d! найбольш актыўны(я) аўтар(ы) з па меншай меры %2!d! ажыцьцяўляе(юць) кожныя (%3!d! %%)"
100	100
101		-#. Resource IDs: (IDS_PROGRS_TIME)
	101	+#. Resource IDs: (3602)
102	102	#, c-format
103	103	msgid "%1!ld! minute(s) and %2!ld! second(s)"
104	104	msgstr "%1!ld! мінута(ў) і %2!ld! сэкунда(ў)"
105	105
106		-#. Resource IDs: (IDS_LOG_DLGTITLEOFFLINE)
	106	+#. Resource IDs: (1837)
107	107	#, c-format
108	108	msgid "%1!ls! (offline)"
109		-msgstr ""
	109	+msgstr "%1!ls! (офлайн)"
110	110
111		-#. Resource IDs: (IDS_PROGRS_PATHATREV)
	111	+#. Resource IDs: (3600)
112	112	#, c-format
113	113	msgid "%1!ls! - at revision: %2!d!"
114	114	msgstr "%1!ls! - у рэвізыі: %2!d!"
115	115
116		-#. Resource IDs: (IDS_DIFF_BASENAMEREV)
	116	+#. Resource IDs: (2410)
117	117	#, c-format
118	118	msgid "%1!ls! : Working Base, Revision %2!ld!"
119	119	msgstr "%1!ls! : Працоўная База, Рэвізыя %2!ld!"
120	120
121		-#. Resource IDs: (IDS_PROGRS_UPDATE)
	121	+#. Resource IDs: (3667)
122	122	#, c-format
123	123	msgid "%1!ls! from %2!ls!"
124		-msgstr ""
	124	+msgstr "%1!ls! з %2!ls!"
125	125
126		-#. Resource IDs: (IDS_PROGRS_FINALINFO)
	126	+#. Resource IDs: (3603)
127	127	#, c-format
128	128	msgid "%1!ls! in %2!ls!"
129	129	msgstr "%1!ls! у %2!ls!"
130	130
131		-#. Resource IDs: (IDS_SVN_PROGRESS_TOTALANDSPEED)
	131	+#. Resource IDs: (5703)
132	132	#, c-format
133	133	msgid "%1!ls!, %2!ls!"
134		-msgstr ""
	134	+msgstr "%1!ls!, %2!ls!"
135	135
136		-#. Resource IDs: (IDS_PROC_EXPORTFOLDERNAME)
	136	+#. Resource IDs: (2316)
137	137	#, c-format
138	138	msgid "%1!ls!\\%2!ls! - Export"
139	139	msgstr "%1!ls!\\%2!ls! - Экспарт"
140	140
141		-#. Resource IDs: (IDS_PROC_EXPORTFOLDERNAME2)
	141	+#. Resource IDs: (2317)
142	142	#, c-format
143	143	msgid "%1!ls!\\%2!ls! - Export (%3!d!)"
144	144	msgstr "%1!ls!\\%2!ls! - Экспарт (%3!d!)"
145	145
146		-#. Resource IDs: (IDS_REPOBROWSE_INFODIR)
	146	+#. Resource IDs: (1666)
147	147	#, c-format
148	148	msgid ""
149	149	"%1!ls!\r\n"
150	150	"Revision %2!ls!, Author %3!ls!, Date %4!ls!"
151		-msgstr ""
	151	+msgstr "%1!ls!\r\nРэвізія %2!ls!, Аўтар %3!ls!, Дата %4!ls!"
152	152
153		-#. Resource IDs: (IDS_REPOBROWSE_INFOFILE)
	153	+#. Resource IDs: (1667)
154	154	#, c-format
155	155	msgid ""
156	156	"%1!ls!\r\n"
157	157	"Revision %2!ls!, Author %3!ls!, Size %4!ls!, Date %5!ls!"
158		-msgstr ""
	158	+msgstr "%1!ls!\r\nРэвізія %2!ls!, Аўтар %3!ls!, Памер %4!ls!, Дата %5!ls!"
159	159
160		-#. Resource IDs: (IDS_REPOBROWSE_INFO)
	160	+#. Resource IDs: (1664)
161	161	#, c-format
162	162	msgid ""
163	163	"%1!ls!\r\n"

		@@ -179,17 +179,17 @@
179	179	"Verify that the correct path and file name are given."
180	180	msgstr "%1\nНемагчыма адшукаць гэты файл.\nПраверце карэктнасьць шляху і імя файлу, якія вы даеце."
181	181
182		-#. Resource IDs: (IDS_SVN_PROGRESS_TOTALBYTESTRANSFERRED)
	182	+#. Resource IDs: (5704)
183	183	#, c-format
184	184	msgid "%I64d Bytes transferred"
185	185	msgstr "%I64d Байтаў перададзена"
186	186
187		-#. Resource IDs: (IDS_SVN_PROGRESS_BYTES_SEC)
	187	+#. Resource IDs: (5705)
188	188	#, c-format
189	189	msgid "%I64d Bytes/s"
190	190	msgstr "%I64d Байтаў/с"
191	191
192		-#. Resource IDs: (IDS_SVN_PROGRESS_TOTALTRANSFERRED)
	192	+#. Resource IDs: (5701)
193	193	#, c-format
194	194	msgid "%I64d kBytes transferred"
195	195	msgstr "%I64d кБайтаў перададзена"

		@@ -206,7 +206,7 @@
206	206	"%Ts"
207	207	msgstr ""
208	208
209		-#. Resource IDs: (IDS_MONITOR_NOTIFY_MULTITITLE)
	209	+#. Resource IDs: (1022)
210	210	#, c-format
211	211	msgid "%d projects have updates:"
212	212	msgstr ""

		@@ -224,42 +224,42 @@
224	224	msgid "%ld of %ld"
225	225	msgstr "%ld з %ld"
226	226
227		-#. Resource IDs: (IDS_EDITPROPS_NUMPATHS)
	227	+#. Resource IDs: (9000)
228	228	#, c-format
229	229	msgid "%ld paths"
230	230	msgstr "%ld тэчак"
231	231
232		-#. Resource IDs: (IDS_REVGRAPH_TAG)
	232	+#. Resource IDs: (4345)
233	233	#, c-format
234	234	msgid "%ls"
235	235	msgstr "%ls"
236	236
237		-#. Resource IDs: (IDS_REVGRAPH_DLGTITLEOFFLINE)
	237	+#. Resource IDs: (1472)
238	238	#, c-format
239	239	msgid "%ls (offline)"
240	240	msgstr "%ls (адсутнічае)"
241	241
242		-#. Resource IDs: (IDS_MENUIGNOREGLOBAL)
	242	+#. Resource IDs: (236)
243	243	#, c-format
244	244	msgid "%ls (recursively)"
245	245	msgstr ""
246	246
247		-#. Resource IDs: (IDS_DIFF_MERGEDNAME)
	247	+#. Resource IDs: (2413)
248	248	#, c-format
249	249	msgid "%ls : Merged file"
250	250	msgstr ""
251	251
252		-#. Resource IDs: (IDS_DIFF_REMOTENAME)
	252	+#. Resource IDs: (2404)
253	253	#, c-format
254	254	msgid "%ls : Remote file"
255	255	msgstr "%ls : Аддалены файл"
256	256
257		-#. Resource IDs: (IDS_DIFF_BASENAME)
	257	+#. Resource IDs: (2401)
258	258	#, c-format
259	259	msgid "%ls : Working Base"
260	260	msgstr "%ls : Працоўная База"
261	261
262		-#. Resource IDs: (IDS_DIFF_WCNAME)
	262	+#. Resource IDs: (2400)
263	263	#, c-format
264	264	msgid "%ls : Working Copy"
265	265	msgstr "%ls : працоўная копія"

		@@ -271,7 +271,7 @@
271	271	"%ld failed hunk(s)"
272	272	msgstr "%ls\n%ld кавалак(аў) з памылкай"
273	273
274		-#. Resource IDs: (IDS_PROC_REMOVEFORCE_TASK1_1)
	274	+#. Resource IDs: (2347)
275	275	#, c-format
276	276	msgid ""
277	277	"%ls\n"

		@@ -278,7 +278,7 @@
278	278	"Do you want to remove the %d files anyway?"
279	279	msgstr ""
280	280
281		-#. Resource IDs: (IDS_PROC_REMOVEFORCE_TASK1)
	281	+#. Resource IDs: (2346)
282	282	#, c-format
283	283	msgid ""
284	284	"%ls\n"

		@@ -285,7 +285,7 @@
285	285	"Do you want to remove the file '%ls' anyway?"
286	286	msgstr ""
287	287
288		-#. Resource IDs: (IDS_PROC_REMOVEFORCE_TASK1_2)
	288	+#. Resource IDs: (2348)
289	289	#, c-format
290	290	msgid ""
291	291	"%ls\n"

		@@ -301,7 +301,7 @@
301	301	"TortoiseMerge can't diff directories."
302	302	msgstr "%ls\n- гэта каталёг, а ня файл!\nTortoiseMerge ня можа зьмяняць каталёгі."
303	303
304		-#. Resource IDs: (IDS_HOOKFAILED_TASK3)
	304	+#. Resource IDs: (5813)
305	305	msgid ""
306	306	"&Abort\n"
307	307	"You can fix the reason the hook script failed first."

		@@ -311,13 +311,13 @@
311	311	msgid "&About TortoiseMerge..."
312	312	msgstr ""
313	313
314		-#. Resource IDs: (IDS_SSL_ACCEPTTEMP_TASK)
	314	+#. Resource IDs: (2360)
315	315	msgid ""
316	316	"&Accept the certificate\n"
317	317	"The certificate is accepted only this one time."
318	318	msgstr ""
319	319
320		-#. Resource IDs: (IDS_MENUADDIMMEDIATE)
	320	+#. Resource IDs: (229)
321	321	msgid "&Add"
322	322	msgstr "&Дадаць"
323	323

		@@ -325,44 +325,33 @@
325	325	msgid "&Add Filter"
326	326	msgstr ""
327	327
328		-#. Resource IDs: (IDS_WARN_ADDCASERENAMED_TASK4)
	328	+#. Resource IDs: (1427)
329	329	msgid ""
330	330	"&Add item\n"
331	331	"This will lead to problems on Windows."
332	332	msgstr ""
333	333
334		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSADV: Control id 1098, IDS_MENUADD)
	334	+#. Resource IDs: (1098, 124)
335	335	msgid "&Add..."
336	336	msgstr "&Дадаць..."
337	337
338		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 1090, Dialog
339		-#. IDD_SETTINGSPROGSMERGE: Control id 1093)
	338	+#. Resource IDs: (1090, 1093)
340	339	msgid "&Advanced..."
341	340	msgstr "&Прасунутыя..."
342	341
343		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1505)
	342	+#. Resource IDs: (1505)
344	343	msgid "&All"
345	344	msgstr ""
346	345
347		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1471)
	346	+#. Resource IDs: (1471)
348	347	msgid "&Allow ambiguous URLs"
349	348	msgstr "&Дапускаць неадназначныя URL-спасылкі"
350	349
351		-#. Resource IDs: (Dialog IDD_UNSHELVE: Control id 1)
	350	+#. Resource IDs: (1)
352	351	msgid "&Apply"
353	352	msgstr ""
354	353
355		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1294, Dialog
356		-#. IDD_EDITPROPEOL: Control id 1294, Dialog IDD_EDITPROPERTYVALUE: Control id
357		-#. 1294, Dialog IDD_EDITPROPEXECUTABLE: Control id 1294, Dialog
358		-#. IDD_EDITPROPKEYWORDS: Control id 1294, Dialog IDD_EDITPROPLOCALHOOKS:
359		-#. Control id 1294, Dialog IDD_EDITPROPMERGELOGTEMPLATE: Control id 1294,
360		-#. Dialog IDD_EDITPROPMIMETYPE: Control id 1294, Dialog IDD_EDITPROPNEEDSLOCK:
361		-#. Control id 1294, Dialog IDD_EDITPROPTSVNLANG: Control id 1294, Dialog
362		-#. IDD_EDITPROPTSVNSIZES: Control id 1294, Dialog IDD_EDITPROPUSERBOOL:
363		-#. Control id 1294, Dialog IDD_EDITPROPUSERMULTILINE: Control id 1294, Dialog
364		-#. IDD_EDITPROPUSERSINGLELINE: Control id 1294, Dialog IDD_EDITPROPUSERSTATE:
365		-#. Control id 1294)
	354	+#. Resource IDs: (1294)
366	355	msgid "&Apply property recursively"
367	356	msgstr "&Ужыць ўласьцівасьць рэкурсыўна"
368	357

		@@ -370,7 +359,7 @@
370	359	msgid "&Apply unified diff"
371	360	msgstr "&Ужыць уніфікаваны фармат"
372	361
373		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535)
	362	+#. Resource IDs: (65535)
374	363	msgid "&Autoclose:"
375	364	msgstr "&Зачыняць аўтаматычна:"
376	365

		@@ -378,15 +367,15 @@
378	367	msgid "&Backup original file"
379	368	msgstr "&Забэкапіць арыгінальны файл"
380	369
381		-#. Resource IDs: (Dialog IDD_EDITPROPMIMETYPE: Control id 1559)
	370	+#. Resource IDs: (1559)
382	371	msgid "&Binary"
383	372	msgstr "&Бінарны"
384	373
385		-#. Resource IDs: (IDS_FILEDIFF_POPBLAME, IDS_LOG_POPUP_BLAMEDIFF)
	374	+#. Resource IDs: (1813, 5150)
386	375	msgid "&Blame changes"
387	376	msgstr "&Аўтарства зьменаў"
388	377
389		-#. Resource IDs: (IDS_LOG_POPUP_BLAMEREVS)
	378	+#. Resource IDs: (1812)
390	379	msgid "&Blame changes in revisions"
391	380	msgstr ""
392	381

		@@ -394,27 +383,27 @@
394	383	msgid "&Blame previous revision"
395	384	msgstr "&Аўтарства папярэдніх рэвізыяў"
396	385
397		-#. Resource IDs: (IDS_MENUBLAME)
	386	+#. Resource IDs: (203)
398	387	msgid "&Blame..."
399	388	msgstr "&Аўтарства..."
400	389
401		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNSIZES: Control id 65535)
	390	+#. Resource IDs: (65535)
402	391	msgid "&Border:"
403	392	msgstr "&Мяжа:"
404	393
405		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1568)
	394	+#. Resource IDs: (1568)
406	395	msgid "&Bottom"
407	396	msgstr "&Ніжні"
408	397
409		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 65535)
	398	+#. Resource IDs: (65535)
410	399	msgid "&Branches"
411	400	msgstr "&Адгалінаваньні"
412	401
413		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1645)
	402	+#. Resource IDs: (1645)
414	403	msgid "&Break write locks"
415	404	msgstr ""
416	405
417		-#. Resource IDs: (IDS_LOG_BROWSEREPO)
	406	+#. Resource IDs: (2201)
418	407	msgid "&Browse repository"
419	408	msgstr "&Прагляд рэпазіторыя"
420	409

		@@ -423,212 +412,207 @@
423	412	msgid "&Browse..."
424	413	msgstr "&Прагляд..."
425	414
426		-#. Resource IDs: (ID_NEW_BUGTRAQ - Menu)
	415	+#. Resource IDs: (32850 - Menu)
427	416	msgid "&Bugtraq (Issue tracker integration)"
428	417	msgstr "&Трэкінг багаў (Інтэграцыя з багтрэкерам)"
429	418
430		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1051)
	419	+#. Resource IDs: (1051)
431	420	msgid "&CD-ROM"
432	421	msgstr "&CD-ROM"
433	422
434		-#. Resource IDs: (Dialog IDD_ADD: Control id 2, Dialog IDD_GOOFFLINE: Control
435		-#. id 2, IDS_MERGE_WCDIRTYASK_TASK4, IDS_MONITOR_DELETE_TASK4,
436		-#. IDS_MSGBOX_CANCEL, IDS_WARN_LOCKOUTDATED_TASK4)
	423	+#. Resource IDs: (1032, 1475, 2, 4461, 9002)
437	424	msgid "&Cancel"
438	425	msgstr "&Скасаваць"
439	426
440		-#. Resource IDs: (IDS_PROC_EXPORTUNVERSION_TASK4)
	427	+#. Resource IDs: (1588)
441	428	msgid ""
442	429	"&Cancel\n"
443	430	"Choose a different folder to export to"
444	431	msgstr ""
445	432
446		-#. Resource IDs: (IDS_PROGRS_COMMITT_TRUNK_TASK4)
	433	+#. Resource IDs: (3523)
447	434	msgid ""
448	435	"&Cancel\n"
449	436	"Do not commit to a tag."
450	437	msgstr ""
451	438
452		-#. Resource IDs: (IDS_PROC_REMOVEFORCE_TASK4)
	439	+#. Resource IDs: (2345)
453	440	msgid ""
454	441	"&Cancel\n"
455	442	"Do not remove"
456	443	msgstr ""
457	444
458		-#. Resource IDs: (IDS_LOG_REVERT_CONFIRM_TASK4)
	445	+#. Resource IDs: (1899)
459	446	msgid ""
460	447	"&Cancel\n"
461	448	"Do not revert."
462	449	msgstr ""
463	450
464		-#. Resource IDs: (IDS_MSG_NEEDSUPDATE_TASK4)
	451	+#. Resource IDs: (1434)
465	452	msgid ""
466	453	"&Cancel\n"
467	454	"Do not update the working copy."
468	455	msgstr ""
469	456
470		-#. Resource IDs: (IDS_PROC_RESOLVE_TASK4)
	457	+#. Resource IDs: (2357)
471	458	msgid ""
472	459	"&Cancel\n"
473	460	"Don't resolve the item."
474	461	msgstr ""
475	462
476		-#. Resource IDs: (IDS_STATUSLIST_WARN_MAXDIFF_TASK4)
	463	+#. Resource IDs: (3423)
477	464	msgid ""
478	465	"&Cancel\n"
479	466	"Don't show the diff."
480	467	msgstr ""
481	468
482		-#. Resource IDs: (IDS_COMMITDLG_WARNNOISSUE_TASK4)
	469	+#. Resource IDs: (2754)
483	470	msgid ""
484	471	"&Cancel\n"
485	472	"Go back and enter an issue number."
486	473	msgstr ""
487	474
488		-#. Resource IDs: (IDS_WARN_FOLDERNOTEMPTY_TASK4)
	475	+#. Resource IDs: (1431)
489	476	msgid ""
490	477	"&Cancel\n"
491	478	"Go back and select a different folder."
492	479	msgstr ""
493	480
494		-#. Resource IDs: (IDS_WARN_NOVALIDPATH_TASK4)
	481	+#. Resource IDs: (1418)
495	482	msgid ""
496	483	"&Cancel\n"
497	484	"I will enter a different path/URL."
498	485	msgstr ""
499	486
500		-#. Resource IDs: (IDS_WARN_RELOCATEREALLY_TASK4)
	487	+#. Resource IDs: (1423)
501	488	msgid ""
502	489	"&Cancel\n"
503	490	"Keep the current URL."
504	491	msgstr ""
505	492
506		-#. Resource IDs: (IDS_SETTINGS_CACHEDELETEQUESTION_TASK4)
	493	+#. Resource IDs: (3182)
507	494	msgid ""
508	495	"&Cancel\n"
509	496	"Leave the cache on disk."
510	497	msgstr ""
511	498
512		-#. Resource IDs: (IDS_PROC_WARNREVERT_TASK4)
	499	+#. Resource IDs: (2352)
513	500	msgid ""
514	501	"&Cancel\n"
515	502	"Local modifications are kept."
516	503	msgstr ""
517	504
518		-#. Resource IDs: (IDS_PROGRS_REVERTMARKERS_TASK4)
	505	+#. Resource IDs: (3609)
519	506	msgid ""
520	507	"&Cancel\n"
521	508	"The conflict is not resolved."
522	509	msgstr ""
523	510
524		-#. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM_TASK4)
	511	+#. Resource IDs: (1437)
525	512	msgid ""
526	513	"&Cancel\n"
527	514	"The file is not copied."
528	515	msgstr ""
529	516
530		-#. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_TASK5)
	517	+#. Resource IDs: (1442)
531	518	msgid ""
532	519	"&Cancel\n"
533	520	"The folder is not exported."
534	521	msgstr ""
535	522
536		-#. Resource IDs: (IDS_REPOBROWSE_MULTIIMPORT_TASK4)
	523	+#. Resource IDs: (1674)
537	524	msgid ""
538	525	"&Cancel\n"
539	526	"The items are not imported."
540	527	msgstr ""
541	528
542		-#. Resource IDs: (IDS_ADJUST_EXTERNAL_AFTER_COMMIT_TASK4)
	529	+#. Resource IDs: (4603)
543	530	msgid ""
544	531	"&Cancel\n"
545	532	"The tagged revision of the external is left as is."
546	533	msgstr ""
547	534
548		-#. Resource IDs: (IDS_PROC_REPLACEEXISTING_TASK4)
	535	+#. Resource IDs: (2341)
549	536	msgid ""
550	537	"&Cancel\n"
551	538	"The target file is left as is"
552	539	msgstr ""
553	540
554		-#. Resource IDs: (IDS_COMMITDLG_WARNUNVERSIONEDFOLDER_TASK4)
	541	+#. Resource IDs: (2758)
555	542	msgid ""
556	543	"&Cancel\n"
557	544	"You have to add the folder manually."
558	545	msgstr ""
559	546
560		-#. Resource IDs: (IDS_DROPEXT_UPDATE_TASK4)
	547	+#. Resource IDs: (4654)
561	548	msgid ""
562	549	"&Cancel\n"
563	550	"You have to run an update yourself to get the externals"
564	551	msgstr ""
565	552
566		-#. Resource IDs: (IDS_PROC_UPGRADECONFIRMATION_TASK4)
	553	+#. Resource IDs: (1584)
567	554	msgid ""
568	555	"&Cancel\n"
569	556	"keep the current format."
570	557	msgstr ""
571	558
572		-#. Resource IDs: (Dialog IDD_SHELVE: Control id 1678)
	559	+#. Resource IDs: (1678)
573	560	msgid "&Checkpoint"
574	561	msgstr ""
575	562
576		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1606)
	563	+#. Resource IDs: (1606)
577	564	msgid "&Choose items..."
578	565	msgstr ""
579	566
580		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1562)
	567	+#. Resource IDs: (1562)
581	568	msgid "&Clean up working copy status"
582	569	msgstr ""
583	570
584		-#. Resource IDs: (IDS_MENUCLEANUP)
	571	+#. Resource IDs: (126)
585	572	msgid "&Clean up..."
586	573	msgstr ""
587	574
588		-#. Resource IDs: (Dialog IDD_REVERT: Control id 1562)
	575	+#. Resource IDs: (1562)
589	576	msgid "&Clear Changelists"
590	577	msgstr ""
591	578
592		-#. Resource IDs: (58112, Dialog IDD_CHECKFORUPDATES: Control id 1, IDS_CLOSE)
	579	+#. Resource IDs: (1, 264, 58112)
593	580	msgid "&Close"
594	581	msgstr "&Зачыніць"
595	582
596		-#. Resource IDs: (Dialog IDD_COLLABORATORSETTINGS: Control id 65535)
	583	+#. Resource IDs: (65535)
597	584	msgid "&Collaborator username"
598	585	msgstr ""
599	586
600		-#. Resource IDs: (IDS_MENUCOMMIT)
	587	+#. Resource IDs: (122)
601	588	msgid "&Commit..."
602	589	msgstr "&Зафіксаваць..."
603	590
604		-#. Resource IDs: (IDS_REPOBROWSE_SHOWDIFF)
	591	+#. Resource IDs: (1614)
605	592	msgid "&Compare URLs"
606	593	msgstr "&Параўнаць URL-спасылкі"
607	594
608		-#. Resource IDs: (IDS_LOG_POPUP_COMPARETWO, IDS_REVGRAPH_POPUP_COMPAREREVS,
609		-#. ID_VIEW_COMPAREREVISIONS - Menu)
	595	+#. Resource IDs: (1214, 32783 - Menu, 4380)
610	596	msgid "&Compare revisions"
611	597	msgstr "&Параўнаць рэвізыі"
612	598
613		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1390, Dialog IDD_MERGEALL:
614		-#. Control id 1390, Dialog IDD_MERGEWIZARD_OPTIONS: Control id 1390)
	599	+#. Resource IDs: (1390)
615	600	msgid "&Compare whitespaces"
616	601	msgstr "&Параўнаць прагалы"
617	602
618		-#. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 1239)
	603	+#. Resource IDs: (1239)
619	604	msgid "&Configure"
620	605	msgstr "&Канфігураваць"
621	606
622		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 1227)
	607	+#. Resource IDs: (1227)
623	608	msgid "&Contact the repository on startup"
624	609	msgstr "&Злучаць рэпазыторый пры запуску"
625	610
626		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 1073)
	611	+#. Resource IDs: (1073)
627	612	msgid "&Convert files when diffing against BASE"
628	613	msgstr "&Пераўтвараць файлы пры параўнаньні з БАЗАй"
629	614
630		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 1471, Dialog
631		-#. IDD_SETTINGSHOOKS: Control id 1367, IDS_EDIT_COPY, ID_EDIT_COPY - Menu)
	615	+#. Resource IDs: (1367, 1471, IDS_EDIT_COPY, ID_EDIT_COPY - Menu)
632	616	msgid "&Copy"
633	617	msgstr "&Капіяваць"
634	618

		@@ -640,38 +624,35 @@
640	624	msgid "&Copy to clipboard"
641	625	msgstr "&Капіяваць у буфэр абмену"
642	626
643		-#. Resource IDs: (IDS_REPOBROWSE_COPY)
	627	+#. Resource IDs: (1603)
644	628	msgid "&Copy to..."
645	629	msgstr "&Капіяваць у..."
646	630
647		-#. Resource IDs: (Dialog IDD_REPOCREATEFINISHED: Control id 1542)
	631	+#. Resource IDs: (1542)
648	632	msgid "&Create folder structure"
649	633	msgstr "&Стварыць структуру тэчак"
650	634
651		-#. Resource IDs: (Dialog IDD_EDITPROPMIMETYPE: Control id 1560, Dialog
652		-#. IDD_SETTINGSPROGSDIFF: Control id 1097)
	635	+#. Resource IDs: (1097, 1560)
653	636	msgid "&Custom"
654	637	msgstr "&Кастамізаваць"
655	638
656		-#. Resource IDs: (Dialog IDD_REVISIONRANGE: Control id 1638, Dialog
657		-#. IDD_REVISIONRANGE: Control id 1641)
	639	+#. Resource IDs: (1638, 1641)
658	640	msgid "&Date"
659	641	msgstr "&Дата"
660	642
661		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1485)
	643	+#. Resource IDs: (1485)
662	644	msgid "&Days of inactivity until small caches get removed"
663	645	msgstr "&Праз колькі дзён неактыўнасьці ачышчаць малыя кэшы"
664	646
665		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1269)
	647	+#. Resource IDs: (1269)
666	648	msgid "&Default"
667	649	msgstr "&Па змоўчаньні"
668	650
669		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHELIST: Control id 1382,
670		-#. IDS_MENUREMOVE)
	651	+#. Resource IDs: (1382, 168)
671	652	msgid "&Delete"
672	653	msgstr "&Выдаліць"
673	654
674		-#. Resource IDs: (IDS_MENUREMOVEKEEP)
	655	+#. Resource IDs: (271)
675	656	msgid "&Delete (keep local)"
676	657	msgstr "&Выдаліць (захоўваць лякальна)"
677	658

		@@ -679,52 +660,51 @@
679	660	msgid "&Delete Filter"
680	661	msgstr ""
681	662
682		-#. Resource IDs: (Dialog IDD_REVERT: Control id 1514)
	663	+#. Resource IDs: (1514)
683	664	msgid "&Delete unversioned items..."
684	665	msgstr "&Выдаліць невэрсіфікаваныя элемэнты..."
685	666
686		-#. Resource IDs: (IDS_REPOBROWSE_DELETE)
	667	+#. Resource IDs: (1604)
687	668	msgid "&Delete..."
688	669	msgstr "&Выдаліць..."
689	670
690		-#. Resource IDs: (IDS_SETTINGS_CACHEDELETEQUESTION_TASK3)
	671	+#. Resource IDs: (3181)
691	672	msgid ""
692	673	"&Delete\n"
693	674	"Remove the cache files."
694	675	msgstr ""
695	676
696		-#. Resource IDs: (IDS_MENUDIFF)
	677	+#. Resource IDs: (176)
697	678	msgid "&Diff"
698	679	msgstr "&Параўнаць"
699	680
700		-#. Resource IDs: (IDS_MENUURLDIFF)
	681	+#. Resource IDs: (261)
701	682	msgid "&Diff with URL"
702	683	msgstr "&Параўнаць з URL"
703	684
704		-#. Resource IDs: (IDS_MENUPREVDIFF)
	685	+#. Resource IDs: (214)
705	686	msgid "&Diff with previous version"
706	687	msgstr "&Параўнаць з папярэдняй вэрсіяй"
707	688
708		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1528)
	689	+#. Resource IDs: (1528)
709	690	msgid "&Directories"
710	691	msgstr "&Каталёгі"
711	692
712		-#. Resource IDs: (Dialog IDD_RECYCLEBIN: Control id 1562)
	693	+#. Resource IDs: (1562)
713	694	msgid "&Do not ask again"
714	695	msgstr ""
715	696
716		-#. Resource IDs: (IDS_HOOKS_APPROVE_TASK4)
	697	+#. Resource IDs: (5803)
717	698	msgid ""
718	699	"&Don't run\n"
719	700	"Do not run the script"
720	701	msgstr ""
721	702
722		-#. Resource IDs: (ID_NEW_EOL - Menu)
	703	+#. Resource IDs: (32851 - Menu)
723	704	msgid "&EOL"
724	705	msgstr "&EOL"
725	706
726		-#. Resource IDs: (65535 - PopupMenu, Dialog IDD_SETTINGSMAIN: Control id 1031,
727		-#. IDS_REPOBROWSE_EDITFILE)
	707	+#. Resource IDs: (1031, 1692, 65535 - PopupMenu)
728	708	msgid "&Edit"
729	709	msgstr "&Рэдагаваць"
730	710

		@@ -732,25 +712,23 @@
732	712	msgid "&Edit Filter"
733	713	msgstr ""
734	714
735		-#. Resource IDs: (IDS_MENUCONFLICT)
	715	+#. Resource IDs: (186)
736	716	msgid "&Edit conflicts"
737	717	msgstr "&Рэдагаваць канфлікты"
738	718
739		-#. Resource IDs: (IDS_LOG_POPUP_MONITOREDIT)
	719	+#. Resource IDs: (1034)
740	720	msgid "&Edit project"
741	721	msgstr ""
742	722
743		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1282, Dialog
744		-#. IDD_EDITPROPEXTERNALS: Control id 1596, Dialog IDD_SETTINGSPROGSADV:
745		-#. Control id 1099, IDS_PROP_EDIT)
	723	+#. Resource IDs: (1099, 1282, 1596, 9902)
746	724	msgid "&Edit..."
747	725	msgstr "&Рэдагаваць..."
748	726
749		-#. Resource IDs: (Dialog IDD_RECYCLEBIN: Control id 1542)
	727	+#. Resource IDs: (1542)
750	728	msgid "&Empty the recycle bin now"
751	729	msgstr ""
752	730
753		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1023)
	731	+#. Resource IDs: (1023)
754	732	msgid "&Enable Proxy Server"
755	733	msgstr "&Уключыць Проксі Сэрвер"
756	734

		@@ -758,35 +736,33 @@
758	736	msgid "&Enable edit"
759	737	msgstr ""
760	738
761		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1434)
	739	+#. Resource IDs: (1434)
762	740	msgid "&Enable log caching"
763	741	msgstr "&Уключыць кэшаваньне лога"
764	742
765		-#. Resource IDs: (Dialog IDD_LOCK: Control id 1213)
	743	+#. Resource IDs: (1213)
766	744	msgid "&Enter a message describing why you are locking the file(s)."
767	745	msgstr "&Увядзіце тэкст з тлумачэньнем, чаму вы заблакавалі файл(ы)."
768	746
769		-#. Resource IDs: (Dialog IDD_EDITPROPEXECUTABLE: Control id 1554)
	747	+#. Resource IDs: (1554)
770	748	msgid "&Executable"
771	749	msgstr "&Выканальныя"
772	750
773		-#. Resource IDs: (ID_MENUEXIT - Menu)
	751	+#. Resource IDs: (32782 - Menu)
774	752	msgid "&Exit"
775	753	msgstr "&Выйсьці"
776	754
777		-#. Resource IDs: (IDS_FILEDIFF_POPEXPORT)
	755	+#. Resource IDs: (5152)
778	756	msgid "&Export selection to..."
779	757	msgstr "&Экспарт вылучанага ў..."
780	758
781		-#. Resource IDs: (IDS_WARN_FOLDERNOTEMPTY_TASK3_1)
	759	+#. Resource IDs: (1432)
782	760	msgid ""
783	761	"&Export\n"
784	762	"Export into the non-empty folder."
785	763	msgstr ""
786	764
787		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 1092, Dialog
788		-#. IDD_SETTINGSPROGSDIFF: Control id 1094, Dialog IDD_SETTINGSPROGSMERGE:
789		-#. Control id 1095)
	765	+#. Resource IDs: (1092, 1094, 1095)
790	766	msgid "&External"
791	767	msgstr "&Зьнешняе"
792	768

		@@ -794,11 +770,11 @@
794	770	msgid "&File"
795	771	msgstr "&Файл"
796	772
797		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1529)
	773	+#. Resource IDs: (1529)
798	774	msgid "&Files"
799	775	msgstr "&Файлы"
800	776
801		-#. Resource IDs: (ID_VIEW_FILTER - Menu)
	777	+#. Resource IDs: (32809 - Menu)
802	778	msgid "&Filter"
803	779	msgstr "&Фільтр"
804	780

		@@ -814,37 +790,35 @@
814	790	msgid "&Fit images in window\t(F)"
815	791	msgstr ""
816	792
817		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1646)
	793	+#. Resource IDs: (1646)
818	794	msgid "&Fix time stamps"
819	795	msgstr ""
820	796
821		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1050)
	797	+#. Resource IDs: (1050)
822	798	msgid "&Fixed drives"
823	799	msgstr "&Фіксаваныя дыскі"
824	800
825		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535)
	801	+#. Resource IDs: (65535)
826	802	msgid "&Font for log messages:"
827	803	msgstr "&Шрыфт паведамленьняў логу:"
828	804
829		-#. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535, Dialog
830		-#. IDD_SETTINGSTBLAME: Control id 65535, Dialog IDD_SETTINGSUDIFF: Control id
831		-#. 65535)
	805	+#. Resource IDs: (65535, Dialog IDD_SETMAINPAGE: Control id 65535)
832	806	msgid "&Font:"
833	807	msgstr "&Шрыфт:"
834	808
835		-#. Resource IDs: (Dialog IDD_RELOCATE: Control id 1530, IDS_COPYDLG_FROMURL)
	809	+#. Resource IDs: (1530, 8000)
836	810	msgid "&From URL:"
837	811	msgstr "&З URL:"
838	812
839		-#. Resource IDs: (Dialog IDD_COPY: Control id 1259)
	813	+#. Resource IDs: (1259)
840	814	msgid "&From WC / URL:"
841	815	msgstr "&З WC / URL:"
842	816
843		-#. Resource IDs: (Dialog IDD_BLAME: Control id 65535)
	817	+#. Resource IDs: (65535)
844	818	msgid "&From revision"
845	819	msgstr "&З рэвізыі"
846	820
847		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_TREE: Control id 1494)
	821	+#. Resource IDs: (1494)
848	822	msgid "&From: (start URL and revision of the range to merge)"
849	823	msgstr "&З: (пачатковы URL і рэвізыя дыяпазону для далучэньня)"
850	824

		@@ -852,29 +826,23 @@
852	826	msgid "&Go To Line...\t(Ctrl+G)"
853	827	msgstr ""
854	828
855		-#. Resource IDs: (ID_VIEW_GROUPBRANCHES - Menu)
	829	+#. Resource IDs: (32799 - Menu)
856	830	msgid "&Group by branch"
857	831	msgstr "&Згрупаваць па галінах"
858	832
859		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_TREE: Control id 1115)
	833	+#. Resource IDs: (1115)
860	834	msgid "&HEAD Revision"
861	835	msgstr "&ГАЛАЎНАЯ Рэвізыя"
862	836
863		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1032, Dialog IDD_CHECKOUT:
864		-#. Control id 1032, Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 1032, Dialog
865		-#. IDD_EXPORT: Control id 1032, Dialog IDD_REVISION: Control id 1032, Dialog
866		-#. IDD_REVISIONRANGE: Control id 1636, Dialog IDD_REVISIONRANGE: Control id
867		-#. 1639, Dialog IDD_SWITCH: Control id 1032, Dialog IDD_UPDATE: Control id
868		-#. 1032, Dialog IDD_URLDIFF: Control id 1032)
	837	+#. Resource IDs: (1032, 1636, 1639)
869	838	msgid "&HEAD revision"
870	839	msgstr "&ГАЛАЎНАЯ рэвізыя"
871	840
872		-#. Resource IDs: (Dialog IDD_COPY: Control id 1182)
	841	+#. Resource IDs: (1182)
873	842	msgid "&HEAD revision in the repository"
874	843	msgstr "&ГАЛАЎНАЯ рэвізыя ў рэпазыторыі"
875	844
876		-#. Resource IDs: (57670, 65535 - PopupMenu, Dialog IDD_ADD: Control id 9,
877		-#. Dialog IDD_CLEANUP: Control id 9, IDS_MENUHELP, ID_MENUHELP - Menu)
	845	+#. Resource IDs: (190, 32781 - Menu, 57670, 65535 - PopupMenu, 9)
878	846	msgid "&Help"
879	847	msgstr "&Дапамога"
880	848

		@@ -886,7 +854,7 @@
886	854	msgid "&Hide"
887	855	msgstr "&Схаваць"
888	856
889		-#. Resource IDs: (Dialog IDD_DELUNVERSIONED: Control id 1562)
	857	+#. Resource IDs: (1562)
890	858	msgid "&Hide ignored items"
891	859	msgstr ""
892	860

		@@ -894,24 +862,24 @@
894	862	msgid "&Hide/Show the patch file list"
895	863	msgstr ""
896	864
897		-#. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1170)
	865	+#. Resource IDs: (1170)
898	866	msgid "&Icon Set:"
899	867	msgstr "&Набор Значкоў:"
900	868
901		-#. Resource IDs: (IDS_MENUIGNOREMULTIPLE)
	869	+#. Resource IDs: (231)
902	870	#, c-format
903	871	msgid "&Ignore %d items by name"
904	872	msgstr "&Ігнараваць %d элемэнты паводле імя"
905	873
906		-#. Resource IDs: (Dialog IDD_SWITCH: Control id 1267)
	874	+#. Resource IDs: (1267)
907	875	msgid "&Ignore ancestry"
908	876	msgstr ""
909	877
910		-#. Resource IDs: (Dialog IDD_RECYCLEBIN: Control id 2)
	878	+#. Resource IDs: (2)
911	879	msgid "&Ignore and proceed"
912	880	msgstr ""
913	881
914		-#. Resource IDs: (IDS_MENUIGNOREMULTIPLE2)
	882	+#. Resource IDs: (283)
915	883	msgid "&Ignore multiple items by name"
916	884	msgstr ""
917	885

		@@ -919,29 +887,29 @@
919	887	msgid "&Image info\t(I)"
920	888	msgstr ""
921	889
922		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1461, IDS_MENUIMPORT)
	890	+#. Resource IDs: (131, 1461)
923	891	msgid "&Import..."
924	892	msgstr "&Імпарт..."
925	893
926		-#. Resource IDs: (IDS_REPOBROWSE_MULTIIMPORT_TASK3)
	894	+#. Resource IDs: (1673)
927	895	msgid ""
928	896	"&Import\n"
929	897	"The items are imported, creating a new revision for each item."
930	898	msgstr ""
931	899
932		-#. Resource IDs: (Dialog IDD_RELOCATE: Control id 1562)
	900	+#. Resource IDs: (1562)
933	901	msgid "&Include externals"
934	902	msgstr "&Уключыць зьнешняе"
935	903
936		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1480)
	904	+#. Resource IDs: (1480)
937	905	msgid "&Include merge info"
938	906	msgstr "&Уключыць дадзеныя аб зьліцьці"
939	907
940		-#. Resource IDs: (IDS_REVGRAPH_POPUP_JOIN_ALL)
	908	+#. Resource IDs: (4385)
941	909	msgid "&Join all"
942	910	msgstr "&Рэгістраваць усё"
943	911
944		-#. Resource IDs: (IDS_REVGRAPH_POPUP_JOIN_RIGHT)
	912	+#. Resource IDs: (4394)
945	913	msgid "&Join with sub-trees"
946	914	msgstr "&Рэгістраваць з суб-галінамі"
947	915

		@@ -949,11 +917,11 @@
949	917	msgid "&Jump to first difference when loading"
950	918	msgstr "&Перайсьці да першага адрозьненьня пасьля загрузкі"
951	919
952		-#. Resource IDs: (ID_NEW_KEYWORDS - Menu)
	920	+#. Resource IDs: (32852 - Menu)
953	921	msgid "&Keywords"
954	922	msgstr "&Ключавыя словы"
955	923
956		-#. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 65535)
	924	+#. Resource IDs: (65535)
957	925	msgid "&Language:"
958	926	msgstr "&Мова:"
959	927

		@@ -961,7 +929,7 @@
961	929	msgid "&Limit search to modified lines"
962	930	msgstr "&Абмежаваць пошук зьмененых радкоў"
963	931
964		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNSIZES: Control id 65535)
	932	+#. Resource IDs: (65535)
965	933	msgid "&Limit:"
966	934	msgstr "&Ліміт:"
967	935

		@@ -978,37 +946,35 @@
978	946	msgid "&Link image positions"
979	947	msgstr "&Злучыць пазыцыі выявы"
980	948
981		-#. Resource IDs: (Dialog IDD_EDITPROPEOL: Control id 1590)
	949	+#. Resource IDs: (1590)
982	950	msgid "&Linux (LF)"
983	951	msgstr "&Linux (LF)"
984	952
985		-#. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1172)
	953	+#. Resource IDs: (1172)
986	954	msgid "&List View"
987	955	msgstr "&Сьпіс"
988	956
989		-#. Resource IDs: (Dialog IDD_EDITPROPERTYVALUE: Control id 1309)
	957	+#. Resource IDs: (1309)
990	958	msgid "&Load..."
991	959	msgstr "&Загрузка..."
992	960
993		-#. Resource IDs: (Dialog IDD_EDITPROPNEEDSLOCK: Control id 1554)
	961	+#. Resource IDs: (1554)
994	962	msgid "&Locking required (read-only update)"
995	963	msgstr "&Неабходна блякаваньне (абнаўленьне толькі для чытаньня)"
996	964
997		-#. Resource IDs: (ID_NEW_LOGSIZES - Menu)
	965	+#. Resource IDs: (32854 - Menu)
998	966	msgid "&Log Sizes"
999	967	msgstr "&Памеры Логаў"
1000	968
1001		-#. Resource IDs: (Dialog IDD_SHELVE: Control id 1673, Dialog IDD_UNSHELVE:
1002		-#. Control id 1673)
	969	+#. Resource IDs: (1673)
1003	970	msgid "&Log message:"
1004	971	msgstr ""
1005	972
1006		-#. Resource IDs: (Dialog IDD_EDITPROPEOL: Control id 1591)
	973	+#. Resource IDs: (1591)
1007	974	msgid "&Mac (CR)"
1008	975	msgstr "&Mac (CR)"
1009	976
1010		-#. Resource IDs: (Dialog IDD_SWITCH: Control id 1562, Dialog IDD_UPDATE:
1011		-#. Control id 1562)
	977	+#. Resource IDs: (1562)
1012	978	msgid "&Make depth sticky"
1013	979	msgstr "&Прыляпіць глыбіню"
1014	980

		@@ -1016,11 +982,11 @@
1016	982	msgid "&Max line length for inline diffs"
1017	983	msgstr ""
1018	984
1019		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1486)
	985	+#. Resource IDs: (1486)
1020	986	msgid "&Maximum size [kByte] of a removed inactive cache"
1021	987	msgstr "&Максымальны памер [кБайтаў] неактыўнага кэшу для выдаленьня"
1022	988
1023		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 1, IDS_MERGE_MERGE)
	989	+#. Resource IDs: (1, 4454)
1024	990	msgid "&Merge"
1025	991	msgstr "&Аб’яднаць"
1026	992

		@@ -1028,7 +994,7 @@
1028	994	msgid "&Merge paths"
1029	995	msgstr "&Аб’яднаць шляхі"
1030	996
1031		-#. Resource IDs: (IDS_MENUMERGE)
	997	+#. Resource IDs: (129)
1032	998	msgid "&Merge..."
1033	999	msgstr "&Аб’яднаць..."
1034	1000

		@@ -1036,15 +1002,15 @@
1036	1002	msgid "&Merging"
1037	1003	msgstr "&Аб’яднаньне"
1038	1004
1039		-#. Resource IDs: (ID_NEW_MIMETYPE - Menu)
	1005	+#. Resource IDs: (32847 - Menu)
1040	1006	msgid "&Mime-Type"
1041	1007	msgstr "&Mime-Type"
1042	1008
1043		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 1493)
	1009	+#. Resource IDs: (1493)
1044	1010	msgid "&Modify color for tag copies"
1045	1011	msgstr "&Зьмяніць колер копій цэтлікаў"
1046	1012
1047		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 1492)
	1013	+#. Resource IDs: (1492)
1048	1014	msgid "&Modify color for trunk copies"
1049	1015	msgstr "&Зьмяніць колер копій ствала"
1050	1016

		@@ -1052,7 +1018,7 @@
1052	1018	msgid "&Moved blocks"
1053	1019	msgstr ""
1054	1020
1055		-#. Resource IDs: (Dialog IDD_UNSHELVE: Control id 1672)
	1021	+#. Resource IDs: (1672)
1056	1022	msgid "&Name"
1057	1023	msgstr ""
1058	1024

		@@ -1060,7 +1026,7 @@
1060	1026	msgid "&Navigate"
1061	1027	msgstr ""
1062	1028
1063		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1049)
	1029	+#. Resource IDs: (1049)
1064	1030	msgid "&Network drives"
1065	1031	msgstr "&Сеткавыя дыскі"
1066	1032

		@@ -1068,17 +1034,16 @@
1068	1034	msgid "&New "
1069	1035	msgstr "&Новае "
1070	1036
1071		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1310, Dialog
1072		-#. IDD_EDITPROPEXTERNALS: Control id 1542)
	1037	+#. Resource IDs: (1310, 1542)
1073	1038	msgid "&New..."
1074	1039	msgstr "&Новае..."
1075	1040
1076		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1208, IDS_LOG_SHOWNEXT)
	1041	+#. Resource IDs: (1208, 1836)
1077	1042	#, c-format
1078	1043	msgid "&Next %ld"
1079	1044	msgstr "&Наступны %ld"
1080	1045
1081		-#. Resource IDs: (IDS_PROPPAGE_NEXT)
	1046	+#. Resource IDs: (5301)
1082	1047	msgid "&Next >"
1083	1048	msgstr "&Наступны >"
1084	1049

		@@ -1086,55 +1051,27 @@
1086	1051	msgid "&Next Page"
1087	1052	msgstr "&Наступная Старонка"
1088	1053
1089		-#. Resource IDs: (Dialog IDD_EDITPROPNEEDSLOCK: Control id 1555)
	1054	+#. Resource IDs: (1555)
1090	1055	msgid "&No locking required"
1091	1056	msgstr "&Блякаваньне не патрэбнае"
1092	1057
1093		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1506)
	1058	+#. Resource IDs: (1506)
1094	1059	msgid "&None"
1095	1060	msgstr ""
1096	1061
1097		-#. Resource IDs: (Dialog IDD_EDITPROPEXECUTABLE: Control id 1555)
	1062	+#. Resource IDs: (1555)
1098	1063	msgid "&Not executable"
1099	1064	msgstr "&Не выканальны"
1100	1065
1101		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1566)
	1066	+#. Resource IDs: (1566)
1102	1067	msgid "&Numeric"
1103	1068	msgstr "&Лічбавы"
1104	1069
1105		-#. Resource IDs: (Dialog IDD_ABOUT: Control id 1, Dialog IDD_ADD: Control id
1106		-#. 1, Dialog IDD_BLAME: Control id 1, Dialog IDD_CHANGEDFILES: Control id 1,
1107		-#. Dialog IDD_CHECKOUT: Control id 1, Dialog IDD_CLEANUP: Control id 1, Dialog
1108		-#. IDD_COMMITDLG: Control id 1, Dialog IDD_COPY: Control id 1, Dialog
1109		-#. IDD_CREATECHANGELIST: Control id 1, Dialog IDD_CREATEPATCH: Control id 1,
1110		-#. Dialog IDD_DELUNVERSIONED: Control id 1, Dialog IDD_DIFFOPTIONS: Control id
1111		-#. 1, Dialog IDD_EDITPROPBUGTRAQ: Control id 1, Dialog IDD_EDITPROPEOL:
1112		-#. Control id 1, Dialog IDD_EDITPROPERTIES: Control id 1, Dialog
1113		-#. IDD_EDITPROPERTYVALUE: Control id 1, Dialog IDD_EDITPROPEXECUTABLE: Control
1114		-#. id 1, Dialog IDD_EDITPROPEXTERNALS: Control id 1, Dialog
1115		-#. IDD_EDITPROPEXTERNALSVALUE: Control id 1, Dialog IDD_EDITPROPKEYWORDS:
1116		-#. Control id 1, Dialog IDD_EDITPROPMIMETYPE: Control id 1, Dialog
1117		-#. IDD_EDITPROPNEEDSLOCK: Control id 1, Dialog IDD_EDITPROPTSVNLANG: Control
1118		-#. id 1, Dialog IDD_EDITPROPTSVNSIZES: Control id 1, Dialog IDD_EXPORT:
1119		-#. Control id 1, Dialog IDD_HISTORYDLG: Control id 1, Dialog IDD_IMPORT:
1120		-#. Control id 1, Dialog IDD_INPUTDLG: Control id 1, Dialog IDD_INPUTLOGDLG:
1121		-#. Control id 1, Dialog IDD_LOCK: Control id 1, Dialog IDD_LOGCACHESTATISTICS:
1122		-#. Control id 1, Dialog IDD_LOGMESSAGE: Control id 1, Dialog IDD_PROMPT:
1123		-#. Control id 1, Dialog IDD_PROPERTIES: Control id 1, Dialog IDD_RELOCATE:
1124		-#. Control id 1, Dialog IDD_RENAME: Control id 1, Dialog
1125		-#. IDD_REPOCREATEFINISHED: Control id 1, Dialog IDD_REPOSITORY_BROWSER:
1126		-#. Control id 1, Dialog IDD_RESOLVE: Control id 1, Dialog IDD_REVERT: Control
1127		-#. id 1607, Dialog IDD_REVGRAPHFILTER: Control id 1, Dialog IDD_REVISION:
1128		-#. Control id 1, Dialog IDD_REVISIONRANGE: Control id 1, Dialog
1129		-#. IDD_SIMPLEPROMPT: Control id 1, Dialog IDD_STATGRAPH: Control id 1, Dialog
1130		-#. IDD_SVNPROGRESS: Control id 1, Dialog IDD_SWITCH: Control id 1, Dialog
1131		-#. IDD_TOOLASSOC: Control id 1, Dialog IDD_UNLOCK: Control id 1, Dialog
1132		-#. IDD_UPDATE: Control id 1, Dialog IDD_URL: Control id 1, Dialog IDD_URLDIFF:
1133		-#. Control id 1, IDS_MSGBOX_OK)
	1070	+#. Resource IDs: (1, 1607, 9001)
1134	1071	msgid "&OK"
1135	1072	msgstr "&OK"
1136	1073
1137		-#. Resource IDs: (Dialog IDD_GOOFFLINE: Control id 1)
	1074	+#. Resource IDs: (1)
1138	1075	msgid "&Offline for now"
1139	1076	msgstr "&Зараз адлучаны"
1140	1077

		@@ -1142,8 +1079,7 @@
1142	1079	msgid "&One Page"
1143	1080	msgstr "&Адна Старонка"
1144	1081
1145		-#. Resource IDs: (IDS_LOG_POPUP_OPEN, IDS_REPOBROWSE_OPEN,
1146		-#. cmdOpen_LabelTitle_RESID)
	1082	+#. Resource IDs: (1602, 1804, cmdOpen_LabelTitle_RESID)
1147	1083	msgid "&Open"
1148	1084	msgstr "&Адчыніць"
1149	1085

		@@ -1151,15 +1087,15 @@
1151	1087	msgid "&Open\t(Ctrl+O)"
1152	1088	msgstr ""
1153	1089
1154		-#. Resource IDs: (Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 1602)
	1090	+#. Resource IDs: (1602)
1155	1091	msgid "&Operative:"
1156	1092	msgstr ""
1157	1093
1158		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 1382)
	1094	+#. Resource IDs: (1382)
1159	1095	msgid "&Options"
1160	1096	msgstr "&Наладкі"
1161	1097
1162		-#. Resource IDs: (ID_NEW_ADVANCED - Menu)
	1098	+#. Resource IDs: (32849 - Menu)
1163	1099	msgid "&Other"
1164	1100	msgstr ""
1165	1101

		@@ -1167,63 +1103,61 @@
1167	1103	msgid "&Overlay images\t(O)"
1168	1104	msgstr ""
1169	1105
1170		-#. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_TASK3)
	1106	+#. Resource IDs: (1440)
1171	1107	msgid ""
1172	1108	"&Overwrite\n"
1173	1109	"Replace the target folder."
1174	1110	msgstr ""
1175	1111
1176		-#. Resource IDs: (IDS_PROC_REPLACEEXISTING_TASK3)
	1112	+#. Resource IDs: (2340)
1177	1113	msgid ""
1178	1114	"&Overwrite\n"
1179	1115	"The target file gets replaced"
1180	1116	msgstr ""
1181	1117
1182		-#. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM_TASK3)
	1118	+#. Resource IDs: (1436)
1183	1119	msgid ""
1184	1120	"&Overwrite\n"
1185	1121	"The target file is replaced."
1186	1122	msgstr ""
1187	1123
1188		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1411, Dialog
1189		-#. IDD_SIMPLEPROMPT: Control id 65535)
	1124	+#. Resource IDs: (1411, 65535)
1190	1125	msgid "&Password:"
1191	1126	msgstr "&Пароль:"
1192	1127
1193		-#. Resource IDs: (IDS_EDIT_PASTE, IDS_MENUCLIPPASTE, IDS_SCIEDIT_PASTE,
1194		-#. ID_EDIT_PASTE - Menu)
	1128	+#. Resource IDs: (225, 6004, IDS_EDIT_PASTE, ID_EDIT_PASTE - Menu)
1195	1129	msgid "&Paste"
1196	1130	msgstr "&Уставіць"
1197	1131
1198		-#. Resource IDs: (Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 1600)
	1132	+#. Resource IDs: (1600)
1199	1133	msgid "&Peg:"
1200	1134	msgstr ""
1201	1135
1202		-#. Resource IDs: (Dialog IDD_GOOFFLINE: Control id 1382)
	1136	+#. Resource IDs: (1382)
1203	1137	msgid "&Permanently offline"
1204	1138	msgstr "&Увесь час адлучаны"
1205	1139
1206		-#. Resource IDs: (Dialog IDD_EDITPROPEOL: Control id 1588)
	1140	+#. Resource IDs: (1588)
1207	1141	msgid "&Platform dependent (native)"
1208	1142	msgstr "&Залежыць ад платформы (роднай)"
1209	1143
1210		-#. Resource IDs: (Dialog IDD_MONITOROPTIONS: Control id 1654)
	1144	+#. Resource IDs: (1654)
1211	1145	msgid "&Play sound on notification"
1212	1146	msgstr ""
1213	1147
1214		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1414)
	1148	+#. Resource IDs: (1414)
1215	1149	msgid "&Port:"
1216	1150	msgstr "&Порт:"
1217	1151
1218		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1489)
	1152	+#. Resource IDs: (1489)
1219	1153	msgid "&Power user defaults"
1220	1154	msgstr "&Наладкі прасунутых карыстальнікаў"
1221	1155
1222		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 1562)
	1156	+#. Resource IDs: (1562)
1223	1157	msgid "&Pre-fetch folders for faster browsing"
1224	1158	msgstr ""
1225	1159
1226		-#. Resource IDs: (Dialog IDD_DIFFOPTIONS: Control id 1676)
	1160	+#. Resource IDs: (1676)
1227	1161	msgid "&Pretty print"
1228	1162	msgstr ""
1229	1163

		@@ -1231,105 +1165,101 @@
1231	1165	msgid "&Print..."
1232	1166	msgstr "&Друк..."
1233	1167
1234		-#. Resource IDs: (IDS_HOOKFAILED_TASK4)
	1168	+#. Resource IDs: (5814)
1235	1169	msgid ""
1236	1170	"&Proceed anyway\n"
1237	1171	"Ignore the hook script and run the command anyway."
1238	1172	msgstr ""
1239	1173
1240		-#. Resource IDs: (IDS_WARN_NOVALIDPATH_TASK3)
	1174	+#. Resource IDs: (1417)
1241	1175	msgid ""
1242	1176	"&Proceed with the entered path\n"
1243	1177	"I'm aware of the possible problems."
1244	1178	msgstr ""
1245	1179
1246		-#. Resource IDs: (IDS_MERGE_WCDIRTYASK_TASK3)
	1180	+#. Resource IDs: (4460)
1247	1181	msgid "&Proceed with the merge."
1248	1182	msgstr ""
1249	1183
1250		-#. Resource IDs: (IDS_COMMITDLG_WARNNOISSUE_TASK3)
	1184	+#. Resource IDs: (2753)
1251	1185	msgid ""
1252	1186	"&Proceed without an issue number\n"
1253	1187	"The commit won't be assigned to an issue."
1254	1188	msgstr ""
1255	1189
1256		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1265)
	1190	+#. Resource IDs: (1265)
1257	1191	msgid "&Properties"
1258	1192	msgstr "&Уласьцівасьці"
1259	1193
1260		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 11021)
	1194	+#. Resource IDs: (11021)
1261	1195	msgid "&Properties..."
1262	1196	msgstr "&Уласьцівасьці..."
1263	1197
1264		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1246, Dialog IDD_COPY:
1265		-#. Control id 1246, Dialog IDD_IMPORT: Control id 1246, Dialog
1266		-#. IDD_INPUTLOGDLG: Control id 1246, Dialog IDD_LOCK: Control id 1246)
	1198	+#. Resource IDs: (1246)
1267	1199	msgid "&Recent messages"
1268	1200	msgstr "&Апошнія паведамленьні"
1269	1201
1270		-#. Resource IDs: (IDS_SCIEDIT_REDO)
	1202	+#. Resource IDs: (6001)
1271	1203	msgid "&Redo"
1272	1204	msgstr "&Вярнуць"
1273	1205
1274		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1382)
	1206	+#. Resource IDs: (1382)
1275	1207	msgid "&Refresh"
1276	1208	msgstr "&Абнавіць"
1277	1209
1278		-#. Resource IDs: (IDS_SSL_REJECT_TASK)
	1210	+#. Resource IDs: (2361)
1279	1211	msgid ""
1280	1212	"&Reject the certificate\n"
1281	1213	"Cancel the connection."
1282	1214	msgstr ""
1283	1215
1284		-#. Resource IDs: (IDS_WARN_RELOCATEREALLY_TASK3)
	1216	+#. Resource IDs: (1422)
1285	1217	msgid ""
1286	1218	"&Relocate\n"
1287	1219	"The working copy is relocated to the new URL."
1288	1220	msgstr ""
1289	1221
1290		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1562)
	1222	+#. Resource IDs: (1562)
1291	1223	msgid "&Remind me to enter a bug-ID"
1292	1224	msgstr "&Нагадаць мне ўвесьці bug-ID"
1293	1225
1294		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1285, Dialog
1295		-#. IDD_EDITPROPEXTERNALS: Control id 1597, Dialog IDD_SETTINGSPROGSADV:
1296		-#. Control id 1100, IDS_PROP_REMOVE)
	1226	+#. Resource IDs: (1100, 1285, 1597, 9901)
1297	1227	msgid "&Remove"
1298	1228	msgstr "&Выдаліць"
1299	1229
1300		-#. Resource IDs: (IDS_PROC_EXPORTUNVERSION_TASK3)
	1230	+#. Resource IDs: (1587)
1301	1231	msgid ""
1302	1232	"&Remove from version control\n"
1303	1233	"All .svn folders are removed"
1304	1234	msgstr ""
1305	1235
1306		-#. Resource IDs: (IDS_LOG_POPUP_MONITORREMOVE)
	1236	+#. Resource IDs: (1035)
1307	1237	msgid "&Remove project"
1308	1238	msgstr ""
1309	1239
1310		-#. Resource IDs: (IDS_PROC_REMOVEFORCE_TASK3)
	1240	+#. Resource IDs: (2344)
1311	1241	msgid ""
1312	1242	"&Remove\n"
1313	1243	"Force the removal"
1314	1244	msgstr ""
1315	1245
1316		-#. Resource IDs: (IDS_EDITPROPS_RECURSIVEREMOVE_TASK4)
	1246	+#. Resource IDs: (9411)
1317	1247	msgid ""
1318	1248	"&Remove\n"
1319	1249	"Remove the property only from this item."
1320	1250	msgstr ""
1321	1251
1322		-#. Resource IDs: (IDS_MONITOR_DELETE_TASK3)
	1252	+#. Resource IDs: (1031)
1323	1253	msgid ""
1324	1254	"&Remove\n"
1325	1255	"The project is removed. If it has sub-projects, those are removed as well."
1326	1256	msgstr ""
1327	1257
1328		-#. Resource IDs: (IDS_REPOBROWSE_RENAME)
	1258	+#. Resource IDs: (1606)
1329	1259	msgid "&Rename"
1330	1260	msgstr "&Перайменаваць"
1331	1261
1332		-#. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_TASK4)
	1262	+#. Resource IDs: (1441)
1333	1263	#, c-format
1334	1264	msgid ""
1335	1265	"&Rename\n"

		@@ -1340,68 +1270,61 @@
1340	1270	msgid "&Replace"
1341	1271	msgstr ""
1342	1272
1343		-#. Resource IDs: (IDS_MENUREPOBROWSE)
	1273	+#. Resource IDs: (201)
1344	1274	msgid "&Repo-browser"
1345	1275	msgstr "&Repo-браўзэр"
1346	1276
1347		-#. Resource IDs: (IDS_PROC_RESOLVE_TASK3)
	1277	+#. Resource IDs: (2356)
1348	1278	msgid ""
1349	1279	"&Resolve\n"
1350	1280	"The item is marked as resolved."
1351	1281	msgstr ""
1352	1282
1353		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1488)
	1283	+#. Resource IDs: (1488)
1354	1284	msgid "&Restore defaults"
1355	1285	msgstr "&Аднавіць Змоўчаньні"
1356	1286
1357		-#. Resource IDs: (Dialog IDD_GOOFFLINE: Control id 1542)
	1287	+#. Resource IDs: (1542)
1358	1288	msgid "&Retry"
1359	1289	msgstr ""
1360	1290
1361		-#. Resource IDs: (Dialog IDD_SVNPROGRESS: Control id 1545)
	1291	+#. Resource IDs: (1545)
1362	1292	msgid "&Retry as different user"
1363	1293	msgstr ""
1364	1294
1365		-#. Resource IDs: (Dialog IDD_SVNPROGRESS: Control id 1542,
1366		-#. IDS_MSGBOX_RETRYWITHOUTHOOKS)
	1295	+#. Resource IDs: (1542, 9020)
1367	1296	msgid "&Retry without hooks"
1368	1297	msgstr "&Паўтарыць без гачыкаў"
1369	1298
1370		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1529)
	1299	+#. Resource IDs: (1529)
1371	1300	msgid "&Revert all changes recursively"
1372	1301	msgstr ""
1373	1302
1374		-#. Resource IDs: (IDS_LOG_POPUP_REVERTREVS)
	1303	+#. Resource IDs: (1808)
1375	1304	msgid "&Revert changes from these revisions"
1376	1305	msgstr "&Адмяніць зьмены з гэтых рэвізыяў"
1377	1306
1378		-#. Resource IDs: (IDS_LOG_POPUP_REVERTREV)
	1307	+#. Resource IDs: (1801)
1379	1308	msgid "&Revert changes from this revision"
1380	1309	msgstr "&Адмяніць зьмены з гэтай рэвізыі"
1381	1310
1382		-#. Resource IDs: (IDS_LOG_REVERT_CONFIRM_TASK3)
	1311	+#. Resource IDs: (1898)
1383	1312	msgid ""
1384	1313	"&Revert\n"
1385	1314	"Changes will be applied to the working copy."
1386	1315	msgstr ""
1387	1316
1388		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1033, Dialog IDD_CHECKOUT:
1389		-#. Control id 1033, Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 1033, Dialog
1390		-#. IDD_EXPORT: Control id 1033, Dialog IDD_MERGEWIZARD_TREE: Control id 1116,
1391		-#. Dialog IDD_REVISION: Control id 1033, Dialog IDD_REVISIONRANGE: Control id
1392		-#. 1637, Dialog IDD_REVISIONRANGE: Control id 1640, Dialog IDD_SWITCH: Control
1393		-#. id 1033, Dialog IDD_UPDATE: Control id 1033, Dialog IDD_URLDIFF: Control id
1394		-#. 1033)
	1317	+#. Resource IDs: (1033, 1116, 1637, 1640)
1395	1318	msgid "&Revision"
1396	1319	msgstr "&Рэвізыя"
1397	1320
1398		-#. Resource IDs: (IDS_HOOKS_APPROVE_TASK3)
	1321	+#. Resource IDs: (5802)
1399	1322	msgid ""
1400	1323	"&Run\n"
1401	1324	"Run the hook script"
1402	1325	msgstr ""
1403	1326
1404		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 65535)
	1327	+#. Resource IDs: (65535)
1405	1328	msgid "&SSH client:"
1406	1329	msgstr "&SSH-кліент:"
1407	1330

		@@ -1413,54 +1336,51 @@
1413	1336	msgid "&Save"
1414	1337	msgstr "&Захаваць"
1415	1338
1416		-#. Resource IDs: (Dialog IDD_PROMPT: Control id 1023, Dialog IDD_SIMPLEPROMPT:
1417		-#. Control id 1023)
	1339	+#. Resource IDs: (1023)
1418	1340	msgid "&Save authentication"
1419	1341	msgstr "&Захаваць аўтэнтыфікацыю"
1420	1342
1421		-#. Resource IDs: (IDS_REVGRAPH_SAVEPIC, ID_FILE_SAVEGRAPHAS - Menu,
1422		-#. ID_FILE_SAVESTATGRAPHAS - Menu)
	1343	+#. Resource IDs: (32771 - Menu, 32806 - Menu, 4351)
1423	1344	msgid "&Save graph as..."
1424	1345	msgstr "&Захаваць граф як..."
1425	1346
1426		-#. Resource IDs: (IDS_FILEDIFF_POPSAVELIST)
	1347	+#. Resource IDs: (5151)
1427	1348	msgid "&Save list of selected files to..."
1428	1349	msgstr "&Захаваць сьпіс абраных файлаў у..."
1429	1350
1430		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1308,
1431		-#. IDS_PROP_SAVEVALUE)
	1351	+#. Resource IDs: (1308, 9900)
1432	1352	msgid "&Save value..."
1433	1353	msgstr "&Захаваць значэньне..."
1434	1354
1435		-#. Resource IDs: (IDS_MENUSETTINGS, ID_FILE_SETTINGS - Menu)
	1355	+#. Resource IDs: (133, ID_FILE_SETTINGS - Menu)
1436	1356	msgid "&Settings"
1437	1357	msgstr "&Налады"
1438	1358
1439		-#. Resource IDs: (Dialog IDD_SHELVE: Control id 1)
	1359	+#. Resource IDs: (1)
1440	1360	msgid "&Shelve"
1441	1361	msgstr ""
1442	1362
1443		-#. Resource IDs: (ID_REFRESHBROWSER - Menu)
	1363	+#. Resource IDs: (32815 - Menu)
1444	1364	msgid "&Show HEAD revisions"
1445	1365	msgstr "&Паказаць галаўныя рэвізіі"
1446	1366
1447		-#. Resource IDs: (Dialog IDD_REVISION: Control id 1132)
	1367	+#. Resource IDs: (1132)
1448	1368	msgid "&Show Log"
1449	1369	msgstr "&Паказаць Лог"
1450	1370
1451		-#. Resource IDs: (ID_POPUP_SHOWMONITOR - Menu)
	1371	+#. Resource IDs: (32873 - Menu)
1452	1372	msgid "&Show Monitor"
1453	1373	msgstr ""
1454	1374
1455		-#. Resource IDs: (Dialog IDD_MONITOROPTIONS: Control id 1529)
	1375	+#. Resource IDs: (1529)
1456	1376	msgid "&Show popup notifications"
1457	1377	msgstr ""
1458	1378
1459		-#. Resource IDs: (Dialog IDD_COPY: Control id 1185)
	1379	+#. Resource IDs: (1185)
1460	1380	msgid "&Specific revision in repository"
1461	1381	msgstr "&Азначаная рэвізыя ў рэпазыторыі"
1462	1382
1463		-#. Resource IDs: (Dialog IDD_REPOCREATEFINISHED: Control id 1605)
	1383	+#. Resource IDs: (1605)
1464	1384	msgid "&Start Repobrowser"
1465	1385	msgstr "&Запусьціць Repo-браўзэр"
1466	1386

		@@ -1468,27 +1388,27 @@
1468	1388	msgid "&Status Bar"
1469	1389	msgstr ""
1470	1390
1471		-#. Resource IDs: (Dialog IDD_LOCK: Control id 1211)
	1391	+#. Resource IDs: (1211)
1472	1392	msgid "&Steal the locks"
1473	1393	msgstr "&Перахапіць блякаваньні"
1474	1394
1475		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1130)
	1395	+#. Resource IDs: (1130)
1476	1396	msgid "&Stop on copy/rename"
1477	1397	msgstr "&Спыніць капіяваньне/перайменаваньне"
1478	1398
1479		-#. Resource IDs: (Dialog IDD_COLLABORATORSETTINGS: Control id 65535)
	1399	+#. Resource IDs: (65535)
1480	1400	msgid "&Subversion username"
1481	1401	msgstr ""
1482	1402
1483		-#. Resource IDs: (IDS_REVGRAPH_POPUP_SWITCH)
	1403	+#. Resource IDs: (4400)
1484	1404	msgid "&Switch WC to path and revision"
1485	1405	msgstr "&Пераключыць WC на прахон і рэвізію"
1486	1406
1487		-#. Resource IDs: (IDS_REVGRAPH_POPUP_SWITCHTOHEAD)
	1407	+#. Resource IDs: (4399)
1488	1408	msgid "&Switch WC to path@HEAD"
1489	1409	msgstr ""
1490	1410
1491		-#. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1173)
	1411	+#. Resource IDs: (1173)
1492	1412	msgid "&Symbol View"
1493	1413	msgstr "&Сымбальны Прагляд"
1494	1414

		@@ -1496,41 +1416,39 @@
1496	1416	msgid "&Tab size:"
1497	1417	msgstr ""
1498	1418
1499		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 65535)
	1419	+#. Resource IDs: (65535)
1500	1420	msgid "&Tags"
1501	1421	msgstr "&Цэтлікі"
1502	1422
1503		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_OPTIONS: Control id 1382)
	1423	+#. Resource IDs: (1382)
1504	1424	msgid "&Test merge"
1505	1425	msgstr "&Праверыць аб’яднаньне"
1506	1426
1507		-#. Resource IDs: (Dialog IDD_EDITPROPMIMETYPE: Control id 1558)
	1427	+#. Resource IDs: (1558)
1508	1428	msgid "&Text"
1509	1429	msgstr "&Тэкст"
1510	1430
1511		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1438)
	1431	+#. Resource IDs: (1438)
1512	1432	msgid "&Timeout in seconds before updating the HEAD revision"
1513	1433	msgstr ""
1514	1434
1515		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 1222)
	1435	+#. Resource IDs: (1222)
1516	1436	msgid "&Timeout in seconds to stop the auto-completion parsing"
1517	1437	msgstr "&Timeout in seconds to stop the auto-completion parsing"
1518	1438
1519		-#. Resource IDs: (Dialog IDD_BLAME: Control id 65535)
	1439	+#. Resource IDs: (65535)
1520	1440	msgid "&To Revision"
1521	1441	msgstr "&У Рэвізыю"
1522	1442
1523		-#. Resource IDs: (Dialog IDD_RELOCATE: Control id 1384, Dialog IDD_URLDIFF:
1524		-#. Control id 1305)
	1443	+#. Resource IDs: (1305, 1384)
1525	1444	msgid "&To URL:"
1526	1445	msgstr "&У URL:"
1527	1446
1528		-#. Resource IDs: (Dialog IDD_COPY: Control id 1384, Dialog IDD_SWITCH: Control
1529		-#. id 1305)
	1447	+#. Resource IDs: (1305, 1384)
1530	1448	msgid "&To path:"
1531	1449	msgstr "&У тэчку:"
1532	1450
1533		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_TREE: Control id 1495)
	1451	+#. Resource IDs: (1495)
1534	1452	msgid "&To: (end URL and revision of the range to merge)"
1535	1453	msgstr "&У: (канец URL і рэвізыі абсягу далучэньня)"
1536	1454

		@@ -1538,25 +1456,23 @@
1538	1456	msgid "&Toolbar"
1539	1457	msgstr ""
1540	1458
1541		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1567)
	1459	+#. Resource IDs: (1567)
1542	1460	msgid "&Top"
1543	1461	msgstr "&Верхні"
1544	1462
1545		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 1091, Dialog
1546		-#. IDD_SETTINGSPROGSDIFF: Control id 1093, Dialog IDD_SETTINGSPROGSMERGE:
1547		-#. Control id 1094)
	1463	+#. Resource IDs: (1091, 1093, 1094)
1548	1464	msgid "&TortoiseMerge"
1549	1465	msgstr "&TortoiseMerge"
1550	1466
1551		-#. Resource IDs: (IDS_MENUSUBMENU)
	1467	+#. Resource IDs: (135)
1552	1468	msgid "&TortoiseSVN"
1553	1469	msgstr "&TortoiseSVN"
1554	1470
1555		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 1096)
	1471	+#. Resource IDs: (1096)
1556	1472	msgid "&TortoiseUDiff"
1557	1473	msgstr "&TortoiseUDiff"
1558	1474
1559		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 65535)
	1475	+#. Resource IDs: (65535)
1560	1476	msgid "&Trunk"
1561	1477	msgstr "&Ствол"
1562	1478

		@@ -1564,86 +1480,81 @@
1564	1480	msgid "&Two Page"
1565	1481	msgstr "&Двухстаронкавы"
1566	1482
1567		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1376, Dialog IDD_EXPORT:
1568		-#. Control id 1394, Dialog IDD_IMPORT: Control id 1058)
	1483	+#. Resource IDs: (1058, 1376, 1394)
1569	1484	msgid "&URL of repository:"
1570	1485	msgstr "&URL рэпазыторыя:"
1571	1486
1572		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1561, Dialog
1573		-#. IDD_EDITPROPEXTERNALSVALUE: Control id 1305, Dialog IDD_URL: Control id
1574		-#. 1076)
	1487	+#. Resource IDs: (1076, 1305, 1561)
1575	1488	msgid "&URL:"
1576	1489	msgstr "&URL:"
1577	1490
1578		-#. Resource IDs: (IDS_SCIEDIT_UNDO, ID_EDIT_UNDO - Menu)
	1491	+#. Resource IDs: (6000, ID_EDIT_UNDO - Menu)
1579	1492	msgid "&Undo"
1580	1493	msgstr "&Скасаваць"
1581	1494
1582		-#. Resource IDs: (IDS_REVGRAPH_POPUP_UNIDIFFREVS, ID_VIEW_UNIFIEDDIFF - Menu)
	1495	+#. Resource IDs: (32785 - Menu, 4382)
1583	1496	msgid "&Unified diff"
1584	1497	msgstr "&Адзіныя змены"
1585	1498
1586		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1061)
	1499	+#. Resource IDs: (1061)
1587	1500	msgid "&Unknown drives"
1588	1501	msgstr "&Невядомыя носьбіты"
1589	1502
1590		-#. Resource IDs: (IDS_MENUUPDATE)
	1503	+#. Resource IDs: (121)
1591	1504	msgid "&Update"
1592	1505	msgstr "&Абнаўленьне"
1593	1506
1594		-#. Resource IDs: (ID_POPUP_UPDATEALL - Menu)
	1507	+#. Resource IDs: (32877 - Menu)
1595	1508	msgid "&Update all"
1596	1509	msgstr ""
1597	1510
1598		-#. Resource IDs: (IDS_LOG_POPUP_UPDATE)
	1511	+#. Resource IDs: (1215)
1599	1512	msgid "&Update item to revision"
1600	1513	msgstr ""
1601	1514
1602		-#. Resource IDs: (IDS_LOG_POPUP_UPDATEREV)
	1515	+#. Resource IDs: (1823)
1603	1516	msgid "&Update item to revision..."
1604	1517	msgstr "&Абнавіць элемэнт да рэвізыі..."
1605	1518
1606		-#. Resource IDs: (IDS_MENUUPDATEEXT)
	1519	+#. Resource IDs: (170)
1607	1520	msgid "&Update to revision..."
1608	1521	msgstr "&Абнавіць да рэвізыі..."
1609	1522
1610		-#. Resource IDs: (IDS_WARN_LOCKOUTDATED_TASK3)
	1523	+#. Resource IDs: (1474)
1611	1524	msgid ""
1612	1525	"&Update\n"
1613	1526	"Update the file and try locking again."
1614	1527	msgstr ""
1615	1528
1616		-#. Resource IDs: (IDS_MSG_NEEDSUPDATE_TASK3)
	1529	+#. Resource IDs: (1433)
1617	1530	msgid ""
1618	1531	"&Update\n"
1619	1532	"Update the working copy and reopen the commit dialog to try again."
1620	1533	msgstr ""
1621	1534
1622		-#. Resource IDs: (IDS_DROPEXT_UPDATE_TASK3)
	1535	+#. Resource IDs: (4653)
1623	1536	msgid ""
1624	1537	"&Update\n"
1625	1538	"Update to the HEAD revision"
1626	1539	msgstr ""
1627	1540
1628		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 1184)
	1541	+#. Resource IDs: (1184)
1629	1542	msgid "&Use auto-completion of file paths and keywords"
1630	1543	msgstr "&Карыстацца аўтадапісваньнем шляху і ключавых словаў"
1631	1544
1632		-#. Resource IDs: (Dialog IDD_DELUNVERSIONED: Control id 1432)
	1545	+#. Resource IDs: (1432)
1633	1546	msgid "&Use recycle bin"
1634	1547	msgstr "&Выкарыстаць сьметніцу"
1635	1548
1636		-#. Resource IDs: (Dialog IDD_PROMPT: Control id 1005, Dialog
1637		-#. IDD_SETTINGSPROXY: Control id 1410, Dialog IDD_SIMPLEPROMPT: Control id
1638		-#. 65535)
	1549	+#. Resource IDs: (1005, 1410, 65535)
1639	1550	msgid "&Username:"
1640	1551	msgstr "&Імя карыстальніка:"
1641	1552
1642		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1647)
	1553	+#. Resource IDs: (1647)
1643	1554	msgid "&Vacuum pristine copies"
1644	1555	msgstr ""
1645	1556
1646		-#. Resource IDs: (Dialog IDD_UNSHELVE: Control id 1674)
	1557	+#. Resource IDs: (1674)
1647	1558	msgid "&Version"
1648	1559	msgstr ""
1649	1560

		@@ -1655,24 +1566,24 @@
1655	1566	msgid "&Whole word"
1656	1567	msgstr "&Усё слова"
1657	1568
1658		-#. Resource IDs: (Dialog IDD_EDITPROPEOL: Control id 1589)
	1569	+#. Resource IDs: (1589)
1659	1570	msgid "&Windows (CRLF)"
1660	1571	msgstr "&Windows (CRLF)"
1661	1572
1662		-#. Resource IDs: (Dialog IDD_COPY: Control id 1183)
	1573	+#. Resource IDs: (1183)
1663	1574	msgid "&Working copy"
1664	1575	msgstr "&Працоўная копія"
1665	1576
1666		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1540)
	1577	+#. Resource IDs: (1540)
1667	1578	msgid "&file list control"
1668	1579	msgstr "&кантроль сьпісу файлаў"
1669	1580
1670		-#. Resource IDs: (IDS_MONITOR_NOTIFY_TEXT)
	1581	+#. Resource IDs: (1024)
1671	1582	#, c-format
1672	1583	msgid "'%ls' : %ld new commits"
1673	1584	msgstr ""
1674	1585
1675		-#. Resource IDs: (IDS_ERR_MUSTBEURLORPATH)
	1586	+#. Resource IDs: (1337)
1676	1587	#, c-format
1677	1588	msgid ""
1678	1589	"'%ls'\n"

		@@ -1679,65 +1590,65 @@
1679	1590	"is not a valid URL or path!"
1680	1591	msgstr ""
1681	1592
1682		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_SKIPRANGES)
	1593	+#. Resource IDs: (5406)
1683	1594	msgid ""
1684	1595	"'skip ranges' are used to mark revision ranges that have not been cached yet"
1685	1596	msgstr ""
1686	1597
1687		-#. Resource IDs: (IDS_REVGRAPH_TAGATTRIBUTED)
	1598	+#. Resource IDs: (4349)
1688	1599	#, c-format
1689	1600	msgid "(%1!ls!) %2!ls!"
1690	1601	msgstr "(%1!ls!) %2!ls!"
1691	1602
1692		-#. Resource IDs: (IDS_LOG_CLEARERROR)
	1603	+#. Resource IDs: (1895)
1693	1604	msgid "(Double-click to clear error message)"
1694	1605	msgstr "(Пстрыкніце двойчы для ачысткі паведамленьня пра памылку)"
1695	1606
1696		-#. Resource IDs: (IDS_EDITPROPS_BINVALUE, IDS_PROPBIN)
	1607	+#. Resource IDs: (263, 9420)
1697	1608	msgid "(binary value)"
1698	1609	msgstr "(двайковае значэньне)"
1699	1610
1700		-#. Resource IDs: (IDS_CONTENTANDPROP)
	1611	+#. Resource IDs: (7004)
1701	1612	msgid "(content and properties)"
1702	1613	msgstr ""
1703	1614
1704		-#. Resource IDs: (IDS_CONTENTONLY)
	1615	+#. Resource IDs: (7002)
1705	1616	msgid "(content only)"
1706	1617	msgstr ""
1707	1618
1708		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_COPY)
	1619	+#. Resource IDs: (4422)
1709	1620	msgid "(copy)"
1710	1621	msgstr "(копія)"
1711	1622
1712		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_BRANCH)
	1623	+#. Resource IDs: (4421)
1713	1624	msgid "(create branch)"
1714	1625	msgstr "(стварыць галіну)"
1715	1626
1716		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_ADDED)
	1627	+#. Resource IDs: (4429)
1717	1628	msgid "(created)"
1718	1629	msgstr "(створана)"
1719	1630
1720		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_DELETE)
	1631	+#. Resource IDs: (4428)
1721	1632	msgid "(delete)"
1722	1633	msgstr "(выдаліць)"
1723	1634
1724		-#. Resource IDs: (IDS_STATUSLIST_EXTERNAL_GROUP)
	1635	+#. Resource IDs: (3414)
1725	1636	msgid "(externals)"
1726	1637	msgstr "(пашырэньні)"
1727	1638
1728		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_MODIFIED)
	1639	+#. Resource IDs: (4426)
1729	1640	msgid "(modified)"
1730	1641	msgstr "(зьменена)"
1731	1642
1732		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_HEAD)
	1643	+#. Resource IDs: (4425)
1733	1644	msgid "(modified, HEAD revision)"
1734	1645	msgstr "(зьменена, ГАЛАЎНАЯ рэвізыя)"
1735	1646
1736		-#. Resource IDs: (IDS_STATUSLIST_MULTIPLETARGETS)
	1647	+#. Resource IDs: (3320)
1737	1648	msgid "(multiple targets selected)"
1738	1649	msgstr "(абрана некалькі мэтаў)"
1739	1650
1740		-#. Resource IDs: (IDS_STATUSLIST_UNASSIGNED_CHANGESET)
	1651	+#. Resource IDs: (3405)
1741	1652	msgid "(no changelist)"
1742	1653	msgstr "(няма сьпісу зьменаў)"
1743	1654

		@@ -1745,15 +1656,15 @@
1745	1656	msgid "(no line number)"
1746	1657	msgstr "(няма нумару радка)"
1747	1658
1748		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_COPYSOURCE)
	1659	+#. Resource IDs: (4427)
1749	1660	msgid "(no modification but copy created from here)"
1750	1661	msgstr "(бяз зьменаў, але копія зробленая адсюль)"
1751	1662
1752		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_WORKINGCOPY)
	1663	+#. Resource IDs: (4437)
1753	1664	msgid "(no modification but relevant for working copy)"
1754	1665	msgstr "(бяз зьменаў і адпавядае працоўнай копіі)"
1755	1666
1756		-#. Resource IDs: (IDS_STATUSLIST_NOPROPVALUE)
	1667	+#. Resource IDs: (3412)
1757	1668	msgid "(no value)"
1758	1669	msgstr "(няма значэньня)"
1759	1670

		@@ -1761,11 +1672,11 @@
1761	1672	msgid "(not found)"
1762	1673	msgstr "(ня знойдзена)"
1763	1674
1764		-#. Resource IDs: (IDS_PROPMODS, IDS_PROPONLY)
	1675	+#. Resource IDs: (7003, IDS_PROPMODS)
1765	1676	msgid "(properties only)"
1766	1677	msgstr ""
1767	1678
1768		-#. Resource IDs: (IDS_STATUSLIST_PROPONLY)
	1679	+#. Resource IDs: (3321)
1769	1680	msgid "(property change only)"
1770	1681	msgstr "(толькі ўласныя зьмены)"
1771	1682

		@@ -1773,15 +1684,15 @@
1773	1684	msgid "(props and content)"
1774	1685	msgstr ""
1775	1686
1776		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_RENAME)
	1687	+#. Resource IDs: (4424)
1777	1688	msgid "(rename)"
1778	1689	msgstr "(перайменаваць)"
1779	1690
1780		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_TAG)
	1691	+#. Resource IDs: (4420)
1781	1692	msgid "(tagged)"
1782	1693	msgstr "(з цэтлікам)"
1783	1694
1784		-#. Resource IDs: (IDS_STATGRAPH_EMPTYAUTHOR)
	1695	+#. Resource IDs: (3908)
1785	1696	msgid "(unknown)"
1786	1697	msgstr "(невядома)"
1787	1698

		@@ -1795,55 +1706,42 @@
1795	1706	msgid "- %d"
1796	1707	msgstr "- %d"
1797	1708
1798		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1035, Dialog IDD_CHECKOUT:
1799		-#. Control id 1036, Dialog IDD_COPY: Control id 1035, Dialog
1800		-#. IDD_EDITPROPEXTERNALSVALUE: Control id 1035, Dialog IDD_EXPORT: Control id
1801		-#. 1035, Dialog IDD_EXPORT: Control id 1036, Dialog IDD_IMPORT: Control id
1802		-#. 1035, Dialog IDD_MERGEWIZARD_REVRANGE: Control id 1035, Dialog
1803		-#. IDD_MERGEWIZARD_TREE: Control id 1035, Dialog IDD_MERGEWIZARD_TREE: Control
1804		-#. id 1036, Dialog IDD_OPEN: Control id 1002, Dialog IDD_OPEN: Control id
1805		-#. 1003, Dialog IDD_SETTINGSBUGTRAQADV: Control id 1474, Dialog
1806		-#. IDD_SETTINGSDIALOGS: Control id 1362, Dialog IDD_SETTINGSHOOKCONFIG:
1807		-#. Control id 1324, Dialog IDD_SETTINGSHOOKCONFIG: Control id 1333, Dialog
1808		-#. IDD_SETTINGSPROGSDIFF: Control id 1021, Dialog IDD_SETTINGSPROGSDIFF:
1809		-#. Control id 1022, Dialog IDD_SETTINGSPROGSDIFF: Control id 1089, Dialog
1810		-#. IDD_SETTINGSPROGSMERGE: Control id 1022, Dialog IDD_SETTINGSSYNC: Control
1811		-#. id 1542, Dialog IDD_SWITCH: Control id 1035, Dialog IDD_TOOLASSOC: Control
1812		-#. id 1104, Dialog IDD_URLDIFF: Control id 1035)
	1709	+#. Resource IDs: (1021, 1022, 1035, 1036, 1089, 1104, 1324, 1333, 1362, 1474,
	1710	+#. 1542, Dialog IDD_OPEN: Control id 1002, Dialog IDD_OPEN: Control id 1003)
1813	1711	msgid "..."
1814	1712	msgstr "..."
1815	1713
1816		-#. Resource IDs: (IDS_REVGRAPH_PROGPREPARING)
	1714	+#. Resource IDs: (4303)
1817	1715	msgid "... checking cache and preparing log query"
1818	1716	msgstr "... праверка кэшу і падрыхтоўка логу запытаў"
1819	1717
1820		-#. Resource IDs: (IDS_REVGRAPH_PROGREADINGWC)
	1718	+#. Resource IDs: (4306)
1821	1719	msgid "... reading working copy status"
1822	1720	msgstr "... чытаньне статусу працоўнай копіі"
1823	1721
1824		-#. Resource IDs: (IDS_ERR_SHELVE_FAILED_MORE)
	1722	+#. Resource IDs: (1057)
1825	1723	#, c-format
1826	1724	msgid "...and %d more paths."
1827	1725	msgstr ""
1828	1726
1829		-#. Resource IDs: (IDS_DIFF_REVISIONPATCHED)
	1727	+#. Resource IDs: (2403)
1830	1728	#, c-format
1831	1729	msgid ": Revision %d"
1832	1730	msgstr ": Рэвізыя %d"
1833	1731
1834		-#. Resource IDs: (IDS_DIFF_WORKINGCOPY)
	1732	+#. Resource IDs: (2402)
1835	1733	msgid ": working copy"
1836	1734	msgstr ": працоўная копія"
1837	1735
1838		-#. Resource IDs: (IDS_PROPPAGE_BACK)
	1736	+#. Resource IDs: (5300)
1839	1737	msgid "< &Back"
1840	1738	msgstr "< &Назад"
1841	1739
1842		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_CREATECS)
	1740	+#. Resource IDs: (3339)
1843	1741	msgid "<new changelist>"
1844	1742	msgstr ""
1845	1743
1846		-#. Resource IDs: (IDS_MONITOR_TOOLBARTEXTS)
	1744	+#. Resource IDs: (1020)
1847	1745	msgid ""
1848	1746	"=&Check Now=&Add Project=E&dit=&Remove=&Mark all as read=&Clear "
1849	1747	"errors=&Update all=&Options=="

		@@ -1853,21 +1751,21 @@
1853	1751	msgid "?"
1854	1752	msgstr "?"
1855	1753
1856		-#. Resource IDs: (IDS_PROP_TT_TSVNUSERFILEPROPERTIES)
	1754	+#. Resource IDs: (9248)
1857	1755	msgid "A list of user defined properties for files to show in the combo box"
1858	1756	msgstr ""
1859	1757
1860		-#. Resource IDs: (IDS_PROP_TT_TSVNUSERFOLDERPROPERTIES)
	1758	+#. Resource IDs: (9249)
1861	1759	msgid "A list of user defined properties for folders to show in the combo box"
1862	1760	msgstr ""
1863	1761
1864		-#. Resource IDs: (IDS_CHECKNEWER_NEWERVERSIONAVAILABLE)
	1762	+#. Resource IDs: (3203)
1865	1763	msgid ""
1866	1764	"A newer version is available.\r\n"
1867	1765	"Please go to https://tortoisesvn.net and download the current version."
1868	1766	msgstr ""
1869	1767
1870		-#. Resource IDs: (IDS_SETTINGS_INCLUDELIST_TT)
	1768	+#. Resource IDs: (3104)
1871	1769	msgid ""
1872	1770	"A newline separated list of paths for which icon overlays are shown.\r\n"
1873	1771	"If you add an '?' char at the end of a path, then only this path will be included.\r\n"

		@@ -1874,7 +1772,7 @@
1874	1772	"If you add an '*' or no char at all at the end of a path, then all files and subdirs inside that path are included too."
1875	1773	msgstr ""
1876	1774
1877		-#. Resource IDs: (IDS_SETTINGS_EXCLUDECONTEXTLIST_TT)
	1775	+#. Resource IDs: (3145)
1878	1776	msgid ""
1879	1777	"A newline separated list of paths for which no context menu is shown.\r\n"
1880	1778	"If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n"

		@@ -1881,7 +1779,7 @@
1881	1779	"An empty list will allow the context menu on all paths."
1882	1780	msgstr ""
1883	1781
1884		-#. Resource IDs: (IDS_SETTINGS_EXCLUDELIST_TT)
	1782	+#. Resource IDs: (3103)
1885	1783	msgid ""
1886	1784	"A newline separated list of paths for which no icon overlays are shown.\r\n"
1887	1785	"If you add an '?' char at the end of a path, then only this path will be excluded.\r\n"

		@@ -1889,7 +1787,7 @@
1889	1787	"An empty list will allow overlays on all paths."
1890	1788	msgstr ""
1891	1789
1892		-#. Resource IDs: (IDS_WARN_RELOCATEREALLY_TASK5)
	1790	+#. Resource IDs: (1424)
1893	1791	msgid ""
1894	1792	"A relocate is only needed if the path to a repository has changed.\n"
1895	1793	"Changing to a different path inside a repository is done by a switch operation.\n"

		@@ -1901,7 +1799,7 @@
1901	1799	msgid "A required resource was unavailable."
1902	1800	msgstr ""
1903	1801
1904		-#. Resource IDs: (IDS_WARN_NOVALIDPATH_TASK5)
	1802	+#. Resource IDs: (1419)
1905	1803	#, c-format
1906	1804	msgid ""
1907	1805	"A valid path on windows must not contain '<>\|\"?*:' or one of the following device names:\n"

		@@ -1909,17 +1807,17 @@
1909	1807	"See the <a href=\"http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx\">documentation</a> from Microsoft about this."
1910	1808	msgstr ""
1911	1809
1912		-#. Resource IDs: (IDS_SETTINGS_DIFFVIEWER_TT)
	1810	+#. Resource IDs: (1252)
1913	1811	msgid ""
1914	1812	"A viewer program for GNU diff files (patch files).\r\n"
1915	1813	"If you don't have one use NotePad."
1916	1814	msgstr ""
1917	1815
1918		-#. Resource IDs: (IDS_REPOBROWSE_IMPORTFOLDER)
	1816	+#. Resource IDs: (1608)
1919	1817	msgid "A&dd folder..."
1920	1818	msgstr "Д&адаць каталёг…"
1921	1819
1922		-#. Resource IDs: (IDS_MSGBOX_ABORT)
	1820	+#. Resource IDs: (9005)
1923	1821	msgid "Abort"
1924	1822	msgstr "Спыніць"
1925	1823

		@@ -1927,7 +1825,7 @@
1927	1825	msgid "Abou&t TortoiseMerge"
1928	1826	msgstr ""
1929	1827
1930		-#. Resource IDs: (IDS_MENUABOUT)
	1828	+#. Resource IDs: (134)
1931	1829	msgid "About"
1932	1830	msgstr ""
1933	1831

		@@ -1935,11 +1833,11 @@
1935	1833	msgid "About TortoiseMerge"
1936	1834	msgstr "Пра TortoiseMerge"
1937	1835
1938		-#. Resource IDs: (Dialog IDD_ABOUT: Control id 129)
	1836	+#. Resource IDs: (129)
1939	1837	msgid "About TortoiseSVN"
1940	1838	msgstr "Пра TortoiseSVN"
1941	1839
1942		-#. Resource IDs: (IDS_SSL_ACCEPTALWAYS_TASK)
	1840	+#. Resource IDs: (2359)
1943	1841	msgid ""
1944	1842	"Accept the certificate &permanently\n"
1945	1843	"You won't get asked about this certificate again."

		@@ -1950,15 +1848,15 @@
1950	1848	msgid "Access to %1 was denied."
1951	1849	msgstr ""
1952	1850
1953		-#. Resource IDs: (IDS_FILEDIFF_ACTION, IDS_PROGRS_ACTION)
	1851	+#. Resource IDs: (1222, 5101)
1954	1852	msgid "Action"
1955	1853	msgstr ""
1956	1854
1957		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 65535)
	1855	+#. Resource IDs: (65535)
1958	1856	msgid "Action log"
1959	1857	msgstr "Журнал дзеяньняў"
1960	1858
1961		-#. Resource IDs: (IDS_LOG_ACTIONS)
	1859	+#. Resource IDs: (1870)
1962	1860	msgid "Actions"
1963	1861	msgstr "Дзеяньні"
1964	1862

		@@ -1973,39 +1871,38 @@
1973	1871	"Discard all changes to %1?"
1974	1872	msgstr ""
1975	1873
1976		-#. Resource IDs: (IDS_WARN_ADDCASERENAMED_TASK3)
	1874	+#. Resource IDs: (1426)
1977	1875	msgid ""
1978	1876	"Ad&just case\n"
1979	1877	"The file is not added."
1980	1878	msgstr ""
1981	1879
1982		-#. Resource IDs: (Dialog IDD_ADD: Control id 155, IDS_PROGRS_CMD_ADD,
1983		-#. IDS_PROGRS_TITLE_ADD, IDS_STATUSLIST_CONTEXT_ADD)
	1880	+#. Resource IDs: (1229, 155, 3330, 3657)
1984	1881	msgid "Add"
1985	1882	msgstr "Дадаць"
1986	1883
1987		-#. Resource IDs: (IDS_REPOBROWSE_IMPORT)
	1884	+#. Resource IDs: (1605)
1988	1885	msgid "Add &file..."
1989	1886	msgstr "Дадаць &файл..."
1990	1887
1991		-#. Resource IDs: (IDS_SCIEDIT_ADDWORD)
	1888	+#. Resource IDs: (6006)
1992	1889	#, c-format
1993	1890	msgid "Add '%ls' to dictionary"
1994	1891	msgstr "Дадаць «%ls» да слоўніка"
1995	1892
1996		-#. Resource IDs: (IDS_MENUADDASREPLACEMENT)
	1893	+#. Resource IDs: (255)
1997	1894	msgid "Add (as replacement)..."
1998	1895	msgstr ""
1999	1896
2000		-#. Resource IDs: (IDS_EDITPROPS_ADDTITLE)
	1897	+#. Resource IDs: (9407)
2001	1898	msgid "Add Properties"
2002	1899	msgstr ""
2003	1900
2004		-#. Resource IDs: (IDS_DLGTITLE_ADD_DIFF_TOOL)
	1901	+#. Resource IDs: (1750)
2005	1902	msgid "Add extension specific diff program"
2006	1903	msgstr ""
2007	1904
2008		-#. Resource IDs: (IDS_DLGTITLE_ADD_MERGE_TOOL)
	1905	+#. Resource IDs: (1751)
2009	1906	msgid "Add extension specific merge program"
2010	1907	msgstr ""
2011	1908

		@@ -2013,47 +1910,45 @@
2013	1910	msgid "Add new files automatically to SVN"
2014	1911	msgstr ""
2015	1912
2016		-#. Resource IDs: (IDS_LOG_POPUP_MONITORADDSUB)
	1913	+#. Resource IDs: (1044)
2017	1914	msgid "Add project or folder here..."
2018	1915	msgstr ""
2019	1916
2020		-#. Resource IDs: (IDS_LOG_POPUP_MONITORADD)
	1917	+#. Resource IDs: (1040)
2021	1918	msgid "Add project or folder..."
2022	1919	msgstr ""
2023	1920
2024		-#. Resource IDs: (IDS_DROPDESC_ADD)
	1921	+#. Resource IDs: (9804)
2025	1922	#, c-format
2026	1923	msgid "Add to %1"
2027	1924	msgstr ""
2028	1925
2029		-#. Resource IDs: (IDS_MENUIGNORE)
	1926	+#. Resource IDs: (194)
2030	1927	msgid "Add to &ignore list"
2031	1928	msgstr "Дадаць да сьпісу &ігнараваньня"
2032	1929
2033		-#. Resource IDs: (IDS_REPOBROWSE_ADDBOOKMARK)
	1930	+#. Resource IDs: (1619)
2034	1931	msgid "Add to Bookmarks"
2035	1932	msgstr ""
2036	1933
2037		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 1279, Dialog
2038		-#. IDD_SETTINGSHOOKS: Control id 1279, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE)
	1934	+#. Resource IDs: (1279, 3341)
2039	1935	msgid "Add..."
2040	1936	msgstr "Дадаць…"
2041	1937
2042		-#. Resource IDs: (Dialog IDD_TOOLASSOC: Control id 171)
	1938	+#. Resource IDs: (171)
2043	1939	msgid "Add/Edit Extension Specific Diff/Merge Program"
2044	1940	msgstr ""
2045	1941
2046		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1509, Dialog
2047		-#. IDD_SETCOLORPAGE: Control id 65535, Dialog IDD_SETTINGSOVERLAYHANDLERS:
2048		-#. Control id 1549, IDS_SVNACTION_ADD, IDS_SVN_SUMMARIZEADDED)
	1942	+#. Resource IDs: (1163, 1509, 1549, 4221, Dialog IDD_SETCOLORPAGE: Control id
	1943	+#. 65535)
2049	1944	msgid "Added"
2050	1945	msgstr ""
2051	1946
2052		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	1947	+#. Resource IDs: (65535)
2053	1948	msgid "Added node"
2054	1949	msgstr ""
2055	1950
2056		-#. Resource IDs: (IDS_PROC_IGNORERECURSIVESUCCESS)
	1951	+#. Resource IDs: (2319)
2057	1952	#, c-format
2058	1953	msgid ""
2059	1954	"Added the file pattern(s)\n"

		@@ -2061,7 +1956,7 @@
2061	1956	"to the global ignore list."
2062	1957	msgstr ""
2063	1958
2064		-#. Resource IDs: (IDS_PROC_IGNORESUCCESS)
	1959	+#. Resource IDs: (2307)
2065	1960	#, c-format
2066	1961	msgid ""
2067	1962	"Added the file pattern(s)\n"

		@@ -2069,19 +1964,19 @@
2069	1964	"to the ignore list."
2070	1965	msgstr ""
2071	1966
2072		-#. Resource IDs: (IDS_SVNACTION_ADDING)
	1967	+#. Resource IDs: (4201)
2073	1968	msgid "Adding"
2074	1969	msgstr ""
2075	1970
2076		-#. Resource IDs: (IDS_PROP_TT_ADD)
	1971	+#. Resource IDs: (9296)
2077	1972	msgid "Adds a new property"
2078	1973	msgstr ""
2079	1974
2080		-#. Resource IDs: (IDS_MENUDESCADD)
	1975	+#. Resource IDs: (139)
2081	1976	msgid "Adds file(s) to Subversion control"
2082	1977	msgstr ""
2083	1978
2084		-#. Resource IDs: (IDS_MENUDESCIGNORE)
	1979	+#. Resource IDs: (195)
2085	1980	msgid "Adds the selected file(s) or the filemask to the 'ignore' list"
2086	1981	msgstr ""
2087	1982

		@@ -2091,40 +1986,39 @@
2091	1986	"Settings"
2092	1987	msgstr ""
2093	1988
2094		-#. Resource IDs: (IDS_EDITPROPS_ADJUST_TO_HEAD)
	1989	+#. Resource IDs: (9443)
2095	1990	msgid "Adjust to HEAD revision"
2096	1991	msgstr ""
2097	1992
2098		-#. Resource IDs: (Dialog IDD_SETTINGS_CONFIG: Control id 307, ID_EDIT_ADVANCED
2099		-#. - Menu)
	1993	+#. Resource IDs: (307, 32848 - Menu)
2100	1994	msgid "Advanced"
2101	1995	msgstr ""
2102	1996
2103		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSADV: Control id 170)
	1997	+#. Resource IDs: (170)
2104	1998	msgid "Advanced Diff/Merge Settings"
2105	1999	msgstr ""
2106	2000
2107		-#. Resource IDs: (IDS_DLGTITLE_ADV_DIFF)
	2001	+#. Resource IDs: (1754)
2108	2002	msgid "Advanced diff settings"
2109	2003	msgstr ""
2110	2004
2111		-#. Resource IDs: (IDS_DLGTITLE_ADV_MERGE)
	2005	+#. Resource IDs: (1755)
2112	2006	msgid "Advanced merge settings"
2113	2007	msgstr ""
2114	2008
2115		-#. Resource IDs: (Dialog IDD_UNSHELVE: Control id 1675)
	2009	+#. Resource IDs: (1675)
2116	2010	msgid "Affected &files:"
2117	2011	msgstr ""
2118	2012
2119		-#. Resource IDs: (Dialog IDD_LOGCACHESTATISTICS: Control id 65535)
	2013	+#. Resource IDs: (65535)
2120	2014	msgid "Age"
2121	2015	msgstr ""
2122	2016
2123		-#. Resource IDs: (ID_VIEW_TOPALIGNTREES - Menu)
	2017	+#. Resource IDs: (32822 - Menu)
2124	2018	msgid "Align trees on top"
2125	2019	msgstr ""
2126	2020
2127		-#. Resource IDs: (Dialog IDD_COPY: Control id 1505)
	2021	+#. Resource IDs: (1505)
2128	2022	msgid "All"
2129	2023	msgstr "Усе"
2130	2024

		@@ -2132,7 +2026,7 @@
2132	2026	msgid "All Files (.)"
2133	2027	msgstr "Усе файлы (.)"
2134	2028
2135		-#. Resource IDs: (IDS_COMMONFILEFILTER)
	2029	+#. Resource IDs: (2500, IDS_COMMONFILEFILTER)
2136	2030	msgid "All Files (.)\|.\|\|"
2137	2031	msgstr "Усе файлы (.)\|.\|\|"
2138	2032

		@@ -2142,47 +2036,46 @@
2142	2036	"Allow Edit"
2143	2037	msgstr ""
2144	2038
2145		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1484)
	2039	+#. Resource IDs: (1484)
2146	2040	msgid "Allow ambiguous &UUIDs"
2147	2041	msgstr "Дазволіць неадназначныя &UUID-ы"
2148	2042
2149		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_AMBIGUOUSURL)
	2043	+#. Resource IDs: (5508)
2150	2044	msgid ""
2151	2045	"Allow different repositories to use the same URL, e.g. "
2152	2046	"http://localhost/myrepos/"
2153	2047	msgstr ""
2154	2048
2155		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_AMBIGUOUSUUID)
	2049	+#. Resource IDs: (5512)
2156	2050	msgid ""
2157	2051	"Allow different repositories to use the same UUID, e.g. copied repositories"
2158	2052	msgstr ""
2159	2053
2160		-#. Resource IDs: (IDS_LOG_ALREADYMERGED)
	2054	+#. Resource IDs: (1896)
2161	2055	msgid "Already merged"
2162	2056	msgstr "Ужо аб’яднана"
2163	2057
2164		-#. Resource IDs: (IDS_LOG_ALREADYMERGEDREVERSED)
	2058	+#. Resource IDs: (1889)
2165	2059	msgid "Already reverse merged"
2166	2060	msgstr ""
2167	2061
2168		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1480)
	2062	+#. Resource IDs: (1480)
2169	2063	msgid "Always close dialogs for local operations"
2170	2064	msgstr ""
2171	2065
2172		-#. Resource IDs: (Dialog IDD_EDITPROPLOCALHOOKS: Control id 1339, Dialog
2173		-#. IDD_SETTINGSHOOKCONFIG: Control id 1339)
	2066	+#. Resource IDs: (1339)
2174	2067	msgid "Always execute the script"
2175	2068	msgstr ""
2176	2069
2177		-#. Resource IDs: (IDS_SETTINGS_USESYSTEMLOCALEFORDATES_TT)
	2070	+#. Resource IDs: (3143)
2178	2071	msgid "Always use the system locale settings to show times and dates"
2179	2072	msgstr "Заўсёды выкарыстоўваць сыстэмную лякаль для адлюстраваньня даты і часу"
2180	2073
2181		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_RAM)
	2074	+#. Resource IDs: (5422)
2182	2075	msgid "Amount of memory required to load the cache"
2183	2076	msgstr ""
2184	2077
2185		-#. Resource IDs: (IDS_SETTINGS_EXTDIFF_TT)
	2078	+#. Resource IDs: (1245)
2186	2079	#, c-format
2187	2080	msgid ""
2188	2081	"An external diff program used\r\n"

		@@ -2193,7 +2086,7 @@
2193	2086	"%mine : the modified file"
2194	2087	msgstr ""
2195	2088
2196		-#. Resource IDs: (IDS_SETTINGS_EXTMERGE_TT)
	2089	+#. Resource IDs: (1250)
2197	2090	#, c-format
2198	2091	msgid ""
2199	2092	"An external merge program used\r\n"

		@@ -2225,7 +2118,7 @@
2225	2118	msgid "An unknown line type was found in line %d!"
2226	2119	msgstr ""
2227	2120
2228		-#. Resource IDs: (IDS_SVNERR_SQLITEBUSY)
	2121	+#. Resource IDs: (4010)
2229	2122	msgid ""
2230	2123	"Another process is blocking the working copy database, or the underlying "
2231	2124	"filesystem does not support file locking; if the working copy is on a "

		@@ -2241,15 +2134,15 @@
2241	2134	msgid "Append this block to left"
2242	2135	msgstr ""
2243	2136
2244		-#. Resource IDs: (IDS_MENUDESCAPPLYPATCH)
	2137	+#. Resource IDs: (209)
2245	2138	msgid "Applies a unified diff file to the working copy"
2246	2139	msgstr ""
2247	2140
2248		-#. Resource IDs: (IDS_MENUAPPLYPATCH)
	2141	+#. Resource IDs: (207)
2249	2142	msgid "Apply &patch..."
2250	2143	msgstr ""
2251	2144
2252		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_POWERDEFAULT)
	2145	+#. Resource IDs: (5514)
2253	2146	msgid ""
2254	2147	"Apply 'Power User' defaults. Those will provide a smoother experience.\n"
2255	2148	"You should know the meaning of all the settings above."

		@@ -2263,28 +2156,28 @@
2263	2156	msgid "Apply unified diff"
2264	2157	msgstr ""
2265	2158
2266		-#. Resource IDs: (IDS_HOOKS_APPROVE_TASK2)
	2159	+#. Resource IDs: (5801)
2267	2160	msgid "Approve or reject client-side hook script"
2268	2161	msgstr ""
2269	2162
2270		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1282)
	2163	+#. Resource IDs: (1282)
2271	2164	msgid "Approved hook scripts"
2272	2165	msgstr ""
2273	2166
2274		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1565)
	2167	+#. Resource IDs: (1565)
2275	2168	msgid "Arb&itrary text"
2276	2169	msgstr ""
2277	2170
2278		-#. Resource IDs: (IDS_PROC_RESOLVE)
	2171	+#. Resource IDs: (2308)
2279	2172	msgid "Are you sure you want to mark the conflicted file(s) as resolved?"
2280	2173	msgstr ""
2281	2174
2282		-#. Resource IDs: (IDS_SETTINGS_CACHEDELETEQUESTION)
	2175	+#. Resource IDs: (3177)
2283	2176	#, c-format
2284	2177	msgid "Are you sure you want to remove the cache of the selected %d items?"
2285	2178	msgstr ""
2286	2179
2287		-#. Resource IDs: (IDS_PROC_WARNREVERT)
	2180	+#. Resource IDs: (1256)
2288	2181	#, c-format
2289	2182	msgid ""
2290	2183	"Are you sure you want to revert %d item(s)? You will lose all changes since "

		@@ -2295,20 +2188,20 @@
2295	2188	msgid "Arrange &vertical\t(V)"
2296	2189	msgstr ""
2297	2190
2298		-#. Resource IDs: (Dialog IDD_EDITPROPEOL: Control id 1587)
	2191	+#. Resource IDs: (1587)
2299	2192	msgid "As &is (no specific EOL)"
2300	2193	msgstr ""
2301	2194
2302		-#. Resource IDs: (IDS_SETTINGS_CONNECTIVITY_ASKUSER)
	2195	+#. Resource IDs: (3172)
2303	2196	msgid "Ask the user"
2304	2197	msgstr ""
2305	2198
2306		-#. Resource IDs: (IDS_SVNACTION_CHANGELISTSET)
	2199	+#. Resource IDs: (4210)
2307	2200	#, c-format
2308	2201	msgid "Assigned to changelist '%ls'"
2309	2202	msgstr ""
2310	2203
2311		-#. Resource IDs: (IDS_PROGRS_ATREV)
	2204	+#. Resource IDs: (1221)
2312	2205	#, c-format
2313	2206	msgid "At revision: %d"
2314	2207	msgstr ""

		@@ -2332,17 +2225,15 @@
2332	2225	msgid "Attempted to write to the reading %1."
2333	2226	msgstr ""
2334	2227
2335		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535, Dialog
2336		-#. IDD_PROMPT: Control id 131, Dialog IDD_SIMPLEPROMPT: Control id 160)
	2228	+#. Resource IDs: (131, 160, 65535)
2337	2229	msgid "Authentication"
2338	2230	msgstr ""
2339	2231
2340		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1278)
	2232	+#. Resource IDs: (1278)
2341	2233	msgid "Authentication data"
2342	2234	msgstr ""
2343	2235
2344		-#. Resource IDs: (Dialog IDD_EDITPROPKEYWORDS: Control id 1562,
2345		-#. IDS_HEADER_AUTHOR, IDS_LOG_AUTHOR, IDS_STATUSLIST_COLAUTHOR)
	2236	+#. Resource IDs: (1209, 1562, 3311, IDS_HEADER_AUTHOR)
2346	2237	msgid "Author"
2347	2238	msgstr "Аўтар"
2348	2239

		@@ -2350,54 +2241,54 @@
2350	2241	msgid "Author:\t\t\t\tStefan Kueng"
2351	2242	msgstr ""
2352	2243
2353		-#. Resource IDs: (IDS_LOG_FILTER_AUTHORS, IDS_LOG_POPUP_CLIPBOARD_AUTHORS)
	2244	+#. Resource IDs: (1839, 1852)
2354	2245	msgid "Authors"
2355	2246	msgstr ""
2356	2247
2357		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1265)
	2248	+#. Resource IDs: (1265)
2358	2249	msgid "Authors case sensitive"
2359	2250	msgstr ""
2360	2251
2361		-#. Resource IDs: (Dialog IDD_ABOUT: Control id 1444)
	2252	+#. Resource IDs: (1444)
2362	2253	msgid "Authors:"
2363	2254	msgstr "Аўтары:"
2364	2255
2365		-#. Resource IDs: (IDS_PROGRS_TITLE_MERGEAUTOMATIC)
	2256	+#. Resource IDs: (3534)
2366	2257	msgid "Auto-Merge"
2367	2258	msgstr ""
2368	2259
2369		-#. Resource IDs: (IDS_PROGRS_CLOSE_NOCONFLICTS)
	2260	+#. Resource IDs: (3542)
2370	2261	msgid "Auto-close if no conflicts"
2371	2262	msgstr ""
2372	2263
2373		-#. Resource IDs: (IDS_PROGRS_CLOSE_NOERROR)
	2264	+#. Resource IDs: (3541)
2374	2265	msgid "Auto-close if no errors"
2375	2266	msgstr ""
2376	2267
2377		-#. Resource IDs: (IDS_PROGRS_CLOSE_NOMERGES)
	2268	+#. Resource IDs: (3543)
2378	2269	msgid "Auto-close if no merges, adds or deletes"
2379	2270	msgstr ""
2380	2271
2381		-#. Resource IDs: (IDS_SETTINGS_AUTOCOMPLETION_TT)
	2272	+#. Resource IDs: (3114)
2382	2273	msgid ""
2383	2274	"Auto-complete suggests words (usually class or member names)\r\n"
2384	2275	"from the files that you have changed as you type a log message."
2385	2276	msgstr ""
2386	2277
2387		-#. Resource IDs: (IDS_PROGRS_CMD_MERGEAUTOMATIC)
	2278	+#. Resource IDs: (3535)
2388	2279	#, c-format
2389	2280	msgid "Auto-merge %1!ls! into %2!ls!"
2390	2281	msgstr ""
2391	2282
2392		-#. Resource IDs: (IDS_COLOURPICKER_DEFAULTTEXT)
	2283	+#. Resource IDs: (7001, IDS_COLOURPICKER_DEFAULTTEXT)
2393	2284	msgid "Automatic"
2394	2285	msgstr "Аўтаматычны"
2395	2286
2396		-#. Resource IDs: (Dialog IDD_AUTOTEXTTESTDLG: Control id 306)
	2287	+#. Resource IDs: (306)
2397	2288	msgid "Autotext Tester"
2398	2289	msgstr ""
2399	2290
2400		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1157)
	2291	+#. Resource IDs: (1157)
2401	2292	msgid "Average"
2402	2293	msgstr ""
2403	2294

		@@ -2406,17 +2297,15 @@
2406	2297	msgid "B&rowse..."
2407	2298	msgstr ""
2408	2299
2409		-#. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog
2410		-#. IDD_SETTINGSTBLAME: Control id 65535, Dialog IDD_SETTINGSUDIFF: Control id
2411		-#. 65535)
	2300	+#. Resource IDs: (65535, Dialog IDD_SETCOLORPAGE: Control id 65535)
2412	2301	msgid "Background"
2413	2302	msgstr ""
2414	2303
2415		-#. Resource IDs: (IDS_REPOBROWSE_TT_BACKWARD)
	2304	+#. Resource IDs: (1682)
2416	2305	msgid "Backwards in browsing history"
2417	2306	msgstr ""
2418	2307
2419		-#. Resource IDs: (IDS_STATGRAPH_BARBUTTON_TT)
	2308	+#. Resource IDs: (3934)
2420	2309	msgid "Bar Graph"
2421	2310	msgstr ""
2422	2311

		@@ -2430,19 +2319,19 @@
2430	2319	"a bitmap"
2431	2320	msgstr ""
2432	2321
2433		-#. Resource IDs: (Dialog IDD_BLAME: Control id 162)
	2322	+#. Resource IDs: (162)
2434	2323	msgid "Blame"
2435	2324	msgstr ""
2436	2325
2437		-#. Resource IDs: (IDS_BLAME_PROGRESSTITLE)
	2326	+#. Resource IDs: (2100)
2438	2327	msgid "Blame - TortoiseSVN"
2439	2328	msgstr ""
2440	2329
2441		-#. Resource IDs: (IDS_LOG_POPUP_BLAME)
	2330	+#. Resource IDs: (1818)
2442	2331	msgid "Blame..."
2443	2332	msgstr ""
2444	2333
2445		-#. Resource IDs: (IDS_MENUDESCBLAME)
	2334	+#. Resource IDs: (205)
2446	2335	msgid "Blames each line of a file on an author"
2447	2336	msgstr ""
2448	2337

		@@ -2454,11 +2343,11 @@
2454	2343	msgid "Blocks"
2455	2344	msgstr ""
2456	2345
2457		-#. Resource IDs: (IDS_BOOKMARKS)
	2346	+#. Resource IDs: (9854)
2458	2347	msgid "Bookmarks"
2459	2348	msgstr ""
2460	2349
2461		-#. Resource IDs: (IDS_ERR_TWOLOGPARAMS)
	2350	+#. Resource IDs: (1325)
2462	2351	msgid ""
2463	2352	"Both /logmsg and /logmsgfile were specified!\n"
2464	2353	"Only one of those can be specified."

		@@ -2477,7 +2366,7 @@
2477	2366	msgid "Br&owse..."
2478	2367	msgstr ""
2479	2368
2480		-#. Resource IDs: (IDS_LOG_COPY_SUCCESS)
	2369	+#. Resource IDs: (1830)
2481	2370	msgid "Branch / tag created successfully!"
2482	2371	msgstr ""
2483	2372

		@@ -2485,45 +2374,43 @@
2485	2374	msgid "Branch at copy-from-rev even if there was no change in that revision"
2486	2375	msgstr ""
2487	2376
2488		-#. Resource IDs: (IDS_MENUBRANCH)
	2377	+#. Resource IDs: (130)
2489	2378	msgid "Branch/&tag..."
2490	2379	msgstr ""
2491	2380
2492		-#. Resource IDs: (IDS_MENU_UNLOCKFORCE)
	2381	+#. Resource IDs: (244)
2493	2382	msgid "Break loc&k"
2494	2383	msgstr ""
2495	2384
2496		-#. Resource IDs: (IDS_MENUDESCUNSHELVE)
	2385	+#. Resource IDs: (289)
2497	2386	msgid "Brings a shelved change back to the working copy"
2498	2387	msgstr ""
2499	2388
2500		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1069)
	2389	+#. Resource IDs: (1069)
2501	2390	msgid "Browse..."
2502	2391	msgstr ""
2503	2392
2504		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1119, Dialog IDD_COPY:
2505		-#. Control id 1119, Dialog IDD_INPUTLOGDLG: Control id 1119)
	2393	+#. Resource IDs: (1119)
2506	2394	msgid "Bug-&ID / Issue-Nr:"
2507	2395	msgstr ""
2508	2396
2509		-#. Resource IDs: (IDS_LOG_BUGIDS)
	2397	+#. Resource IDs: (1840)
2510	2398	msgid "Bug-ID"
2511	2399	msgstr ""
2512	2400
2513		-#. Resource IDs: (Dialog IDD_BUGTRAQREGEXTESTER: Control id 1578, Dialog
2514		-#. IDD_EDITPROPBUGTRAQ: Control id 1578)
	2401	+#. Resource IDs: (1578)
2515	2402	msgid "Bug-ID e&xpression:"
2516	2403	msgstr ""
2517	2404
2518		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1119)
	2405	+#. Resource IDs: (1119)
2519	2406	msgid "Bug-ID is:"
2520	2407	msgstr ""
2521	2408
2522		-#. Resource IDs: (IDS_LOG_FILTER_BUGIDS)
	2409	+#. Resource IDs: (1856)
2523	2410	msgid "Bug-IDs"
2524	2411	msgstr ""
2525	2412
2526		-#. Resource IDs: (Dialog IDD_BUGTRAQREGEXTESTER: Control id 327)
	2413	+#. Resource IDs: (327)
2527	2414	msgid "Bugtraq Regex Tester - TortoiseSVN"
2528	2415	msgstr ""
2529	2416

		@@ -2531,27 +2418,27 @@
2531	2418	msgid "C"
2532	2419	msgstr ""
2533	2420
2534		-#. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 1215)
	2421	+#. Resource IDs: (1215)
2535	2422	msgid "C&heck now"
2536	2423	msgstr ""
2537	2424
2538		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1132)
	2425	+#. Resource IDs: (1132)
2539	2426	msgid "C&heck repository"
2540	2427	msgstr ""
2541	2428
2542		-#. Resource IDs: (IDS_REVGRAPH_POPUP_COLLAPSE_RIGHT)
	2429	+#. Resource IDs: (4389)
2543	2430	msgid "C&ollapse sub-trees"
2544	2431	msgstr ""
2545	2432
2546		-#. Resource IDs: (IDS_REPOBROWSE_SHOWDIFF_CONTENTONLY)
	2433	+#. Resource IDs: (1618)
2547	2434	msgid "C&ompare URLs (content only)"
2548	2435	msgstr ""
2549	2436
2550		-#. Resource IDs: (IDS_LOG_POPUP_COPY)
	2437	+#. Resource IDs: (1216)
2551	2438	msgid "C&reate branch/tag from revision"
2552	2439	msgstr ""
2553	2440
2554		-#. Resource IDs: (IDS_REPOBROWSE_MKDIR)
	2441	+#. Resource IDs: (1607)
2555	2442	msgid "C&reate folder..."
2556	2443	msgstr ""
2557	2444

		@@ -2563,15 +2450,15 @@
2563	2450	msgid "CAP"
2564	2451	msgstr ""
2565	2452
2566		-#. Resource IDs: (IDS_SETTINGS_REPOSITORY_SIZE)
	2453	+#. Resource IDs: (3171)
2567	2454	msgid "Cache size [kB]"
2568	2455	msgstr ""
2569	2456
2570		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHELIST: Control id 1440)
	2457	+#. Resource IDs: (1440)
2571	2458	msgid "Cached Repositories"
2572	2459	msgstr ""
2573	2460
2574		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1127)
	2461	+#. Resource IDs: (1127)
2575	2462	msgid "Can double-click in log list to compare with previous revision"
2576	2463	msgstr ""
2577	2464

		@@ -2579,7 +2466,7 @@
2579	2466	msgid "Can not activate a static ActiveX object."
2580	2467	msgstr ""
2581	2468
2582		-#. Resource IDs: (IDS_ERR_COPYITSELF)
	2469	+#. Resource IDs: (1303)
2583	2470	#, c-format
2584	2471	msgid ""
2585	2472	"Can't copy \n"

		@@ -2588,49 +2475,15 @@
2588	2475	"%2!ls!"
2589	2476	msgstr ""
2590	2477
2591		-#. Resource IDs: (2, Dialog IDD_BLAME: Control id 2, Dialog
2592		-#. IDD_BUGTRAQREGEXTESTER: Control id 2, Dialog IDD_CHECKOUT: Control id 2,
2593		-#. Dialog IDD_CLEANUP: Control id 2, Dialog IDD_COLLABORATORSETTINGS: Control
2594		-#. id 2, Dialog IDD_COMMITDLG: Control id 2, Dialog IDD_COPY: Control id 2,
2595		-#. Dialog IDD_CREATECHANGELIST: Control id 2, Dialog IDD_CREATEPATCH: Control
2596		-#. id 2, Dialog IDD_DELUNVERSIONED: Control id 2, Dialog IDD_DIFFOPTIONS:
2597		-#. Control id 2, Dialog IDD_EDITPROPBUGTRAQ: Control id 2, Dialog
2598		-#. IDD_EDITPROPEOL: Control id 2, Dialog IDD_EDITPROPERTYVALUE: Control id 2,
2599		-#. Dialog IDD_EDITPROPEXECUTABLE: Control id 2, Dialog IDD_EDITPROPEXTERNALS:
2600		-#. Control id 2, Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 2, Dialog
2601		-#. IDD_EDITPROPKEYWORDS: Control id 2, Dialog IDD_EDITPROPLOCALHOOKS: Control
2602		-#. id 2, Dialog IDD_EDITPROPMERGELOGTEMPLATE: Control id 2, Dialog
2603		-#. IDD_EDITPROPMIMETYPE: Control id 2, Dialog IDD_EDITPROPNEEDSLOCK: Control
2604		-#. id 2, Dialog IDD_EDITPROPTSVNLANG: Control id 2, Dialog
2605		-#. IDD_EDITPROPTSVNSIZES: Control id 2, Dialog IDD_EDITPROPUSERBOOL: Control
2606		-#. id 2, Dialog IDD_EDITPROPUSERMULTILINE: Control id 2, Dialog
2607		-#. IDD_EDITPROPUSERSINGLELINE: Control id 2, Dialog IDD_EDITPROPUSERSTATE:
2608		-#. Control id 2, Dialog IDD_ENCODING: Control id 2, Dialog IDD_EXPORT: Control
2609		-#. id 2, Dialog IDD_FIND: Control id 2, Dialog IDD_GOTO: Control id 2, Dialog
2610		-#. IDD_GOTODLG: Control id 2, Dialog IDD_HISTORYDLG: Control id 2, Dialog
2611		-#. IDD_IMPORT: Control id 2, Dialog IDD_INPUTDLG: Control id 2, Dialog
2612		-#. IDD_INPUTLOGDLG: Control id 2, Dialog IDD_LOCK: Control id 2, Dialog
2613		-#. IDD_LOGMESSAGE: Control id 1383, Dialog IDD_MERGEALL: Control id 2, Dialog
2614		-#. IDD_MONITOROPTIONS: Control id 2, Dialog IDD_MONITORPROJECT: Control id 2,
2615		-#. Dialog IDD_OPEN: Control id 2, Dialog IDD_OPENDLG: Control id 2, Dialog
2616		-#. IDD_PASSWORD: Control id 2, Dialog IDD_PROMPT: Control id 2, Dialog
2617		-#. IDD_REGEXFILTER: Control id 2, Dialog IDD_REGEXFILTERS: Control id 2,
2618		-#. Dialog IDD_RELOCATE: Control id 2, Dialog IDD_RENAME: Control id 2, Dialog
2619		-#. IDD_REPOSITORY_BROWSER: Control id 2, Dialog IDD_RESOLVE: Control id 2,
2620		-#. Dialog IDD_REVERT: Control id 2, Dialog IDD_REVGRAPHFILTER: Control id 2,
2621		-#. Dialog IDD_REVISION: Control id 2, Dialog IDD_REVISIONRANGE: Control id 2,
2622		-#. Dialog IDD_SETTINGSBUGTRAQADV: Control id 2, Dialog IDD_SETTINGSHOOKCONFIG:
2623		-#. Control id 2, Dialog IDD_SETTINGSPROGSADV: Control id 2, Dialog
2624		-#. IDD_SETTINGS_CLEARAUTH: Control id 2, Dialog IDD_SHELVE: Control id 2,
2625		-#. Dialog IDD_SIMPLEPROMPT: Control id 2, Dialog IDD_SVNPROGRESS: Control id
2626		-#. 2, Dialog IDD_SWITCH: Control id 2, Dialog IDD_TOOLASSOC: Control id 2,
2627		-#. Dialog IDD_UNLOCK: Control id 2, Dialog IDD_UNSHELVE: Control id 2, Dialog
2628		-#. IDD_UPDATE: Control id 2, Dialog IDD_URL: Control id 2, Dialog IDD_URLDIFF:
2629		-#. Control id 2, IDS_PROPPAGE_CANCEL)
	2478	+#. Resource IDs: (1383, 2, 5302, Dialog IDD_ENCODING: Control id 2, Dialog
	2479	+#. IDD_FIND: Control id 2, Dialog IDD_GOTO: Control id 2, Dialog IDD_GOTODLG:
	2480	+#. Control id 2, Dialog IDD_OPEN: Control id 2, Dialog IDD_OPENDLG: Control id
	2481	+#. 2, Dialog IDD_REGEXFILTER: Control id 2, Dialog IDD_REGEXFILTERS: Control
	2482	+#. id 2)
2630	2483	msgid "Cancel"
2631	2484	msgstr "Скасаваць"
2632	2485
2633		-#. Resource IDs: (IDS_COMMITDLG_COPYDEPTH_TASK4)
	2486	+#. Resource IDs: (2711)
2634	2487	msgid ""
2635	2488	"Cancel\n"
2636	2489	"Change the selection for the commit."

		@@ -2672,23 +2525,23 @@
2672	2525	"Stay with current settings"
2673	2526	msgstr ""
2674	2527
2675		-#. Resource IDs: (IDS_WARN_CONFIRM_MOVE_SPECIAL_DIRECTORY_TASK4)
	2528	+#. Resource IDs: (1696)
2676	2529	msgid ""
2677	2530	"Cancel\n"
2678	2531	"The items are not moved."
2679	2532	msgstr ""
2680	2533
2681		-#. Resource IDs: (IDS_WARN_SYNCPWWRONG_TASK4)
	2534	+#. Resource IDs: (9925)
2682	2535	msgid ""
2683	2536	"Cancel\n"
2684	2537	"You can enter another password and try again"
2685	2538	msgstr ""
2686	2539
2687		-#. Resource IDs: (IDS_BLAME_PROGRESSCANCEL)
	2540	+#. Resource IDs: (2102)
2688	2541	msgid "Cancelling TortoiseSVN Blame..."
2689	2542	msgstr ""
2690	2543
2691		-#. Resource IDs: (IDS_REVGRAPH_PROGCANCEL)
	2544	+#. Resource IDs: (4305)
2692	2545	msgid "Cancelling operation..."
2693	2546	msgstr ""
2694	2547

		@@ -2696,29 +2549,29 @@
2696	2549	msgid "Cannot show diff because of inconsistent newlines in the file."
2697	2550	msgstr ""
2698	2551
2699		-#. Resource IDs: (IDS_LOG_FILTER_CASESENSITIVE)
	2552	+#. Resource IDs: (1857)
2700	2553	msgid "Case-sensitive"
2701	2554	msgstr ""
2702	2555
2703		-#. Resource IDs: (IDS_ERR_SSL_EXPIRED)
	2556	+#. Resource IDs: (1302)
2704	2557	#, c-format
2705	2558	msgid "Certificate expired. Valid until: %ls"
2706	2559	msgstr ""
2707	2560
2708		-#. Resource IDs: (IDS_ERR_SSL_NOTYETVALID)
	2561	+#. Resource IDs: (1301)
2709	2562	#, c-format
2710	2563	msgid "Certificate not yet valid. Valid from: %ls"
2711	2564	msgstr ""
2712	2565
2713		-#. Resource IDs: (IDS_SSL_ACCEPTQUESTION_TASK)
	2566	+#. Resource IDs: (2362)
2714	2567	msgid "Certificate validation failed"
2715	2568	msgstr ""
2716	2569
2717		-#. Resource IDs: (IDS_CERTIFICATESFILEFILTER)
	2570	+#. Resource IDs: (2502)
2718	2571	msgid "Certificates\|.p12;.pkcs12;.pfx\|All\|.*\|\|"
2719	2572	msgstr ""
2720	2573
2721		-#. Resource IDs: (IDS_ADJUST_EXTERNAL_AFTER_COMMIT_TASK3)
	2574	+#. Resource IDs: (4602)
2722	2575	msgid ""
2723	2576	"Chan&ge the tagged revision\n"
2724	2577	"The svn:external property of the parent folder is changed accordingly."

		@@ -2732,33 +2585,33 @@
2732	2585	msgid "Change the window size"
2733	2586	msgstr ""
2734	2587
2735		-#. Resource IDs: (Dialog IDD_DIFFFILES: Control id 199)
	2588	+#. Resource IDs: (199)
2736	2589	msgid "Changed Files"
2737	2590	msgstr ""
2738	2591
2739		-#. Resource IDs: (IDS_FILEDIFF_CHANGEDLISTINTRO)
	2592	+#. Resource IDs: (5170)
2740	2593	#, c-format
2741	2594	msgid "Changed files between %1!ls!, %2!ls! and %3!ls!, %4!ls!"
2742	2595	msgstr ""
2743	2596
2744		-#. Resource IDs: (IDS_SVNACTION_CHANGELISTMOVED)
	2597	+#. Resource IDs: (4215)
2745	2598	#, c-format
2746	2599	msgid "Changelist %ls moved"
2747	2600	msgstr ""
2748	2601
2749		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	2602	+#. Resource IDs: (65535)
2750	2603	msgid "Changelist:"
2751	2604	msgstr ""
2752	2605
2753		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1242)
	2606	+#. Resource IDs: (1242)
2754	2607	msgid "Changes made (double-click on file for diff):"
2755	2608	msgstr ""
2756	2609
2757		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNSIZES: Control id 65535)
	2610	+#. Resource IDs: (65535)
2758	2611	msgid "Char position where to show a border line in commit text boxes:"
2759	2612	msgstr ""
2760	2613
2761		-#. Resource IDs: (IDS_MENUCHECKOUT)
	2614	+#. Resource IDs: (120)
2762	2615	msgid "Chec&kout..."
2763	2616	msgstr ""
2764	2617

		@@ -2766,49 +2619,49 @@
2766	2619	msgid "Check"
2767	2620	msgstr ""
2768	2621
2769		-#. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 174)
	2622	+#. Resource IDs: (174)
2770	2623	msgid "Check For Updates"
2771	2624	msgstr ""
2772	2625
2773		-#. Resource IDs: (Dialog IDD_ABOUT: Control id 1031)
	2626	+#. Resource IDs: (1031)
2774	2627	msgid "Check For Updates..."
2775	2628	msgstr "Праверыць абнаўленьні..."
2776	2629
2777		-#. Resource IDs: (IDS_REVGRAPH_POPUP_CFM)
	2630	+#. Resource IDs: (4401)
2778	2631	msgid "Check for &modifications"
2779	2632	msgstr ""
2780	2633
2781		-#. Resource IDs: (IDS_MENUSHOWCHANGED)
	2634	+#. Resource IDs: (192)
2782	2635	msgid "Check for modi&fications"
2783	2636	msgstr ""
2784	2637
2785		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 65535)
	2638	+#. Resource IDs: (65535)
2786	2639	msgid "Check for modifications"
2787	2640	msgstr ""
2788	2641
2789		-#. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 65535)
	2642	+#. Resource IDs: (65535)
2790	2643	msgid "Check for updates"
2791	2644	msgstr ""
2792	2645
2793		-#. Resource IDs: (IDS_MENUDESCCHECKOUT)
	2646	+#. Resource IDs: (136)
2794	2647	msgid "Check out a working copy from a repository"
2795	2648	msgstr ""
2796	2649
2797		-#. Resource IDs: (Dialog IDD_SETTINGS_CLEARAUTH: Control id 1536)
	2650	+#. Resource IDs: (1536)
2798	2651	msgid "Check the authentication items you want to delete below"
2799	2652	msgstr ""
2800	2653
2801		-#. Resource IDs: (IDS_SVNERR_CHECKPATHORURL)
	2654	+#. Resource IDs: (4000)
2802	2655	msgid "Check the path and/or URL you've entered."
2803	2656	msgstr ""
2804	2657
2805		-#. Resource IDs: (IDS_SETTINGS_MENULAYOUT_TT)
	2658	+#. Resource IDs: (3102)
2806	2659	msgid ""
2807	2660	"Check those menu entries you want to appear in the top context menu instead "
2808	2661	"of the TortoiseSVN submenu"
2809	2662	msgstr ""
2810	2663
2811		-#. Resource IDs: (IDS_SETTINGS_SHORTDATEFORMAT_TT)
	2664	+#. Resource IDs: (1279)
2812	2665	msgid "Check to use a less verbose date and time format in log messages"
2813	2666	msgstr ""
2814	2667

		@@ -2816,79 +2669,77 @@
2816	2669	msgid "Check working copy for modifications"
2817	2670	msgstr ""
2818	2671
2819		-#. Resource IDs: (IDS_WARN_FOLDERNOTEMPTY_TASK3)
	2672	+#. Resource IDs: (1430)
2820	2673	msgid ""
2821	2674	"Check&out\n"
2822	2675	"Checkout into the non empty folder."
2823	2676	msgstr ""
2824	2677
2825		-#. Resource IDs: (IDS_HOOKTYPE_CHECKCOMMIT)
	2678	+#. Resource IDs: (9108)
2826	2679	msgid "Check-Commit Hook"
2827	2680	msgstr ""
2828	2681
2829		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1504, Dialog IDD_COPY:
2830		-#. Control id 1504)
	2682	+#. Resource IDs: (1504)
2831	2683	msgid "Check:"
2832	2684	msgstr ""
2833	2685
2834		-#. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 1536)
	2686	+#. Resource IDs: (1536)
2835	2687	msgid "Checking if a newer version of TortoiseSVN is available..."
2836	2688	msgstr ""
2837	2689
2838		-#. Resource IDs: (IDS_MONITOR_CHECKPROJECT)
	2690	+#. Resource IDs: (1033)
2839	2691	#, c-format
2840	2692	msgid "Checking project '%ls' for updates..."
2841	2693	msgstr ""
2842	2694
2843		-#. Resource IDs: (IDS_PROGRS_FETCHING_TREE_CONFLICT_PROGRESS)
	2695	+#. Resource IDs: (3680)
2844	2696	#, c-format
2845	2697	msgid "Checking r%1!ld!..."
2846	2698	msgstr ""
2847	2699
2848		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 133, Dialog
2849		-#. IDD_SETTINGSDIALOGS: Control id 65535, IDS_PROGRS_TITLE_CHECKOUT)
	2700	+#. Resource IDs: (1225, 133, 65535)
2850	2701	msgid "Checkout"
2851	2702	msgstr ""
2852	2703
2853		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1074)
	2704	+#. Resource IDs: (1074)
2854	2705	msgid "Checkout &directory:"
2855	2706	msgstr ""
2856	2707
2857		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1377)
	2708	+#. Resource IDs: (1377)
2858	2709	msgid "Checkout D&epth"
2859	2710	msgstr ""
2860	2711
2861		-#. Resource IDs: (IDS_PROGRS_CMD_CHECKOUT)
	2712	+#. Resource IDs: (3650)
2862	2713	#, c-format
2863	2714	msgid "Checkout from %1!ls!, revision %2!ls!, %3!ls!, %4!ls!"
2864	2715	msgstr ""
2865	2716
2866		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	2717	+#. Resource IDs: (65535)
2867	2718	msgid "Checksum:"
2868	2719	msgstr ""
2869	2720
2870		-#. Resource IDs: (Dialog IDD_UPDATE: Control id 1606)
	2721	+#. Resource IDs: (1606)
2871	2722	msgid "Choose items..."
2872	2723	msgstr ""
2873	2724
2874		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 65535)
	2725	+#. Resource IDs: (65535)
2875	2726	msgid "Classification Patterns"
2876	2727	msgstr ""
2877	2728
2878		-#. Resource IDs: (IDS_PROC_CLEANUP)
	2729	+#. Resource IDs: (2304)
2879	2730	msgid "Cleaning up"
2880	2731	msgstr ""
2881	2732
2882		-#. Resource IDs: (IDS_PROC_CLEANUP_INFO1)
	2733	+#. Resource IDs: (2332)
2883	2734	#, c-format
2884	2735	msgid "Cleaning up directory '%1!ls!'"
2885	2736	msgstr ""
2886	2737
2887		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 329)
	2738	+#. Resource IDs: (329)
2888	2739	msgid "Cleanup"
2889	2740	msgstr ""
2890	2741
2891		-#. Resource IDs: (IDS_PROC_CLEANUPFINISHED_FAILED)
	2742	+#. Resource IDs: (1324)
2892	2743	#, c-format
2893	2744	msgid ""
2894	2745	"Cleanup failed to process the following paths:\n"

		@@ -2895,7 +2746,7 @@
2895	2746	"%ls"
2896	2747	msgstr ""
2897	2748
2898		-#. Resource IDs: (IDS_PROC_CLEANUPFINISHED)
	2749	+#. Resource IDs: (1257)
2899	2750	#, c-format
2900	2751	msgid ""
2901	2752	"Cleanup has successfully processed the following paths:\n"

		@@ -2902,37 +2753,33 @@
2902	2753	"%ls"
2903	2754	msgstr ""
2904	2755
2905		-#. Resource IDs: (IDS_MENUDESCCLEANUP)
	2756	+#. Resource IDs: (141)
2906	2757	msgid "Cleanup interrupted operations, locked files, ..."
2907	2758	msgstr ""
2908	2759
2909		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1273, Dialog
2910		-#. IDD_SETTINGSSAVEDDATA: Control id 1275, Dialog IDD_SETTINGSSAVEDDATA:
2911		-#. Control id 1276, Dialog IDD_SETTINGSSAVEDDATA: Control id 1281, Dialog
2912		-#. IDD_SETTINGSSAVEDDATA: Control id 1283, Dialog IDD_SETTINGSSAVEDDATA:
2913		-#. Control id 1427)
	2760	+#. Resource IDs: (1273, 1275, 1276, 1281, 1283, 1427)
2914	2761	msgid "Clear"
2915	2762	msgstr ""
2916	2763
2917		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1279)
	2764	+#. Resource IDs: (1279)
2918	2765	msgid "Clear all"
2919	2766	msgstr ""
2920	2767
2921		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1284)
	2768	+#. Resource IDs: (1284)
2922	2769	msgid "Clear..."
2923	2770	msgstr ""
2924	2771
2925		-#. Resource IDs: (IDS_SETTINGS_SAVEDDATA_URLHIST_TT)
	2772	+#. Resource IDs: (3127)
2926	2773	#, c-format
2927	2774	msgid "Clears %1!ld! URLs stored for %2!ld! working copies"
2928	2775	msgstr ""
2929	2776
2930		-#. Resource IDs: (IDS_SETTINGS_SAVEDDATA_LOGHIST_TT)
	2777	+#. Resource IDs: (3126)
2931	2778	#, c-format
2932	2779	msgid "Clears %1!ld! log messages stored for %2!ld! working copies"
2933	2780	msgstr ""
2934	2781
2935		-#. Resource IDs: (IDS_SETTINGS_SAVEDDATA_AUTH_TT)
	2782	+#. Resource IDs: (3129)
2936	2783	#, c-format
2937	2784	msgid ""
2938	2785	"Clears %1!ld! username/password pairs, %2!ld! ssl certificates and %3!ld! "

		@@ -2939,36 +2786,36 @@
2939	2786	"usernames"
2940	2787	msgstr ""
2941	2788
2942		-#. Resource IDs: (IDS_SETTINGS_CLEARHOOKS_TT)
	2789	+#. Resource IDs: (3162)
2943	2790	#, c-format
2944	2791	msgid "Clears all %ld approved client-side hook scripts"
2945	2792	msgstr ""
2946	2793
2947		-#. Resource IDs: (IDS_SETTINGS_SAVEDDATA_REPOLOGHIST_TT)
	2794	+#. Resource IDs: (3139)
2948	2795	#, c-format
2949	2796	msgid "Clears cached logs from %ld repositories"
2950	2797	msgstr ""
2951	2798
2952		-#. Resource IDs: (IDS_SETTINGS_SAVEDDATA_RESIZABLE_TT)
	2799	+#. Resource IDs: (3128)
2953	2800	#, c-format
2954	2801	msgid "Clears the stored sizes and positions of %ld dialogs"
2955	2802	msgstr ""
2956	2803
2957		-#. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 1466)
	2804	+#. Resource IDs: (1466)
2958	2805	msgid "Click here to go to the website"
2959	2806	msgstr ""
2960	2807
2961		-#. Resource IDs: (IDS_COMMITDLG_HISTORY_TT)
	2808	+#. Resource IDs: (2705)
2962	2809	msgid "Click here to select a recently typed message"
2963	2810	msgstr ""
2964	2811
2965		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 65535)
	2812	+#. Resource IDs: (65535)
2966	2813	msgid ""
2967	2814	"Click on \"Advanced\" to specify alternate diff programs based on file "
2968	2815	"extension"
2969	2816	msgstr ""
2970	2817
2971		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 65535)
	2818	+#. Resource IDs: (65535)
2972	2819	msgid ""
2973	2820	"Click on \"Advanced\" to specify alternate merge programs based on file "
2974	2821	"extension"

		@@ -2980,11 +2827,11 @@
2980	2827	"Use text blocks"
2981	2828	msgstr ""
2982	2829
2983		-#. Resource IDs: (IDS_CLIPBOARD_PROGRESS_DEST)
	2830	+#. Resource IDs: (4100)
2984	2831	msgid "Clipboard"
2985	2832	msgstr ""
2986	2833
2987		-#. Resource IDs: (IDS_PROGRS_CLOSE_MANUAL)
	2834	+#. Resource IDs: (3540)
2988	2835	msgid "Close manually"
2989	2836	msgstr ""
2990	2837

		@@ -2992,15 +2839,15 @@
2992	2839	msgid "Close the active window and prompts to save the documents"
2993	2840	msgstr ""
2994	2841
2995		-#. Resource IDs: (Dialog IDD_COLLABORATORSETTINGS: Control id 350)
	2842	+#. Resource IDs: (350)
2996	2843	msgid "Code Collaborator Settings"
2997	2844	msgstr ""
2998	2845
2999		-#. Resource IDs: (IDS_REVGRAPH_POPUP_COLLAPSE_ABOVE)
	2846	+#. Resource IDs: (4387)
3000	2847	msgid "Coll&apse source tree"
3001	2848	msgstr ""
3002	2849
3003		-#. Resource IDs: (Dialog IDD_COLLABORATORSETTINGS: Control id 65535)
	2850	+#. Resource IDs: (65535)
3004	2851	msgid "Collaborator &password"
3005	2852	msgstr ""
3006	2853

		@@ -3008,7 +2855,7 @@
3008	2855	msgid "Collapse"
3009	2856	msgstr ""
3010	2857
3011		-#. Resource IDs: (IDS_REVGRAPH_POPUP_COLLAPSE_BELOW)
	2858	+#. Resource IDs: (4391)
3012	2859	msgid "Collapse &following tree"
3013	2860	msgstr ""
3014	2861

		@@ -3018,11 +2865,11 @@
3018	2865	"Collapse"
3019	2866	msgstr ""
3020	2867
3021		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	2868	+#. Resource IDs: (65535)
3022	2869	msgid "Color 1"
3023	2870	msgstr "Колер 1"
3024	2871
3025		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	2872	+#. Resource IDs: (65535)
3026	2873	msgid "Color 2"
3027	2874	msgstr "Колер 2"
3028	2875

		@@ -3038,25 +2885,23 @@
3038	2885	msgid "Color by au&thor"
3039	2886	msgstr ""
3040	2887
3041		-#. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 138, Dialog
3042		-#. IDD_SETTINGSTBLAME: Control id 65535, Dialog IDD_SETTINGSUDIFF: Control id
3043		-#. 65535)
	2888	+#. Resource IDs: (65535, Dialog IDD_SETCOLORPAGE: Control id 138)
3044	2889	msgid "Colors"
3045	2890	msgstr "Колеры"
3046	2891
3047		-#. Resource IDs: (IDS_PROGRS_CMDINFO)
	2892	+#. Resource IDs: (3506)
3048	2893	msgid "Command"
3049	2894	msgstr "Каманда"
3050	2895
3051		-#. Resource IDs: (IDS_SETTINGS_HOOKS_COMMANDLINECOL)
	2896	+#. Resource IDs: (3154)
3052	2897	msgid "Command Line"
3053	2898	msgstr "Камандны радок"
3054	2899
3055		-#. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1336)
	2900	+#. Resource IDs: (1336)
3056	2901	msgid "Command Line To Execute:"
3057	2902	msgstr ""
3058	2903
3059		-#. Resource IDs: (IDS_EDITPROPS_LOCALHOOK_CMDLINELABEL)
	2904	+#. Resource IDs: (9432)
3060	2905	#, c-format
3061	2906	msgid ""
3062	2907	"Command Line To Execute:\r\n"

		@@ -3063,7 +2908,7 @@
3063	2908	"To specify a path inside a working copy, specify the url in the repository with the repository root url as %REPOROOT%, or %REPOROOT+% deeper down the working copy root."
3064	2909	msgstr ""
3065	2910
3066		-#. Resource IDs: (IDS_MSG_NEEDSUPDATE_TITLE)
	2911	+#. Resource IDs: (9850)
3067	2912	msgid "Command failed - Update needed"
3068	2913	msgstr ""
3069	2914

		@@ -3071,93 +2916,91 @@
3071	2916	msgid "Command failed."
3072	2917	msgstr ""
3073	2918
3074		-#. Resource IDs: (IDS_COMMITDLG_WARNUNVERSIONEDFOLDER_TASK3)
	2919	+#. Resource IDs: (2757)
3075	2920	msgid ""
3076	2921	"Commi&t only the folder\n"
3077	2922	"Files inside the folder won't get committed."
3078	2923	msgstr ""
3079	2924
3080		-#. Resource IDs: (IDS_PROGRS_COMMITT_TRUNK_TASK3)
	2925	+#. Resource IDs: (3522)
3081	2926	msgid ""
3082	2927	"Commi&t\n"
3083	2928	"Commit the changes to the target."
3084	2929	msgstr ""
3085	2930
3086		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 135, Dialog
3087		-#. IDD_SETTINGSMISC: Control id 1083, IDS_PROGRS_TITLE_COMMIT)
	2931	+#. Resource IDs: (1083, 1228, 135)
3088	2932	msgid "Commit"
3089	2933	msgstr ""
3090	2934
3091		-#. Resource IDs: (IDS_PROGRS_CMD_COMMIT)
	2935	+#. Resource IDs: (3658)
3092	2936	#, c-format
3093	2937	msgid "Commit to %1!ls!"
3094	2938	msgstr ""
3095	2939
3096		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1110)
	2940	+#. Resource IDs: (1110)
3097	2941	msgid "Commit to:"
3098	2942	msgstr ""
3099	2943
3100		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_COMMIT)
	2944	+#. Resource IDs: (3333)
3101	2945	msgid "Commit..."
3102	2946	msgstr ""
3103	2947
3104		-#. Resource IDs: (IDS_STATGRAPH_COMMITSBYAUTHOR)
	2948	+#. Resource IDs: (3900)
3105	2949	msgid "Commits by author"
3106	2950	msgstr ""
3107	2951
3108		-#. Resource IDs: (IDS_STATGRAPH_COMMITSBYDATE)
	2952	+#. Resource IDs: (3901)
3109	2953	msgid "Commits by date"
3110	2954	msgstr ""
3111	2955
3112		-#. Resource IDs: (IDS_STATGRAPH_COMMITSBYUNIT)
	2956	+#. Resource IDs: (3941)
3113	2957	#, c-format
3114	2958	msgid "Commits each %ls:"
3115	2959	msgstr ""
3116	2960
3117		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1135)
	2961	+#. Resource IDs: (1135)
3118	2962	msgid "Commits each week:"
3119	2963	msgstr ""
3120	2964
3121		-#. Resource IDs: (IDS_MENUDESCCOMMIT)
	2965	+#. Resource IDs: (138)
3122	2966	msgid "Commits your changes to the repository"
3123	2967	msgstr ""
3124	2968
3125		-#. Resource IDs: (IDS_COMMITDLG_WARNUNVERSIONEDFOLDER_TASK1)
	2969	+#. Resource IDs: (2755)
3126	2970	msgid ""
3127	2971	"Committing an unversioned folder will not recursively add its child items!\n"
3128	2972	"You might want to add these folders recursively by using the 'Add...' context menu item."
3129	2973	msgstr ""
3130	2974
3131		-#. Resource IDs: (IDS_PROGRS_COMMITT_TRUNK_TASK2)
	2975	+#. Resource IDs: (3521)
3132	2976	msgid "Committing to a tag"
3133	2977	msgstr ""
3134	2978
3135		-#. Resource IDs: (IDS_SVNACTION_COMMITTINGTRANSACTION)
	2979	+#. Resource IDs: (4247)
3136	2980	msgid "Committing transaction..."
3137	2981	msgstr ""
3138	2982
3139		-#. Resource IDs: (IDS_REVGRAPH_POPUP_COMPAREHEADS,
3140		-#. ID_VIEW_COMPAREHEADREVISIONS - Menu)
	2983	+#. Resource IDs: (32784 - Menu, 4381)
3141	2984	msgid "Compare &HEAD revisions"
3142	2985	msgstr ""
3143	2986
3144		-#. Resource IDs: (IDS_LOG_POPUP_BLAMECOMPARE)
	2987	+#. Resource IDs: (1811)
3145	2988	msgid "Compare and &blame with working BASE"
3146	2989	msgstr ""
3147	2990
3148		-#. Resource IDs: (IDS_LOG_POPUP_BLAMEWITHPREVIOUS)
	2991	+#. Resource IDs: (1817)
3149	2992	msgid "Compare and blame with previous revision"
3150	2993	msgstr ""
3151	2994
3152		-#. Resource IDs: (IDS_LOG_POPUP_COMPARETWOPROP)
	2995	+#. Resource IDs: (1825)
3153	2996	msgid "Compare revisions (&properties only)"
3154	2997	msgstr ""
3155	2998
3156		-#. Resource IDs: (IDS_LOG_POPUP_COMPARETWOTEXT)
	2999	+#. Resource IDs: (1824)
3157	3000	msgid "Compare revisions (conten&t only)"
3158	3001	msgstr ""
3159	3002
3160		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_COMPARETWO)
	3003	+#. Resource IDs: (3344)
3161	3004	msgid "Compare two files"
3162	3005	msgstr ""
3163	3006

		@@ -3166,23 +3009,23 @@
3166	3009	msgid "Compare whitespaces"
3167	3010	msgstr ""
3168	3011
3169		-#. Resource IDs: (IDS_LOG_COMPAREWITHHEAD)
	3012	+#. Resource IDs: (2202)
3170	3013	msgid "Compare with &HEAD and BASE"
3171	3014	msgstr ""
3172	3015
3173		-#. Resource IDs: (IDS_LOG_POPUP_COMPARE)
	3016	+#. Resource IDs: (1212)
3174	3017	msgid "Compare with &working copy"
3175	3018	msgstr ""
3176	3019
3177		-#. Resource IDs: (IDS_LOG_COMPAREWITHBASE)
	3020	+#. Resource IDs: (2200)
3178	3021	msgid "Compare with b&ase"
3179	3022	msgstr ""
3180	3023
3181		-#. Resource IDs: (IDS_LOG_COMPAREWITHBASE_CONTENTONLY)
	3024	+#. Resource IDs: (2203)
3182	3025	msgid "Compare with base (content only)"
3183	3026	msgstr ""
3184	3027
3185		-#. Resource IDs: (IDS_LOG_POPUP_COMPAREWITHPREVIOUS)
	3028	+#. Resource IDs: (1816)
3186	3029	msgid "Compare with previous revision"
3187	3030	msgstr ""
3188	3031

		@@ -3192,25 +3035,25 @@
3192	3035	"Compare whitespaces"
3193	3036	msgstr ""
3194	3037
3195		-#. Resource IDs: (IDS_MENUDESCDIFF)
	3038	+#. Resource IDs: (177)
3196	3039	msgid ""
3197	3040	"Compares the file with the last committed revision to show you the changes "
3198	3041	"you made"
3199	3042	msgstr ""
3200	3043
3201		-#. Resource IDs: (IDS_MENUDESCURLDIFF)
	3044	+#. Resource IDs: (262)
3202	3045	msgid "Compares the selected file with a file in the repository"
3203	3046	msgstr ""
3204	3047
3205		-#. Resource IDs: (IDS_SVNACTION_COMPLETED)
	3048	+#. Resource IDs: (1170)
3206	3049	msgid "Completed"
3207	3050	msgstr "Завершана"
3208	3051
3209		-#. Resource IDs: (IDS_PROGRS_FINISHED)
	3052	+#. Resource IDs: (3503)
3210	3053	msgid "Completed!"
3211	3054	msgstr "Завершана!"
3212	3055
3213		-#. Resource IDs: (Dialog IDD_RECYCLEBIN: Control id 1620)
	3056	+#. Resource IDs: (1620)
3214	3057	msgid "Configure &TortoiseSVN to never use the recycle bin"
3215	3058	msgstr ""
3216	3059

		@@ -3222,36 +3065,36 @@
3222	3065	msgid "Configure Filter Regexes"
3223	3066	msgstr ""
3224	3067
3225		-#. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 236)
	3068	+#. Resource IDs: (236)
3226	3069	msgid "Configure Hook Scripts"
3227	3070	msgstr ""
3228	3071
3229		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 284)
	3072	+#. Resource IDs: (284)
3230	3073	msgid "Configure Issue Tracker Integration"
3231	3074	msgstr ""
3232	3075
3233		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 65535)
	3076	+#. Resource IDs: (65535)
3234	3077	msgid "Configure the program used for comparing different revisions of files"
3235	3078	msgstr ""
3236	3079
3237		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 65535)
	3080	+#. Resource IDs: (65535)
3238	3081	msgid ""
3239	3082	"Configure the program used for comparing different revisions of properties"
3240	3083	msgstr ""
3241	3084
3242		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 65535)
	3085	+#. Resource IDs: (65535)
3243	3086	msgid "Configure the program used to resolve conflicted files."
3244	3087	msgstr ""
3245	3088
3246		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 65535)
	3089	+#. Resource IDs: (65535)
3247	3090	msgid "Configure viewer program for GNU diff files (patch files)."
3248	3091	msgstr ""
3249	3092
3250		-#. Resource IDs: (IDS_PROC_WARNREVERT_TASK2)
	3093	+#. Resource IDs: (2350)
3251	3094	msgid "Confirm revert"
3252	3095	msgstr ""
3253	3096
3254		-#. Resource IDs: (IDS_EDITCONFLICT_PROP_MAININSTRUCTION)
	3097	+#. Resource IDs: (1047)
3255	3098	#, c-format
3256	3099	msgid "Conflict for property \"%s\" discovered"
3257	3100	msgstr ""

		@@ -3260,12 +3103,11 @@
3260	3103	msgid "Conflict resolved"
3261	3104	msgstr "Канфлікт разьвязаны"
3262	3105
3263		-#. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535,
3264		-#. IDS_SVNACTION_CONFLICTED)
	3106	+#. Resource IDs: (4204, Dialog IDD_SETCOLORPAGE: Control id 65535)
3265	3107	msgid "Conflicted"
3266	3108	msgstr ""
3267	3109
3268		-#. Resource IDs: (IDS_SVNACTION_DRYRUN_CONFLICTED)
	3110	+#. Resource IDs: (4236)
3269	3111	msgid "Conflicted (maybe)"
3270	3112	msgstr ""
3271	3113

		@@ -3274,11 +3116,11 @@
3274	3116	msgid "Conflicts: %d"
3275	3117	msgstr "Канфліктаў: %d"
3276	3118
3277		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_UPDATE)
	3119	+#. Resource IDs: (5505)
3278	3120	msgid "Connect to the repository server and download missing log data"
3279	3121	msgstr ""
3280	3122
3281		-#. Resource IDs: (Dialog IDD_LOGCACHESTATISTICS: Control id 65535)
	3123	+#. Resource IDs: (65535)
3282	3124	msgid "Container sizes"
3283	3125	msgstr ""
3284	3126

		@@ -3294,32 +3136,32 @@
3294	3136	msgid "Convert tabs to spaces"
3295	3137	msgstr ""
3296	3138
3297		-#. Resource IDs: (IDS_MENUDESCUPGRADE)
	3139	+#. Resource IDs: (228)
3298	3140	msgid "Converts the working copy format to the new version"
3299	3141	msgstr ""
3300	3142
3301		-#. Resource IDs: (IDS_SCIEDIT_COPY)
	3143	+#. Resource IDs: (6003)
3302	3144	msgid "Cop&y"
3303	3145	msgstr ""
3304	3146
3305		-#. Resource IDs: (IDS_SVNACTION_COPY)
	3147	+#. Resource IDs: (1164)
3306	3148	msgid "Copied"
3307	3149	msgstr ""
3308	3150
3309		-#. Resource IDs: (IDS_REVGRAPH_BOXTOOLTIP_COPYSOURCE)
	3151	+#. Resource IDs: (4410)
3310	3152	#, c-format
3311	3153	msgid "Copied from: %1!ls!@%2!ld!\r\n"
3312	3154	msgstr ""
3313	3155
3314		-#. Resource IDs: (IDS_MENUDESCCOPYURL)
	3156	+#. Resource IDs: (281)
3315	3157	msgid "Copies the URLs of all selected items to the clipboard"
3316	3158	msgstr ""
3317	3159
3318		-#. Resource IDs: (IDS_PROGRS_TITLE_COPY, cmdCopy_LabelTitle_RESID)
	3160	+#. Resource IDs: (1235, cmdCopy_LabelTitle_RESID)
3319	3161	msgid "Copy"
3320	3162	msgstr "Капіяваць"
3321	3163
3322		-#. Resource IDs: (IDS_INPUT_COPYMORE)
	3164	+#. Resource IDs: (2020)
3323	3165	#, c-format
3324	3166	msgid ""
3325	3167	"Copy %1!ld! items to\r\n"

		@@ -3326,12 +3168,12 @@
3326	3168	"%2!ls!"
3327	3169	msgstr ""
3328	3170
3329		-#. Resource IDs: (IDS_PROGRS_CMD_COPY)
	3171	+#. Resource IDs: (3655)
3330	3172	#, c-format
3331	3173	msgid "Copy %1!ls! to %2!ls!, Revision %3!ls!"
3332	3174	msgstr ""
3333	3175
3334		-#. Resource IDs: (IDS_INPUT_COPY)
	3176	+#. Resource IDs: (2012)
3335	3177	#, c-format
3336	3178	msgid ""
3337	3179	"Copy %1!ls!\r\n"

		@@ -3342,37 +3184,37 @@
3342	3184	msgid "Copy &revision number to clipboard"
3343	3185	msgstr ""
3344	3186
3345		-#. Resource IDs: (Dialog IDD_COPY: Control id 142)
	3187	+#. Resource IDs: (142)
3346	3188	msgid "Copy (Branch / Tag)"
3347	3189	msgstr ""
3348	3190
3349		-#. Resource IDs: (IDS_MENUCOPYURL, IDS_REPOBROWSE_URLTOCLIPBOARD)
	3191	+#. Resource IDs: (1612, 280)
3350	3192	msgid "Copy URL to clipboard"
3351	3193	msgstr ""
3352	3194
3353		-#. Resource IDs: (IDS_PROC_COPYUNVERSIONED_TASK4)
	3195	+#. Resource IDs: (2377)
3354	3196	msgid ""
3355	3197	"Copy and add\n"
3356	3198	"The file is copied to the destination and added to version control."
3357	3199	msgstr ""
3358	3200
3359		-#. Resource IDs: (IDS_PROC_COPYRENAME)
	3201	+#. Resource IDs: (2335)
3360	3202	msgid "Copy and rename"
3361	3203	msgstr ""
3362	3204
3363		-#. Resource IDs: (IDS_REPOBROWSE_COPYRENAMEDROP)
	3205	+#. Resource IDs: (1648)
3364	3206	msgid "Copy and rename item to here"
3365	3207	msgstr ""
3366	3208
3367		-#. Resource IDs: (IDS_LOG_COPYFROM)
	3209	+#. Resource IDs: (1206)
3368	3210	msgid "Copy from path"
3369	3211	msgstr ""
3370	3212
3371		-#. Resource IDs: (IDS_REPOBROWSE_COPYDROP)
	3213	+#. Resource IDs: (1646)
3372	3214	msgid "Copy items to here"
3373	3215	msgstr ""
3374	3216
3375		-#. Resource IDs: (IDS_FILEDIFF_POPCLIPBOARD)
	3217	+#. Resource IDs: (5153)
3376	3218	msgid "Copy selection to cli&pboard"
3377	3219	msgstr ""
3378	3220

		@@ -3382,63 +3224,63 @@
3382	3224	"Copy"
3383	3225	msgstr ""
3384	3226
3385		-#. Resource IDs: (IDS_DROPDESC_COPY)
	3227	+#. Resource IDs: (9802)
3386	3228	#, c-format
3387	3229	msgid "Copy to %1"
3388	3230	msgstr ""
3389	3231
3390		-#. Resource IDs: (IDS_LOG_POPUP_COPYTOCLIPBOARD)
	3232	+#. Resource IDs: (1809)
3391	3233	msgid "Copy to clipboard"
3392	3234	msgstr ""
3393	3235
3394		-#. Resource IDs: (IDS_REPOBROWSE_COPYTOWC)
	3236	+#. Resource IDs: (1611)
3395	3237	msgid "Copy to working copy..."
3396	3238	msgstr ""
3397	3239
3398		-#. Resource IDs: (IDS_PROC_NEWNAMECOPY)
	3240	+#. Resource IDs: (1552)
3399	3241	#, c-format
3400	3242	msgid "Copy: New name for %ls"
3401	3243	msgstr ""
3402	3244
3403		-#. Resource IDs: (IDS_PROC_COPYUNVERSIONED_TASK3)
	3245	+#. Resource IDs: (2376)
3404	3246	msgid ""
3405	3247	"Copy\n"
3406	3248	"The file is copied to the destination and left unversioned."
3407	3249	msgstr ""
3408	3250
3409		-#. Resource IDs: (IDS_PROC_COPYINGPROG)
	3251	+#. Resource IDs: (1274)
3410	3252	#, c-format
3411	3253	msgid "Copying %1!ls!"
3412	3254	msgstr ""
3413	3255
3414		-#. Resource IDs: (IDS_SVNACTION_COPYREMOTE)
	3256	+#. Resource IDs: (4241)
3415	3257	msgid "Copying from foreign repository URL"
3416	3258	msgstr ""
3417	3259
3418		-#. Resource IDs: (IDS_PROC_COPYING)
	3260	+#. Resource IDs: (1273)
3419	3261	msgid "Copying..."
3420	3262	msgstr ""
3421	3263
3422		-#. Resource IDs: (IDS_ERR_FAILEDIGNOREPROPERTY)
	3264	+#. Resource IDs: (1292)
3423	3265	#, c-format
3424	3266	msgid "Could not add %ls to the ignore list!"
3425	3267	msgstr ""
3426	3268
3427		-#. Resource IDs: (IDS_EDITCONFLICT_ACTIONINFO_ADD)
	3269	+#. Resource IDs: (9300)
3428	3270	#, c-format
3429	3271	msgid "Could not add '%ls' because"
3430	3272	msgstr ""
3431	3273
3432		-#. Resource IDs: (IDS_EDITCONFLICT_PROP_ACTIONINFO_ADD)
	3274	+#. Resource IDs: (9303)
3433	3275	#, c-format
3434	3276	msgid "Could not add property '%1!ls!' on '%2!ls!' because"
3435	3277	msgstr ""
3436	3278
3437		-#. Resource IDs: (IDS_CHECKNEWER_NETERROR)
	3279	+#. Resource IDs: (3204)
3438	3280	msgid "Could not check for a newer version!"
3439	3281	msgstr ""
3440	3282
3441		-#. Resource IDs: (IDS_ERR_COPYFILES)
	3283	+#. Resource IDs: (1289)
3442	3284	#, c-format
3443	3285	msgid ""
3444	3286	"Could not copy the files!\n"

		@@ -3450,25 +3292,25 @@
3450	3292	msgid "Could not create %1 because the directory is full."
3451	3293	msgstr ""
3452	3294
3453		-#. Resource IDs: (IDS_ERR_CREATETEMPDIR)
	3295	+#. Resource IDs: (1334)
3454	3296	msgid "Could not create temp folder!"
3455	3297	msgstr ""
3456	3298
3457		-#. Resource IDs: (IDS_EDITCONFLICT_ACTIONINFO_DELETE)
	3299	+#. Resource IDs: (9302)
3458	3300	#, c-format
3459	3301	msgid "Could not delete '%ls' because"
3460	3302	msgstr ""
3461	3303
3462		-#. Resource IDs: (IDS_EDITCONFLICT_PROP_ACTIONINFO_DELETE)
	3304	+#. Resource IDs: (9305)
3463	3305	#, c-format
3464	3306	msgid "Could not delete property '%1!ls!' on '%2!ls!' because"
3465	3307	msgstr ""
3466	3308
3467		-#. Resource IDs: (IDS_ERR_NOPREVREVISION)
	3309	+#. Resource IDs: (1323)
3468	3310	msgid "Could not determine the last committed revision!"
3469	3311	msgstr ""
3470	3312
3471		-#. Resource IDs: (IDS_ERR_NOPARENTFOUND)
	3313	+#. Resource IDs: (1335)
3472	3314	#, c-format
3473	3315	msgid ""
3474	3316	"Could not find a parent folder for\n"

		@@ -3475,16 +3317,16 @@
3475	3317	"%ls"
3476	3318	msgstr ""
3477	3319
3478		-#. Resource IDs: (IDS_ERR_NOSTATUS)
	3320	+#. Resource IDs: (1285)
3479	3321	msgid "Could not get the status!"
3480	3322	msgstr ""
3481	3323
3482		-#. Resource IDs: (IDS_EDITCONFLICT_ACTIONINFO_MODIFY)
	3324	+#. Resource IDs: (9301)
3483	3325	#, c-format
3484	3326	msgid "Could not merge '%ls' because"
3485	3327	msgstr ""
3486	3328
3487		-#. Resource IDs: (IDS_EDITCONFLICT_PROP_ACTIONINFO_MODIFY)
	3329	+#. Resource IDs: (9304)
3488	3330	#, c-format
3489	3331	msgid "Could not merge property '%1!ls!' on '%2!ls!' because"
3490	3332	msgstr ""

		@@ -3506,22 +3348,22 @@
3506	3348	msgid "Could not remove %1 because it is the current directory."
3507	3349	msgstr ""
3508	3350
3509		-#. Resource IDs: (IDS_ERR_FAILEDUNIGNOREPROPERTY)
	3351	+#. Resource IDs: (1309)
3510	3352	#, c-format
3511	3353	msgid "Could not remove %ls from the ignore list"
3512	3354	msgstr ""
3513	3355
3514		-#. Resource IDs: (IDS_EDITCONFLICT_ACTIONINFO_REPLACE)
	3356	+#. Resource IDs: (9306)
3515	3357	#, c-format
3516	3358	msgid "Could not replace '%ls' because"
3517	3359	msgstr ""
3518	3360
3519		-#. Resource IDs: (IDS_EDITCONFLICT_PROP_ACTIONINFO_REPLACE)
	3361	+#. Resource IDs: (9307)
3520	3362	#, c-format
3521	3363	msgid "Could not replace property '%1!ls!' on '%2!ls!' because"
3522	3364	msgstr ""
3523	3365
3524		-#. Resource IDs: (IDS_ERR_NOURLOFFILE)
	3366	+#. Resource IDs: (1287)
3525	3367	#, c-format
3526	3368	msgid ""
3527	3369	"Could not retrieve URL of the file!\n"

		@@ -3535,7 +3377,7 @@
3535	3377	"Patching is not possible!"
3536	3378	msgstr ""
3537	3379
3538		-#. Resource IDs: (IDS_ERR_DIFFVIEWSTART)
	3380	+#. Resource IDs: (1293, IDS_ERR_DIFFVIEWSTART)
3539	3381	#, c-format
3540	3382	msgid ""
3541	3383	"Could not start diff viewer!\n"

		@@ -3542,7 +3384,7 @@
3542	3384	"%ls"
3543	3385	msgstr ""
3544	3386
3545		-#. Resource IDs: (IDS_ERR_EXTDIFFSTART)
	3387	+#. Resource IDs: (1282)
3546	3388	#, c-format
3547	3389	msgid ""
3548	3390	"Could not start external diff program!\n"

		@@ -3549,7 +3391,7 @@
3549	3391	"%ls"
3550	3392	msgstr ""
3551	3393
3552		-#. Resource IDs: (IDS_ERR_EXTMERGESTART)
	3394	+#. Resource IDs: (1290)
3553	3395	#, c-format
3554	3396	msgid ""
3555	3397	"Could not start external merge program!\n"

		@@ -3560,7 +3402,7 @@
3560	3402	msgid "Could not start print job."
3561	3403	msgstr ""
3562	3404
3563		-#. Resource IDs: (IDS_ERR_TEXTVIEWSTART)
	3405	+#. Resource IDs: (1326, IDS_ERR_TEXTVIEWSTART)
3564	3406	#, c-format
3565	3407	msgid ""
3566	3408	"Could not start text viewer!\n"

		@@ -3567,7 +3409,7 @@
3567	3409	"%ls"
3568	3410	msgstr ""
3569	3411
3570		-#. Resource IDs: (IDS_ERR_THREADSTARTFAILED)
	3412	+#. Resource IDs: (1281, IDS_ERR_THREADSTARTFAILED)
3571	3413	msgid "Could not start thread!"
3572	3414	msgstr ""
3573	3415

		@@ -3580,7 +3422,7 @@
3580	3422	msgid "Count: %u matches."
3581	3423	msgstr ""
3582	3424
3583		-#. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 1542)
	3425	+#. Resource IDs: (1542)
3584	3426	msgid "Create &Library"
3585	3427	msgstr ""
3586	3428

		@@ -3588,37 +3430,37 @@
3588	3430	msgid "Create &patch file"
3589	3431	msgstr ""
3590	3432
3591		-#. Resource IDs: (IDS_MENUCREATEPATCH)
	3433	+#. Resource IDs: (206)
3592	3434	msgid "Create &patch..."
3593	3435	msgstr ""
3594	3436
3595		-#. Resource IDs: (Dialog IDD_CREATECHANGELIST: Control id 243)
	3437	+#. Resource IDs: (243)
3596	3438	msgid "Create Changelist"
3597	3439	msgstr ""
3598	3440
3599		-#. Resource IDs: (Dialog IDD_CREATEPATCH: Control id 208)
	3441	+#. Resource IDs: (208)
3600	3442	msgid "Create Patch"
3601	3443	msgstr ""
3602	3444
3603		-#. Resource IDs: (IDS_CHECKPOINT_BTN_TT)
	3445	+#. Resource IDs: (1055)
3604	3446	msgid ""
3605	3447	"Create a checkpoint.\n"
3606	3448	"The selected modifications are saved to a shelf, but the local modifications are kept."
3607	3449	msgstr ""
3608	3450
3609		-#. Resource IDs: (IDS_LOG_CODE_COLLABORATOR)
	3451	+#. Resource IDs: (1015)
3610	3452	msgid "Create code collaborator revie&w..."
3611	3453	msgstr ""
3612	3454
3613		-#. Resource IDs: (Dialog IDD_COPY: Control id 1385)
	3455	+#. Resource IDs: (1385)
3614	3456	msgid "Create copy in the repository from:"
3615	3457	msgstr ""
3616	3458
3617		-#. Resource IDs: (Dialog IDD_COPY: Control id 1562)
	3459	+#. Resource IDs: (1562)
3618	3460	msgid "Create intermediate folders"
3619	3461	msgstr ""
3620	3462
3621		-#. Resource IDs: (IDS_INPUT_MKDIR)
	3463	+#. Resource IDs: (2013)
3622	3464	#, c-format
3623	3465	msgid ""
3624	3466	"Create new directory:\r\n"

		@@ -3629,20 +3471,20 @@
3629	3471	msgid "Create patch file"
3630	3472	msgstr ""
3631	3473
3632		-#. Resource IDs: (IDS_MENUCREATEREPOS)
	3474	+#. Resource IDs: (123)
3633	3475	msgid "Create repositor&y here"
3634	3476	msgstr ""
3635	3477
3636		-#. Resource IDs: (IDS_REPOBROWSE_CREATELINK)
	3478	+#. Resource IDs: (1617)
3637	3479	msgid "Create shortcut"
3638	3480	msgstr ""
3639	3481
3640		-#. Resource IDs: (IDS_MENUDESCCOPY)
	3482	+#. Resource IDs: (148)
3641	3483	msgid ""
3642	3484	"Creates a 'cheap' copy inside the repository used for branches or tagging"
3643	3485	msgstr ""
3644	3486
3645		-#. Resource IDs: (IDS_SETTINGS_CREATELIB_TT)
	3487	+#. Resource IDs: (3179)
3646	3488	msgid ""
3647	3489	"Creates a library folder with special settings for Subversion working copies"
3648	3490	msgstr ""

		@@ -3653,41 +3495,41 @@
3653	3495	"Create patch file"
3654	3496	msgstr ""
3655	3497
3656		-#. Resource IDs: (IDS_MENUDESCCREATEREPOS)
	3498	+#. Resource IDs: (147)
3657	3499	msgid "Creates a repository database at the current location"
3658	3500	msgstr ""
3659	3501
3660		-#. Resource IDs: (IDS_MENUDESCCREATEPATCH)
	3502	+#. Resource IDs: (208)
3661	3503	msgid "Creates a unified diff file with all changes you made"
3662	3504	msgstr ""
3663	3505
3664		-#. Resource IDs: (IDS_SHELF_CHECKPOINTING)
	3506	+#. Resource IDs: (1060)
3665	3507	#, c-format
3666	3508	msgid "Creating checkpoint \"%s\""
3667	3509	msgstr ""
3668	3510
3669		-#. Resource IDs: (Dialog IDD_ABOUT: Control id 65535)
	3511	+#. Resource IDs: (65535)
3670	3512	msgid "Credits:"
3671	3513	msgstr ""
3672	3514
3673		-#. Resource IDs: (IDS_SCIEDIT_CUT)
	3515	+#. Resource IDs: (6002)
3674	3516	msgid "Cu&t"
3675	3517	msgstr ""
3676	3518
3677		-#. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 1113)
	3519	+#. Resource IDs: (1113)
3678	3520	msgid "Current version is:"
3679	3521	msgstr ""
3680	3522
3681		-#. Resource IDs: (IDS_CHECKNEWER_CURRENTVERSION)
	3523	+#. Resource IDs: (3201)
3682	3524	#, c-format
3683	3525	msgid "Current version is: %ls"
3684	3526	msgstr ""
3685	3527
3686		-#. Resource IDs: (IDS_SVN_DEPTH_CUSTOM)
	3528	+#. Resource IDs: (265)
3687	3529	msgid "Custom depths"
3688	3530	msgstr ""
3689	3531
3690		-#. Resource IDs: (IDS_EDITPROPS_MERGETITLEHINT)
	3532	+#. Resource IDs: (9433)
3691	3533	msgid ""
3692	3534	"Custom title string. Available keywords are:\r\n"
3693	3535	"{mergeurl}:\tthe source url of the merge\r\n"

		@@ -3702,40 +3544,39 @@
3702	3544	"Cut"
3703	3545	msgstr ""
3704	3546
3705		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHELIST: Control id 1279)
	3547	+#. Resource IDs: (1279)
3706	3548	msgid "D&etails"
3707	3549	msgstr ""
3708	3550
3709		-#. Resource IDs: (Dialog IDD_EDITPROPKEYWORDS: Control id 1529,
3710		-#. IDS_HEADER_DATE, IDS_LOG_DATE, IDS_STATUSLIST_COLDATE)
	3551	+#. Resource IDs: (1210, 1529, 3312, IDS_HEADER_DATE)
3711	3552	msgid "Date"
3712	3553	msgstr "Дата"
3713	3554
3714		-#. Resource IDs: (IDS_LOG_FILTER_DATERANGE)
	3555	+#. Resource IDs: (1858)
3715	3556	msgid "Date Range"
3716	3557	msgstr "Дыяпазон датаў"
3717	3558
3718		-#. Resource IDs: (ID_EDIT_DEFAULT - Menu)
	3559	+#. Resource IDs: (32842 - Menu)
3719	3560	msgid "Default"
3720	3561	msgstr ""
3721	3562
3722		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535)
	3563	+#. Resource IDs: (65535)
3723	3564	msgid "Default &number of log messages"
3724	3565	msgstr ""
3725	3566
3726		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1516)
	3567	+#. Resource IDs: (1516)
3727	3568	msgid "Default URL:"
3728	3569	msgstr ""
3729	3570
3730		-#. Resource IDs: (IDS_MSG_IMPORTEDSTRUCTUREFINISHED)
	3571	+#. Resource IDs: (1280)
3731	3572	msgid "Default directory structure successfully created!"
3732	3573	msgstr ""
3733	3574
3734		-#. Resource IDs: (Dialog IDD_MONITOROPTIONS: Control id 65535)
	3575	+#. Resource IDs: (65535)
3735	3576	msgid "Default monitor interval in minutes:"
3736	3577	msgstr ""
3737	3578
3738		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1515)
	3579	+#. Resource IDs: (1515)
3739	3580	msgid "Default path:"
3740	3581	msgstr ""
3741	3582

		@@ -3743,45 +3584,45 @@
3743	3584	msgid "Default to UTF-8 encoding"
3744	3585	msgstr ""
3745	3586
3746		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1617)
	3587	+#. Resource IDs: (1617)
3747	3588	msgid "Delete &ignored files and folders"
3748	3589	msgstr ""
3749	3590
3750		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1613)
	3591	+#. Resource IDs: (1613)
3751	3592	msgid "Delete &unversioned files and folders"
3752	3593	msgstr ""
3753	3594
3754		-#. Resource IDs: (IDS_SETTINGS_CACHEDELETEQUESTION_TASK2)
	3595	+#. Resource IDs: (3180)
3755	3596	msgid "Delete Repository cache"
3756	3597	msgstr ""
3757	3598
3758		-#. Resource IDs: (Dialog IDD_DELUNVERSIONED: Control id 240)
	3599	+#. Resource IDs: (240)
3759	3600	msgid "Delete Unversioned Items"
3760	3601	msgstr ""
3761	3602
3762		-#. Resource IDs: (IDS_MENUDELETEIGNOREMULTIPLE)
	3603	+#. Resource IDs: (221)
3763	3604	#, c-format
3764	3605	msgid "Delete and &ignore %d items by name"
3765	3606	msgstr ""
3766	3607
3767		-#. Resource IDs: (IDS_MENUDELETEIGNOREMULTIPLE2)
	3608	+#. Resource IDs: (284)
3768	3609	msgid "Delete and &ignore multiple items by name"
3769	3610	msgstr ""
3770	3611
3771		-#. Resource IDs: (IDS_MENUDELETEIGNOREMULTIPLEMASK)
	3612	+#. Resource IDs: (222)
3772	3613	#, c-format
3773	3614	msgid "Delete and ignore %d items by &extension"
3774	3615	msgstr ""
3775	3616
3776		-#. Resource IDs: (IDS_MENUDELETEIGNOREMULTIPLEMASK2)
	3617	+#. Resource IDs: (285)
3777	3618	msgid "Delete and ignore multiple items by &extension"
3778	3619	msgstr ""
3779	3620
3780		-#. Resource IDs: (IDS_DELUNVERSIONED)
	3621	+#. Resource IDs: (9855)
3781	3622	msgid "Delete unversioned items"
3782	3623	msgstr ""
3783	3624
3784		-#. Resource IDs: (IDS_MENUDELUNVERSIONED)
	3625	+#. Resource IDs: (268)
3785	3626	msgid "Delete unversioned items..."
3786	3627	msgstr ""
3787	3628

		@@ -3791,62 +3632,60 @@
3791	3632	"The file is removed."
3792	3633	msgstr ""
3793	3634
3794		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1510, Dialog
3795		-#. IDD_SETTINGSOVERLAYHANDLERS: Control id 1551, IDS_SVNACTION_DELETE,
3796		-#. IDS_SVN_SUMMARIZEDELETED)
	3635	+#. Resource IDs: (1165, 1510, 1551, 4223)
3797	3636	msgid "Deleted"
3798	3637	msgstr "Выдалены"
3799	3638
3800		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	3639	+#. Resource IDs: (65535)
3801	3640	msgid "Deleted node"
3802	3641	msgstr ""
3803	3642
3804		-#. Resource IDs: (IDS_MENUDESCDELETEIGNORE)
	3643	+#. Resource IDs: (224)
3805	3644	msgid ""
3806	3645	"Deletes and adds the selected file(s) or the filemask to the 'ignore' list"
3807	3646	msgstr ""
3808	3647
3809		-#. Resource IDs: (IDS_MENUDESCREMOVE)
	3648	+#. Resource IDs: (169)
3810	3649	msgid "Deletes files / folders from version control"
3811	3650	msgstr ""
3812	3651
3813		-#. Resource IDs: (IDS_MENUDESCREMOVEKEEP)
	3652	+#. Resource IDs: (272)
3814	3653	msgid "Deletes files / folders from version control but keeps the file"
3815	3654	msgstr ""
3816	3655
3817		-#. Resource IDs: (IDS_SETTINGS_CLEARACTIONLOG_TT)
	3656	+#. Resource IDs: (3159)
3818	3657	msgid "Deletes the action log file"
3819	3658	msgstr ""
3820	3659
3821		-#. Resource IDs: (IDS_SVNACTION_DELETING)
	3660	+#. Resource IDs: (4202)
3822	3661	msgid "Deleting"
3823	3662	msgstr "Выдаленьне"
3824	3663
3825		-#. Resource IDs: (IDS_SETTINGS_DELCACHE)
	3664	+#. Resource IDs: (5556)
3826	3665	msgid "Deleting cached data"
3827	3666	msgstr ""
3828	3667
3829		-#. Resource IDs: (IDS_SETTINGS_DELFILE)
	3668	+#. Resource IDs: (5555)
3830	3669	msgid "Deleting file"
3831	3670	msgstr ""
3832	3671
3833		-#. Resource IDs: (IDS_STATUSLIST_COLDEPTH)
	3672	+#. Resource IDs: (3299)
3834	3673	msgid "Depth"
3835	3674	msgstr ""
3836	3675
3837		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	3676	+#. Resource IDs: (65535)
3838	3677	msgid "Depth:"
3839	3678	msgstr "Глыбіня:"
3840	3679
3841		-#. Resource IDs: (IDS_STATUSLIST_UNCHECKGROUP)
	3680	+#. Resource IDs: (3407)
3842	3681	msgid "Deselect changelist"
3843	3682	msgstr ""
3844	3683
3845		-#. Resource IDs: (Dialog IDD_COPY: Control id 1547)
	3684	+#. Resource IDs: (1547)
3846	3685	msgid "Destinatio&n URL:"
3847	3686	msgstr ""
3848	3687
3849		-#. Resource IDs: (Dialog IDD_SWITCH: Control id 1547)
	3688	+#. Resource IDs: (1547)
3850	3689	msgid "Destination URL:"
3851	3690	msgstr ""
3852	3691

		@@ -3864,7 +3703,7 @@
3864	3703	"a device independent bitmap"
3865	3704	msgstr ""
3866	3705
3867		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1277)
	3706	+#. Resource IDs: (1277)
3868	3707	msgid "Dialog sizes and positions"
3869	3708	msgstr ""
3870	3709

		@@ -3872,31 +3711,31 @@
3872	3711	msgid "Diff"
3873	3712	msgstr ""
3874	3713
3875		-#. Resource IDs: (Dialog IDD_URLDIFF: Control id 1542)
	3714	+#. Resource IDs: (1542)
3876	3715	msgid "Diff &Options"
3877	3716	msgstr ""
3878	3717
3879		-#. Resource IDs: (Dialog IDD_DIFFOPTIONS: Control id 325)
	3718	+#. Resource IDs: (325)
3880	3719	msgid "Diff Options"
3881	3720	msgstr ""
3882	3721
3883		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 192)
	3722	+#. Resource IDs: (192)
3884	3723	msgid "Diff Viewer"
3885	3724	msgstr ""
3886	3725
3887		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 193)
	3726	+#. Resource IDs: (193)
3888	3727	msgid "Diff Viewer::Merge Tool"
3889	3728	msgstr ""
3890	3729
3891		-#. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535)
	3730	+#. Resource IDs: (65535)
3892	3731	msgid "Diff added lines"
3893	3732	msgstr ""
3894	3733
3895		-#. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535)
	3734	+#. Resource IDs: (65535)
3896	3735	msgid "Diff command"
3897	3736	msgstr ""
3898	3737
3899		-#. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535)
	3738	+#. Resource IDs: (65535)
3900	3739	msgid "Diff comment"
3901	3740	msgstr ""
3902	3741

		@@ -3904,40 +3743,40 @@
3904	3743	msgid "Diff file:"
3905	3744	msgstr ""
3906	3745
3907		-#. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535)
	3746	+#. Resource IDs: (65535)
3908	3747	msgid "Diff header"
3909	3748	msgstr ""
3910	3749
3911		-#. Resource IDs: (IDS_MENUDIFFLATER)
	3750	+#. Resource IDs: (267)
3912	3751	msgid "Diff later"
3913	3752	msgstr ""
3914	3753
3915		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1533)
	3754	+#. Resource IDs: (1533)
3916	3755	msgid "Diff options"
3917	3756	msgstr "Налады параўнаньня"
3918	3757
3919		-#. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535)
	3758	+#. Resource IDs: (65535)
3920	3759	msgid "Diff position"
3921	3760	msgstr ""
3922	3761
3923		-#. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535)
	3762	+#. Resource IDs: (65535)
3924	3763	msgid "Diff removed lines"
3925	3764	msgstr ""
3926	3765
3927		-#. Resource IDs: (Dialog IDD_URLDIFF: Control id 279)
	3766	+#. Resource IDs: (279)
3928	3767	msgid "Diff with URL"
3929	3768	msgstr ""
3930	3769
3931		-#. Resource IDs: (IDS_MENUDIFFNOW)
	3770	+#. Resource IDs: (275)
3932	3771	#, c-format
3933	3772	msgid "Diff with \"%ls\""
3934	3773	msgstr ""
3935	3774
3936		-#. Resource IDs: (Dialog IDD_DIFFFILES: Control id 1302)
	3775	+#. Resource IDs: (1302)
3937	3776	msgid "Difference between"
3938	3777	msgstr "Адрозьненьне паміж"
3939	3778
3940		-#. Resource IDs: (ID_VIEW_SHOWDIFFPATHS - Menu)
	3779	+#. Resource IDs: (32817 - Menu)
3941	3780	msgid "Differential path &names"
3942	3781	msgstr ""
3943	3782

		@@ -3945,11 +3784,11 @@
3945	3784	msgid "Diffing"
3946	3785	msgstr ""
3947	3786
3948		-#. Resource IDs: (IDS_MENUDESCPREVDIFF)
	3787	+#. Resource IDs: (215)
3949	3788	msgid "Diffs the working copy file with the one before the last commit."
3950	3789	msgstr ""
3951	3790
3952		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1513)
	3791	+#. Resource IDs: (1513)
3953	3792	msgid "Directories"
3954	3793	msgstr "Каталёгі"
3955	3794

		@@ -3957,11 +3796,11 @@
3957	3796	msgid "Directory:"
3958	3797	msgstr "Каталёг:"
3959	3798
3960		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1529)
	3799	+#. Resource IDs: (1529)
3961	3800	msgid "Disable status cache for elevated processes"
3962	3801	msgstr ""
3963	3802
3964		-#. Resource IDs: (IDS_MERGEWIZARD_OPTIONS_FORCE_TT)
	3803	+#. Resource IDs: (9521)
3965	3804	msgid "Discards local changes upon incoming deletes"
3966	3805	msgstr ""
3967	3806

		@@ -3999,51 +3838,51 @@
3999	3838	"About"
4000	3839	msgstr ""
4001	3840
4002		-#. Resource IDs: (IDS_HOOKS_APPROVE_TASK5)
	3841	+#. Resource IDs: (5804)
4003	3842	msgid "Do not ask again for this script"
4004	3843	msgstr ""
4005	3844
4006		-#. Resource IDs: (Dialog IDD_EXPORT: Control id 1562)
	3845	+#. Resource IDs: (1562)
4007	3846	msgid "Do not expand keywords"
4008	3847	msgstr ""
4009	3848
4010		-#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535)
	3849	+#. Resource IDs: (65535)
4011	3850	msgid "Do not show the context menu for the following paths:"
4012	3851	msgstr ""
4013	3852
4014		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_OPTIONS: Control id 1562)
	3853	+#. Resource IDs: (1562)
4015	3854	msgid "Do reintegrate instead of automatic merge (old style)"
4016	3855	msgstr ""
4017	3856
4018		-#. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM_TASK5)
	3857	+#. Resource IDs: (1438)
4019	3858	msgid "Do this for all existing files"
4020	3859	msgstr ""
4021	3860
4022		-#. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_TASK6)
	3861	+#. Resource IDs: (1443)
4023	3862	msgid "Do this for all existing folders"
4024	3863	msgstr ""
4025	3864
4026		-#. Resource IDs: (IDS_PROC_REPLACEEXISTING_TASK5)
	3865	+#. Resource IDs: (2342)
4027	3866	msgid "Do this for all existing items"
4028	3867	msgstr ""
4029	3868
4030		-#. Resource IDs: (IDS_EDITPROPS_RECURSIVEREMOVE_TASK6)
	3869	+#. Resource IDs: (9413)
4031	3870	msgid "Do this for all selected items"
4032	3871	msgstr ""
4033	3872
4034		-#. Resource IDs: (IDS_COMMITDLG_WARNUNVERSIONEDFOLDER_TASK5)
	3873	+#. Resource IDs: (2759)
4035	3874	msgid "Do this for all selected unversioned folders"
4036	3875	msgstr ""
4037	3876
4038		-#. Resource IDs: (IDS_PROC_MOVEUNVERSIONED_TASK6)
	3877	+#. Resource IDs: (2375)
4039	3878	msgid "Do this for all unversioned items"
4040	3879	msgstr ""
4041	3880
4042		-#. Resource IDs: (IDS_PROC_REMOVEFORCE_TASK5)
	3881	+#. Resource IDs: (2358)
4043	3882	msgid "Do this for all unversioned/modified items"
4044	3883	msgstr ""
4045	3884
4046		-#. Resource IDs: (IDS_PROC_VENDORDROP_CONFIRM)
	3885	+#. Resource IDs: (1464)
4047	3886	#, c-format
4048	3887	msgid "Do you want to drop the vendor branch into the working copy \"%ls\"?"
4049	3888	msgstr ""

		@@ -4052,7 +3891,7 @@
4052	3891	msgid "Do you want to load the changed files?"
4053	3892	msgstr ""
4054	3893
4055		-#. Resource IDs: (IDS_PROC_EXPORTUNVERSION)
	3894	+#. Resource IDs: (1577)
4056	3895	#, c-format
4057	3896	msgid ""
4058	3897	"Do you want to make this working copy unversioned?\n"

		@@ -4060,7 +3899,7 @@
4060	3899	"%ls!"
4061	3900	msgstr ""
4062	3901
4063		-#. Resource IDs: (IDS_PROC_RESOLVE_TASK1)
	3902	+#. Resource IDs: (2354)
4064	3903	#, c-format
4065	3904	msgid "Do you want to mark '%ls' as resolved?"
4066	3905	msgstr ""

		@@ -4073,7 +3912,7 @@
4073	3912	"as resolved?"
4074	3913	msgstr ""
4075	3914
4076		-#. Resource IDs: (IDS_SSL_ACCEPTQUESTION)
	3915	+#. Resource IDs: (1201)
4077	3916	msgid "Do you want to proceed?"
4078	3917	msgstr "Жадаеце працягнуць?"
4079	3918

		@@ -4087,22 +3926,22 @@
4087	3926	"Note: you will lose all changes you've made!"
4088	3927	msgstr ""
4089	3928
4090		-#. Resource IDs: (IDS_MONITOR_DELETE_TASK2)
	3929	+#. Resource IDs: (1030)
4091	3930	#, c-format
4092	3931	msgid "Do you want to remove the monitored project '%ls'?"
4093	3932	msgstr ""
4094	3933
4095		-#. Resource IDs: (IDS_EDITPROPS_RECURSIVEREMOVEQUESTION)
	3934	+#. Resource IDs: (9402)
4096	3935	#, c-format
4097	3936	msgid "Do you want to remove the property %ls recursively?"
4098	3937	msgstr ""
4099	3938
4100		-#. Resource IDs: (IDS_PROC_WARNREVERT_TASK1)
	3939	+#. Resource IDs: (2349)
4101	3940	#, c-format
4102	3941	msgid "Do you want to revert '%ls'?"
4103	3942	msgstr ""
4104	3943
4105		-#. Resource IDs: (IDS_LOG_REVERT_CONFIRM_TASK6)
	3944	+#. Resource IDs: (1911)
4106	3945	#, c-format
4107	3946	msgid ""
4108	3947	"Do you want to revert all changes in\n"

		@@ -4110,7 +3949,7 @@
4110	3949	"and go back to this revision?"
4111	3950	msgstr ""
4112	3951
4113		-#. Resource IDs: (IDS_LOG_REVERT_CONFIRM_TASK1)
	3952	+#. Resource IDs: (1910)
4114	3953	#, c-format
4115	3954	msgid ""
4116	3955	"Do you want to revert all changes in\n"

		@@ -4118,7 +3957,7 @@
4118	3957	"which were made in this revision?"
4119	3958	msgstr ""
4120	3959
4121		-#. Resource IDs: (IDS_DROPEXT_UPDATE_TASK1)
	3960	+#. Resource IDs: (4651)
4122	3961	#, c-format
4123	3962	msgid ""
4124	3963	"Do you want to update the folder \"%ls\" to fetch the applied svn:externals?"

		@@ -4128,13 +3967,13 @@
4128	3967	msgid "Document :"
4129	3968	msgstr "Дакумэнт:"
4130	3969
4131		-#. Resource IDs: (Dialog IDD_ABOUT: Control id 65535)
	3970	+#. Resource IDs: (65535)
4132	3971	msgid ""
4133	3972	"Documentation : Simon Large\n"
4134	3973	"Code : Tobias Schäfer, Stefan Fuhrmann"
4135	3974	msgstr ""
4136	3975
4137		-#. Resource IDs: (IDS_CHECKOUT_TT_MULTIWC)
	3976	+#. Resource IDs: (1503)
4138	3977	msgid ""
4139	3978	"Don't make the checkout directory a sparse working copy.\n"
4140	3979	"Instead, all URLs get checked out into a separate\n"

		@@ -4160,15 +3999,15 @@
4160	3999	"Reload the views without saving the modifications"
4161	4000	msgstr ""
4162	4001
4163		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1079)
	4002	+#. Resource IDs: (1079)
4164	4003	msgid "Drive Types"
4165	4004	msgstr ""
4166	4005
4167		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1315)
	4006	+#. Resource IDs: (1315)
4168	4007	msgid "Drives A: and B:"
4169	4008	msgstr ""
4170	4009
4171		-#. Resource IDs: (IDS_DROPDESC_NODROP)
	4010	+#. Resource IDs: (9800)
4172	4011	#, c-format
4173	4012	msgid "Drop not possible on %1!ls!"
4174	4013	msgstr ""

		@@ -4177,19 +4016,19 @@
4177	4016	msgid "E"
4178	4017	msgstr ""
4179	4018
4180		-#. Resource IDs: (ID_INLINEEDIT - Menu)
	4019	+#. Resource IDs: (32816 - Menu)
4181	4020	msgid "E&xact copy sources"
4182	4021	msgstr ""
4183	4022
4184		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1518)
	4023	+#. Resource IDs: (1518)
4185	4024	msgid "E&xclude paths:"
4186	4025	msgstr ""
4187	4026
4188		-#. Resource IDs: (ID_NEW_EXECUTABLE - Menu)
	4027	+#. Resource IDs: (32839 - Menu)
4189	4028	msgid "E&xecutable"
4190	4029	msgstr ""
4191	4030
4192		-#. Resource IDs: (105 - Menu, ID_APP_EXIT - Menu, ID_POPUP_EXIT - Menu,
	4031	+#. Resource IDs: (105 - Menu, 32874 - Menu, ID_APP_EXIT - Menu,
4193	4032	#. cmdExit_LabelTitle_RESID)
4194	4033	msgid "E&xit"
4195	4034	msgstr ""

		@@ -4198,19 +4037,19 @@
4198	4037	msgid "E&xit\t(Ctrl+W)"
4199	4038	msgstr ""
4200	4039
4201		-#. Resource IDs: (IDS_REVGRAPH_POPUP_EXPAND_ALL)
	4040	+#. Resource IDs: (4384)
4202	4041	msgid "E&xpand all"
4203	4042	msgstr ""
4204	4043
4205		-#. Resource IDs: (IDS_REVGRAPH_POPUP_EXPAND_RIGHT)
	4044	+#. Resource IDs: (4388)
4206	4045	msgid "E&xpand sub-trees"
4207	4046	msgstr ""
4208	4047
4209		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHELIST: Control id 1437)
	4048	+#. Resource IDs: (1437)
4210	4049	msgid "E&xport"
4211	4050	msgstr ""
4212	4051
4213		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1382, IDS_MENUEXPORT)
	4052	+#. Resource IDs: (132, 1382)
4214	4053	msgid "E&xport..."
4215	4054	msgstr ""
4216	4055

		@@ -4222,65 +4061,64 @@
4222	4061	msgid "EXT"
4223	4062	msgstr ""
4224	4063
4225		-#. Resource IDs: (65535 - PopupMenu, Dialog IDD_SETTINGSPROXY: Control id
4226		-#. 1237, cmdGroupEdit_LabelTitle_RESID, cmdTabEdit_LabelTitle_RESID)
	4064	+#. Resource IDs: (1237, 65535 - PopupMenu, cmdGroupEdit_LabelTitle_RESID,
	4065	+#. cmdTabEdit_LabelTitle_RESID)
4227	4066	msgid "Edit"
4228	4067	msgstr ""
4229	4068
4230		-#. Resource IDs: (Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 319)
	4069	+#. Resource IDs: (319)
4231	4070	msgid "Edit External"
4232	4071	msgstr ""
4233	4072
4234		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 359)
	4073	+#. Resource IDs: (359)
4235	4074	msgid "Edit Project to monitor"
4236	4075	msgstr ""
4237	4076
4238		-#. Resource IDs: (Dialog IDD_EDITPROPERTYVALUE: Control id 227,
4239		-#. IDS_EDITPROPS_EDITTITLE)
	4077	+#. Resource IDs: (227, 9408)
4240	4078	msgid "Edit Properties"
4241	4079	msgstr ""
4242	4080
4243		-#. Resource IDs: (IDS_PROC_EDIT_PROP_CONFLICTS)
	4081	+#. Resource IDs: (2322)
4244	4082	msgid "Edit Property Conflicts"
4245	4083	msgstr ""
4246	4084
4247		-#. Resource IDs: (IDS_PROC_EDIT_TEXT_CONFLICTS)
	4085	+#. Resource IDs: (2321)
4248	4086	msgid "Edit Text Conflicts"
4249	4087	msgstr ""
4250	4088
4251		-#. Resource IDs: (IDS_PROC_EDIT_TREE_CONFLICTS)
	4089	+#. Resource IDs: (2318)
4252	4090	msgid "Edit Tree Conflicts"
4253	4091	msgstr ""
4254	4092
4255		-#. Resource IDs: (IDS_LOG_POPUP_EDITAUTHOR)
	4093	+#. Resource IDs: (1805)
4256	4094	msgid "Edit author"
4257	4095	msgstr ""
4258	4096
4259		-#. Resource IDs: (IDS_LOG_AUTHOREDITTITLE)
	4097	+#. Resource IDs: (1832)
4260	4098	msgid "Edit author name"
4261	4099	msgstr ""
4262	4100
4263		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 315)
	4101	+#. Resource IDs: (315)
4264	4102	msgid "Edit bugtraq properties"
4265	4103	msgstr ""
4266	4104
4267		-#. Resource IDs: (IDS_DLGTITLE_EDIT_DIFF_TOOL)
	4105	+#. Resource IDs: (1752)
4268	4106	msgid "Edit extension specific diff program"
4269	4107	msgstr ""
4270	4108
4271		-#. Resource IDs: (IDS_DLGTITLE_EDIT_MERGE_TOOL)
	4109	+#. Resource IDs: (1753)
4272	4110	msgid "Edit extension specific merge program"
4273	4111	msgstr ""
4274	4112
4275		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNLANG: Control id 321)
	4113	+#. Resource IDs: (321)
4276	4114	msgid "Edit language properties"
4277	4115	msgstr ""
4278	4116
4279		-#. Resource IDs: (IDS_LOG_MESSAGEEDITTITLE, IDS_LOG_POPUP_EDITLOG)
	4117	+#. Resource IDs: (1806, 1831)
4280	4118	msgid "Edit log message"
4281	4119	msgstr ""
4282	4120
4283		-#. Resource IDs: (IDS_INPUT_EDITPROP)
	4121	+#. Resource IDs: (2022)
4284	4122	#, c-format
4285	4123	msgid ""
4286	4124	"Edit property '%1!S!' on\r\n"

		@@ -4287,32 +4125,31 @@
4287	4125	"%2!ls!"
4288	4126	msgstr ""
4289	4127
4290		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 1382, Dialog
4291		-#. IDD_SETTINGSHOOKS: Control id 1331)
	4128	+#. Resource IDs: (1331, 1382)
4292	4129	msgid "Edit..."
4293	4130	msgstr ""
4294	4131
4295		-#. Resource IDs: (IDS_EDITCONFLICT_TEXT_EDITCMD)
	4132	+#. Resource IDs: (2323)
4296	4133	msgid ""
4297	4134	"Edit\n"
4298	4135	"Edit text conflicts"
4299	4136	msgstr ""
4300	4137
4301		-#. Resource IDs: (IDS_EDITCONFLICT_PROP_EDITCMD)
	4138	+#. Resource IDs: (1049)
4302	4139	msgid ""
4303	4140	"Edit\n"
4304	4141	"change merged property value in editor"
4305	4142	msgstr ""
4306	4143
4307		-#. Resource IDs: (IDS_PROP_TT_EDIT)
	4144	+#. Resource IDs: (9295)
4308	4145	msgid "Edits the selected property value"
4309	4146	msgstr ""
4310	4147
4311		-#. Resource IDs: (IDS_SETTINGS_PROXYSERVER_TT)
	4148	+#. Resource IDs: (1251)
4312	4149	msgid "Either the name or IP of the proxy server"
4313	4150	msgstr ""
4314	4151
4315		-#. Resource IDs: (IDS_SVNACTION_ELIDEMERGEINFO)
	4152	+#. Resource IDs: (4230)
4316	4153	msgid "Eliding mergeinfo"
4317	4154	msgstr ""
4318	4155

		@@ -4320,11 +4157,11 @@
4320	4157	msgid "Empty"
4321	4158	msgstr "Пусты"
4322	4159
4323		-#. Resource IDs: (Dialog IDD_ADD: Control id 1562)
	4160	+#. Resource IDs: (1562)
4324	4161	msgid "Enable Auto-&Properties"
4325	4162	msgstr ""
4326	4163
4327		-#. Resource IDs: (Dialog IDD_IMPORT: Control id 1562)
	4164	+#. Resource IDs: (1562)
4328	4165	msgid "Enable Auto-Properties"
4329	4166	msgstr ""
4330	4167

		@@ -4336,19 +4173,19 @@
4336	4173	msgid "Enable EditorConfig"
4337	4174	msgstr ""
4338	4175
4339		-#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 1648)
	4176	+#. Resource IDs: (1648)
4340	4177	msgid "Enable drag context menu"
4341	4178	msgstr ""
4342	4179
4343		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_ENABLE)
	4180	+#. Resource IDs: (5500)
4344	4181	msgid "Enable log caching to speed up log and revision graph dialogs"
4345	4182	msgstr ""
4346	4183
4347		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535)
	4184	+#. Resource IDs: (65535)
4348	4185	msgid "Enabled Overlay Handlers"
4349	4186	msgstr ""
4350	4187
4351		-#. Resource IDs: (IDS_SETTINGS_SPELLCHECKER_TT)
	4188	+#. Resource IDs: (3118)
4352	4189	msgid ""
4353	4190	"Enables the spellchecker only if the\n"
4354	4191	"tsvn:projectlanguage property is set."

		@@ -4395,7 +4232,7 @@
4395	4232	msgid "Encountered an unexpected error while writing %1."
4396	4233	msgstr ""
4397	4234
4398		-#. Resource IDs: (Dialog IDD_REVISIONRANGE: Control id 1537)
	4235	+#. Resource IDs: (1537)
4399	4236	msgid "End Revision"
4400	4237	msgstr ""
4401	4238

		@@ -4403,7 +4240,7 @@
4403	4240	msgid "End of Line Style"
4404	4241	msgstr ""
4405	4242
4406		-#. Resource IDs: (IDS_SETTINGS_HOOKS_ENFORCE)
	4243	+#. Resource IDs: (3188)
4407	4244	msgid "Enforce"
4408	4245	msgstr ""
4409	4246

		@@ -4411,11 +4248,11 @@
4411	4248	msgid "Enlarge the window to full size"
4412	4249	msgstr ""
4413	4250
4414		-#. Resource IDs: (Dialog IDD_INPUTLOGDLG: Control id 241)
	4251	+#. Resource IDs: (241)
4415	4252	msgid "Enter Log Message"
4416	4253	msgstr ""
4417	4254
4418		-#. Resource IDs: (Dialog IDD_CREATECHANGELIST: Control id 65535)
	4255	+#. Resource IDs: (65535)
4419	4256	msgid "Enter a &name for the changelist:"
4420	4257	msgstr ""
4421	4258

		@@ -4435,7 +4272,7 @@
4435	4272	msgid "Enter a date."
4436	4273	msgstr "Увядзіце дату."
4437	4274
4438		-#. Resource IDs: (IDS_LOCK_MESSAGEHINT)
	4275	+#. Resource IDs: (5000)
4439	4276	msgid "Enter a lock message (optional):"
4440	4277	msgstr ""
4441	4278

		@@ -4469,15 +4306,15 @@
4469	4306	msgid "Enter an integer."
4470	4307	msgstr ""
4471	4308
4472		-#. Resource IDs: (Dialog IDD_AUTOTEXTTESTDLG: Control id 65535)
	4309	+#. Resource IDs: (65535)
4473	4310	msgid "Enter file content to test for below:"
4474	4311	msgstr ""
4475	4312
4476		-#. Resource IDs: (Dialog IDD_INPUTDLG: Control id 1065)
	4313	+#. Resource IDs: (1065)
4477	4314	msgid "Enter log &message:"
4478	4315	msgstr ""
4479	4316
4480		-#. Resource IDs: (IDS_INPUT_ENTERLOG)
	4317	+#. Resource IDs: (2000)
4481	4318	msgid "Enter log message:"
4482	4319	msgstr ""
4483	4320

		@@ -4486,15 +4323,15 @@
4486	4323	msgid "Enter no more than %1 characters."
4487	4324	msgstr ""
4488	4325
4489		-#. Resource IDs: (IDS_LOGCACHE_EXPORTFILTER)
	4326	+#. Resource IDs: (1017)
4490	4327	msgid "Enter the prefix\|*"
4491	4328	msgstr ""
4492	4329
4493		-#. Resource IDs: (Dialog IDD_AUTOTEXTTESTDLG: Control id 65535)
	4330	+#. Resource IDs: (65535)
4494	4331	msgid "Enter the regex string below:"
4495	4332	msgstr ""
4496	4333
4497		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1577)
	4334	+#. Resource IDs: (1577)
4498	4335	msgid ""
4499	4336	"Enter the regular expression patterns for filtering out the bug-ID from a "
4500	4337	"commit message."

		@@ -4512,20 +4349,20 @@
4512	4349	"Erase"
4513	4350	msgstr ""
4514	4351
4515		-#. Resource IDs: (IDS_ERR_ERROR)
	4352	+#. Resource IDs: (1307, IDS_ERR_ERROR)
4516	4353	msgid "Error"
4517	4354	msgstr "Памылка"
4518	4355
4519		-#. Resource IDs: (IDS_PROC_ICONCACHENOTREBUILT)
	4356	+#. Resource IDs: (2315)
4520	4357	msgid "Error rebuilding Shell Icon Cache!"
4521	4358	msgstr ""
4522	4359
4523		-#. Resource IDs: (IDS_ERR_SSL_VALIDATE)
	4360	+#. Resource IDs: (1294)
4524	4361	#, c-format
4525	4362	msgid "Error validating server certificate for %ls:"
4526	4363	msgstr ""
4527	4364
4528		-#. Resource IDs: (IDS_REG_ERROR)
	4365	+#. Resource IDs: (1110)
4529	4366	#, c-format
4530	4367	msgid ""
4531	4368	"Error while reading/writing the registry key %1!ls!\n"

		@@ -4532,110 +4369,110 @@
4532	4369	"%2!ls!"
4533	4370	msgstr ""
4534	4371
4535		-#. Resource IDs: (IDS_COMMITDLG_WARNNOISSUE_TASK1)
	4372	+#. Resource IDs: (2751)
4536	4373	msgid "Every commit should be assigned to an issue."
4537	4374	msgstr ""
4538	4375
4539		-#. Resource IDs: (ID_NEW_EXTERNALS - Menu)
	4376	+#. Resource IDs: (32853 - Menu)
4540	4377	msgid "Ex&ternals"
4541	4378	msgstr ""
4542	4379
4543		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1413)
	4380	+#. Resource IDs: (1413)
4544	4381	msgid "Exceptions:"
4545	4382	msgstr ""
4546	4383
4547		-#. Resource IDs: (IDS_SVN_DEPTH_EXCLUDE)
	4384	+#. Resource IDs: (304)
4548	4385	msgid "Exclude"
4549	4386	msgstr ""
4550	4387
4551		-#. Resource IDs: (Dialog IDD_AUTOTEXTTESTDLG: Control id 2)
	4388	+#. Resource IDs: (2)
4552	4389	msgid "Exit"
4553	4390	msgstr ""
4554	4391
4555		-#. Resource IDs: (IDS_REVGRAPH_POPUP_EXPAND_ABOVE)
	4392	+#. Resource IDs: (4386)
4556	4393	msgid "Exp&and source tree"
4557	4394	msgstr ""
4558	4395
4559		-#. Resource IDs: (IDS_REVGRAPH_POPUP_EXPAND_BELOW)
	4396	+#. Resource IDs: (4390)
4560	4397	msgid "Expand &following tree"
4561	4398	msgstr ""
4562	4399
4563		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 65535)
	4400	+#. Resource IDs: (65535)
4564	4401	msgid "Expert settings"
4565	4402	msgstr ""
4566	4403
4567		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_EXPLORE)
	4404	+#. Resource IDs: (3331)
4568	4405	msgid "Explore to"
4569	4406	msgstr ""
4570	4407
4571		-#. Resource IDs: (Dialog IDD_EXPORT: Control id 238, IDS_PROGRS_TITLE_EXPORT)
	4408	+#. Resource IDs: (1233, 238)
4572	4409	msgid "Export"
4573	4410	msgstr ""
4574	4411
4575		-#. Resource IDs: (Dialog IDD_EXPORT: Control id 1074)
	4412	+#. Resource IDs: (1074)
4576	4413	msgid "Export &directory:"
4577	4414	msgstr ""
4578	4415
4579		-#. Resource IDs: (IDS_EXPORTFILTER)
	4416	+#. Resource IDs: (2506)
4580	4417	msgid "Export files (.tsex)\|.tsex\|All Files (.)\|.\|\|"
4581	4418	msgstr ""
4582	4419
4583		-#. Resource IDs: (IDS_PROGRS_CMD_EXPORT)
	4420	+#. Resource IDs: (3659)
4584	4421	#, c-format
4585	4422	msgid "Export from %1!ls!"
4586	4423	msgstr ""
4587	4424
4588		-#. Resource IDs: (Dialog IDD_SETTINGSSYNC: Control id 1667)
	4425	+#. Resource IDs: (1667)
4589	4426	msgid "Export settings to file..."
4590	4427	msgstr ""
4591	4428
4592		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_EXPORT)
	4429	+#. Resource IDs: (5506)
4593	4430	msgid ""
4594	4431	"Export the selected cache as a set of Comma Separated Value (CSV) files"
4595	4432	msgstr ""
4596	4433
4597		-#. Resource IDs: (IDS_PROC_EXPORT_2)
	4434	+#. Resource IDs: (1260)
4598	4435	msgid "Export unversioned files too"
4599	4436	msgstr ""
4600	4437
4601		-#. Resource IDs: (IDS_SVNPROGRESS_EXPORTING)
	4438	+#. Resource IDs: (4530)
4602	4439	#, c-format
4603	4440	msgid "Exporting %1!ls!"
4604	4441	msgstr ""
4605	4442
4606		-#. Resource IDs: (IDS_PROC_EXPORT_3)
	4443	+#. Resource IDs: (1261)
4607	4444	msgid "Exporting..."
4608	4445	msgstr ""
4609	4446
4610		-#. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_TASK2)
	4447	+#. Resource IDs: (1439)
4611	4448	msgid "Exporting: Target folder exists."
4612	4449	msgstr ""
4613	4450
4614		-#. Resource IDs: (IDS_PROP_TT_EXPORT)
	4451	+#. Resource IDs: (9292)
4615	4452	msgid "Exports a set of properties to a file"
4616	4453	msgstr ""
4617	4454
4618		-#. Resource IDs: (IDS_MENUDESCEXPORT)
	4455	+#. Resource IDs: (145)
4619	4456	msgid "Exports a versioned folder as a separate unversioned folder"
4620	4457	msgstr ""
4621	4458
4622		-#. Resource IDs: (IDS_STATUSLIST_COLEXT)
	4459	+#. Resource IDs: (3308)
4623	4460	msgid "Extension"
4624	4461	msgstr ""
4625	4462
4626		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSADV: Control id 1287)
	4463	+#. Resource IDs: (1287)
4627	4464	msgid "Extension/mime-type specific programs"
4628	4465	msgstr ""
4629	4466
4630		-#. Resource IDs: (IDS_SVNACTION_EXTERNAL)
	4467	+#. Resource IDs: (1171)
4631	4468	msgid "External"
4632	4469	msgstr ""
4633	4470
4634		-#. Resource IDs: (Dialog IDD_TOOLASSOC: Control id 65535)
	4471	+#. Resource IDs: (65535)
4635	4472	msgid "External Program:"
4636	4473	msgstr ""
4637	4474
4638		-#. Resource IDs: (IDS_REPOBROWSE_INFOEXT)
	4475	+#. Resource IDs: (1665)
4639	4476	#, c-format
4640	4477	msgid ""
4641	4478	"External \"%1!ls!\"\r\n"

		@@ -4642,15 +4479,15 @@
4642	4479	"Revision %2!ls!"
4643	4480	msgstr ""
4644	4481
4645		-#. Resource IDs: (IDS_SVNACTION_FAILEDEXTERNAL)
	4482	+#. Resource IDs: (4192)
4646	4483	msgid "External failed"
4647	4484	msgstr ""
4648	4485
4649		-#. Resource IDs: (IDS_PROGRS_EXTERNALSEXCLUDED)
	4486	+#. Resource IDs: (3604)
4650	4487	msgid "Externals excluded"
4651	4488	msgstr ""
4652	4489
4653		-#. Resource IDs: (IDS_PROGRS_EXTERNALSINCLUDED)
	4490	+#. Resource IDs: (3605)
4654	4491	msgid "Externals included"
4655	4492	msgstr ""
4656	4493

		@@ -4658,12 +4495,11 @@
4658	4495	msgid "F"
4659	4496	msgstr ""
4660	4497
4661		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 1480, Dialog
4662		-#. IDD_MERGEWIZARD_OPTIONS: Control id 1480)
	4498	+#. Resource IDs: (1480)
4663	4499	msgid "F&orce the merge"
4664	4500	msgstr ""
4665	4501
4666		-#. Resource IDs: (IDS_SVNACTION_FAILEDREVERT)
	4502	+#. Resource IDs: (1175)
4667	4503	msgid "Failed revert"
4668	4504	msgstr ""
4669	4505

		@@ -4677,7 +4513,7 @@
4677	4513	msgid "Failed to convert ActiveX object."
4678	4514	msgstr ""
4679	4515
4680		-#. Resource IDs: (IDS_ERR_COPYFAILED)
	4516	+#. Resource IDs: (1342)
4681	4517	#, c-format
4682	4518	msgid ""
4683	4519	"Failed to copy the file '%ls' to '%ls'.\n"

		@@ -4703,7 +4539,7 @@
4703	4539	msgid "Failed to launch server application."
4704	4540	msgstr ""
4705	4541
4706		-#. Resource IDs: (IDS_ERR_MONITORINILOAD)
	4542	+#. Resource IDs: (1043)
4707	4543	msgid "Failed to load the configuration file for the project monitor!"
4708	4544	msgstr ""
4709	4545

		@@ -4719,7 +4555,7 @@
4719	4555	msgid "Failed to save document."
4720	4556	msgstr ""
4721	4557
4722		-#. Resource IDs: (IDS_ERR_FAILEDISSUETRACKERCOM)
	4558	+#. Resource IDs: (1327)
4723	4559	#, c-format
4724	4560	msgid ""
4725	4561	"Failed to start the issue tracker COM provider '%1!ls!'.\n"

		@@ -4726,28 +4562,28 @@
4726	4562	"%2!ls!"
4727	4563	msgstr ""
4728	4564
4729		-#. Resource IDs: (IDS_PROGRS_TITLEFAILED)
	4565	+#. Resource IDs: (3504)
4730	4566	msgid "Failed!"
4731	4567	msgstr ""
4732	4568
4733		-#. Resource IDs: (IDS_SVNACTION_FAILEDREQUIRESTARGET)
	4569	+#. Resource IDs: (4245)
4734	4570	msgid "Failed: target required"
4735	4571	msgstr ""
4736	4572
4737		-#. Resource IDs: (IDS_EDITPROPS_FETCH_AND_ADJUST_TO_HEAD)
	4573	+#. Resource IDs: (9444)
4738	4574	msgid "Fetch HEAD revision and adjust to it"
4739	4575	msgstr ""
4740	4576
4741		-#. Resource IDs: (IDS_SETTINGS_REPOBROWSER_PREFETCH_TT)
	4577	+#. Resource IDs: (3183)
4742	4578	msgid ""
4743	4579	"Fetches the contents of folders in the background so browsing is faster"
4744	4580	msgstr ""
4745	4581
4746		-#. Resource IDs: (IDS_PROC_VENDORDROP_GETDATA2)
	4582	+#. Resource IDs: (1462)
4747	4583	msgid "Fetching file list of source"
4748	4584	msgstr ""
4749	4585
4750		-#. Resource IDs: (IDS_PROC_VENDORDROP_GETDATA1)
	4586	+#. Resource IDs: (1461)
4751	4587	msgid "Fetching file list of target"
4752	4588	msgstr ""
4753	4589

		@@ -4760,16 +4596,16 @@
4760	4596	msgid "Fetching revision %ls of file:"
4761	4597	msgstr ""
4762	4598
4763		-#. Resource IDs: (IDS_PROC_CLEANUP_INFOFETCHSTATUS)
	4599	+#. Resource IDs: (2363)
4764	4600	#, c-format
4765	4601	msgid "Fetching status of %1!ls!"
4766	4602	msgstr ""
4767	4603
4768		-#. Resource IDs: (IDS_PROGRS_FETCHING_TREE_CONFLICT_INFO)
	4604	+#. Resource IDs: (1237)
4769	4605	msgid "Fetching tree conflict information..."
4770	4606	msgstr ""
4771	4607
4772		-#. Resource IDs: (IDS_FILEDIFF_FILE, IDS_LOG_FILE)
	4608	+#. Resource IDs: (1180, 5100)
4773	4609	msgid "File"
4774	4610	msgstr ""
4775	4611

		@@ -4777,21 +4613,20 @@
4777	4613	msgid "File Encoding"
4778	4614	msgstr ""
4779	4615
4780		-#. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM_TASK2,
4781		-#. IDS_WARN_ADDCASERENAMED_TASK2)
	4616	+#. Resource IDs: (1425, 1435)
4782	4617	msgid "File already exists"
4783	4618	msgstr ""
4784	4619
4785		-#. Resource IDs: (IDS_STATGRAPH_FILECHANGESBYUNIT)
	4620	+#. Resource IDs: (3942)
4786	4621	#, c-format
4787	4622	msgid "File changes each %ls:"
4788	4623	msgstr ""
4789	4624
4790		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1138)
	4625	+#. Resource IDs: (1138)
4791	4626	msgid "File changes each week:"
4792	4627	msgstr ""
4793	4628
4794		-#. Resource IDs: (IDS_PROGRS_REVERTMARKERS_TASK2)
	4629	+#. Resource IDs: (3607)
4795	4630	msgid "File contains conflict markers"
4796	4631	msgstr ""
4797	4632

		@@ -4807,7 +4642,7 @@
4807	4642	msgid "File is empty."
4808	4643	msgstr ""
4809	4644
4810		-#. Resource IDs: (IDS_STATUSLIST_EMPTYMSG)
	4645	+#. Resource IDs: (3404)
4811	4646	msgid "File list is empty"
4812	4647	msgstr ""
4813	4648

		@@ -4879,45 +4714,45 @@
4879	4714	"Zoom:\t\t\t%d%%"
4880	4715	msgstr ""
4881	4716
4882		-#. Resource IDs: (IDS_STATUSLIST_COLFILENAME)
	4717	+#. Resource IDs: (3317)
4883	4718	msgid "Filename"
4884	4719	msgstr ""
4885	4720
4886		-#. Resource IDs: (Dialog IDD_TOOLASSOC: Control id 65535)
	4721	+#. Resource IDs: (65535)
4887	4722	msgid "Filename, extension or mime-type:"
4888	4723	msgstr ""
4889	4724
4890		-#. Resource IDs: (IDS_PROGS_EXTCOL)
	4725	+#. Resource IDs: (1178)
4891	4726	msgid "Filename/Extension"
4892	4727	msgstr ""
4893	4728
4894		-#. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_FILENAMES)
	4729	+#. Resource IDs: (1845)
4895	4730	msgid "Filenames"
4896	4731	msgstr ""
4897	4732
4898		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1512)
	4733	+#. Resource IDs: (1512)
4899	4734	msgid "Files"
4900	4735	msgstr ""
4901	4736
4902		-#. Resource IDs: (IDS_LOG_FILTER_BY)
	4737	+#. Resource IDs: (1859)
4903	4738	msgid "Filter by"
4904	4739	msgstr ""
4905	4740
4906		-#. Resource IDs: (Dialog IDD_SETTINGSCOLORS: Control id 65535)
	4741	+#. Resource IDs: (65535)
4907	4742	msgid "Filter match"
4908	4743	msgstr ""
4909	4744
4910		-#. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 65535)
	4745	+#. Resource IDs: (65535)
4911	4746	msgid ""
4912	4747	"Filter out paths that contain one of the following strings\n"
4913	4748	"(separate multiple paths with the '*' char):"
4914	4749	msgstr ""
4915	4750
4916		-#. Resource IDs: (IDS_FILEDIFF_FILTERCUE)
	4751	+#. Resource IDs: (5120)
4917	4752	msgid "Filter paths"
4918	4753	msgstr ""
4919	4754
4920		-#. Resource IDs: (Dialog IDD_HISTORYDLG: Control id 1644)
	4755	+#. Resource IDs: (1644)
4921	4756	msgid "Filter:"
4922	4757	msgstr ""
4923	4758

		@@ -4930,11 +4765,11 @@
4930	4765	msgid "Find"
4931	4766	msgstr ""
4932	4767
4933		-#. Resource IDs: (Dialog IDD_EDITPROPEXTERNALS: Control id 1633)
	4768	+#. Resource IDs: (1633)
4934	4769	msgid "Find &HEAD-Revision"
4935	4770	msgstr ""
4936	4771
4937		-#. Resource IDs: (IDS_EDITPROPS_PROG_FINDHEADTITLE)
	4772	+#. Resource IDs: (9440)
4938	4773	msgid "Find HEAD revisions"
4939	4774	msgstr ""
4940	4775

		@@ -4958,15 +4793,15 @@
4958	4793	msgid "Find: First occurrence from the top found. End of document reached."
4959	4794	msgstr ""
4960	4795
4961		-#. Resource IDs: (IDS_PROGRS_TITLEFIN)
	4796	+#. Resource IDs: (1224)
4962	4797	msgid "Finished!"
4963	4798	msgstr ""
4964	4799
4965		-#. Resource IDs: (ID_VIEW_ZOOMALL - Menu)
	4800	+#. Resource IDs: (32804 - Menu)
4966	4801	msgid "Fit graph"
4967	4802	msgstr ""
4968	4803
4969		-#. Resource IDs: (ID_VIEW_ZOOMHEIGHT - Menu)
	4804	+#. Resource IDs: (32802 - Menu)
4970	4805	msgid "Fit height"
4971	4806	msgstr ""
4972	4807

		@@ -4978,24 +4813,23 @@
4978	4813	msgid "Fit image &widths\t(W)"
4979	4814	msgstr ""
4980	4815
4981		-#. Resource IDs: (ID_VIEW_ZOOMWIDTH - Menu)
	4816	+#. Resource IDs: (32803 - Menu)
4982	4817	msgid "Fit width"
4983	4818	msgstr ""
4984	4819
4985		-#. Resource IDs: (IDS_COPYEXTLIST_COLTAGGED)
	4820	+#. Resource IDs: (4483)
4986	4821	msgid "Fixed at rev"
4987	4822	msgstr ""
4988	4823
4989		-#. Resource IDs: (ID_VIEW_FOLDTAGS - Menu)
	4824	+#. Resource IDs: (32818 - Menu)
4990	4825	msgid "Fold &tags"
4991	4826	msgstr ""
4992	4827
4993		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	4828	+#. Resource IDs: (65535)
4994	4829	msgid "Folded tag"
4995	4830	msgstr ""
4996	4831
4997		-#. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535, Dialog
4998		-#. IDD_SETTINGSUDIFF: Control id 65535)
	4832	+#. Resource IDs: (65535)
4999	4833	msgid "Font"
5000	4834	msgstr ""
5001	4835

		@@ -5003,45 +4837,43 @@
5003	4837	msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel"
5004	4838	msgstr ""
5005	4839
5006		-#. Resource IDs: (IDS_LOG_STOPONCOPY_HINT)
	4840	+#. Resource IDs: (1892)
5007	4841	msgid "For complete history deselect 'Stop on copy/rename'"
5008	4842	msgstr ""
5009	4843
5010		-#. Resource IDs: (IDS_MERGE_FORCE)
	4844	+#. Resource IDs: (4455)
5011	4845	msgid "Force"
5012	4846	msgstr ""
5013	4847
5014		-#. Resource IDs: (IDS_PROC_REMOVEFORCE_TASK2)
	4848	+#. Resource IDs: (2343)
5015	4849	msgid "Force removal"
5016	4850	msgstr ""
5017	4851
5018		-#. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535, Dialog
5019		-#. IDD_SETTINGSUDIFF: Control id 65535)
	4852	+#. Resource IDs: (65535, Dialog IDD_SETCOLORPAGE: Control id 65535)
5020	4853	msgid "Foreground"
5021	4854	msgstr ""
5022	4855
5023		-#. Resource IDs: (IDS_REPOBROWSE_TT_FORWARD)
	4856	+#. Resource IDs: (1683)
5024	4857	msgid "Forwards in browsing history"
5025	4858	msgstr ""
5026	4859
5027		-#. Resource IDs: (Dialog IDD_AUTOTEXTTESTDLG: Control id 65535)
	4860	+#. Resource IDs: (65535)
5028	4861	msgid "Found auto words:"
5029	4862	msgstr ""
5030	4863
5031		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1200, Dialog
5032		-#. IDD_REVGRAPHFILTER: Control id 65535)
	4864	+#. Resource IDs: (1200, 65535)
5033	4865	msgid "From:"
5034	4866	msgstr ""
5035	4867
5036		-#. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_FULL)
	4868	+#. Resource IDs: (1799)
5037	4869	msgid "Full data"
5038	4870	msgstr ""
5039	4871
5040		-#. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_FULLNOPATHS)
	4872	+#. Resource IDs: (1842)
5041	4873	msgid "Full revision data without changed paths"
5042	4874	msgstr ""
5043	4875
5044		-#. Resource IDs: (IDS_SVN_DEPTH_INFINITE)
	4876	+#. Resource IDs: (300)
5045	4877	msgid "Fully recursive"
5046	4878	msgstr ""
5047	4879

		@@ -5049,91 +4881,90 @@
5049	4881	msgid "G"
5050	4882	msgstr ""
5051	4883
5052		-#. Resource IDs: (IDS_REVGRAPH_ERR_GDIINIT)
	4884	+#. Resource IDs: (4360)
5053	4885	msgid "GDI+ couldn't be initialized!"
5054	4886	msgstr ""
5055	4887
5056		-#. Resource IDs: (IDS_REVGRAPH_ERR_NOBITMAP)
	4888	+#. Resource IDs: (4361)
5057	4889	msgid ""
5058	4890	"GDI+ couldn't create a bitmap object. You probably don't have enough memory."
5059	4891	msgstr ""
5060	4892
5061		-#. Resource IDs: (IDS_SVNPROGRESS_EXPORTINGWAIT)
	4893	+#. Resource IDs: (4532)
5062	4894	msgid "Gathering information. Please wait..."
5063	4895	msgstr ""
5064	4896
5065		-#. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 107, Dialog
5066		-#. IDD_SETTINGSMAIN: Control id 143)
	4897	+#. Resource IDs: (143, Dialog IDD_SETMAINPAGE: Control id 107)
5067	4898	msgid "General"
5068	4899	msgstr ""
5069	4900
5070		-#. Resource IDs: (Dialog IDD_SETTINGSCOLORS: Control id 212)
	4901	+#. Resource IDs: (212)
5071	4902	msgid "General::Colors"
5072	4903	msgstr ""
5073	4904
5074		-#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 195)
	4905	+#. Resource IDs: (195)
5075	4906	msgid "General::Context Menu"
5076	4907	msgstr ""
5077	4908
5078		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 196)
	4909	+#. Resource IDs: (196)
5079	4910	msgid "General::Dialogs 1"
5080	4911	msgstr ""
5081	4912
5082		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 213)
	4913	+#. Resource IDs: (213)
5083	4914	msgid "General::Dialogs 2"
5084	4915	msgstr ""
5085	4916
5086		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 332)
	4917	+#. Resource IDs: (332)
5087	4918	msgid "General::Dialogs 3"
5088	4919	msgstr ""
5089	4920
5090		-#. Resource IDs: (IDS_PROC_PATCHTITLE)
	4921	+#. Resource IDs: (2301)
5091	4922	msgid "Generating patchfile..."
5092	4923	msgstr ""
5093	4924
5094		-#. Resource IDs: (IDS_MENU_LOCK)
	4925	+#. Resource IDs: (240)
5095	4926	msgid "Get loc&k..."
5096	4927	msgstr ""
5097	4928
5098		-#. Resource IDs: (IDS_LOG_POPUP_GETMERGELOGS)
	4929	+#. Resource IDs: (1820)
5099	4930	msgid "Get merge logs"
5100	4931	msgstr ""
5101	4932
5102		-#. Resource IDs: (IDS_PROGRESSGETFILE)
	4933	+#. Resource IDs: (1900)
5103	4934	#, c-format
5104	4935	msgid "Getting file %1!ls!"
5105	4936	msgstr ""
5106	4937
5107		-#. Resource IDs: (IDS_PROGRESSGETFILEREVISION)
	4938	+#. Resource IDs: (1906)
5108	4939	#, c-format
5109	4940	msgid "Getting file %1!ls!, revision %2!ls!"
5110	4941	msgstr ""
5111	4942
5112		-#. Resource IDs: (IDS_BLAME_PROGRESSINFOSTART)
	4943	+#. Resource IDs: (2104)
5113	4944	msgid "Getting file info..."
5114	4945	msgstr ""
5115	4946
5116		-#. Resource IDs: (IDS_REVGRAPH_PROGGETREVS)
	4947	+#. Resource IDs: (4301)
5117	4948	msgid "Getting information from repository..."
5118	4949	msgstr ""
5119	4950
5120		-#. Resource IDs: (IDS_PROGRESS_INFO)
	4951	+#. Resource IDs: (1905)
5121	4952	msgid "Getting information..."
5122	4953	msgstr ""
5123	4954
5124		-#. Resource IDs: (IDS_PROGRS_INFOGETTINGINFO)
	4955	+#. Resource IDs: (3511)
5125	4956	msgid "Getting required information..."
5126	4957	msgstr ""
5127	4958
5128		-#. Resource IDs: (IDS_PROGRESS_UNIFIEDDIFF)
	4959	+#. Resource IDs: (1903)
5129	4960	msgid "Getting unified diff"
5130	4961	msgstr ""
5131	4962
5132		-#. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 1517)
	4963	+#. Resource IDs: (1517)
5133	4964	msgid "Global ignore &pattern:"
5134	4965	msgstr ""
5135	4966
5136		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 65535)
	4967	+#. Resource IDs: (65535)
5137	4968	msgid "Global settings"
5138	4969	msgstr ""
5139	4970

		@@ -5185,11 +5016,11 @@
5185	5016	msgid "Goto Line"
5186	5017	msgstr ""
5187	5018
5188		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1134)
	5019	+#. Resource IDs: (1134)
5189	5020	msgid "Graph type:"
5190	5021	msgstr ""
5191	5022
5192		-#. Resource IDs: (IDS_REVGRAPH_ERR_NOGRAPHFORROOT)
	5023	+#. Resource IDs: (4365)
5193	5024	msgid "Graphs for repository roots are always empty!"
5194	5025	msgstr ""
5195	5026

		@@ -5197,61 +5028,40 @@
5197	5028	msgid "Group by branch"
5198	5029	msgstr ""
5199	5030
5200		-#. Resource IDs: (IDS_STATUSLIST_SHOWGROUPS)
	5031	+#. Resource IDs: (3408)
5201	5032	msgid "Group changelists"
5202	5033	msgstr ""
5203	5034
5204		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_TREE: Control id 1032)
	5035	+#. Resource IDs: (1032)
5205	5036	msgid "H&EAD Revision"
5206	5037	msgstr "&ГАЛАЎНАЯ Рэвізыя"
5207	5038
5208		-#. Resource IDs: (Dialog IDD_DIFFFILES: Control id 1353, Dialog IDD_DIFFFILES:
5209		-#. Control id 1354, IDS_EXTERNALS_HEADREV)
	5039	+#. Resource IDs: (1353, 1354, 3482)
5210	5040	msgid "HEAD"
5211	5041	msgstr ""
5212	5042
5213		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	5043	+#. Resource IDs: (65535)
5214	5044	msgid "HEAD node"
5215	5045	msgstr ""
5216	5046
5217		-#. Resource IDs: (IDS_REPOBROWSE_TT_HEADREV)
	5047	+#. Resource IDs: (1680)
5218	5048	#, c-format
5219	5049	msgid "HEAD revision is %ls"
5220	5050	msgstr ""
5221	5051
5222		-#. Resource IDs: (Dialog IDD_EDITPROPKEYWORDS: Control id 1595)
	5052	+#. Resource IDs: (1595)
5223	5053	msgid "Header"
5224	5054	msgstr ""
5225	5055
5226		-#. Resource IDs: (Dialog IDD_BLAME: Control id 9, Dialog IDD_CHECKOUT: Control
5227		-#. id 9, Dialog IDD_COMMITDLG: Control id 9, Dialog IDD_COPY: Control id 9,
5228		-#. Dialog IDD_CREATEPATCH: Control id 9, Dialog IDD_EDITPROPBUGTRAQ: Control
5229		-#. id 9, Dialog IDD_EDITPROPEOL: Control id 9, Dialog IDD_EDITPROPERTIES:
5230		-#. Control id 9, Dialog IDD_EDITPROPERTYVALUE: Control id 9, Dialog
5231		-#. IDD_EDITPROPEXECUTABLE: Control id 9, Dialog IDD_EDITPROPEXTERNALS: Control
5232		-#. id 9, Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 9, Dialog
5233		-#. IDD_EDITPROPKEYWORDS: Control id 9, Dialog IDD_EDITPROPLOCALHOOKS: Control
5234		-#. id 9, Dialog IDD_EDITPROPMERGELOGTEMPLATE: Control id 9, Dialog
5235		-#. IDD_EDITPROPMIMETYPE: Control id 9, Dialog IDD_EDITPROPNEEDSLOCK: Control
5236		-#. id 9, Dialog IDD_EDITPROPTSVNLANG: Control id 9, Dialog
5237		-#. IDD_EDITPROPTSVNSIZES: Control id 9, Dialog IDD_EXPORT: Control id 9,
5238		-#. Dialog IDD_IMPORT: Control id 9, Dialog IDD_LOCK: Control id 9, Dialog
5239		-#. IDD_LOGMESSAGE: Control id 9, Dialog IDD_MERGEALL: Control id 9, Dialog
5240		-#. IDD_OPENDLG: Control id 9, Dialog IDD_RELOCATE: Control id 9, Dialog
5241		-#. IDD_REPOSITORY_BROWSER: Control id 9, Dialog IDD_RESOLVE: Control id 9,
5242		-#. Dialog IDD_REVERT: Control id 9, Dialog IDD_SETTINGSBUGTRAQADV: Control id
5243		-#. 9, Dialog IDD_SETTINGSHOOKCONFIG: Control id 9, Dialog IDD_SHELVE: Control
5244		-#. id 9, Dialog IDD_SWITCH: Control id 9, Dialog IDD_UNLOCK: Control id 9,
5245		-#. Dialog IDD_UNSHELVE: Control id 9, Dialog IDD_URLDIFF: Control id 9,
5246		-#. IDS_PROPPAGE_HELP)
	5056	+#. Resource IDs: (5303, 9, Dialog IDD_OPENDLG: Control id 9)
5247	5057	msgid "Help"
5248	5058	msgstr ""
5249	5059
5250		-#. Resource IDs: (ID_VIEW_REMOVEDELETEDONES - Menu)
	5060	+#. Resource IDs: (32820 - Menu)
5251	5061	msgid "Hide &deleted paths"
5252	5062	msgstr ""
5253	5063
5254		-#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 1562)
	5064	+#. Resource IDs: (1562)
5255	5065	msgid "Hide Menus for unversioned paths"
5256	5066	msgstr ""
5257	5067

		@@ -5267,20 +5077,19 @@
5267	5077	msgid "Hide deleted branches and tags"
5268	5078	msgstr ""
5269	5079
5270		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1562)
	5080	+#. Resource IDs: (1562)
5271	5081	msgid "Hide non-mergeable revisions"
5272	5082	msgstr ""
5273	5083
5274		-#. Resource IDs: (ID_VIEW_REMOVETAGS - Menu)
	5084	+#. Resource IDs: (32832 - Menu)
5275	5085	msgid "Hide ta&gs"
5276	5086	msgstr ""
5277	5087
5278		-#. Resource IDs: (Dialog IDD_EDITPROPLOCALHOOKS: Control id 1326, Dialog
5279		-#. IDD_SETTINGSHOOKCONFIG: Control id 1326)
	5088	+#. Resource IDs: (1326)
5280	5089	msgid "Hide the script while running"
5281	5090	msgstr ""
5282	5091
5283		-#. Resource IDs: (ID_VIEW_REMOVEUNCHANGEDBRANCHES - Menu)
	5092	+#. Resource IDs: (32830 - Menu)
5284	5093	msgid "Hide unused &branches"
5285	5094	msgstr ""
5286	5095

		@@ -5294,58 +5103,56 @@
5294	5103	"Hides or shows the patch file list"
5295	5104	msgstr ""
5296	5105
5297		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_MAXREVISION)
	5106	+#. Resource IDs: (5411)
5298	5107	msgid "Highest revision number in the cache"
5299	5108	msgstr ""
5300	5109
5301		-#. Resource IDs: (Dialog IDD_SETTINGSHOOKS: Control id 103)
	5110	+#. Resource IDs: (103)
5302	5111	msgid "Hook Scripts"
5303	5112	msgstr ""
5304	5113
5305		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 283)
	5114	+#. Resource IDs: (283)
5306	5115	msgid "Hook Scripts::Issue Tracker Integration"
5307	5116	msgstr ""
5308	5117
5309		-#. Resource IDs: (IDS_SETTINGS_HOOKS_TYPECOL)
	5118	+#. Resource IDs: (3152)
5310	5119	msgid "Hook Type"
5311	5120	msgstr ""
5312	5121
5313		-#. Resource IDs: (Dialog IDD_EDITPROPLOCALHOOKS: Control id 1334, Dialog
5314		-#. IDD_SETTINGSHOOKCONFIG: Control id 1334)
	5122	+#. Resource IDs: (1334)
5315	5123	msgid "Hook Type:"
5316	5124	msgstr ""
5317	5125
5318		-#. Resource IDs: (IDS_HOOKFAILED_TASK2)
	5126	+#. Resource IDs: (5812)
5319	5127	msgid "Hook script failed"
5320	5128	msgstr ""
5321	5129
5322		-#. Resource IDs: (IDS_COMMITDLG_CHECKCOMMIT_TASK1)
	5130	+#. Resource IDs: (2760)
5323	5131	msgid "Hook script failed!"
5324	5132	msgstr ""
5325	5133
5326		-#. Resource IDs: (IDS_ERR_SSL_CNMISMATCH)
	5134	+#. Resource IDs: (1296)
5327	5135	#, c-format
5328	5136	msgid "Hostname mismatch (%ls)"
5329	5137	msgstr ""
5330	5138
5331		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 1392, Dialog
5332		-#. IDD_MERGEWIZARD_OPTIONS: Control id 1392)
	5139	+#. Resource IDs: (1392)
5333	5140	msgid "I&gnore all whitespaces"
5334	5141	msgstr ""
5335	5142
5336		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1264)
	5143	+#. Resource IDs: (1264)
5337	5144	msgid "I&gnored"
5338	5145	msgstr ""
5339	5146
5340		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1519)
	5147	+#. Resource IDs: (1519)
5341	5148	msgid "I&nclude paths:"
5342	5149	msgstr ""
5343	5150
5344		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1580)
	5151	+#. Resource IDs: (1580)
5345	5152	msgid "IBugTraqProvider"
5346	5153	msgstr ""
5347	5154
5348		-#. Resource IDs: (Dialog IDD_EDITPROPKEYWORDS: Control id 1592)
	5155	+#. Resource IDs: (1592)
5349	5156	msgid "ID"
5350	5157	msgstr ""
5351	5158

		@@ -5516,19 +5323,19 @@
5516	5323	msgid "ID:57665:V C +W"
5517	5324	msgstr ""
5518	5325
5519		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 106)
	5326	+#. Resource IDs: (106)
5520	5327	msgid "Icon Overlays"
5521	5328	msgstr ""
5522	5329
5523		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 65535)
	5330	+#. Resource IDs: (65535)
5524	5331	msgid "Icon Overlays / Status Columns"
5525	5332	msgstr ""
5526	5333
5527		-#. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184)
	5334	+#. Resource IDs: (184)
5528	5335	msgid "Icon Overlays::Icon Set"
5529	5336	msgstr ""
5530	5337
5531		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 308)
	5338	+#. Resource IDs: (308)
5532	5339	msgid "Icon Overlays::Overlay Handlers"
5533	5340	msgstr ""
5534	5341

		@@ -5536,85 +5343,85 @@
5536	5343	msgid "Icons/Design/Code:\t\tLuebbe Onken"
5537	5344	msgstr ""
5538	5345
5539		-#. Resource IDs: (IDS_SETTINGS_BRANCHESPATTERN)
	5346	+#. Resource IDs: (5521)
5540	5347	msgid ""
5541	5348	"If a component (part between two '/') of a given path matches one\n"
5542	5349	"of these patterns, it is considered a 'branch'."
5543	5350	msgstr ""
5544	5351
5545		-#. Resource IDs: (IDS_SETTINGS_TAGSPATTERN)
	5352	+#. Resource IDs: (5522)
5546	5353	msgid ""
5547	5354	"If a component (part between two '/') of a given path matches one\n"
5548	5355	"of these patterns, it is considered a 'tag'."
5549	5356	msgstr ""
5550	5357
5551		-#. Resource IDs: (IDS_SETTINGS_TRUNKPATTERN)
	5358	+#. Resource IDs: (5520)
5552	5359	msgid ""
5553	5360	"If a component (part between two '/') of a given path matches one\n"
5554	5361	"of these patterns, it is considered a 'trunk'."
5555	5362	msgstr ""
5556	5363
5557		-#. Resource IDs: (IDS_SETTINGS_ONLYEXPLORER_TT)
	5364	+#. Resource IDs: (3101)
5558	5365	msgid ""
5559	5366	"If activated, prevents the overlays and the context menu from showing in "
5560	5367	"'save as...' or 'open' dialogs"
5561	5368	msgstr ""
5562	5369
5563		-#. Resource IDs: (IDS_SETTINGS_GETLOCKTOP_TT)
	5370	+#. Resource IDs: (3157)
5564	5371	msgid ""
5565	5372	"If activated, the menu entry 'Get Lock' is always shown in the top level menu\n"
5566	5373	"if the selected file has the svn:needs-lock property set"
5567	5374	msgstr ""
5568	5375
5569		-#. Resource IDs: (IDS_SETTINGS_CONVERTBASE_TT)
	5376	+#. Resource IDs: (1255)
5570	5377	msgid ""
5571	5378	"If checked, TortoiseSVN creates a temporary file of the BASE to do the diff\n"
5572	5379	"with the keywords expanded and the line endings adjusted."
5573	5380	msgstr ""
5574	5381
5575		-#. Resource IDs: (IDS_SETTINGS_DIFFBYDOUBLECLICK_TT)
	5382	+#. Resource IDs: (3142)
5576	5383	msgid ""
5577	5384	"If checked, double-clicking on a revision in the log list compares it with "
5578	5385	"the previous revision"
5579	5386	msgstr ""
5580	5387
5581		-#. Resource IDs: (IDS_SETTINGS_USEWCURL_TT)
	5388	+#. Resource IDs: (3117)
5582	5389	msgid ""
5583	5390	"If enabled, the Merge dialog initializes the 'From:' URL with the URL of the selected working copy\r\n"
5584	5391	"instead of the last used URL."
5585	5392	msgstr ""
5586	5393
5587		-#. Resource IDs: (IDS_SETTINGS_REPOCHECK_TT)
	5394	+#. Resource IDs: (3119)
5588	5395	msgid ""
5589	5396	"If enabled, the repository is contacted when the dialog starts up.\r\n"
5590	5397	"You don't have to click on 'Check Repository' anymore."
5591	5398	msgstr ""
5592	5399
5593		-#. Resource IDs: (IDS_SETTINGS_SHOWEXCLUDEDASNORMAL_TT)
	5400	+#. Resource IDs: (3138)
5594	5401	msgid ""
5595	5402	"If enabled, working copy folders which are excluded from\n"
5596	5403	"showing overlays still show the overlay for status 'normal'"
5597	5404	msgstr ""
5598	5405
5599		-#. Resource IDs: (IDS_SETTINGS_COMMITFILETIMES_TT)
	5406	+#. Resource IDs: (3106)
5600	5407	msgid ""
5601	5408	"If set, TortoiseSVN will set the filetimes to the time they\r\n"
5602	5409	"were last committed. If not set, TortoiseSVN uses the current time."
5603	5410	msgstr ""
5604	5411
5605		-#. Resource IDs: (IDS_SETTINGS_UNVERSIONEDRECURSE_TT)
	5412	+#. Resource IDs: (3121)
5606	5413	msgid ""
5607	5414	"If set, files inside unversioned folders can be shown in the status control.\r\n"
5608	5415	"The status control is used for example in the commit dialog."
5609	5416	msgstr ""
5610	5417
5611		-#. Resource IDs: (IDS_SETTINGS_IGNOREONCOMMITIGNORE_TT)
	5418	+#. Resource IDs: (3134)
5612	5419	msgid ""
5613	5420	"If set, then modified files that are in the \"ignore-on-commit\" changelist do not mark the parent folders as modified\r\n"
5614	5421	"i.e., they get the normal icon unless another file or folder is modified."
5615	5422	msgstr ""
5616	5423
5617		-#. Resource IDs: (IDS_SETTINGS_UNVERSIONEDASMODIFIED_TT)
	5424	+#. Resource IDs: (3133)
5618	5425	msgid ""
5619	5426	"If set, then unversioned files will mark the status of the parent directory as modified\r\n"
5620	5427	"i.e. they get the modified overlay icon."

		@@ -5626,11 +5433,11 @@
5626	5433	"background color."
5627	5434	msgstr ""
5628	5435
5629		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1439)
	5436	+#. Resource IDs: (1439)
5630	5437	msgid "If the repository can not be contacted"
5631	5438	msgstr ""
5632	5439
5633		-#. Resource IDs: (IDS_PROC_UPGRADECONFIRMATION_TASK5)
	5440	+#. Resource IDs: (1585)
5634	5441	msgid ""
5635	5442	"If you use other SVN clients besides TortoiseSVN on this computer, you have "
5636	5443	"to upgrade those clients too. Otherwise those clients won't be able to "

		@@ -5637,32 +5444,30 @@
5637	5444	"access the working copy with the new format."
5638	5445	msgstr ""
5639	5446
5640		-#. Resource IDs: (IDS_SVNERR_UNLOCKFAILED)
	5447	+#. Resource IDs: (4004)
5641	5448	msgid ""
5642	5449	"If you want to break the lock, use the 'Check For Modifications' dialog or "
5643	5450	"the repository browser."
5644	5451	msgstr ""
5645	5452
5646		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535)
	5453	+#. Resource IDs: (65535)
5647	5454	msgid "Ignore"
5648	5455	msgstr ""
5649	5456
5650		-#. Resource IDs: (IDS_MENUIGNOREMULTIPLEMASK)
	5457	+#. Resource IDs: (220)
5651	5458	#, c-format
5652	5459	msgid "Ignore %d items by &extension"
5653	5460	msgstr ""
5654	5461
5655		-#. Resource IDs: (Dialog IDD_DIFFOPTIONS: Control id 1126)
	5462	+#. Resource IDs: (1126)
5656	5463	msgid "Ignore &EOL changes"
5657	5464	msgstr ""
5658	5465
5659		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1392, Dialog IDD_DIFFOPTIONS:
5660		-#. Control id 1611)
	5466	+#. Resource IDs: (1392, 1611)
5661	5467	msgid "Ignore &all whitespaces"
5662	5468	msgstr ""
5663	5469
5664		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 1267, Dialog
5665		-#. IDD_MERGEWIZARD_OPTIONS: Control id 1267)
	5470	+#. Resource IDs: (1267)
5666	5471	msgid "Ignore &ancestry"
5667	5472	msgstr ""
5668	5473

		@@ -5699,8 +5504,7 @@
5699	5504	msgid "Ignore comments"
5700	5505	msgstr ""
5701	5506
5702		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1127, Dialog IDD_MERGEALL:
5703		-#. Control id 1126, Dialog IDD_MERGEWIZARD_OPTIONS: Control id 1126)
	5507	+#. Resource IDs: (1126, 1127)
5704	5508	msgid "Ignore line &endings"
5705	5509	msgstr ""
5706	5510

		@@ -5708,30 +5512,28 @@
5708	5512	msgid "Ignore line &endings (recommended)"
5709	5513	msgstr ""
5710	5514
5711		-#. Resource IDs: (IDS_MENUIGNOREMULTIPLEMASK2)
	5515	+#. Resource IDs: (282)
5712	5516	msgid "Ignore multiple items by &extension"
5713	5517	msgstr ""
5714	5518
5715		-#. Resource IDs: (Dialog IDD_DIFFOPTIONS: Control id 1529)
	5519	+#. Resource IDs: (1529)
5716	5520	msgid "Ignore whitespace &changes"
5717	5521	msgstr ""
5718	5522
5719		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 1391, Dialog
5720		-#. IDD_MERGEWIZARD_OPTIONS: Control id 1391)
	5523	+#. Resource IDs: (1391)
5721	5524	msgid "Ignore whitespace c&hanges"
5722	5525	msgstr ""
5723	5526
5724		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1391,
5725		-#. ID_VIEW_IGNOREWHITESPACECHANGES - Menu,
	5527	+#. Resource IDs: (1391, ID_VIEW_IGNOREWHITESPACECHANGES - Menu,
5726	5528	#. cmdIgnoreWhitespaceChanges_LabelTitle_RESID)
5727	5529	msgid "Ignore whitespace changes"
5728	5530	msgstr ""
5729	5531
5730		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 1432)
	5532	+#. Resource IDs: (1432)
5731	5533	msgid "Ignored"
5732	5534	msgstr ""
5733	5535
5734		-#. Resource IDs: (IDS_PROGRS_IGNOREDINCLUDED)
	5536	+#. Resource IDs: (3606)
5735	5537	msgid "Ignored items included"
5736	5538	msgstr ""
5737	5539

		@@ -5747,41 +5549,41 @@
5747	5549	"Ignore whitespace changes"
5748	5550	msgstr ""
5749	5551
5750		-#. Resource IDs: (IDS_WARN_NOVALIDPATH_TASK2)
	5552	+#. Resource IDs: (1416)
5751	5553	msgid "Illegal path"
5752	5554	msgstr ""
5753	5555
5754		-#. Resource IDs: (IDS_SVN_DEPTH_IMMEDIATE)
	5556	+#. Resource IDs: (301)
5755	5557	msgid "Immediate children, including folders"
5756	5558	msgstr ""
5757	5559
5758		-#. Resource IDs: (Dialog IDD_IMPORT: Control id 139, IDS_PROGRS_TITLE_IMPORT)
	5560	+#. Resource IDs: (1226, 139)
5759	5561	msgid "Import"
5760	5562	msgstr ""
5761	5563
5762		-#. Resource IDs: (IDS_PROGRS_CMD_IMPORT)
	5564	+#. Resource IDs: (3651)
5763	5565	#, c-format
5764	5566	msgid "Import %1!ls! to %2!ls!%3!ls!"
5765	5567	msgstr ""
5766	5568
5767		-#. Resource IDs: (IDS_INPUT_IMPORTFILES)
	5569	+#. Resource IDs: (2017)
5768	5570	#, c-format
5769	5571	msgid "Import %ld items"
5770	5572	msgstr ""
5771	5573
5772		-#. Resource IDs: (Dialog IDD_IMPORT: Control id 1386)
	5574	+#. Resource IDs: (1386)
5773	5575	msgid "Import &message"
5774	5576	msgstr ""
5775	5577
5776		-#. Resource IDs: (Dialog IDD_SETTINGSSYNC: Control id 1665)
	5578	+#. Resource IDs: (1665)
5777	5579	msgid "Import Settings from file..."
5778	5580	msgstr ""
5779	5581
5780		-#. Resource IDs: (IDS_PROP_TT_IMPORT)
	5582	+#. Resource IDs: (9291)
5781	5583	msgid "Import a previously saved set of properties from a file"
5782	5584	msgstr ""
5783	5585
5784		-#. Resource IDs: (IDS_INPUT_IMPORTFILEFULL)
	5586	+#. Resource IDs: (2016)
5785	5587	#, c-format
5786	5588	msgid ""
5787	5589	"Import file %1!ls!\r\n"

		@@ -5788,7 +5590,7 @@
5788	5590	"to %2!ls!"
5789	5591	msgstr ""
5790	5592
5791		-#. Resource IDs: (IDS_INPUT_IMPORTFILE)
	5593	+#. Resource IDs: (2011)
5792	5594	#, c-format
5793	5595	msgid ""
5794	5596	"Import file to\r\n"

		@@ -5795,7 +5597,7 @@
5795	5597	"%ls"
5796	5598	msgstr ""
5797	5599
5798		-#. Resource IDs: (IDS_INPUT_IMPORTFOLDER)
	5600	+#. Resource IDs: (2010)
5799	5601	#, c-format
5800	5602	msgid ""
5801	5603	"Import folder %1!ls!\r\n"

		@@ -5802,51 +5604,51 @@
5802	5604	"to %2!ls!"
5803	5605	msgstr ""
5804	5606
5805		-#. Resource IDs: (IDS_DROPDESC_IMPORT)
	5607	+#. Resource IDs: (9801)
5806	5608	#, c-format
5807	5609	msgid "Import to %1"
5808	5610	msgstr ""
5809	5611
5810		-#. Resource IDs: (IDS_MSG_IMPORTEDSTRUCTURE)
	5612	+#. Resource IDs: (1265)
5811	5613	msgid "Imported folder structure"
5812	5614	msgstr ""
5813	5615
5814		-#. Resource IDs: (IDS_PROGRESSIMPORT)
	5616	+#. Resource IDs: (1907)
5815	5617	#, c-format
5816	5618	msgid "Importing file %1!ls!"
5817	5619	msgstr ""
5818	5620
5819		-#. Resource IDs: (IDS_MENUDESCIMPORT)
	5621	+#. Resource IDs: (144)
5820	5622	msgid "Imports the directory to a repository"
5821	5623	msgstr ""
5822	5624
5823		-#. Resource IDs: (Dialog IDD_COLLABORATORSETTINGS: Control id 65535)
	5625	+#. Resource IDs: (65535)
5824	5626	msgid ""
5825	5627	"In order to show this dialog in the future, press <Ctrl> while executing the"
5826	5628	" Code Collaborator menu command."
5827	5629	msgstr ""
5828	5630
5829		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1616)
	5631	+#. Resource IDs: (1616)
5830	5632	msgid "Include e&xternals"
5831	5633	msgstr ""
5832	5634
5833		-#. Resource IDs: (Dialog IDD_IMPORT: Control id 1266)
	5635	+#. Resource IDs: (1266)
5834	5636	msgid "Include ignored files"
5835	5637	msgstr ""
5836	5638
5837		-#. Resource IDs: (IDS_SYNC_INCLUDELOCAL)
	5639	+#. Resource IDs: (9927)
5838	5640	msgid "Include local settings"
5839	5641	msgstr ""
5840	5642
5841		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1126)
	5643	+#. Resource IDs: (1126)
5842	5644	msgid "Include merged revisions"
5843	5645	msgstr ""
5844	5646
5845		-#. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 65535)
	5647	+#. Resource IDs: (65535)
5846	5648	msgid "Include only the following revision range:"
5847	5649	msgstr ""
5848	5650
5849		-#. Resource IDs: (IDS_REPOSTATUS_TT_REPOCHECK)
	5651	+#. Resource IDs: (3820)
5850	5652	msgid ""
5851	5653	"Includes the repository for status check\n"
5852	5654	"Hold down the shift key when clicking to fetch everything."

		@@ -5856,15 +5658,15 @@
5856	5658	msgid "Incorrect filename."
5857	5659	msgstr ""
5858	5660
5859		-#. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535)
	5661	+#. Resource IDs: (65535)
5860	5662	msgid "Index colors:"
5861	5663	msgstr ""
5862	5664
5863		-#. Resource IDs: (IDS_SVNACTION_INFOEXTERNAL)
	5665	+#. Resource IDs: (4246)
5864	5666	msgid "Info on external"
5865	5667	msgstr ""
5866	5668
5867		-#. Resource IDs: (IDS_INFORMATION)
	5669	+#. Resource IDs: (1019)
5868	5670	msgid "Information"
5869	5671	msgstr ""
5870	5672

		@@ -5882,7 +5684,7 @@
5882	5684	msgid "Inline differences"
5883	5685	msgstr ""
5884	5686
5885		-#. Resource IDs: (Dialog IDD_INPUTDLG: Control id 161)
	5687	+#. Resource IDs: (161)
5886	5688	msgid "Input"
5887	5689	msgstr ""
5888	5690

		@@ -5892,11 +5694,11 @@
5892	5694	"Paste"
5893	5695	msgstr ""
5894	5696
5895		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1575)
	5697	+#. Resource IDs: (1575)
5896	5698	msgid "Insert message at:"
5897	5699	msgstr ""
5898	5700
5899		-#. Resource IDs: (Dialog IDD_EDITPROPMERGELOGTEMPLATE: Control id 1660)
	5701	+#. Resource IDs: (1660)
5900	5702	msgid "Insert title at the bottom, after the message"
5901	5703	msgstr ""
5902	5704

		@@ -5908,7 +5710,7 @@
5908	5710	msgid "Internal application error."
5909	5711	msgstr ""
5910	5712
5911		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_PAIRTOKENS)
	5713	+#. Resource IDs: (5408)
5912	5714	msgid "Internal value indicating compression quality"
5913	5715	msgstr ""
5914	5716

		@@ -5916,11 +5718,11 @@
5916	5718	msgid "Invalid Currency."
5917	5719	msgstr ""
5918	5720
5919		-#. Resource IDs: (IDS_INVALIDPARAMS)
	5721	+#. Resource IDs: (1340)
5920	5722	msgid "Invalid parameters"
5921	5723	msgstr ""
5922	5724
5923		-#. Resource IDs: (IDS_ERR_INVALIDREV)
	5725	+#. Resource IDs: (1304)
5924	5726	msgid ""
5925	5727	"Invalid revision number! Valid revisions are:\n"
5926	5728	"HEAD, BASE, PREV, COMMITTED, WC,\n"

		@@ -5939,7 +5741,7 @@
5939	5741	"{20020217T1530-0500}"
5940	5742	msgstr ""
5941	5743
5942		-#. Resource IDs: (IDS_ERR_INVALIDREVNOWC)
	5744	+#. Resource IDs: (1315)
5943	5745	msgid ""
5944	5746	"Invalid revision number! Valid revisions are:\n"
5945	5747	"HEAD\n"

		@@ -5958,7 +5760,7 @@
5958	5760	"{20020217T1530-0500}"
5959	5761	msgstr ""
5960	5762
5961		-#. Resource IDs: (IDS_ERR_INVALIDREVRANGE)
	5763	+#. Resource IDs: (1322)
5962	5764	msgid ""
5963	5765	"Invalid revision range!\n"
5964	5766	"Valid revisions are numbers and HEAD, separated by commas.\n"

		@@ -5966,11 +5768,11 @@
5966	5768	"Example: 2-5,7,10,44-70,300-HEAD"
5967	5769	msgstr ""
5968	5770
5969		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1571)
	5771	+#. Resource IDs: (1571)
5970	5772	msgid "Issue tracker"
5971	5773	msgstr ""
5972	5774
5973		-#. Resource IDs: (IDS_WARN_RELOCATEREALLY_TASK1)
	5775	+#. Resource IDs: (1420)
5974	5776	#, c-format
5975	5777	msgid ""
5976	5778	"It seems you are trying to relocate your working copy to a different path inside the same repository.\n"

		@@ -5980,11 +5782,11 @@
5980	5782	"Improper use of relocate will corrupt your working copy!"
5981	5783	msgstr ""
5982	5784
5983		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1480)
	5785	+#. Resource IDs: (1480)
5984	5786	msgid "Items in &externals"
5985	5787	msgstr ""
5986	5788
5987		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1527)
	5789	+#. Resource IDs: (1527)
5988	5790	msgid "Items to show"
5989	5791	msgstr ""
5990	5792

		@@ -5992,23 +5794,23 @@
5992	5794	msgid "J&ump to first conflict when loading"
5993	5795	msgstr ""
5994	5796
5995		-#. Resource IDs: (IDS_REVGRAPH_POPUP_JOIN_BELOW)
	5797	+#. Resource IDs: (4396)
5996	5798	msgid "Join with following &tree"
5997	5799	msgstr ""
5998	5800
5999		-#. Resource IDs: (IDS_REVGRAPH_POPUP_JOIN_ABOVE)
	5801	+#. Resource IDs: (4392)
6000	5802	msgid "Join with source tree"
6001	5803	msgstr ""
6002	5804
6003		-#. Resource IDs: (Dialog IDD_SVNPROGRESS: Control id 1632)
	5805	+#. Resource IDs: (1632)
6004	5806	msgid "Jump to next &conflict"
6005	5807	msgstr ""
6006	5808
6007		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1203)
	5809	+#. Resource IDs: (1203)
6008	5810	msgid "Keep &locks"
6009	5811	msgstr ""
6010	5812
6011		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126)
	5813	+#. Resource IDs: (1126)
6012	5814	msgid "Keep c&hangelists"
6013	5815	msgstr ""
6014	5816

		@@ -6018,7 +5820,7 @@
6018	5820	"Jump to first unresolved conflict"
6019	5821	msgstr ""
6020	5822
6021		-#. Resource IDs: (IDS_SETTINGSCLEAR_COL1)
	5823	+#. Resource IDs: (5570)
6022	5824	msgid "Kind"
6023	5825	msgstr ""
6024	5826

		@@ -6026,47 +5828,47 @@
6026	5828	msgid "L"
6027	5829	msgstr ""
6028	5830
6029		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNSIZES: Control id 65535)
	5831	+#. Resource IDs: (65535)
6030	5832	msgid "L&imit:"
6031	5833	msgstr "&Ліміт:"
6032	5834
6033		-#. Resource IDs: (ID_NEW_LANGUAGES - Menu)
	5835	+#. Resource IDs: (32855 - Menu)
6034	5836	msgid "Lan&guages"
6035	5837	msgstr ""
6036	5838
6037		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNLANG: Control id 65535)
	5839	+#. Resource IDs: (65535)
6038	5840	msgid "Language:"
6039	5841	msgstr ""
6040	5842
6041		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	5843	+#. Resource IDs: (65535)
6042	5844	msgid "Last changed author:"
6043	5845	msgstr ""
6044	5846
6045		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	5847	+#. Resource IDs: (65535)
6046	5848	msgid "Last changed revision:"
6047	5849	msgstr ""
6048	5850
6049		-#. Resource IDs: (IDS_COLDESCREV)
	5851	+#. Resource IDs: (175)
6050	5852	msgid "Last saved revision of item"
6051	5853	msgstr ""
6052	5854
6053		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_LASTWRITE)
	5855	+#. Resource IDs: (5401)
6054	5856	msgid "Last time the cache content was changed"
6055	5857	msgstr ""
6056	5858
6057		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_LASTREAD)
	5859	+#. Resource IDs: (5400)
6058	5860	msgid "Last time the cache was accessed"
6059	5861	msgstr ""
6060	5862
6061		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_LASTHEADUPDATE)
	5863	+#. Resource IDs: (5402)
6062	5864	msgid "Last time the repository was asked for the HEAD revision number"
6063	5865	msgstr ""
6064	5866
6065		-#. Resource IDs: (IDS_MENUDESCCONFLICT)
	5867	+#. Resource IDs: (187)
6066	5868	msgid "Launches the external diff / merge program to solve the conflicts"
6067	5869	msgstr ""
6068	5870
6069		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1137)
	5871	+#. Resource IDs: (1137)
6070	5872	msgid "Least active author:"
6071	5873	msgstr ""
6072	5874

		@@ -6080,7 +5882,7 @@
6080	5882	msgid "Leave only marked changes"
6081	5883	msgstr ""
6082	5884
6083		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535)
	5885	+#. Resource IDs: (65535)
6084	5886	msgid "Leave the box \"Path or URL\" empty to create a folder item"
6085	5887	msgstr ""
6086	5888

		@@ -6092,11 +5894,11 @@
6092	5894	msgid "Left image"
6093	5895	msgstr ""
6094	5896
6095		-#. Resource IDs: (IDS_SVNACTION_LEFTLOCALMODS)
	5897	+#. Resource IDs: (4240)
6096	5898	msgid "Left local modifications"
6097	5899	msgstr ""
6098	5900
6099		-#. Resource IDs: (IDS_EDITPROPS_MERGETITLEHINTREVERSE)
	5901	+#. Resource IDs: (9434)
6100	5902	msgid "Like above, but used for reverse merges"
6101	5903	msgstr ""
6102	5904

		@@ -6104,7 +5906,7 @@
6104	5906	msgid "Line"
6105	5907	msgstr ""
6106	5908
6107		-#. Resource IDs: (IDS_STATGRAPH_LINEBUTTON_TT)
	5909	+#. Resource IDs: (3932)
6108	5910	msgid "Line Graph"
6109	5911	msgstr ""
6110	5912

		@@ -6142,11 +5944,11 @@
6142	5944	"Help Topics"
6143	5945	msgstr ""
6144	5946
6145		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_CACHELIST)
	5947	+#. Resource IDs: (5503)
6146	5948	msgid "List of repositories for which log information has been cached"
6147	5949	msgstr ""
6148	5950
6149		-#. Resource IDs: (Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 1599)
	5951	+#. Resource IDs: (1599)
6150	5952	msgid "Lo&cal path:"
6151	5953	msgstr ""
6152	5954

		@@ -6154,7 +5956,7 @@
6154	5956	msgid "Load Images"
6155	5957	msgstr ""
6156	5958
6157		-#. Resource IDs: (Dialog IDD_SETTINGSSYNC: Control id 1663)
	5959	+#. Resource IDs: (1663)
6158	5960	msgid "Load Settings from file"
6159	5961	msgstr ""
6160	5962

		@@ -6170,15 +5972,15 @@
6170	5972	"The views are updated with the new content."
6171	5973	msgstr ""
6172	5974
6173		-#. Resource IDs: (ID_NEW_LOCALHOOKS - Menu)
	5975	+#. Resource IDs: (32861 - Menu)
6174	5976	msgid "Local &Hooks"
6175	5977	msgstr ""
6176	5978
6177		-#. Resource IDs: (Dialog IDD_EDITPROPLOCALHOOKS: Control id 334)
	5979	+#. Resource IDs: (334)
6178	5980	msgid "Local hook scripts"
6179	5981	msgstr ""
6180	5982
6181		-#. Resource IDs: (IDS_CHECKOUT_TT_DIR)
	5983	+#. Resource IDs: (1500)
6182	5984	msgid ""
6183	5985	"Location where the contents of the\n"
6184	5986	"repository URL(s) will be saved to."

		@@ -6188,122 +5990,120 @@
6188	5990	msgid "Locator Bar"
6189	5991	msgstr ""
6190	5992
6191		-#. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535,
6192		-#. cmdViewLocatorBar_LabelTitle_RESID)
	5993	+#. Resource IDs: (65535, cmdViewLocatorBar_LabelTitle_RESID)
6193	5994	msgid "Locator bar"
6194	5995	msgstr ""
6195	5996
6196		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 65535,
6197		-#. IDS_PROGRS_CMD_LOCK, IDS_PROGRS_TITLE_LOCK, IDS_STATUSLIST_COLLOCK)
	5997	+#. Resource IDs: (3309, 3531, 3660, 65535)
6198	5998	msgid "Lock"
6199	5999	msgstr ""
6200	6000
6201		-#. Resource IDs: (IDS_STATUSLIST_COLLOCKDATE)
	6001	+#. Resource IDs: (3319)
6202	6002	msgid "Lock Date"
6203	6003	msgstr ""
6204	6004
6205		-#. Resource IDs: (Dialog IDD_LOCK: Control id 191)
	6005	+#. Resource IDs: (191)
6206	6006	msgid "Lock Files"
6207	6007	msgstr ""
6208	6008
6209		-#. Resource IDs: (IDS_SVNACTION_BROKENLOCKED)
	6009	+#. Resource IDs: (4239)
6210	6010	msgid "Lock broken"
6211	6011	msgstr ""
6212	6012
6213		-#. Resource IDs: (IDS_STATUSLIST_LOCKBROKEN)
	6013	+#. Resource IDs: (3400)
6214	6014	msgid "Lock broken!"
6215	6015	msgstr ""
6216	6016
6217		-#. Resource IDs: (IDS_STATUSLIST_COLLOCKCOMMENT)
	6017	+#. Resource IDs: (3310)
6218	6018	msgid "Lock comment"
6219	6019	msgstr ""
6220	6020
6221		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	6021	+#. Resource IDs: (65535)
6222	6022	msgid "Lock creation date:"
6223	6023	msgstr ""
6224	6024
6225		-#. Resource IDs: (IDS_SVNACTION_FAILEDLOCK)
	6025	+#. Resource IDs: (4207)
6226	6026	msgid "Lock failed"
6227	6027	msgstr ""
6228	6028
6229		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	6029	+#. Resource IDs: (65535)
6230	6030	msgid "Lock owner:"
6231	6031	msgstr ""
6232	6032
6233		-#. Resource IDs: (IDS_STATUSLIST_LOCKSTOLEN)
	6033	+#. Resource IDs: (3401)
6234	6034	#, c-format
6235	6035	msgid "Lock stolen by %ls"
6236	6036	msgstr ""
6237	6037
6238		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 1529)
	6038	+#. Resource IDs: (1529)
6239	6039	msgid "Locked"
6240	6040	msgstr ""
6241	6041
6242		-#. Resource IDs: (IDS_SVNACTION_LOCKEDBY)
	6042	+#. Resource IDs: (4206)
6243	6043	#, c-format
6244	6044	msgid "Locked by %ls"
6245	6045	msgstr ""
6246	6046
6247		-#. Resource IDs: (IDS_WARN_LOCKOUTDATED_TASK2)
	6047	+#. Resource IDs: (1473)
6248	6048	msgid "Locking failed"
6249	6049	msgstr ""
6250	6050
6251		-#. Resource IDs: (IDS_WARN_LOCKOUTDATED)
	6051	+#. Resource IDs: (1408)
6252	6052	msgid ""
6253	6053	"Locking failed because a newer version exists!\n"
6254	6054	"Do you want to update and try again?"
6255	6055	msgstr ""
6256	6056
6257		-#. Resource IDs: (IDS_MENUDESC_LOCK)
	6057	+#. Resource IDs: (242)
6258	6058	msgid "Locks a file for other users and makes it editable by you."
6259	6059	msgstr ""
6260	6060
6261		-#. Resource IDs: (Dialog IDD_LOGCACHESTATISTICS: Control id 282)
	6061	+#. Resource IDs: (282)
6262	6062	msgid "Log Cache Statistics"
6263	6063	msgstr ""
6264	6064
6265		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 281)
	6065	+#. Resource IDs: (281)
6266	6066	msgid "Log Caching"
6267	6067	msgstr ""
6268	6068
6269		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHELIST: Control id 295)
	6069	+#. Resource IDs: (295)
6270	6070	msgid "Log Caching::Cached Repositories"
6271	6071	msgstr ""
6272	6072
6273		-#. Resource IDs: (Dialog IDD_HISTORYDLG: Control id 211)
	6073	+#. Resource IDs: (211)
6274	6074	msgid "Log History"
6275	6075	msgstr ""
6276	6076
6277		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 130)
	6077	+#. Resource IDs: (130)
6278	6078	msgid "Log Messages"
6279	6079	msgstr ""
6280	6080
6281		-#. Resource IDs: (Dialog IDD_COPY: Control id 1386)
	6081	+#. Resource IDs: (1386)
6282	6082	msgid "Log message"
6283	6083	msgstr ""
6284	6084
6285		-#. Resource IDs: (IDS_COMMITDLG_MSGLENGTH)
	6085	+#. Resource IDs: (2761)
6286	6086	msgid "Log message is too short!"
6287	6087	msgstr ""
6288	6088
6289		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535)
	6089	+#. Resource IDs: (65535)
6290	6090	msgid "Log messages"
6291	6091	msgstr ""
6292	6092
6293		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1274)
	6093	+#. Resource IDs: (1274)
6294	6094	msgid "Log messages (Input dialog)"
6295	6095	msgstr ""
6296	6096
6297		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1280)
	6097	+#. Resource IDs: (1280)
6298	6098	msgid "Log messages (Show log dialog)"
6299	6099	msgstr ""
6300	6100
6301		-#. Resource IDs: (IDS_REPOSTATUS_WCINFO)
	6101	+#. Resource IDs: (3801)
6302	6102	#, c-format
6303	6103	msgid "Lowest shown revision: %1!ld! - Highest shown revision: %2!ld!"
6304	6104	msgstr ""
6305	6105
6306		-#. Resource IDs: (IDS_REPOSTATUS_HEADREV)
	6106	+#. Resource IDs: (3800)
6307	6107	#, c-format
6308	6108	msgid ""
6309	6109	"Lowest shown revision: %1!ld! - Highest shown revision: %2!ld!\n"

		@@ -6314,42 +6114,42 @@
6314	6114	msgid "Mail system DLL is invalid."
6315	6115	msgstr ""
6316	6116
6317		-#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 65535)
	6117	+#. Resource IDs: (65535)
6318	6118	msgid "Main context menu"
6319	6119	msgstr ""
6320	6120
6321		-#. Resource IDs: (Dialog IDD_GOOFFLINE: Control id 1431)
	6121	+#. Resource IDs: (1431)
6322	6122	msgid "Make this the default"
6323	6123	msgstr ""
6324	6124
6325		-#. Resource IDs: (IDS_MENUDESCPROPERTIES)
	6125	+#. Resource IDs: (258)
6326	6126	msgid "Manage Subversion properties"
6327	6127	msgstr ""
6328	6128
6329		-#. Resource IDs: (IDS_HOOKTYPE_MANUALPRECOMMIT)
	6129	+#. Resource IDs: (9107)
6330	6130	msgid "Manual Pre-Commit Hook"
6331	6131	msgstr ""
6332	6132
6333		-#. Resource IDs: (Dialog IDD_SETTINGSSYNC: Control id 65535)
	6133	+#. Resource IDs: (65535)
6334	6134	msgid "Manual import/export"
6335	6135	msgstr ""
6336	6136
6337		-#. Resource IDs: (IDS_STATUSLIST_WARN_MAXDIFF_TASK2)
	6137	+#. Resource IDs: (3421)
6338	6138	msgid "Many items selected to show diff"
6339	6139	msgstr ""
6340	6140
6341		-#. Resource IDs: (IDS_MONITOR_MARKASREADTT)
	6141	+#. Resource IDs: (1039)
6342	6142	msgid "Mark all projects as read"
6343	6143	msgstr ""
6344	6144
6345		-#. Resource IDs: (IDS_PROGRS_REVERTMARKERS_TASK3)
	6145	+#. Resource IDs: (3608)
6346	6146	msgid ""
6347	6147	"Mark as &resolved\n"
6348	6148	"The conflict is resolved."
6349	6149	msgstr ""
6350	6150
6351		-#. Resource IDs: (IDS_PROC_RESOLVE_TASK2, IDS_SVNPROGRESS_MENUMARKASRESOLVED,
6352		-#. ID_EDIT_MARKASRESOLVED - Menu, cmdMarkResolved_LabelTitle_RESID)
	6151	+#. Resource IDs: (2355, 4503, ID_EDIT_MARKASRESOLVED - Menu,
	6152	+#. cmdMarkResolved_LabelTitle_RESID)
6353	6153	msgid "Mark as resolved"
6354	6154	msgstr ""
6355	6155

		@@ -6363,11 +6163,11 @@
6363	6163	msgid "Mark current revision of your working copy"
6364	6164	msgstr ""
6365	6165
6366		-#. Resource IDs: (IDS_REPOBROWSE_PREPAREDIFF)
	6166	+#. Resource IDs: (1615)
6367	6167	msgid "Mark for comparison"
6368	6168	msgstr ""
6369	6169
6370		-#. Resource IDs: (IDS_PROC_VENDORDROP_REMOVE)
	6170	+#. Resource IDs: (1463)
6371	6171	msgid "Mark missing files as removed"
6372	6172	msgstr ""
6373	6173

		@@ -6379,7 +6179,7 @@
6379	6179	msgid "Marked Blocks"
6380	6180	msgstr ""
6381	6181
6382		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	6182	+#. Resource IDs: (65535)
6383	6183	msgid "Markers"
6384	6184	msgstr ""
6385	6185

		@@ -6389,13 +6189,13 @@
6389	6189	"Mark as resolved"
6390	6190	msgstr ""
6391	6191
6392		-#. Resource IDs: (IDS_EDITPROPCONFLICT_TT_RESOLVED)
	6192	+#. Resource IDs: (1037)
6393	6193	msgid ""
6394	6194	"Marks the conflict as resolved.\r\n"
6395	6195	"Note: this does not resolve the conflict, only marks it as resolved!"
6396	6196	msgstr ""
6397	6197
6398		-#. Resource IDs: (IDS_MERGEWIZARD_OPTIONS_RECORDONLY_TT)
	6198	+#. Resource IDs: (9520)
6399	6199	msgid ""
6400	6200	"Marks the revisions as merged, without actually doing the merge.\r\n"
6401	6201	"This blocks the revisions from getting merged in the future."

		@@ -6405,107 +6205,101 @@
6405	6205	msgid "Match &case"
6406	6206	msgstr ""
6407	6207
6408		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1159)
	6208	+#. Resource IDs: (1159)
6409	6209	msgid "Max"
6410	6210	msgstr ""
6411	6211
6412		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 1317)
	6212	+#. Resource IDs: (1317)
6413	6213	msgid "Max. items to keep in the log message history"
6414	6214	msgstr ""
6415	6215
6416		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 65535)
	6216	+#. Resource IDs: (65535)
6417	6217	msgid "Max. lines in action log"
6418	6218	msgstr ""
6419	6219
6420		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1487)
	6220	+#. Resource IDs: (1487)
6421	6221	msgid "Maximum number of tool &failures until cache removal"
6422	6222	msgstr ""
6423	6223
6424		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_OPTIONS: Control id 111, Dialog
6425		-#. IDD_MERGEWIZARD_REVRANGE: Control id 278, Dialog IDD_MERGEWIZARD_START:
6426		-#. Control id 109, Dialog IDD_MERGEWIZARD_TREE: Control id 110, Dialog
6427		-#. IDD_SETTINGSDIALOGS: Control id 65535, IDS_PROGRS_TITLE_MERGE)
	6224	+#. Resource IDs: (109, 110, 111, 1234, 278, 65535)
6428	6225	msgid "Merge"
6429	6226	msgstr ""
6430	6227
6431		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 65535, Dialog
6432		-#. IDD_MERGEWIZARD_OPTIONS: Control id 1488)
	6228	+#. Resource IDs: (1488, 65535)
6433	6229	msgid "Merge &depth:"
6434	6230	msgstr ""
6435	6231
6436		-#. Resource IDs: (ID_NEW_MERGELOGTEMPLATES - Menu)
	6232	+#. Resource IDs: (32865 - Menu)
6437	6233	msgid "Merge Log &Templates"
6438	6234	msgstr ""
6439	6235
6440		-#. Resource IDs: (Dialog IDD_EDITPROPMERGELOGTEMPLATE: Control id 345)
	6236	+#. Resource IDs: (345)
6441	6237	msgid "Merge Log Templates"
6442	6238	msgstr ""
6443	6239
6444		-#. Resource IDs: (IDS_PROGRS_TITLE_MERGEREINTEGRATE)
	6240	+#. Resource IDs: (3533)
6445	6241	msgid "Merge Reintegrate"
6446	6242	msgstr ""
6447	6243
6448		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_START: Control id 1468)
	6244	+#. Resource IDs: (1468)
6449	6245	msgid "Merge a &range of revisions"
6450	6246	msgstr ""
6451	6247
6452		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 277)
	6248	+#. Resource IDs: (277)
6453	6249	msgid "Merge all"
6454	6250	msgstr ""
6455	6251
6456		-#. Resource IDs: (IDS_MENUMERGEALL)
	6252	+#. Resource IDs: (210)
6457	6253	msgid "Merge all..."
6458	6254	msgstr ""
6459	6255
6460		-#. Resource IDs: (IDS_MENUDESCMERGE)
	6256	+#. Resource IDs: (149)
6461	6257	msgid "Merge changes into the working copy"
6462	6258	msgstr ""
6463	6259
6464		-#. Resource IDs: (IDS_EDITCONFLICT_TEXT_BINARY_MAININSTRUCTION)
	6260	+#. Resource IDs: (1050)
6465	6261	#, c-format
6466	6262	msgid "Merge conflict discovered in binary file %s"
6467	6263	msgstr ""
6468	6264
6469		-#. Resource IDs: (IDS_EDITCONFLICT_TEXT_MAININSTRUCTION)
	6265	+#. Resource IDs: (1051)
6470	6266	#, c-format
6471	6267	msgid "Merge conflict discovered in file %s"
6472	6268	msgstr ""
6473	6269
6474		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 1534, Dialog
6475		-#. IDD_MERGEWIZARD_OPTIONS: Control id 1487, IDS_MERGEWIZARD_OPTIONSTITLE)
	6270	+#. Resource IDs: (1487, 1534, 9516)
6476	6271	msgid "Merge options"
6477	6272	msgstr ""
6478	6273
6479		-#. Resource IDs: (IDS_MERGEWIZARD_REVRANGETITLE)
	6274	+#. Resource IDs: (9514)
6480	6275	msgid "Merge revision range"
6481	6276	msgstr ""
6482	6277
6483		-#. Resource IDs: (IDS_LOG_POPUP_MERGEREV)
	6278	+#. Resource IDs: (1821)
6484	6279	msgid "Merge revision to..."
6485	6280	msgstr ""
6486	6281
6487		-#. Resource IDs: (IDS_LOG_POPUP_MERGEREVS)
	6282	+#. Resource IDs: (1822)
6488	6283	msgid "Merge revisions to..."
6489	6284	msgstr ""
6490	6285
6491		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_START: Control id 1470)
	6286	+#. Resource IDs: (1470)
6492	6287	msgid "Merge two different &trees"
6493	6288	msgstr ""
6494	6289
6495		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_START: Control id 1486,
6496		-#. IDS_MERGEWIZARD_STARTTITLE)
	6290	+#. Resource IDs: (1486, 9510)
6497	6291	msgid "Merge type"
6498	6292	msgstr ""
6499	6293
6500		-#. Resource IDs: (IDS_SVNACTION_MERGED, IDS_VIEWTITLE_MERGED)
	6294	+#. Resource IDs: (4203, IDS_VIEWTITLE_MERGED)
6501	6295	msgid "Merged"
6502	6296	msgstr ""
6503	6297
6504		-#. Resource IDs: (IDS_SVNPROGRESS_MERGELOGRANGE)
	6298	+#. Resource IDs: (4560)
6505	6299	msgid "Merged revision(s) {revrange} from {mergeurl}:\n"
6506	6300	msgstr ""
6507	6301
6508		-#. Resource IDs: (IDS_MENUDESCMERGEALL)
	6302	+#. Resource IDs: (211)
6509	6303	msgid ""
6510	6304	"Merges all missing revisions from trunk into the working copy of a feature "
6511	6305	"branch using merge-tracking information"

		@@ -6515,16 +6309,16 @@
6515	6309	msgid "Merging"
6516	6310	msgstr ""
6517	6311
6518		-#. Resource IDs: (IDS_PROGRS_CMD_MERGEALL)
	6312	+#. Resource IDs: (3656)
6519	6313	#, c-format
6520	6314	msgid "Merging %1!ls! into %2!ls!, %3!ls!%4!ls!"
6521	6315	msgstr ""
6522	6316
6523		-#. Resource IDs: (IDS_SVNACTION_MERGEBEGINNONE)
	6317	+#. Resource IDs: (4216)
6524	6318	msgid "Merging differences between repository URLs"
6525	6319	msgstr ""
6526	6320
6527		-#. Resource IDs: (IDS_PROGRS_CMD_MERGEURL)
	6321	+#. Resource IDs: (3654)
6528	6322	#, c-format
6529	6323	msgid ""
6530	6324	"Merging from %1!ls!, revision %2!ls! to %3!ls!, revision %4!ls! into %5!ls!,"

		@@ -6531,52 +6325,50 @@
6531	6325	" %6!ls!%7!ls!%8!ls!"
6532	6326	msgstr ""
6533	6327
6534		-#. Resource IDs: (IDS_SVNACTION_MERGEBEGINMULTIPLE)
	6328	+#. Resource IDs: (4213)
6535	6329	#, c-format
6536	6330	msgid "Merging r%1!ld! through r%2!ld!"
6537	6331	msgstr ""
6538	6332
6539		-#. Resource IDs: (IDS_SVNACTION_MERGEBEGINSINGLE)
	6333	+#. Resource IDs: (4214)
6540	6334	#, c-format
6541	6335	msgid "Merging r%ld"
6542	6336	msgstr ""
6543	6337
6544		-#. Resource IDs: (IDS_PROGRS_CMD_MERGEPEG)
	6338	+#. Resource IDs: (3653)
6545	6339	#, c-format
6546	6340	msgid "Merging revisions %1!ls! of %2!ls! into %3!ls!, %4!ls!%5!ls!%6!ls!"
6547	6341	msgstr ""
6548	6342
6549		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1241, Dialog
6550		-#. IDD_INPUTLOGDLG: Control id 1359, IDS_LOG_MESSAGE)
	6343	+#. Resource IDs: (1207, 1241, 1359)
6551	6344	msgid "Message"
6552	6345	msgstr ""
6553	6346
6554		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1574)
	6347	+#. Resource IDs: (1574)
6555	6348	msgid "Message &label:"
6556	6349	msgstr ""
6557	6350
6558		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1573)
	6351	+#. Resource IDs: (1573)
6559	6352	msgid "Message &pattern:"
6560	6353	msgstr ""
6561	6354
6562		-#. Resource IDs: (Dialog IDD_BUGTRAQREGEXTESTER: Control id 1579, Dialog
6563		-#. IDD_EDITPROPBUGTRAQ: Control id 1579)
	6355	+#. Resource IDs: (1579)
6564	6356	msgid "Message part &expression:"
6565	6357	msgstr ""
6566	6358
6567		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1241)
	6359	+#. Resource IDs: (1241)
6568	6360	msgid "Message:"
6569	6361	msgstr ""
6570	6362
6571		-#. Resource IDs: (IDS_LOG_FILTER_MESSAGES, IDS_LOG_POPUP_CLIPBOARD_MSGS)
	6363	+#. Resource IDs: (1841, 1853)
6572	6364	msgid "Messages"
6573	6365	msgstr ""
6574	6366
6575		-#. Resource IDs: (IDS_PROGRS_MIMETYPE)
	6367	+#. Resource IDs: (1236)
6576	6368	msgid "Mime type"
6577	6369	msgstr ""
6578	6370
6579		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1158)
	6371	+#. Resource IDs: (1158)
6580	6372	msgid "Min"
6581	6373	msgstr ""
6582	6374

		@@ -6584,18 +6376,16 @@
6584	6376	msgid "Mine"
6585	6377	msgstr ""
6586	6378
6587		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNSIZES: Control id 65535)
	6379	+#. Resource IDs: (65535)
6588	6380	msgid "Minimum number of chars for a commit message:"
6589	6381	msgstr ""
6590	6382
6591		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNSIZES: Control id 65535)
	6383	+#. Resource IDs: (65535)
6592	6384	msgid "Minimum number of chars for a lock message:"
6593	6385	msgstr ""
6594	6386
6595		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535, Dialog
6596		-#. IDD_SETCOLORPAGE: Control id 65535, Dialog IDD_SETMAINPAGE: Control id
6597		-#. 1023, Dialog IDD_SETTINGSDIALOGS: Control id 65535, Dialog
6598		-#. IDD_SETTINGSREVGRAPH: Control id 65535, Dialog IDD_UPDATE: Control id 1610)
	6387	+#. Resource IDs: (1610, 65535, Dialog IDD_SETCOLORPAGE: Control id 65535,
	6388	+#. Dialog IDD_SETMAINPAGE: Control id 1023)
6599	6389	msgid "Misc"
6600	6390	msgstr ""
6601	6391

		@@ -6603,21 +6393,19 @@
6603	6393	msgid "Mixed"
6604	6394	msgstr ""
6605	6395
6606		-#. Resource IDs: (IDS_STATUSLIST_COLMODIFICATIONDATE)
	6396	+#. Resource IDs: (3316)
6607	6397	msgid "Modification date"
6608	6398	msgstr ""
6609	6399
6610		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1511, Dialog
6611		-#. IDD_SETCOLORPAGE: Control id 65535, IDS_SVNACTION_MODIFIED,
6612		-#. IDS_SVN_SUMMARIZEMODIFIED)
	6400	+#. Resource IDs: (1172, 1511, 4222, Dialog IDD_SETCOLORPAGE: Control id 65535)
6613	6401	msgid "Modified"
6614	6402	msgstr ""
6615	6403
6616		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	6404	+#. Resource IDs: (65535)
6617	6405	msgid "Modified node"
6618	6406	msgstr ""
6619	6407
6620		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535)
	6408	+#. Resource IDs: (65535)
6621	6409	msgid "Monitor interval in minutes:"
6622	6410	msgstr ""
6623	6411

		@@ -6625,19 +6413,19 @@
6625	6413	msgid "More colors..."
6626	6414	msgstr ""
6627	6415
6628		-#. Resource IDs: (IDS_REPOBROWSE_MULTIIMPORT_TASK2)
	6416	+#. Resource IDs: (1672)
6629	6417	msgid "More than one item dropped."
6630	6418	msgstr ""
6631	6419
6632		-#. Resource IDs: (IDS_COLOURPICKER_CUSTOMTEXT)
	6420	+#. Resource IDs: (7000)
6633	6421	msgid "More..."
6634	6422	msgstr ""
6635	6423
6636		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1136)
	6424	+#. Resource IDs: (1136)
6637	6425	msgid "Most active author:"
6638	6426	msgstr ""
6639	6427
6640		-#. Resource IDs: (IDS_INPUT_MOVEMORE)
	6428	+#. Resource IDs: (2021)
6641	6429	#, c-format
6642	6430	msgid ""
6643	6431	"Move %1!ld! items to\r\n"

		@@ -6644,7 +6432,7 @@
6644	6432	"%2!ls!"
6645	6433	msgstr ""
6646	6434
6647		-#. Resource IDs: (IDS_INPUT_MOVE)
	6435	+#. Resource IDs: (2019)
6648	6436	#, c-format
6649	6437	msgid ""
6650	6438	"Move %1!ls!\r\n"

		@@ -6651,71 +6439,71 @@
6651	6439	"to %2!ls!"
6652	6440	msgstr ""
6653	6441
6654		-#. Resource IDs: (IDS_PROC_MOVEUNVERSIONED_TASK4)
	6442	+#. Resource IDs: (2373)
6655	6443	msgid ""
6656	6444	"Move and add\n"
6657	6445	"The file is moved to the destination and added to version control."
6658	6446	msgstr ""
6659	6447
6660		-#. Resource IDs: (IDS_PROC_MOVERENAME)
	6448	+#. Resource IDs: (2336)
6661	6449	msgid "Move and rename"
6662	6450	msgstr ""
6663	6451
6664		-#. Resource IDs: (IDS_REPOBROWSE_MOVERENAMEDROP)
	6452	+#. Resource IDs: (1649)
6665	6453	msgid "Move and rename item to here"
6666	6454	msgstr ""
6667	6455
6668		-#. Resource IDs: (IDS_SVNACTION_MOVEBROKEN)
	6456	+#. Resource IDs: (4242)
6669	6457	msgid "Move broken"
6670	6458	msgstr ""
6671	6459
6672		-#. Resource IDs: (IDS_REPOBROWSE_MOVEDROP)
	6460	+#. Resource IDs: (1647)
6673	6461	msgid "Move items to here"
6674	6462	msgstr ""
6675	6463
6676		-#. Resource IDs: (IDS_WARN_CONFIRM_MOVE_SPECIAL_DIRECTORY_TASK2)
	6464	+#. Resource IDs: (1694)
6677	6465	msgid "Move special file or directory"
6678	6466	msgstr ""
6679	6467
6680		-#. Resource IDs: (IDS_DROPDESC_MOVE)
	6468	+#. Resource IDs: (9803)
6681	6469	#, c-format
6682	6470	msgid "Move to %1"
6683	6471	msgstr ""
6684	6472
6685		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_MOVETOCS)
	6473	+#. Resource IDs: (3340)
6686	6474	msgid "Move to changelist"
6687	6475	msgstr ""
6688	6476
6689		-#. Resource IDs: (IDS_SVNACTION_MOVEREPLACED)
	6477	+#. Resource IDs: (4244)
6690	6478	msgid "Move-Replaced"
6691	6479	msgstr ""
6692	6480
6693		-#. Resource IDs: (IDS_PROGRS_CMD_RENAME)
	6481	+#. Resource IDs: (3661)
6694	6482	msgid "Move/Rename"
6695	6483	msgstr ""
6696	6484
6697		-#. Resource IDs: (IDS_PROC_NEWNAMEMOVE)
	6485	+#. Resource IDs: (1553)
6698	6486	#, c-format
6699	6487	msgid "Move: New name for %ls"
6700	6488	msgstr ""
6701	6489
6702		-#. Resource IDs: (IDS_PROC_MOVEUNVERSIONED_TASK3)
	6490	+#. Resource IDs: (2372)
6703	6491	msgid ""
6704	6492	"Move\n"
6705	6493	"The file is moved to the destination and left unversioned."
6706	6494	msgstr ""
6707	6495
6708		-#. Resource IDs: (IDS_WARN_CONFIRM_MOVE_SPECIAL_DIRECTORY_TASK3)
	6496	+#. Resource IDs: (1695)
6709	6497	msgid ""
6710	6498	"Move\n"
6711	6499	"The items are moved to the target path."
6712	6500	msgstr ""
6713	6501
6714		-#. Resource IDs: (IDS_SVNACTION_MOVED)
	6502	+#. Resource IDs: (4243)
6715	6503	msgid "Moved"
6716	6504	msgstr ""
6717	6505
6718		-#. Resource IDs: (IDS_STATUSLIST_MOVEDFROM)
	6506	+#. Resource IDs: (3345)
6719	6507	#, c-format
6720	6508	msgid ""
6721	6509	"Moved from\r\n"

		@@ -6722,7 +6510,7 @@
6722	6510	"%ls"
6723	6511	msgstr ""
6724	6512
6725		-#. Resource IDs: (IDS_STATUSLIST_MOVEDTO)
	6513	+#. Resource IDs: (3346)
6726	6514	#, c-format
6727	6515	msgid ""
6728	6516	"Moved to\r\n"

		@@ -6729,20 +6517,20 @@
6729	6517	"%ls"
6730	6518	msgstr ""
6731	6519
6732		-#. Resource IDs: (IDS_SETTINGS_USERECYCLEBIN_TT)
	6520	+#. Resource IDs: (3144)
6733	6521	msgid "Moves the modified files to the recycle bin first before reverting"
6734	6522	msgstr ""
6735	6523
6736		-#. Resource IDs: (IDS_PROC_MOVINGPROG)
	6524	+#. Resource IDs: (1275)
6737	6525	#, c-format
6738	6526	msgid "Moving %1!ls!"
6739	6527	msgstr ""
6740	6528
6741		-#. Resource IDs: (IDS_PROC_MOVING)
	6529	+#. Resource IDs: (1269)
6742	6530	msgid "Moving..."
6743	6531	msgstr ""
6744	6532
6745		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1204)
	6533	+#. Resource IDs: (1204)
6746	6534	msgid "Multiple, &independent working copies"
6747	6535	msgstr ""
6748	6536

		@@ -6766,8 +6554,7 @@
6766	6554	msgid "NUM"
6767	6555	msgstr ""
6768	6556
6769		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535, Dialog
6770		-#. IDD_REGEXFILTER: Control id 65535)
	6557	+#. Resource IDs: (65535, Dialog IDD_REGEXFILTER: Control id 65535)
6771	6558	msgid "Name:"
6772	6559	msgstr ""
6773	6560

		@@ -6781,28 +6568,28 @@
6781	6568	"Goto Line"
6782	6569	msgstr ""
6783	6570
6784		-#. Resource IDs: (ID_NEW_NEEDSLOCK - Menu)
	6571	+#. Resource IDs: (32845 - Menu)
6785	6572	msgid "Needs-&Lock"
6786	6573	msgstr ""
6787	6574
6788		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 1550)
	6575	+#. Resource IDs: (1550)
6789	6576	msgid "Needs-lock"
6790	6577	msgstr ""
6791	6578
6792		-#. Resource IDs: (IDS_ERR_PATHPARAMMISSING)
	6579	+#. Resource IDs: (1336)
6793	6580	msgid ""
6794	6581	"Neither /path nor /pathfile was specified or does not contain a valid path!"
6795	6582	msgstr ""
6796	6583
6797		-#. Resource IDs: (IDS_STATUSLIST_NESTED)
	6584	+#. Resource IDs: (3402)
6798	6585	msgid "Nested"
6799	6586	msgstr ""
6800	6587
6801		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 102)
	6588	+#. Resource IDs: (102)
6802	6589	msgid "Network"
6803	6590	msgstr ""
6804	6591
6805		-#. Resource IDs: (IDS_SETTINGS_CONNECTIVITY_OFFLINEFOREVER)
	6592	+#. Resource IDs: (3174)
6806	6593	msgid "Never try to contact the repository again"
6807	6594	msgstr ""
6808	6595

		@@ -6810,15 +6597,15 @@
6810	6597	msgid "New"
6811	6598	msgstr ""
6812	6599
6813		-#. Resource IDs: (Dialog IDD_RENAME: Control id 1076)
	6600	+#. Resource IDs: (1076)
6814	6601	msgid "New &name:"
6815	6602	msgstr ""
6816	6603
6817		-#. Resource IDs: (IDS_PROGRS_COPY_SWITCHNOTREADY)
	6604	+#. Resource IDs: (1239)
6818	6605	msgid "New branch/tag is not ready yet, retrying switch..."
6819	6606	msgstr ""
6820	6607
6821		-#. Resource IDs: (IDS_WARN_RENAMEREQUIRED)
	6608	+#. Resource IDs: (1506)
6822	6609	msgid "New name must not be empty or the same as the original name!"
6823	6610	msgstr ""
6824	6611

		@@ -6841,13 +6628,13 @@
6841	6628	msgid "Next inline difference"
6842	6629	msgstr ""
6843	6630
6844		-#. Resource IDs: (IDS_ERR_NOCOMMAND)
	6631	+#. Resource IDs: (1283)
6845	6632	msgid ""
6846	6633	"No command specified!\n"
6847	6634	"TortoiseProc.exe is used by the Shell extension and should not be called directly!"
6848	6635	msgstr ""
6849	6636
6850		-#. Resource IDs: (IDS_ERR_EMPTYDIFF)
	6637	+#. Resource IDs: (1305)
6851	6638	msgid "No differences found!"
6852	6639	msgstr ""
6853	6640

		@@ -6859,17 +6646,17 @@
6859	6646	msgid "No error occurred."
6860	6647	msgstr ""
6861	6648
6862		-#. Resource IDs: (IDS_COPY_NOEXTERNALSFOUND)
	6649	+#. Resource IDs: (4481)
6863	6650	msgid "No externals found"
6864	6651	msgstr ""
6865	6652
6866		-#. Resource IDs: (IDS_COPY_NOEXTERNALSFORURLS)
	6653	+#. Resource IDs: (4484)
6867	6654	msgid ""
6868	6655	"No externals: For URLs, no externals are gathered.\n"
6869	6656	"If you want to tag externals, start the command directly from a working copy."
6870	6657	msgstr ""
6871	6658
6872		-#. Resource IDs: (IDS_REPOSTATUS_EMPTYFILELIST)
	6659	+#. Resource IDs: (3810)
6873	6660	msgid ""
6874	6661	"No files to show with the current setting.\n"
6875	6662	"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n"

		@@ -6876,7 +6663,7 @@
6876	6663	"To see remote changes, click on 'Check Repository'"
6877	6664	msgstr ""
6878	6665
6879		-#. Resource IDs: (IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED)
	6666	+#. Resource IDs: (2704)
6880	6667	msgid ""
6881	6668	"No files were changed or added since the last commit.\n"
6882	6669	"There's nothing for TortoiseSVN to do here...\n"

		@@ -6884,7 +6671,7 @@
6884	6671	"with the checkbox at the bottom."
6885	6672	msgstr ""
6886	6673
6887		-#. Resource IDs: (IDS_COMMITDLG_NOTHINGTOCOMMIT)
	6674	+#. Resource IDs: (1220)
6888	6675	msgid ""
6889	6676	"No files were changed or added since\n"
6890	6677	"the last commit. There's nothing\n"

		@@ -6895,61 +6682,59 @@
6895	6682	msgid "No filter"
6896	6683	msgstr ""
6897	6684
6898		-#. Resource IDs: (IDS_REVGRAPH_ERR_NOGRAPH)
	6685	+#. Resource IDs: (4363)
6899	6686	msgid "No graph available"
6900	6687	msgstr ""
6901	6688
6902		-#. Resource IDs: (IDS_REVGRAPH_ERR_NOENCODER)
	6689	+#. Resource IDs: (4362)
6903	6690	#, c-format
6904	6691	msgid "No image encoder found for %ls."
6905	6692	msgstr ""
6906	6693
6907		-#. Resource IDs: (IDS_ERR_NOPATH)
	6694	+#. Resource IDs: (1330)
6908	6695	msgid "No path or pathfile specified on the command line!"
6909	6696	msgstr ""
6910	6697
6911		-#. Resource IDs: (IDS_ERR_SHELVE_NOTHING_WAS_SHELVED)
	6698	+#. Resource IDs: (1058)
6912	6699	msgid "No path was shelved."
6913	6700	msgstr ""
6914	6701
6915		-#. Resource IDs: (IDS_SETTINGS_CACHENONE_TT)
	6702	+#. Resource IDs: (3125)
6916	6703	msgid ""
6917	6704	"No status cache. Only versioned folders get an overlay, files don't get an "
6918	6705	"overlay"
6919	6706	msgstr ""
6920	6707
6921		-#. Resource IDs: (IDS_ERR_NOSUCHREVISION)
	6708	+#. Resource IDs: (1331)
6922	6709	#, c-format
6923	6710	msgid "No such revision '%1!ls!'"
6924	6711	msgstr ""
6925	6712
6926		-#. Resource IDs: (IDS_SPELLEDIT_NOTHESAURUS)
	6713	+#. Resource IDs: (3003)
6927	6714	msgid "No thesaurus suggestions"
6928	6715	msgstr ""
6929	6716
6930		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	6717	+#. Resource IDs: (65535)
6931	6718	msgid "Node Status:"
6932	6719	msgstr ""
6933	6720
6934		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	6721	+#. Resource IDs: (65535)
6935	6722	msgid "Node colors"
6936	6723	msgstr ""
6937	6724
6938		-#. Resource IDs: (IDS_COMMITDLG_COPYDEPTH_TASK2)
	6725	+#. Resource IDs: (2709)
6939	6726	msgid "Non-recursive commit of moved/renamed folders."
6940	6727	msgstr ""
6941	6728
6942		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1507)
	6729	+#. Resource IDs: (1507)
6943	6730	msgid "Non-versioned"
6944	6731	msgstr ""
6945	6732
6946		-#. Resource IDs: (Dialog IDD_COPY: Control id 1506, Dialog
6947		-#. IDD_SETTINGSOVERLAY: Control id 1271)
	6733	+#. Resource IDs: (1271, 1506)
6948	6734	msgid "None"
6949	6735	msgstr ""
6950	6736
6951		-#. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535,
6952		-#. IDS_SVN_SUMMARIZENORMAL)
	6737	+#. Resource IDs: (4220, Dialog IDD_SETCOLORPAGE: Control id 65535)
6953	6738	msgid "Normal"
6954	6739	msgstr ""
6955	6740

		@@ -6957,7 +6742,7 @@
6957	6742	msgid "Not all of the system registry entries (or INI file) were removed."
6958	6743	msgstr ""
6959	6744
6960		-#. Resource IDs: (IDS_REVGRAPH_ERR_NOMEMORY)
	6745	+#. Resource IDs: (4364)
6961	6746	msgid ""
6962	6747	"Not enough memory!\n"
6963	6748	"Try reducing the size of the revision graph by either\n"

		@@ -6964,7 +6749,7 @@
6964	6749	"collapsing nodes or reducing the zoom factor."
6965	6750	msgstr ""
6966	6751
6967		-#. Resource IDs: (IDS_SVNACTION_PATHNOTEXIST)
	6752	+#. Resource IDs: (4234)
6968	6753	msgid "Not under version control"
6969	6754	msgstr ""
6970	6755

		@@ -6975,115 +6760,105 @@
6975	6760	"not recover the auto-saved versions, they will be deleted."
6976	6761	msgstr ""
6977	6762
6978		-#. Resource IDs: (Dialog IDD_REVERT: Control id 1481)
	6763	+#. Resource IDs: (1481)
6979	6764	msgid "Note: the folder contains unversioned items"
6980	6765	msgstr ""
6981	6766
6982		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535)
	6767	+#. Resource IDs: (65535)
6983	6768	msgid "Note: this affects all Tortoise clients, not just TortoiseSVN!"
6984	6769	msgstr ""
6985	6770
6986		-#. Resource IDs: (Dialog IDD_EDITPROPEXECUTABLE: Control id 1557)
	6771	+#. Resource IDs: (1557)
6987	6772	msgid "Note: this property has no effect on Windows"
6988	6773	msgstr ""
6989	6774
6990		-#. Resource IDs: (IDS_COMMITDLG_NOTHINGSELECTED)
	6775	+#. Resource IDs: (2762)
6991	6776	msgid "Nothing is selected for commit!"
6992	6777	msgstr ""
6993	6778
6994		-#. Resource IDs: (IDS_NOTHING_SHELVED)
	6779	+#. Resource IDs: (1052)
6995	6780	msgid "Nothing is shelved!"
6996	6781	msgstr ""
6997	6782
6998		-#. Resource IDs: (IDS_WARN_NOTE)
	6783	+#. Resource IDs: (1406)
6999	6784	msgid "Notice"
7000	6785	msgstr ""
7001	6786
7002		-#. Resource IDs: (IDS_STATGRAPH_NUMBEROFUNIT)
	6787	+#. Resource IDs: (3940)
7003	6788	#, c-format
7004	6789	msgid "Number of %ls:"
7005	6790	msgstr ""
7006	6791
7007		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_AUTHORS)
	6792	+#. Resource IDs: (5403)
7008	6793	msgid "Number of authors in the cache"
7009	6794	msgstr ""
7010	6795
7011		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1161)
	6796	+#. Resource IDs: (1161)
7012	6797	msgid "Number of authors:"
7013	6798	msgstr ""
7014	6799
7015		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_MERGESREVISIONS)
	6800	+#. Resource IDs: (5417)
7016	6801	msgid "Number of cached merged revisions"
7017	6802	msgstr ""
7018	6803
7019		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_REVISIONCOUNT)
	6804	+#. Resource IDs: (5412)
7020	6805	msgid "Number of cached revisions"
7021	6806	msgstr ""
7022	6807
7023		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_CHANGEDREVISIONS)
	6808	+#. Resource IDs: (5414)
7024	6809	msgid "Number of cached revisions that have a non-empty change list"
7025	6810	msgstr ""
7026	6811
7027		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_USERREVPROPSREVISIONS)
	6812	+#. Resource IDs: (5420)
7028	6813	msgid "Number of cached revisions that have user revision properties"
7029	6814	msgstr ""
7030	6815
7031		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_CHANGESMISSING)
	6816	+#. Resource IDs: (5415)
7032	6817	msgid "Number of cached revisions whose change list is not cached yet"
7033	6818	msgstr ""
7034	6819
7035		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_USERREVPROPSMISSING)
	6820	+#. Resource IDs: (5421)
7036	6821	msgid ""
7037	6822	"Number of cached revisions whose user revision properties are not cached yet"
7038	6823	msgstr ""
7039	6824
7040		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_PATHS)
	6825	+#. Resource IDs: (5405)
7041	6826	msgid ""
7042	6827	"Number of different paths shown in the log dialog, including parent paths"
7043	6828	msgstr ""
7044	6829
7045		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_WORDTOKENS)
	6830	+#. Resource IDs: (5407)
7046	6831	msgid "Number of different words used in log messages"
7047	6832	msgstr ""
7048	6833
7049		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_MERGESMISSING)
	6834	+#. Resource IDs: (5418)
7050	6835	msgid "Number of merged revisions that are not cached yet"
7051	6836	msgstr ""
7052	6837
7053		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_PATHELEMENTS)
	6838	+#. Resource IDs: (5404)
7054	6839	msgid ""
7055	6840	"Number of path elements. A path element is a folder or file name like "
7056	6841	"'foo.txt' or 'mybranch'."
7057	6842	msgstr ""
7058	6843
7059		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_FAILURELIMIT)
	6844	+#. Resource IDs: (5511)
7060	6845	msgid ""
7061	6846	"Number of times a log cache can fail to close properly\n"
7062	6847	"due to crashes etc. until it gets deleted automatically."
7063	6848	msgstr ""
7064	6849
7065		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1160)
	6850	+#. Resource IDs: (1160)
7066	6851	msgid "Number of weeks:"
7067	6852	msgstr ""
7068	6853
7069		-#. Resource IDs: (Dialog IDD_CREATEPATCH: Control id 1542)
	6854	+#. Resource IDs: (1542)
7070	6855	msgid "O&ptions"
7071	6856	msgstr ""
7072	6857
7073		-#. Resource IDs: (1, Dialog IDD_ABOUT: Control id 1, Dialog
7074		-#. IDD_BUGTRAQREGEXTESTER: Control id 1, Dialog IDD_COLLABORATORSETTINGS:
7075		-#. Control id 1, Dialog IDD_EDITPROPLOCALHOOKS: Control id 1, Dialog
7076		-#. IDD_EDITPROPMERGELOGTEMPLATE: Control id 1, Dialog IDD_EDITPROPUSERBOOL:
7077		-#. Control id 1, Dialog IDD_EDITPROPUSERMULTILINE: Control id 1, Dialog
7078		-#. IDD_EDITPROPUSERSINGLELINE: Control id 1, Dialog IDD_EDITPROPUSERSTATE:
7079		-#. Control id 1, Dialog IDD_ENCODING: Control id 1, Dialog IDD_GOTO: Control
7080		-#. id 1, Dialog IDD_GOTODLG: Control id 1, Dialog IDD_MONITOROPTIONS: Control
7081		-#. id 1, Dialog IDD_MONITORPROJECT: Control id 1, Dialog IDD_OPEN: Control id
7082		-#. 1, Dialog IDD_OPENDLG: Control id 1, Dialog IDD_PASSWORD: Control id 1,
7083		-#. Dialog IDD_REGEXFILTER: Control id 1, Dialog IDD_REGEXFILTERS: Control id
7084		-#. 1, Dialog IDD_SETTINGSBUGTRAQADV: Control id 1, Dialog
7085		-#. IDD_SETTINGSHOOKCONFIG: Control id 1, Dialog IDD_SETTINGSPROGSADV: Control
7086		-#. id 1, Dialog IDD_SETTINGS_CLEARAUTH: Control id 1)
	6858	+#. Resource IDs: (1, Dialog IDD_ABOUT: Control id 1, Dialog IDD_ENCODING:
	6859	+#. Control id 1, Dialog IDD_GOTO: Control id 1, Dialog IDD_GOTODLG: Control id
	6860	+#. 1, Dialog IDD_OPEN: Control id 1, Dialog IDD_OPENDLG: Control id 1, Dialog
	6861	+#. IDD_REGEXFILTER: Control id 1, Dialog IDD_REGEXFILTERS: Control id 1)
7087	6862	msgid "OK"
7088	6863	msgstr ""
7089	6864

		@@ -7091,25 +6866,23 @@
7091	6866	msgid "OVR"
7092	6867	msgstr ""
7093	6868
7094		-#. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535)
	6869	+#. Resource IDs: (65535)
7095	6870	msgid "Older lines"
7096	6871	msgstr ""
7097	6872
7098		-#. Resource IDs: (ID_URL_FOCUS - Menu)
	6873	+#. Resource IDs: (32814 - Menu)
7099	6874	msgid "Oldest on to&p"
7100	6875	msgstr ""
7101	6876
7102		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1202, Dialog IDD_EXPORT:
7103		-#. Control id 1202, Dialog IDD_SWITCH: Control id 1202, Dialog IDD_UPDATE:
7104		-#. Control id 1202)
	6877	+#. Resource IDs: (1202)
7105	6878	msgid "Omit e&xternals"
7106	6879	msgstr ""
7107	6880
7108		-#. Resource IDs: (IDS_PROC_OMMITEXTERNALS)
	6881	+#. Resource IDs: (2313)
7109	6882	msgid "Omit externals"
7110	6883	msgstr ""
7111	6884
7112		-#. Resource IDs: (IDS_WARN_CONFIRM_MOVE_SPECIAL_DIRECTORY_TASK1)
	6885	+#. Resource IDs: (1693)
7113	6886	msgid ""
7114	6887	"One of the paths you are attempting to move appears to be a special path\n"
7115	6888	"(one of 'branches', 'tags' or 'trunk')."

		@@ -7119,11 +6892,11 @@
7119	6892	msgid "One or more auto-saved documents were found."
7120	6893	msgstr ""
7121	6894
7122		-#. Resource IDs: (IDS_PROGRS_CONFLICTSOCCURED)
	6895	+#. Resource IDs: (3501)
7123	6896	msgid "One or more files are in a conflicted state."
7124	6897	msgstr ""
7125	6898
7126		-#. Resource IDs: (IDS_ERR_SHELVE_FAILED_PATHS)
	6899	+#. Resource IDs: (1056)
7127	6900	#, c-format
7128	6901	msgid ""
7129	6902	"One or more paths could not be shelved.\n"

		@@ -7131,37 +6904,37 @@
7131	6904	"%s"
7132	6905	msgstr ""
7133	6906
7134		-#. Resource IDs: (IDS_MONITOR_NOTIFY_TITLE)
	6907	+#. Resource IDs: (1023)
7135	6908	msgid "One project has updates:"
7136	6909	msgstr ""
7137	6910
7138		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_OPTIONS: Control id 1424)
	6911	+#. Resource IDs: (1424)
7139	6912	msgid "Onl&y record the merge (block revisions from getting merged)"
7140	6913	msgstr ""
7141	6914
7142		-#. Resource IDs: (IDS_SVN_DEPTH_FILES)
	6915	+#. Resource IDs: (302)
7143	6916	msgid "Only file children"
7144	6917	msgstr ""
7145	6918
7146		-#. Resource IDs: (IDS_COMMITDLG_ONLYNUMBERS)
	6919	+#. Resource IDs: (2702)
7147	6920	msgid ""
7148	6921	"Only numbers (optionally separated by commas)\n"
7149	6922	"are allowed!"
7150	6923	msgstr ""
7151	6924
7152		-#. Resource IDs: (IDS_ACC_PROPONLYCHANGE)
	6925	+#. Resource IDs: (10002)
7153	6926	msgid "Only properties changed"
7154	6927	msgstr ""
7155	6928
7156		-#. Resource IDs: (IDS_SVN_DEPTH_EMPTY)
	6929	+#. Resource IDs: (303)
7157	6930	msgid "Only this item"
7158	6931	msgstr ""
7159	6932
7160		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 1224)
	6933	+#. Resource IDs: (1224)
7161	6934	msgid "Only use s&pellchecker when tsvn:projectlanguage is set"
7162	6935	msgstr ""
7163	6936
7164		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	6937	+#. Resource IDs: (65535)
7165	6938	msgid "Opacity"
7166	6939	msgstr ""
7167	6940

		@@ -7169,15 +6942,15 @@
7169	6942	msgid "Open"
7170	6943	msgstr ""
7171	6944
7172		-#. Resource IDs: (IDS_LOG_POPUP_OPENLOCAL)
	6945	+#. Resource IDs: (1826)
7173	6946	msgid "Open &local"
7174	6947	msgstr ""
7175	6948
7176		-#. Resource IDs: (IDS_LOG_POPUP_OPENWITHLOCAL)
	6949	+#. Resource IDs: (1827)
7177	6950	msgid "Open &with local..."
7178	6951	msgstr ""
7179	6952
7180		-#. Resource IDs: (IDS_SSL_CLIENTCERTIFICATEFILENAME)
	6953	+#. Resource IDs: (1202)
7181	6954	msgid "Open client certificate file"
7182	6955	msgstr ""
7183	6956

		@@ -7195,23 +6968,23 @@
7195	6968	msgid "Open image file..."
7196	6969	msgstr ""
7197	6970
7198		-#. Resource IDs: (IDS_LOG_POPUP_OPENLOCAL_MULTIPLE)
	6971	+#. Resource IDs: (1014)
7199	6972	msgid "Open multiple &local..."
7200	6973	msgstr ""
7201	6974
7202		-#. Resource IDs: (IDS_SVNPROGRESS_MENUOPENPARENT)
	6975	+#. Resource IDs: (4502)
7203	6976	msgid "Open parent folder"
7204	6977	msgstr ""
7205	6978
7206		-#. Resource IDs: (IDS_LOG_POPUP_OPENURL)
	6979	+#. Resource IDs: (1846)
7207	6980	msgid "Open repository &Url"
7208	6981	msgstr ""
7209	6982
7210		-#. Resource IDs: (IDS_LOG_POPUP_OPENWITH)
	6983	+#. Resource IDs: (1807)
7211	6984	msgid "Open with..."
7212	6985	msgstr ""
7213	6986
7214		-#. Resource IDs: (IDS_LOG_POPUP_EXPLORE)
	6987	+#. Resource IDs: (1045)
7215	6988	msgid "Open working copy in &explorer"
7216	6989	msgstr ""
7217	6990

		@@ -7221,19 +6994,19 @@
7221	6994	"Help Topics"
7222	6995	msgstr ""
7223	6996
7224		-#. Resource IDs: (IDS_MENUDESCREPOBROWSE)
	6997	+#. Resource IDs: (202)
7225	6998	msgid "Opens the repository browser to tweak the repository online"
7226	6999	msgstr ""
7227	7000
7228		-#. Resource IDs: (IDS_SETTINGS_CONNECTIVITY_OFFLINENOW)
	7001	+#. Resource IDs: (3173)
7229	7002	msgid "Operate from log cache for now only"
7230	7003	msgstr ""
7231	7004
7232		-#. Resource IDs: (IDS_EXTERNALS_OPERATIVE)
	7005	+#. Resource IDs: (3481)
7233	7006	msgid "Operative"
7234	7007	msgstr ""
7235	7008
7236		-#. Resource IDs: (IDS_SETTINGS_CONF_NAMECOL)
	7009	+#. Resource IDs: (5560)
7237	7010	msgid "Option"
7238	7011	msgstr ""
7239	7012

		@@ -7241,7 +7014,7 @@
7241	7014	msgid "Ori&ginal size\t(S)"
7242	7015	msgstr ""
7243	7016
7244		-#. Resource IDs: (IDS_STATGRAPH_OTHERGROUP)
	7017	+#. Resource IDs: (3907)
7245	7018	msgid "Others"
7246	7019	msgstr ""
7247	7020

		@@ -7253,17 +7026,17 @@
7253	7026	msgid "Output.prn"
7254	7027	msgstr ""
7255	7028
7256		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	7029	+#. Resource IDs: (65535)
7257	7030	msgid "Overlays"
7258	7031	msgstr ""
7259	7032
7260		-#. Resource IDs: (IDS_EXPORT_TT_EOL)
	7033	+#. Resource IDs: (1505)
7261	7034	msgid ""
7262	7035	"Override the svn:eol-style property setting.\n"
7263	7036	"Files which don't have this property set are not affected."
7264	7037	msgstr ""
7265	7038
7266		-#. Resource IDs: (IDS_WARN_SYNCPWWRONG_TASK3)
	7039	+#. Resource IDs: (9924)
7267	7040	msgid ""
7268	7041	"Overwrite\n"
7269	7042	"The settings are overwritten"

		@@ -7301,29 +7074,27 @@
7301	7074	msgid "Page :"
7302	7075	msgstr ""
7303	7076
7304		-#. Resource IDs: (IDS_SETTINGS_BUGTRAQ_PARAMETERSCOL)
	7077	+#. Resource IDs: (1006)
7305	7078	msgid "Parameters"
7306	7079	msgstr ""
7307	7080
7308		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 1477)
	7081	+#. Resource IDs: (1477)
7309	7082	msgid "Parameters:"
7310	7083	msgstr ""
7311	7084
7312		-#. Resource IDs: (Dialog IDD_PASSWORD: Control id 370)
	7085	+#. Resource IDs: (370)
7313	7086	msgid "Password"
7314	7087	msgstr ""
7315	7088
7316		-#. Resource IDs: (IDS_WARN_SYNCPWWRONG_TASK2)
	7089	+#. Resource IDs: (9923)
7317	7090	msgid "Password is wrong"
7318	7091	msgstr ""
7319	7092
7320		-#. Resource IDs: (IDS_SETTINGSCLEAR_COL4)
	7093	+#. Resource IDs: (5573)
7321	7094	msgid "Password/phrase"
7322	7095	msgstr ""
7323	7096
7324		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535, Dialog
7325		-#. IDD_PASSWORD: Control id 65535, Dialog IDD_SETTINGSSYNC: Control id 65535,
7326		-#. IDS_AUTH_PASSWORD)
	7097	+#. Resource IDs: (1101, 65535)
7327	7098	msgid "Password:"
7328	7099	msgstr ""
7329	7100

		@@ -7331,11 +7102,11 @@
7331	7102	msgid "Paste"
7332	7103	msgstr ""
7333	7104
7334		-#. Resource IDs: (IDS_COMMITDLG_POPUP_PASTEFILELIST)
	7105	+#. Resource IDs: (2750)
7335	7106	msgid "Paste filename list"
7336	7107	msgstr ""
7337	7108
7338		-#. Resource IDs: (IDS_MENUDESCCLIPPASTE)
	7109	+#. Resource IDs: (226)
7339	7110	msgid ""
7340	7111	"Pastes the svn path from the clipboard, resulting in a move (cut) or copy "
7341	7112	"operation"

		@@ -7357,7 +7128,7 @@
7357	7128	msgid "Patch selected files"
7358	7129	msgstr ""
7359	7130
7360		-#. Resource IDs: (IDS_PATCHFILEFILTER)
	7131	+#. Resource IDs: (2503, IDS_PATCHFILEFILTER)
7361	7132	msgid "Patchfiles (.diff, .patch)\|.diff;.patch\|All (.)\|.\|\|"
7362	7133	msgstr ""
7363	7134

		@@ -7370,9 +7141,7 @@
7370	7141	msgid "Patching file '%1!ls!'"
7371	7142	msgstr ""
7372	7143
7373		-#. Resource IDs: (IDS_HEADER_PATH, IDS_PATH, IDS_PROGRS_PATH,
7374		-#. IDS_SETTINGS_BUGTRAQ_PATHCOL, IDS_SETTINGS_HOOKS_PATHCOL,
7375		-#. IDS_SHELF_UNSHELVE_FILECOL, IDS_STATUSLIST_COLFILE)
	7144	+#. Resource IDs: (1004, 1062, 1223, 3153, 3300, IDS_HEADER_PATH, IDS_PATH)
7376	7145	msgid "Path"
7377	7146	msgstr ""
7378	7147

		@@ -7380,31 +7149,31 @@
7380	7149	msgid "Path found that matches the patch better."
7381	7150	msgstr ""
7382	7151
7383		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535)
	7152	+#. Resource IDs: (65535)
7384	7153	msgid "Path or URL:"
7385	7154	msgstr ""
7386	7155
7387		-#. Resource IDs: (Dialog IDD_SETTINGSSYNC: Control id 65535)
	7156	+#. Resource IDs: (65535)
7388	7157	msgid "Path:"
7389	7158	msgstr ""
7390	7159
7391		-#. Resource IDs: (IDS_LOG_FILTER_PATHS)
	7160	+#. Resource IDs: (1851)
7392	7161	msgid "Paths"
7393	7162	msgstr ""
7394	7163
7395		-#. Resource IDs: (IDS_LOG_POPUP_CLIPBOARD_RELPATH)
	7164	+#. Resource IDs: (1844)
7396	7165	msgid "Paths relative to root"
7397	7166	msgstr ""
7398	7167
7399		-#. Resource IDs: (IDS_EXTERNALS_PEG)
	7168	+#. Resource IDs: (3480)
7400	7169	msgid "Peg"
7401	7170	msgstr ""
7402	7171
7403		-#. Resource IDs: (IDS_STATGRAPH_PERCENTAGE_OF_AUTHORSHIP)
	7172	+#. Resource IDs: (3913)
7404	7173	msgid "Percent of authorship"
7405	7174	msgstr ""
7406	7175
7407		-#. Resource IDs: (IDS_STATGRAPH_PERCENTAGE_OF_AUTHORSHIPY)
	7176	+#. Resource IDs: (3914)
7408	7177	msgid "Percents"
7409	7178	msgstr ""
7410	7179

		@@ -7414,29 +7183,29 @@
7414	7183	"a picture"
7415	7184	msgstr ""
7416	7185
7417		-#. Resource IDs: (IDS_PICTUREFILEFILTER)
	7186	+#. Resource IDs: (2504)
7418	7187	msgid ""
7419	7188	"Pictures (.svg, .wmf, .jpg, .png, .bmp, .gif, "
7420	7189	".webp)\|.svg;.wmf;.jpg;.jpeg;.png;.bmp;.gif;.webp\|All (.)\|.*\|\|"
7421	7190	msgstr ""
7422	7191
7423		-#. Resource IDs: (IDS_STATGRAPH_PIEBUTTON_TT)
	7192	+#. Resource IDs: (3930)
7424	7193	msgid "Pie Graph"
7425	7194	msgstr ""
7426	7195
7427		-#. Resource IDs: (IDS_ERR_NOHOOKCOMMANDPECIFIED)
	7196	+#. Resource IDs: (1319)
7428	7197	msgid "Please enter a hook script to execute."
7429	7198	msgstr ""
7430	7199
7431		-#. Resource IDs: (IDS_ERR_NOHOOKPATHSPECIFIED)
	7200	+#. Resource IDs: (1318)
7432	7201	msgid "Please enter a path where to apply the hook script to."
7433	7202	msgstr ""
7434	7203
7435		-#. Resource IDs: (IDS_SVNERR_RUNCLEANUP)
	7204	+#. Resource IDs: (308)
7436	7205	msgid "Please execute the 'Cleanup' command."
7437	7206	msgstr ""
7438	7207
7439		-#. Resource IDs: (IDS_PROGRS_COPY_WARNING)
	7208	+#. Resource IDs: (1238)
7440	7209	msgid ""
7441	7210	"Please note:\n"
7442	7211	"Your working copy remains on the previous path. If you want your next changes\n"

		@@ -7445,29 +7214,27 @@
7445	7214	"Use the Switch command to do that."
7446	7215	msgstr ""
7447	7216
7448		-#. Resource IDs: (IDS_ERR_NOHOOKTYPESPECIFIED)
	7217	+#. Resource IDs: (1317)
7449	7218	msgid "Please select a hook type"
7450	7219	msgstr ""
7451	7220
7452		-#. Resource IDs: (IDS_PROPWAITCANCEL)
	7221	+#. Resource IDs: (199)
7453	7222	msgid "Please wait while cancelling..."
7454	7223	msgstr ""
7455	7224
7456		-#. Resource IDs: (IDS_FILEDIFF_WAIT)
	7225	+#. Resource IDs: (5102)
7457	7226	msgid "Please wait while differences are obtained..."
7458	7227	msgstr ""
7459	7228
7460		-#. Resource IDs: (IDS_COPY_WAITFOREXTERNALS)
	7229	+#. Resource IDs: (4480)
7461	7230	msgid "Please wait while the externals are gathered..."
7462	7231	msgstr ""
7463	7232
7464		-#. Resource IDs: (IDS_REPOBROWSE_INITWAIT)
	7233	+#. Resource IDs: (1660)
7465	7234	msgid "Please wait while the repository browser is initializing..."
7466	7235	msgstr ""
7467	7236
7468		-#. Resource IDs: (Dialog IDD_PLEASEWAIT: Control id 347,
7469		-#. IDS_BLAME_PROGRESSINFO, IDS_PROC_CLEANUP_INFO2, IDS_PROGRESSWAIT,
7470		-#. IDS_REPOBROWSE_WAIT, IDS_STATUSLIST_BUSYMSG)
	7237	+#. Resource IDs: (1661, 1902, 2101, 2333, 3403, 347)
7471	7238	msgid "Please wait..."
7472	7239	msgstr ""
7473	7240

		@@ -7475,19 +7242,19 @@
7475	7242	msgid "Port :"
7476	7243	msgstr ""
7477	7244
7478		-#. Resource IDs: (IDS_SETTINGS_REVGRAPH_OPACITY)
	7245	+#. Resource IDs: (5550)
7479	7246	msgid "Possible values: 0 (fully transparent) .. 255 (opaque)"
7480	7247	msgstr ""
7481	7248
7482		-#. Resource IDs: (IDS_HOOKTYPE_POSTCOMMIT)
	7249	+#. Resource IDs: (9102)
7483	7250	msgid "Post-Commit Hook"
7484	7251	msgstr ""
7485	7252
7486		-#. Resource IDs: (IDS_HOOKTYPE_POSTLOCK)
	7253	+#. Resource IDs: (9110)
7487	7254	msgid "Post-Lock Hook"
7488	7255	msgstr ""
7489	7256
7490		-#. Resource IDs: (IDS_HOOKTYPE_POSTUPDATE)
	7257	+#. Resource IDs: (9105)
7491	7258	msgid "Post-Update Hook"
7492	7259	msgstr ""
7493	7260

		@@ -7495,19 +7262,19 @@
7495	7262	msgid "Pre&v Page"
7496	7263	msgstr ""
7497	7264
7498		-#. Resource IDs: (IDS_HOOKTYPE_PRECOMMIT)
	7265	+#. Resource IDs: (9101)
7499	7266	msgid "Pre-Commit Hook"
7500	7267	msgstr ""
7501	7268
7502		-#. Resource IDs: (IDS_HOOKTYPE_PRECONNECT)
	7269	+#. Resource IDs: (9106)
7503	7270	msgid "Pre-Connect Hook"
7504	7271	msgstr ""
7505	7272
7506		-#. Resource IDs: (IDS_HOOKTYPE_PRELOCK)
	7273	+#. Resource IDs: (9109)
7507	7274	msgid "Pre-Lock Hook"
7508	7275	msgstr ""
7509	7276
7510		-#. Resource IDs: (IDS_HOOKTYPE_PREUPDATE)
	7277	+#. Resource IDs: (9104)
7511	7278	msgid "Pre-Update Hook"
7512	7279	msgstr ""
7513	7280

		@@ -7558,151 +7325,150 @@
7558	7325	msgid "Printing"
7559	7326	msgstr ""
7560	7327
7561		-#. Resource IDs: (IDS_HOOK_FORCEDPROCEED)
	7328	+#. Resource IDs: (5811)
7562	7329	msgid "Proceed anyway"
7563	7330	msgstr ""
7564	7331
7565		-#. Resource IDs: (IDS_COMMITDLG_COPYDEPTH_TASK3)
	7332	+#. Resource IDs: (2710)
7566	7333	msgid ""
7567	7334	"Proceed with the commit\n"
7568	7335	"the renamed/moved folders are committed recursively in the repository."
7569	7336	msgstr ""
7570	7337
7571		-#. Resource IDs: (IDS_BLAME_PROGRESSINFO2)
	7338	+#. Resource IDs: (2103)
7572	7339	#, c-format
7573	7340	msgid "Processing revision %1!d! of %2!d!..."
7574	7341	msgstr ""
7575	7342
7576		-#. Resource IDs: (IDS_PROGS_TOOLCOL)
	7343	+#. Resource IDs: (1179)
7577	7344	msgid "Program"
7578	7345	msgstr ""
7579	7346
7580		-#. Resource IDs: (IDS_PROGRAMSFILEFILTER)
	7347	+#. Resource IDs: (2501)
7581	7348	msgid "Programs (.exe)\|.exe\|All Files (.)\|.\|\|"
7582	7349	msgstr ""
7583	7350
7584		-#. Resource IDs: (Dialog IDD_SVNPROGRESS: Control id 134)
	7351	+#. Resource IDs: (134)
7585	7352	msgid "Progress"
7586	7353	msgstr ""
7587	7354
7588		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535)
	7355	+#. Resource IDs: (65535)
7589	7356	msgid "Project"
7590	7357	msgstr ""
7591	7358
7592		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 226, Dialog
7593		-#. IDD_PROPERTIES: Control id 177, IDS_MENUPROPERTIES)
	7359	+#. Resource IDs: (177, 226, 257)
7594	7360	msgid "Properties"
7595	7361	msgstr ""
7596	7362
7597		-#. Resource IDs: (IDS_PROPSFILEFILTER)
	7363	+#. Resource IDs: (2505)
7598	7364	msgid "Properties (.svnprops)\|.svnprops\|All Files (.)\|.\|\|"
7599	7365	msgstr ""
7600	7366
7601		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1287)
	7367	+#. Resource IDs: (1287)
7602	7368	msgid "Properties for"
7603	7369	msgstr ""
7604	7370
7605		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_PROPERTIES)
	7371	+#. Resource IDs: (3334)
7606	7372	msgid "Properties..."
7607	7373	msgstr ""
7608	7374
7609		-#. Resource IDs: (IDS_PROPPROPERTY)
	7375	+#. Resource IDs: (164)
7610	7376	msgid "Property"
7611	7377	msgstr ""
7612	7378
7613		-#. Resource IDs: (IDS_DIFF_PROP_REVISIONNAME)
	7379	+#. Resource IDs: (2409)
7614	7380	#, c-format
7615	7381	msgid "Property %1!ls! : Revision %2!ls!"
7616	7382	msgstr ""
7617	7383
7618		-#. Resource IDs: (IDS_DIFF_PROP_BASENAMEREV)
	7384	+#. Resource IDs: (2411)
7619	7385	#, c-format
7620	7386	msgid "Property %1!ls! : Working Base, Revision %2!ld!"
7621	7387	msgstr ""
7622	7388
7623		-#. Resource IDs: (IDS_DIFF_PROP_MERGENAME)
	7389	+#. Resource IDs: (2412)
7624	7390	#, c-format
7625	7391	msgid "Property %ls : merged"
7626	7392	msgstr ""
7627	7393
7628		-#. Resource IDs: (IDS_DIFF_PROP_REMOTENAME)
	7394	+#. Resource IDs: (2408)
7629	7395	#, c-format
7630	7396	msgid "Property %ls : remote"
7631	7397	msgstr ""
7632	7398
7633		-#. Resource IDs: (IDS_DIFF_PROP_BASENAME)
	7399	+#. Resource IDs: (2407)
7634	7400	#, c-format
7635	7401	msgid "Property %ls : working base"
7636	7402	msgstr ""
7637	7403
7638		-#. Resource IDs: (IDS_DIFF_PROP_WCNAME)
	7404	+#. Resource IDs: (2406)
7639	7405	#, c-format
7640	7406	msgid "Property %ls : working copy"
7641	7407	msgstr ""
7642	7408
7643		-#. Resource IDs: (IDS_SVNACTION_PROPDEL)
	7409	+#. Resource IDs: (4191)
7644	7410	#, c-format
7645	7411	msgid "Property '%ls' deleted"
7646	7412	msgstr ""
7647	7413
7648		-#. Resource IDs: (IDS_SVNACTION_PROPSET)
	7414	+#. Resource IDs: (4190)
7649	7415	#, c-format
7650	7416	msgid "Property '%ls' set"
7651	7417	msgstr ""
7652	7418
7653		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 107)
	7419	+#. Resource IDs: (107)
7654	7420	msgid "Property Page"
7655	7421	msgstr ""
7656	7422
7657		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	7423	+#. Resource IDs: (65535)
7658	7424	msgid "Property Status:"
7659	7425	msgstr ""
7660	7426
7661		-#. Resource IDs: (IDS_EDITCONFLICT_PROP_DIFF)
	7427	+#. Resource IDs: (1048)
7662	7428	msgid "Property diff:\n"
7663	7429	msgstr ""
7664	7430
7665		-#. Resource IDs: (Dialog IDD_EDITPROPERTYVALUE: Control id 1292)
	7431	+#. Resource IDs: (1292)
7666	7432	msgid "Property name:"
7667	7433	msgstr ""
7668	7434
7669		-#. Resource IDs: (IDS_STATUSLIST_COLPROPSTATUS)
	7435	+#. Resource IDs: (3304)
7670	7436	msgid "Property status"
7671	7437	msgstr ""
7672	7438
7673		-#. Resource IDs: (Dialog IDD_EDITPROPERTYVALUE: Control id 1293)
	7439	+#. Resource IDs: (1293)
7674	7440	msgid "Property value:"
7675	7441	msgstr ""
7676	7442
7677		-#. Resource IDs: (IDS_SETTINGS_BUGTRAQ_PROVIDERCOL)
	7443	+#. Resource IDs: (1005)
7678	7444	msgid "Provider"
7679	7445	msgstr ""
7680	7446
7681		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1586)
	7447	+#. Resource IDs: (1586)
7682	7448	msgid "Provider para&meters:"
7683	7449	msgstr ""
7684	7450
7685		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1581)
	7451	+#. Resource IDs: (1581)
7686	7452	msgid "Provider uuid win&32:"
7687	7453	msgstr ""
7688	7454
7689		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 1475)
	7455	+#. Resource IDs: (1475)
7690	7456	msgid "Provider:"
7691	7457	msgstr ""
7692	7458
7693		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1412)
	7459	+#. Resource IDs: (1412)
7694	7460	msgid "Proxy &timeout in seconds:"
7695	7461	msgstr ""
7696	7462
7697		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1080)
	7463	+#. Resource IDs: (1080)
7698	7464	msgid "Proxy Settings"
7699	7465	msgstr ""
7700	7466
7701		-#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 1338)
	7467	+#. Resource IDs: (1338)
7702	7468	msgid "Put \"Get Lock\" on top menu when svn:needs-lock is set"
7703	7469	msgstr ""
7704	7470
7705		-#. Resource IDs: (IDS_MENUDESCSHELVE)
	7471	+#. Resource IDs: (288)
7706	7472	msgid "Puts all changes you made onto a shelf"
7707	7473	msgstr ""
7708	7474

		@@ -7722,19 +7488,19 @@
7722	7488	msgid "R"
7723	7489	msgstr ""
7724	7490
7725		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1073)
	7491	+#. Resource IDs: (1073)
7726	7492	msgid "R&AM drives"
7727	7493	msgstr ""
7728	7494
7729		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_REVRANGE: Control id 1423)
	7495	+#. Resource IDs: (1423)
7730	7496	msgid "R&everse merge"
7731	7497	msgstr ""
7732	7498
7733		-#. Resource IDs: (IDS_LOG_POPUP_REVERTTOREV)
	7499	+#. Resource IDs: (1810)
7734	7500	msgid "R&evert to this revision"
7735	7501	msgstr ""
7736	7502
7737		-#. Resource IDs: (Dialog IDD_LOGCACHESTATISTICS: Control id 65535)
	7503	+#. Resource IDs: (65535)
7738	7504	msgid "RAM [kB]: "
7739	7505	msgstr ""
7740	7506

		@@ -7742,62 +7508,62 @@
7742	7508	msgid "REC"
7743	7509	msgstr ""
7744	7510
7745		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1048)
	7511	+#. Resource IDs: (1048)
7746	7512	msgid "Re&movable drives"
7747	7513	msgstr ""
7748	7514
7749		-#. Resource IDs: (IDS_MENURENAME)
	7515	+#. Resource IDs: (166)
7750	7516	msgid "Re&name..."
7751	7517	msgstr ""
7752	7518
7753		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSADV: Control id 1382)
	7519	+#. Resource IDs: (1382)
7754	7520	msgid "Re&store defaults"
7755	7521	msgstr ""
7756	7522
7757		-#. Resource IDs: (IDS_MENUREVERT)
	7523	+#. Resource IDs: (125)
7758	7524	msgid "Re&vert..."
7759	7525	msgstr ""
7760	7526
7761		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_TREE: Control id 1033)
	7527	+#. Resource IDs: (1033)
7762	7528	msgid "Re&vision"
7763	7529	msgstr ""
7764	7530
7765		-#. Resource IDs: (IDS_MENUDESCHELP)
	7531	+#. Resource IDs: (191)
7766	7532	msgid "Read the 'Daily Use Guide' before you are stuck..."
7767	7533	msgstr ""
7768	7534
7769		-#. Resource IDs: (IDS_SETTINGSCLEAR_COL2)
	7535	+#. Resource IDs: (5571)
7770	7536	msgid "Realm String"
7771	7537	msgstr ""
7772	7538
7773		-#. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535)
	7539	+#. Resource IDs: (65535)
7774	7540	msgid "Recently modified lines"
7775	7541	msgstr ""
7776	7542
7777		-#. Resource IDs: (IDS_MERGE_RECORDONLY)
	7543	+#. Resource IDs: (4453)
7778	7544	msgid "Record Only"
7779	7545	msgstr ""
7780	7546
7781		-#. Resource IDs: (IDS_SVNACTION_MERGEINFO)
	7547	+#. Resource IDs: (4225)
7782	7548	msgid "Recording mergeinfo for merge between URLs"
7783	7549	msgstr ""
7784	7550
7785		-#. Resource IDs: (IDS_SVNACTION_MERGERECORDBEGINMULTIPLE)
	7551	+#. Resource IDs: (4228)
7786	7552	#, c-format
7787	7553	msgid "Recording mergeinfo for merge of r%1!ld! through r%2!ld!"
7788	7554	msgstr ""
7789	7555
7790		-#. Resource IDs: (IDS_SVNACTION_MERGERECORDBEGINSINGLE)
	7556	+#. Resource IDs: (4226)
7791	7557	#, c-format
7792	7558	msgid "Recording mergeinfo for merge of r%ld"
7793	7559	msgstr ""
7794	7560
7795		-#. Resource IDs: (IDS_SVNACTION_MERGERECORDBEGINMULTIPLEREVERSE)
	7561	+#. Resource IDs: (4229)
7796	7562	#, c-format
7797	7563	msgid "Recording mergeinfo for reverse merge of r%1!ld! through r%2!ld!"
7798	7564	msgstr ""
7799	7565
7800		-#. Resource IDs: (IDS_SVNACTION_MERGERECORDBEGINSINGLEREVERSE)
	7566	+#. Resource IDs: (4227)
7801	7567	#, c-format
7802	7568	msgid "Recording mergeinfo for reverse merge of r%ld"
7803	7569	msgstr ""

		@@ -7808,25 +7574,25 @@
7808	7574	"Open the auto-saved versions instead of the explicitly saved versions"
7809	7575	msgstr ""
7810	7576
7811		-#. Resource IDs: (IDS_EDITPROPS_RECURSIVEREMOVE_TASK3)
	7577	+#. Resource IDs: (9410)
7812	7578	msgid ""
7813	7579	"Recur&sive\n"
7814	7580	"Remove the property also from items in Subfolders."
7815	7581	msgstr ""
7816	7582
7817		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 1260)
	7583	+#. Resource IDs: (1260)
7818	7584	msgid "Recurse into unversioned folders"
7819	7585	msgstr ""
7820	7586
7821		-#. Resource IDs: (IDS_EDITPROPS_RECURSIVEREMOVE_TASK2)
	7587	+#. Resource IDs: (9409)
7822	7588	msgid "Recursive operation"
7823	7589	msgstr ""
7824	7590
7825		-#. Resource IDs: (Dialog IDD_RECYCLEBIN: Control id 333)
	7591	+#. Resource IDs: (333)
7826	7592	msgid "Recycle bin"
7827	7593	msgstr ""
7828	7594
7829		-#. Resource IDs: (IDS_SVNACTION_URLREDIRECT)
	7595	+#. Resource IDs: (4231)
7830	7596	msgid "Redirecting to url"
7831	7597	msgstr ""
7832	7598

		@@ -7840,7 +7606,7 @@
7840	7606	"Redo"
7841	7607	msgstr ""
7842	7608
7843		-#. Resource IDs: (ID_VIEW_REDUCECROSSLINES - Menu)
	7609	+#. Resource IDs: (32819 - Menu)
7844	7610	msgid "Reduce cross-&lines"
7845	7611	msgstr ""
7846	7612

		@@ -7848,16 +7614,15 @@
7848	7614	msgid "Reduce the window to an icon"
7849	7615	msgstr ""
7850	7616
7851		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1382,
7852		-#. IDS_REPOBROWSE_REFRESH)
	7617	+#. Resource IDs: (1382, 1609)
7853	7618	msgid "Refresh"
7854	7619	msgstr ""
7855	7620
7856		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1615)
	7621	+#. Resource IDs: (1615)
7857	7622	msgid "Refresh &shell overlays"
7858	7623	msgstr ""
7859	7624
7860		-#. Resource IDs: (IDS_PROC_CLEANUP_INFOREFRESHSHELL)
	7625	+#. Resource IDs: (2366)
7861	7626	#, c-format
7862	7627	msgid "Refreshing shell for %1!ls!"
7863	7628	msgstr ""

		@@ -7883,7 +7648,7 @@
7883	7648	msgid "Regex is invalid!"
7884	7649	msgstr ""
7885	7650
7886		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535)
	7651	+#. Resource IDs: (65535)
7887	7652	msgid "Regex matching message:"
7888	7653	msgstr ""
7889	7654

		@@ -7891,11 +7656,11 @@
7891	7656	msgid "Regex:"
7892	7657	msgstr ""
7893	7658
7894		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1576)
	7659	+#. Resource IDs: (1576)
7895	7660	msgid "Regular Expression"
7896	7661	msgstr ""
7897	7662
7898		-#. Resource IDs: (IDS_LOG_FILTER_REGEX_TT)
	7663	+#. Resource IDs: (1860)
7899	7664	msgid ""
7900	7665	"Regular expressions filter:\r\n"
7901	7666	". : any character\r\n"

		@@ -7914,7 +7679,7 @@
7914	7679	"\\s : whitespaces"
7915	7680	msgstr ""
7916	7681
7917		-#. Resource IDs: (IDS_PROGRS_CMD_MERGEREINTEGRATE)
	7682	+#. Resource IDs: (3666)
7918	7683	#, c-format
7919	7684	msgid "Reintegrate merge %1!ls! into %2!ls!"
7920	7685	msgstr ""

		@@ -7924,20 +7689,20 @@
7924	7689	msgid "Rejected patch hunks for '%ls'"
7925	7690	msgstr ""
7926	7691
7927		-#. Resource IDs: (IDS_MENU_UNLOCK)
	7692	+#. Resource IDs: (241)
7928	7693	msgid "Release loc&k..."
7929	7694	msgstr ""
7930	7695
7931		-#. Resource IDs: (IDS_MENUDESC_UNLOCKFORCE)
	7696	+#. Resource IDs: (245)
7932	7697	msgid ""
7933	7698	"Releases locks even if you're not the owner of the locks (breaks them)."
7934	7699	msgstr ""
7935	7700
7936		-#. Resource IDs: (IDS_MENUDESC_UNLOCK)
	7701	+#. Resource IDs: (243)
7937	7702	msgid "Releases locks on files so other users can edit them again."
7938	7703	msgstr ""
7939	7704
7940		-#. Resource IDs: (IDS_MENURELOCATE)
	7705	+#. Resource IDs: (188)
7941	7706	msgid "Relo&cate..."
7942	7707	msgstr ""
7943	7708

		@@ -7951,74 +7716,73 @@
7951	7716	"Reload"
7952	7717	msgstr ""
7953	7718
7954		-#. Resource IDs: (Dialog IDD_RELOCATE: Control id 157)
	7719	+#. Resource IDs: (157)
7955	7720	msgid "Relocate"
7956	7721	msgstr ""
7957	7722
7958		-#. Resource IDs: (IDS_WARN_RELOCATEREALLY_TASK2)
	7723	+#. Resource IDs: (1421)
7959	7724	msgid "Relocate where a switch might be intended"
7960	7725	msgstr ""
7961	7726
7962		-#. Resource IDs: (IDS_PROC_RELOCATING)
	7727	+#. Resource IDs: (1270)
7963	7728	msgid "Relocating..."
7964	7729	msgstr ""
7965	7730
7966		-#. Resource IDs: (IDS_SWITCH_STICKYDEPTH_TT)
	7731	+#. Resource IDs: (8010)
7967	7732	msgid "Remember the depth for this working copy"
7968	7733	msgstr ""
7969	7734
7970		-#. Resource IDs: (IDS_STATUSLIST_COLREMOTEPROPSTATUS)
	7735	+#. Resource IDs: (3306)
7971	7736	msgid "Remote property status"
7972	7737	msgstr ""
7973	7738
7974		-#. Resource IDs: (IDS_STATUSLIST_COLREMOTEREVISION)
	7739	+#. Resource IDs: (3318)
7975	7740	msgid "Remote revision"
7976	7741	msgstr ""
7977	7742
7978		-#. Resource IDs: (IDS_STATUSLIST_COLREMOTESTATUS)
	7743	+#. Resource IDs: (3302)
7979	7744	msgid "Remote status"
7980	7745	msgstr ""
7981	7746
7982		-#. Resource IDs: (IDS_STATUSLIST_COLREMOTETEXTSTATUS)
	7747	+#. Resource IDs: (3305)
7983	7748	msgid "Remote text status"
7984	7749	msgstr ""
7985	7750
7986		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 1470, Dialog
7987		-#. IDD_SETTINGSHOOKS: Control id 1332)
	7751	+#. Resource IDs: (1332, 1470)
7988	7752	msgid "Remove"
7989	7753	msgstr ""
7990	7754
7991		-#. Resource IDs: (IDS_INPUT_REMOVEMORE)
	7755	+#. Resource IDs: (2015)
7992	7756	#, c-format
7993	7757	msgid "Remove %ld items"
7994	7758	msgstr ""
7995	7759
7996		-#. Resource IDs: (IDS_INPUT_REMOVEONE)
	7760	+#. Resource IDs: (2014)
7997	7761	#, c-format
7998	7762	msgid "Remove %ls"
7999	7763	msgstr ""
8000	7764
8001		-#. Resource IDs: (IDS_REPOBROWSE_REMOVEBOOKMARK)
	7765	+#. Resource IDs: (1620)
8002	7766	msgid "Remove Bookmark"
8003	7767	msgstr ""
8004	7768
8005		-#. Resource IDs: (IDS_MONITOR_DELETE_TASK1)
	7769	+#. Resource IDs: (1029)
8006	7770	msgid "Remove Project"
8007	7771	msgstr ""
8008	7772
8009		-#. Resource IDs: (Dialog IDD_SETTINGS_CLEARAUTH: Control id 348)
	7773	+#. Resource IDs: (348)
8010	7774	msgid "Remove Saved Authentication Data"
8011	7775	msgstr ""
8012	7776
8013		-#. Resource IDs: (IDS_MENUUNIGNORE)
	7777	+#. Resource IDs: (237)
8014	7778	msgid "Remove from &ignore list"
8015	7779	msgstr ""
8016	7780
8017		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_REMOVEFROMCS)
	7781	+#. Resource IDs: (3338)
8018	7782	msgid "Remove from changelist"
8019	7783	msgstr ""
8020	7784
8021		-#. Resource IDs: (IDS_INPUT_REMOVEPROP)
	7785	+#. Resource IDs: (2023)
8022	7786	#, c-format
8023	7787	msgid ""
8024	7788	"Remove property '%1!S!' from\r\n"

		@@ -8025,11 +7789,11 @@
8025	7789	"%2!ls!"
8026	7790	msgstr ""
8027	7791
8028		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_DELETE)
	7792	+#. Resource IDs: (5507)
8029	7793	msgid "Remove the selected cache(s) from disk"
8030	7794	msgstr ""
8031	7795
8032		-#. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1352)
	7796	+#. Resource IDs: (1352)
8033	7797	msgid "Remove the whole subtree(s)"
8034	7798	msgstr ""
8035	7799

		@@ -8037,11 +7801,11 @@
8037	7801	msgid "Removed"
8038	7802	msgstr ""
8039	7803
8040		-#. Resource IDs: (IDS_SVNACTION_CHANGELISTCLEAR)
	7804	+#. Resource IDs: (4211)
8041	7805	msgid "Removed from changelist"
8042	7806	msgstr ""
8043	7807
8044		-#. Resource IDs: (IDS_PROC_UNIGNORERECURSIVESUCCESS)
	7808	+#. Resource IDs: (2320)
8045	7809	#, c-format
8046	7810	msgid ""
8047	7811	"Removed the file pattern(s)\n"

		@@ -8049,7 +7813,7 @@
8049	7813	"from the global ignore list."
8050	7814	msgstr ""
8051	7815
8052		-#. Resource IDs: (IDS_PROC_UNIGNORESUCCESS)
	7816	+#. Resource IDs: (2311)
8053	7817	#, c-format
8054	7818	msgid ""
8055	7819	"Removed the file pattern(s)\n"

		@@ -8057,38 +7821,38 @@
8057	7821	"from the ignore list."
8058	7822	msgstr ""
8059	7823
8060		-#. Resource IDs: (IDS_MENUDESCDELUNVERSIONED)
	7824	+#. Resource IDs: (269)
8061	7825	msgid "Removes all unversioned and ignored items"
8062	7826	msgstr ""
8063	7827
8064		-#. Resource IDs: (IDS_MENUDESCUNIGNORE)
	7828	+#. Resource IDs: (238)
8065	7829	msgid "Removes the file or filemask from the list of ignored items"
8066	7830	msgstr ""
8067	7831
8068		-#. Resource IDs: (IDS_PROP_TT_REMOVE)
	7832	+#. Resource IDs: (9294)
8069	7833	msgid "Removes the selected properties"
8070	7834	msgstr ""
8071	7835
8072		-#. Resource IDs: (IDS_PROC_CLEANUP_INFODELIGNORED)
	7836	+#. Resource IDs: (2367)
8073	7837	#, c-format
8074	7838	msgid "Removing ignored items. in %1!ls!"
8075	7839	msgstr ""
8076	7840
8077		-#. Resource IDs: (IDS_PROC_CLEANUP_INFODELUNVERSIONED)
	7841	+#. Resource IDs: (2365)
8078	7842	#, c-format
8079	7843	msgid "Removing unversioned items in %1!ls!"
8080	7844	msgstr ""
8081	7845
8082		-#. Resource IDs: (Dialog IDD_RENAME: Control id 151)
	7846	+#. Resource IDs: (151)
8083	7847	msgid "Rename"
8084	7848	msgstr ""
8085	7849
8086		-#. Resource IDs: (IDS_RENAME_INFO)
	7850	+#. Resource IDs: (1504)
8087	7851	#, c-format
8088	7852	msgid "Rename '%ls':"
8089	7853	msgstr ""
8090	7854
8091		-#. Resource IDs: (IDS_INPUT_RENAME)
	7855	+#. Resource IDs: (2018)
8092	7856	#, c-format
8093	7857	msgid ""
8094	7858	"Rename item from %1!ls!\r\n"

		@@ -8095,33 +7859,33 @@
8095	7859	"to %2!ls!"
8096	7860	msgstr ""
8097	7861
8098		-#. Resource IDs: (IDS_PROGRS_TITLE_RENAME)
	7862	+#. Resource IDs: (3530)
8099	7863	msgid "Rename/move"
8100	7864	msgstr ""
8101	7865
8102		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	7866	+#. Resource IDs: (65535)
8103	7867	msgid "Renamed node"
8104	7868	msgstr ""
8105	7869
8106		-#. Resource IDs: (IDS_MENUDESCRENAME)
	7870	+#. Resource IDs: (167)
8107	7871	msgid "Renames files / folders inside version control"
8108	7872	msgstr ""
8109	7873
8110		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 1562)
	7874	+#. Resource IDs: (1562)
8111	7875	msgid "Reopen dialog after commit if items were left uncommitted"
8112	7876	msgstr ""
8113	7877
8114		-#. Resource IDs: (IDS_SETTINGS_INCOMPLETEREOPEN_TT)
	7878	+#. Resource IDs: (3146)
8115	7879	msgid ""
8116	7880	"Reopens the commit dialog after a successful commit if there were files "
8117	7881	"and/or folders left uncommitted."
8118	7882	msgstr ""
8119	7883
8120		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_REPAIRCOPY)
	7884	+#. Resource IDs: (3342)
8121	7885	msgid "Repair copy"
8122	7886	msgstr ""
8123	7887
8124		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_REPAIRMOVE)
	7888	+#. Resource IDs: (3337)
8125	7889	msgid "Repair move"
8126	7890	msgstr ""
8127	7891

		@@ -8154,74 +7918,71 @@
8154	7918	msgid "Replaced %d matches"
8155	7919	msgstr ""
8156	7920
8157		-#. Resource IDs: (IDS_SVNACTION_REPLACED)
	7921	+#. Resource IDs: (1173)
8158	7922	msgid "Replacing"
8159	7923	msgstr ""
8160	7924
8161		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1374, Dialog IDD_COPY:
8162		-#. Control id 1383, Dialog IDD_EXPORT: Control id 1383, Dialog IDD_IMPORT:
8163		-#. Control id 1055)
	7925	+#. Resource IDs: (1055, 1374, 1383)
8164	7926	msgid "Repository"
8165	7927	msgstr ""
8166	7928
8167		-#. Resource IDs: (Dialog IDD_REPOSITORY_BROWSER: Control id 153)
	7929	+#. Resource IDs: (153)
8168	7930	msgid "Repository Browser"
8169	7931	msgstr ""
8170	7932
8171		-#. Resource IDs: (IDS_SETTINGS_REPOSITORY_URL)
	7933	+#. Resource IDs: (3170)
8172	7934	msgid "Repository URL"
8173	7935	msgstr ""
8174	7936
8175		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	7937	+#. Resource IDs: (65535)
8176	7938	msgid "Repository UUID:"
8177	7939	msgstr ""
8178	7940
8179		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 65535)
	7941	+#. Resource IDs: (65535)
8180	7942	msgid "Repository browser"
8181	7943	msgstr ""
8182	7944
8183		-#. Resource IDs: (Dialog IDD_REPOCREATEFINISHED: Control id 324)
	7945	+#. Resource IDs: (324)
8184	7946	msgid "Repository created"
8185	7947	msgstr ""
8186	7948
8187		-#. Resource IDs: (IDS_REPOBROWSE_QUERYFAILURE)
	7949	+#. Resource IDs: (1668)
8188	7950	msgid "Repository query failed. Refresh to retry."
8189	7951	msgstr ""
8190	7952
8191		-#. Resource IDs: (IDS_REPOBROWSE_ERR_CANCEL)
	7953	+#. Resource IDs: (1691)
8192	7954	msgid "Request cancelled by TSVN"
8193	7955	msgstr ""
8194	7956
8195		-#. Resource IDs: (Dialog IDD_SIMPLEPROMPT: Control id 65535)
	7957	+#. Resource IDs: (65535)
8196	7958	msgid "Requests a username and a password"
8197	7959	msgstr ""
8198	7960
8199		-#. Resource IDs: (IDS_MENURESOLVE)
	7961	+#. Resource IDs: (127)
8200	7962	msgid "Res&olve..."
8201	7963	msgstr ""
8202	7964
8203		-#. Resource IDs: (IDS_STATUSLIST_RESETCOLUMNORDER)
	7965	+#. Resource IDs: (3411)
8204	7966	msgid "Reset columns"
8205	7967	msgstr ""
8206	7968
8207		-#. Resource IDs: (Dialog IDD_RESOLVE: Control id 207, IDS_PROGRS_CMD_RESOLVE,
8208		-#. IDS_PROGRS_TITLE_RESOLVE)
	7969	+#. Resource IDs: (1231, 207, 3662)
8209	7970	msgid "Resolve"
8210	7971	msgstr ""
8211	7972
8212		-#. Resource IDs: (IDS_SVNPROGRESS_MENUUSEMINE)
	7973	+#. Resource IDs: (4501)
8213	7974	msgid "Resolve conflict using 'mine'"
8214	7975	msgstr ""
8215	7976
8216		-#. Resource IDs: (IDS_SVNPROGRESS_MENUUSETHEIRS)
	7977	+#. Resource IDs: (4500)
8217	7978	msgid "Resolve conflict using 'theirs'"
8218	7979	msgstr ""
8219	7980
8220		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_RESOLVED, IDS_SVNACTION_RESOLVE)
	7981	+#. Resource IDs: (1168, 3332)
8221	7982	msgid "Resolved"
8222	7983	msgstr ""
8223	7984
8224		-#. Resource IDs: (IDS_SVNPROGRESS_RESOLVED)
	7985	+#. Resource IDs: (4510)
8225	7986	#, c-format
8226	7987	msgid ""
8227	7988	"Resolved:\n"

		@@ -8228,22 +7989,19 @@
8228	7989	"%ls"
8229	7990	msgstr ""
8230	7991
8231		-#. Resource IDs: (IDS_MENUDESCRESOLVE)
	7992	+#. Resource IDs: (142)
8232	7993	msgid "Resolves conflicted files"
8233	7994	msgstr ""
8234	7995
8235		-#. Resource IDs: (IDS_MENURESTORE)
	7996	+#. Resource IDs: (9912)
8236	7997	msgid "Restore"
8237	7998	msgstr ""
8238	7999
8239		-#. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 1097, Dialog
8240		-#. IDD_SETTINGSCOLORS: Control id 1254, Dialog IDD_SETTINGSREVGRAPHCOLORS:
8241		-#. Control id 1254, Dialog IDD_SETTINGSTBLAME: Control id 1254, Dialog
8242		-#. IDD_SETTINGSUDIFF: Control id 1254)
	8000	+#. Resource IDs: (1254, Dialog IDD_SETCOLORPAGE: Control id 1097)
8243	8001	msgid "Restore Default"
8244	8002	msgstr ""
8245	8003
8246		-#. Resource IDs: (IDS_MENUCREATERESTORE)
	8004	+#. Resource IDs: (9911)
8247	8005	msgid "Restore after commit"
8248	8006	msgstr ""
8249	8007

		@@ -8251,113 +8009,107 @@
8251	8009	msgid "Restore the window to normal size"
8252	8010	msgstr ""
8253	8011
8254		-#. Resource IDs: (IDS_SVNACTION_RESTORE)
	8012	+#. Resource IDs: (1166)
8255	8013	msgid "Restored"
8256	8014	msgstr ""
8257	8015
8258		-#. Resource IDs: (IDS_SVNPROGRESS_MERGELOGRANGEREVERSE)
	8016	+#. Resource IDs: (4561)
8259	8017	msgid "Reverse merged revision(s) {revrange} from {mergeurl}:\n"
8260	8018	msgstr ""
8261	8019
8262		-#. Resource IDs: (IDS_SVNACTION_MERGEBEGINMULTIPLEREVERSE)
	8020	+#. Resource IDs: (4218)
8263	8021	#, c-format
8264	8022	msgid "Reverse merging %1!ld! through %2!ld!"
8265	8023	msgstr ""
8266	8024
8267		-#. Resource IDs: (IDS_SVNACTION_MERGEBEGINSINGLEREVERSE)
	8025	+#. Resource IDs: (4217)
8268	8026	#, c-format
8269	8027	msgid "Reverse merging %ld"
8270	8028	msgstr ""
8271	8029
8272		-#. Resource IDs: (Dialog IDD_REVERT: Control id 175, IDS_PROGRS_CMD_REVERT,
8273		-#. IDS_PROGRS_TITLE_REVERT)
	8030	+#. Resource IDs: (1230, 175, 3663)
8274	8031	msgid "Revert"
8275	8032	msgstr ""
8276	8033
8277		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_STDDEFAULT)
	8034	+#. Resource IDs: (5513)
8278	8035	msgid "Revert to default settings. Recommended for unexperienced users."
8279	8036	msgstr ""
8280	8037
8281		-#. Resource IDs: (IDS_PROC_WARNREVERT_TASK3)
	8038	+#. Resource IDs: (2351)
8282	8039	msgid ""
8283	8040	"Revert\n"
8284	8041	"All local modifications will be lost."
8285	8042	msgstr ""
8286	8043
8287		-#. Resource IDs: (IDS_SVNACTION_REVERT)
	8044	+#. Resource IDs: (1167)
8288	8045	msgid "Reverted"
8289	8046	msgstr ""
8290	8047
8291		-#. Resource IDs: (IDS_PROC_CLEANUP_INFOREVERT)
	8048	+#. Resource IDs: (2364)
8292	8049	#, c-format
8293	8050	msgid "Reverting %1!ls!"
8294	8051	msgstr ""
8295	8052
8296		-#. Resource IDs: (IDS_LOG_REVERT_CONFIRM_TASK2)
	8053	+#. Resource IDs: (1897)
8297	8054	msgid "Reverting changes"
8298	8055	msgstr ""
8299	8056
8300		-#. Resource IDs: (IDS_MENUDESCREVERT)
	8057	+#. Resource IDs: (140)
8301	8058	msgid "Reverts all changes you made since the last update"
8302	8059	msgstr ""
8303	8060
8304		-#. Resource IDs: (IDS_MENUDESCUNDOADD)
	8061	+#. Resource IDs: (213)
8305	8062	msgid "Reverts an addition to version control"
8306	8063	msgstr ""
8307	8064
8308		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1375, Dialog
8309		-#. IDD_EDITPROPEXTERNALSVALUE: Control id 1375, Dialog IDD_EDITPROPKEYWORDS:
8310		-#. Control id 1593, Dialog IDD_EXPORT: Control id 1393, Dialog IDD_REVISION:
8311		-#. Control id 1306, Dialog IDD_SWITCH: Control id 1306, Dialog IDD_UPDATE:
8312		-#. Control id 65535, Dialog IDD_URLDIFF: Control id 1306, IDS_HEADER_REVISION,
8313		-#. IDS_LOG_REVISION, IDS_STATUSLIST_COLREVISION)
	8065	+#. Resource IDs: (1208, 1306, 1375, 1393, 1593, 3313, 65535,
	8066	+#. IDS_HEADER_REVISION)
8314	8067	msgid "Revision"
8315	8068	msgstr ""
8316	8069
8317		-#. Resource IDs: (IDS_PROGRESSREVISIONTEXT)
	8070	+#. Resource IDs: (1908)
8318	8071	#, c-format
8319	8072	msgid "Revision %1!ls!"
8320	8073	msgstr ""
8321	8074
8322		-#. Resource IDs: (IDS_REVGRAPH_PROGCURRENTREV)
	8075	+#. Resource IDs: (4302)
8323	8076	#, c-format
8324	8077	msgid "Revision %ld"
8325	8078	msgstr ""
8326	8079
8327		-#. Resource IDs: (IDS_MENUREVISIONGRAPH)
	8080	+#. Resource IDs: (233)
8328	8081	msgid "Revision &graph"
8329	8082	msgstr ""
8330	8083
8331		-#. Resource IDs: (Dialog IDD_REVISIONGRAPH: Control id 182, Dialog
8332		-#. IDD_SETTINGSREVGRAPH: Control id 296)
	8084	+#. Resource IDs: (182, 296)
8333	8085	msgid "Revision Graph"
8334	8086	msgstr ""
8335	8087
8336		-#. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 239)
	8088	+#. Resource IDs: (239)
8337	8089	msgid "Revision Graph Filter"
8338	8090	msgstr ""
8339	8091
8340		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 299)
	8092	+#. Resource IDs: (299)
8341	8093	msgid "Revision Graph::Colors"
8342	8094	msgstr ""
8343	8095
8344		-#. Resource IDs: (Dialog IDD_REVISIONRANGE: Control id 228)
	8096	+#. Resource IDs: (228)
8345	8097	msgid "Revision Range"
8346	8098	msgstr ""
8347	8099
8348		-#. Resource IDs: (IDS_REVGRAPH_PROGTITLE)
	8100	+#. Resource IDs: (4300)
8349	8101	msgid "Revision graph"
8350	8102	msgstr ""
8351	8103
8352		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_REVRANGE: Control id 1492)
	8104	+#. Resource IDs: (1492)
8353	8105	msgid "Revision range to merge"
8354	8106	msgstr ""
8355	8107
8356		-#. Resource IDs: (IDS_REPO_BROWSEREV)
	8108	+#. Resource IDs: (1190)
8357	8109	msgid "Revision: "
8358	8110	msgstr ""
8359	8111
8360		-#. Resource IDs: (IDS_REVGRAPH_BOXTOOLTIP)
	8112	+#. Resource IDs: (4340)
8361	8113	#, c-format
8362	8114	msgid ""
8363	8115	"Revision: %1!ld! %2!ls!\r\n"

		@@ -8369,7 +8121,7 @@
8369	8121	"%7!ls!"
8370	8122	msgstr ""
8371	8123
8372		-#. Resource IDs: (IDS_REVGRAPH_BOXTOOLTIP_TAGGED)
	8124	+#. Resource IDs: (4344)
8373	8125	#, c-format
8374	8126	msgid ""
8375	8127	"Revision: %1!ld! %2!ls!\r\n"

		@@ -8383,8 +8135,7 @@
8383	8135	"%9!ls!"
8384	8136	msgstr ""
8385	8137
8386		-#. Resource IDs: (Dialog IDD_LOGCACHESTATISTICS: Control id 65535,
8387		-#. IDS_LOG_FILTER_REVS, IDS_LOG_POPUP_CLIPBOARD_REVS)
	8138	+#. Resource IDs: (1838, 1854, 65535)
8388	8139	msgid "Revisions"
8389	8140	msgstr ""
8390	8141

		@@ -8402,11 +8153,11 @@
8402	8153	msgid "Right image"
8403	8154	msgstr ""
8404	8155
8405		-#. Resource IDs: (IDS_RUNCLEANUPNOW)
	8156	+#. Resource IDs: (249)
8406	8157	msgid "Run cleanup &now"
8407	8158	msgstr ""
8408	8159
8409		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1542)
	8160	+#. Resource IDs: (1542)
8410	8161	msgid "Run hoo&k script"
8411	8162	msgstr ""
8412	8163

		@@ -8414,11 +8165,11 @@
8414	8165	msgid "S"
8415	8166	msgstr ""
8416	8167
8417		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1132)
	8168	+#. Resource IDs: (1132)
8418	8169	msgid "S&tatistics"
8419	8170	msgstr ""
8420	8171
8421		-#. Resource IDs: (IDS_MENUSWITCH)
	8172	+#. Resource IDs: (128)
8422	8173	msgid "S&witch..."
8423	8174	msgstr ""
8424	8175

		@@ -8426,87 +8177,87 @@
8426	8177	msgid "SCRL"
8427	8178	msgstr ""
8428	8179
8429		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1081)
	8180	+#. Resource IDs: (1081)
8430	8181	msgid "SSH"
8431	8182	msgstr ""
8432	8183
8433		-#. Resource IDs: (IDS_DROPVENDORMENU)
	8184	+#. Resource IDs: (266)
8434	8185	msgid "SVN &Vendorbranch here"
8435	8186	msgstr ""
8436	8187
8437		-#. Resource IDs: (IDS_DROPEXTERNAL)
	8188	+#. Resource IDs: (279)
8438	8189	msgid "SVN Add as &external here"
8439	8190	msgstr ""
8440	8191
8441		-#. Resource IDs: (IDS_COLTITLEAUTHOR)
	8192	+#. Resource IDs: (251)
8442	8193	msgid "SVN Author"
8443	8194	msgstr ""
8444	8195
8445		-#. Resource IDs: (IDS_DROPCOPYADDMENU)
	8196	+#. Resource IDs: (178)
8446	8197	msgid "SVN Copy and add files to this WC"
8447	8198	msgstr ""
8448	8199
8449		-#. Resource IDs: (IDS_DROPCOPYRENAMEMENU)
	8200	+#. Resource IDs: (250)
8450	8201	msgid "SVN Copy and rename versioned item here"
8451	8202	msgstr ""
8452	8203
8453		-#. Resource IDs: (IDS_DROPCOPYMENU)
	8204	+#. Resource IDs: (198)
8454	8205	msgid "SVN Copy versioned item(s) here"
8455	8206	msgstr ""
8456	8207
8457		-#. Resource IDs: (IDS_DROPEXPORTEXTENDEDMENU)
	8208	+#. Resource IDs: (219)
8458	8209	msgid "SVN Export all items here"
8459	8210	msgstr ""
8460	8211
8461		-#. Resource IDs: (IDS_DROPEXPORTCHANGEDMENU)
	8212	+#. Resource IDs: (235)
8462	8213	msgid "SVN Export changed items here"
8463	8214	msgstr ""
8464	8215</