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

R/O
SSH
HTTPS

tortoisesvn: コミット

コミットメタ情報

リビジョン	28554 (tree)
日時	2019-04-12 16:15:57
作者	luebbe

ログメッセージ

Pulled latest translations from transifex.com

変更サマリ

modified: trunk/Languages/fa/TortoiseUI.po (diff)
modified: trunk/Languages/it/TortoiseDoc.po (diff)
modified: trunk/Languages/nl/TortoiseDoc.po (diff)

差分

--- trunk/Languages/fa/TortoiseUI.po (revision 28553)

+++ trunk/Languages/fa/TortoiseUI.po (revision 28554)

		@@ -14,7 +14,7 @@
14	14	# Ehsan Alimohammadi <alimohamadi.eh@gmail.com>, 2016
15	15	# Emad Farrokhi <emadfh@gmail.com>, 2015
16	16	# Hossein Montazeri <hm.webmaster@gmail.com>, 2012
17		-# Mohammad Zare <mohammad.zr90@gmail.com>, 2013
	17	+# Mohammad Zare <mohammad.zr90@gmail.com>, 2013,2019
18	18	# mohsensajjadi <mohsensajjadi@yahoo.com>, 2013
19	19	# mohsensajjadi <mohsensajjadi@yahoo.com>, 2011
20	20	msgid ""

		@@ -22,8 +22,8 @@
22	22	"Project-Id-Version: TortoiseSVN\n"
23	23	"Report-Msgid-Bugs-To: \n"
24	24	"POT-Creation-Date: 1900-01-01 00:00+0000\n"
25		-"PO-Revision-Date: 2018-10-02 02:10+0000\n"
26		-"Last-Translator: luebbe <luebbe.opensource@gmail.com>\n"
	25	+"PO-Revision-Date: 2019-04-07 10:01+0000\n"
	26	+"Last-Translator: Mohammad Zare <mohammad.zr90@gmail.com>\n"
27	27	"Language-Team: Persian (http://www.transifex.com/luebbe/tortoisesvn/language/fa/)\n"
28	28	"MIME-Version: 1.0\n"
29	29	"Content-Type: text/plain; charset=UTF-8\n"

		@@ -49,16 +49,16 @@
49	49	msgid "! %d"
50	50	msgstr "! %d"
51	51
52		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1262)
	52	+#. Resource IDs: (1262)
53	53	msgid "# authors shown individually:"
54	54	msgstr "# مولفین به‌صورت منحصر به‌فرد نمایش شده‌اند:"
55	55
56		-#. Resource IDs: (IDS_SVN_PROGRESS_TOTALMBTRANSFERRED)
	56	+#. Resource IDs: (5702)
57	57	#, c-format
58	58	msgid "%.2f MBytes transferred"
59	59	msgstr "%.2f مگابایت انتقال یافت"
60	60
61		-#. Resource IDs: (IDS_SVN_PROGRESS_KBYTES_SEC)
	61	+#. Resource IDs: (5706)
62	62	#, c-format
63	63	msgid "%.2f kBytes/s"
64	64	msgstr "%.2f کیلوبایت/ثانیه"

		@@ -88,63 +88,63 @@
88	88	msgid "%1 was not found."
89	89	msgstr "%1 یافت نشد."
90	90
91		-#. Resource IDs: (IDS_COMMITDLG_STATISTICSFORMAT)
	91	+#. Resource IDs: (2701)
92	92	#, c-format
93	93	msgid "%1!d! files selected, %2!d! files total"
94	94	msgstr "تعداد %1!d! فایل از مجموع %2!d! انتخاب شده‌اند"
95	95
96		-#. Resource IDs: (IDS_STATGRAPH_AUTHORSLIDER_TT)
	96	+#. Resource IDs: (3935)
97	97	#, c-format
98	98	msgid ""
99	99	"%1!d! most active author(s) with at least %2!d! commits each (%3!d! %%)"
100	100	msgstr "%1!d! فعال‌ترین نویسندگان باحداقل %2!d! اعمال برای هر نفر (%3!d! %%)"
101	101
102		-#. Resource IDs: (IDS_PROGRS_TIME)
	102	+#. Resource IDs: (3602)
103	103	#, c-format
104	104	msgid "%1!ld! minute(s) and %2!ld! second(s)"
105	105	msgstr "%1!ld! دقیقه و %2!ld! ثانیه"
106	106
107		-#. Resource IDs: (IDS_LOG_DLGTITLEOFFLINE)
	107	+#. Resource IDs: (1837)
108	108	#, c-format
109	109	msgid "%1!ls! (offline)"
110	110	msgstr "%1!ls! (offline)"
111	111
112		-#. Resource IDs: (IDS_PROGRS_PATHATREV)
	112	+#. Resource IDs: (3600)
113	113	#, c-format
114	114	msgid "%1!ls! - at revision: %2!d!"
115	115	msgstr "%1!ls!- در اصلاحیه: %2!d!"
116	116
117		-#. Resource IDs: (IDS_DIFF_BASENAMEREV)
	117	+#. Resource IDs: (2410)
118	118	#, c-format
119	119	msgid "%1!ls! : Working Base, Revision %2!ld!"
120	120	msgstr "%1!ls! : پایه کاری, اصلاحیه %2!ld!"
121	121
122		-#. Resource IDs: (IDS_PROGRS_UPDATE)
	122	+#. Resource IDs: (3667)
123	123	#, c-format
124	124	msgid "%1!ls! from %2!ls!"
125	125	msgstr ""
126	126
127		-#. Resource IDs: (IDS_PROGRS_FINALINFO)
	127	+#. Resource IDs: (3603)
128	128	#, c-format
129	129	msgid "%1!ls! in %2!ls!"
130	130	msgstr "%1!ls! با %2!ls!"
131	131
132		-#. Resource IDs: (IDS_SVN_PROGRESS_TOTALANDSPEED)
	132	+#. Resource IDs: (5703)
133	133	#, c-format
134	134	msgid "%1!ls!, %2!ls!"
135	135	msgstr ""
136	136
137		-#. Resource IDs: (IDS_PROC_EXPORTFOLDERNAME)
	137	+#. Resource IDs: (2316)
138	138	#, c-format
139	139	msgid "%1!ls!\\%2!ls! - Export"
140	140	msgstr "%1!ls!\\%2!ls! - صدور"
141	141
142		-#. Resource IDs: (IDS_PROC_EXPORTFOLDERNAME2)
	142	+#. Resource IDs: (2317)
143	143	#, c-format
144	144	msgid "%1!ls!\\%2!ls! - Export (%3!d!)"
145	145	msgstr "%1!ls!\\%2!ls! - صادر کردن (%3!d!)"
146	146
147		-#. Resource IDs: (IDS_REPOBROWSE_INFODIR)
	147	+#. Resource IDs: (1666)
148	148	#, c-format
149	149	msgid ""
150	150	"%1!ls!\r\n"

		@@ -151,7 +151,7 @@
151	151	"Revision %2!ls!, Author %3!ls!, Date %4!ls!"
152	152	msgstr "%1!ls!\nویرایش%2!ls!, k,نویسنده%3!ls!, تاریخ%4!ls!"
153	153
154		-#. Resource IDs: (IDS_REPOBROWSE_INFOFILE)
	154	+#. Resource IDs: (1667)
155	155	#, c-format
156	156	msgid ""
157	157	"%1!ls!\r\n"

		@@ -158,7 +158,7 @@
158	158	"Revision %2!ls!, Author %3!ls!, Size %4!ls!, Date %5!ls!"
159	159	msgstr "%1!ls!\nویرایش%2!ls!, نویسنده%3!ls!, حجم%4!ls!, تاریخ %5!ls!"
160	160
161		-#. Resource IDs: (IDS_REPOBROWSE_INFO)
	161	+#. Resource IDs: (1664)
162	162	#, c-format
163	163	msgid ""
164	164	"%1!ls!\r\n"

		@@ -180,17 +180,17 @@
180	180	"Verify that the correct path and file name are given."
181	181	msgstr "%1\nفایل مورد نظر یافت نشد.\nاطمینان حاصل کنید که مسیر و نام فایل به‌درستی وارد شده‌اند."
182	182
183		-#. Resource IDs: (IDS_SVN_PROGRESS_TOTALBYTESTRANSFERRED)
	183	+#. Resource IDs: (5704)
184	184	#, c-format
185	185	msgid "%I64d Bytes transferred"
186	186	msgstr "بمیزان %I64d بایت انتقال یافت"
187	187
188		-#. Resource IDs: (IDS_SVN_PROGRESS_BYTES_SEC)
	188	+#. Resource IDs: (5705)
189	189	#, c-format
190	190	msgid "%I64d Bytes/s"
191	191	msgstr "%I64d بایت/ثانیه"
192	192
193		-#. Resource IDs: (IDS_SVN_PROGRESS_TOTALTRANSFERRED)
	193	+#. Resource IDs: (5701)
194	194	#, c-format
195	195	msgid "%I64d kBytes transferred"
196	196	msgstr "بمیزان %I64d کیلوبایت انتقال یافت"

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

		@@ -225,42 +225,42 @@
225	225	msgid "%ld of %ld"
226	226	msgstr "%ld از %ld"
227	227
228		-#. Resource IDs: (IDS_EDITPROPS_NUMPATHS)
	228	+#. Resource IDs: (9000)
229	229	#, c-format
230	230	msgid "%ld paths"
231	231	msgstr "مسیر %ld"
232	232
233		-#. Resource IDs: (IDS_REVGRAPH_TAG)
	233	+#. Resource IDs: (4345)
234	234	#, c-format
235	235	msgid "%ls"
236	236	msgstr "%ls"
237	237
238		-#. Resource IDs: (IDS_REVGRAPH_DLGTITLEOFFLINE)
	238	+#. Resource IDs: (1472)
239	239	#, c-format
240	240	msgid "%ls (offline)"
241	241	msgstr "%ls (خارج از خط)"
242	242
243		-#. Resource IDs: (IDS_MENUIGNOREGLOBAL)
	243	+#. Resource IDs: (236)
244	244	#, c-format
245	245	msgid "%ls (recursively)"
246	246	msgstr "%ls (بازگشتی)"
247	247
248		-#. Resource IDs: (IDS_DIFF_MERGEDNAME)
	248	+#. Resource IDs: (2413)
249	249	#, c-format
250	250	msgid "%ls : Merged file"
251	251	msgstr "%ls : فایل ادغام شد"
252	252
253		-#. Resource IDs: (IDS_DIFF_REMOTENAME)
	253	+#. Resource IDs: (2404)
254	254	#, c-format
255	255	msgid "%ls : Remote file"
256	256	msgstr "%ls : فایل remote"
257	257
258		-#. Resource IDs: (IDS_DIFF_BASENAME)
	258	+#. Resource IDs: (2401)
259	259	#, c-format
260	260	msgid "%ls : Working Base"
261	261	msgstr "%ls : پایهٔ کاری"
262	262
263		-#. Resource IDs: (IDS_DIFF_WCNAME)
	263	+#. Resource IDs: (2400)
264	264	#, c-format
265	265	msgid "%ls : Working Copy"
266	266	msgstr "%ls : نسخه کاری"

		@@ -272,7 +272,7 @@
272	272	"%ld failed hunk(s)"
273	273	msgstr "%ls\n%ld failed hunk(s)"
274	274
275		-#. Resource IDs: (IDS_PROC_REMOVEFORCE_TASK1_1)
	275	+#. Resource IDs: (2347)
276	276	#, c-format
277	277	msgid ""
278	278	"%ls\n"

		@@ -279,7 +279,7 @@
279	279	"Do you want to remove the %d files anyway?"
280	280	msgstr "%ls\nآیا مایلید فایلهای %d در هر صورت حذف شوند?"
281	281
282		-#. Resource IDs: (IDS_PROC_REMOVEFORCE_TASK1)
	282	+#. Resource IDs: (2346)
283	283	#, c-format
284	284	msgid ""
285	285	"%ls\n"

		@@ -286,7 +286,7 @@
286	286	"Do you want to remove the file '%ls' anyway?"
287	287	msgstr "%ls\nآیا مایلید فایل '%ls' در هر صورت حذف شود?"
288	288
289		-#. Resource IDs: (IDS_PROC_REMOVEFORCE_TASK1_2)
	289	+#. Resource IDs: (2348)
290	290	#, c-format
291	291	msgid ""
292	292	"%ls\n"

		@@ -302,7 +302,7 @@
302	302	"TortoiseMerge can't diff directories."
303	303	msgstr "%ls\nیک پوشه است و \nTortoiseMerge امکان مقایسه پوشه ها را ندارد."
304	304
305		-#. Resource IDs: (IDS_HOOKFAILED_TASK3)
	305	+#. Resource IDs: (5813)
306	306	msgid ""
307	307	"&Abort\n"
308	308	"You can fix the reason the hook script failed first."

		@@ -312,58 +312,47 @@
312	312	msgid "&About TortoiseMerge..."
313	313	msgstr "&دربارهٔ TortoiseMerge..."
314	314
315		-#. Resource IDs: (IDS_SSL_ACCEPTTEMP_TASK)
	315	+#. Resource IDs: (2360)
316	316	msgid ""
317	317	"&Accept the certificate\n"
318	318	"The certificate is accepted only this one time."
319	319	msgstr ""
320	320
321		-#. Resource IDs: (IDS_MENUADDIMMEDIATE)
	321	+#. Resource IDs: (229)
322	322	msgid "&Add"
323	323	msgstr "&افزودن"
324	324
325	325	#. Resource IDs: (Dialog IDD_REGEXFILTERS: Control id 1505)
326	326	msgid "&Add Filter"
327		-msgstr ""
	327	+msgstr "افزودن فیلتر"
328	328
329		-#. Resource IDs: (IDS_WARN_ADDCASERENAMED_TASK4)
	329	+#. Resource IDs: (1427)
330	330	msgid ""
331	331	"&Add item\n"
332	332	"This will lead to problems on Windows."
333	333	msgstr ""
334	334
335		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSADV: Control id 1098, IDS_MENUADD)
	335	+#. Resource IDs: (1098, 124)
336	336	msgid "&Add..."
337	337	msgstr "&اضافه‌کردن..."
338	338
339		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 1090, Dialog
340		-#. IDD_SETTINGSPROGSMERGE: Control id 1093)
	339	+#. Resource IDs: (1090, 1093)
341	340	msgid "&Advanced..."
342	341	msgstr "&پیشرفته..."
343	342
344		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1505)
	343	+#. Resource IDs: (1505)
345	344	msgid "&All"
346	345	msgstr "همه"
347	346
348		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1471)
	347	+#. Resource IDs: (1471)
349	348	msgid "&Allow ambiguous URLs"
350	349	msgstr "پذیرفتن آدرس‌های &مبهم"
351	350
352		-#. Resource IDs: (Dialog IDD_UNSHELVE: Control id 1)
	351	+#. Resource IDs: (1)
353	352	msgid "&Apply"
354		-msgstr ""
	353	+msgstr "اعمال کردن"
355	354
356		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1294, Dialog
357		-#. IDD_EDITPROPEOL: Control id 1294, Dialog IDD_EDITPROPERTYVALUE: Control id
358		-#. 1294, Dialog IDD_EDITPROPEXECUTABLE: Control id 1294, Dialog
359		-#. IDD_EDITPROPKEYWORDS: Control id 1294, Dialog IDD_EDITPROPLOCALHOOKS:
360		-#. Control id 1294, Dialog IDD_EDITPROPMERGELOGTEMPLATE: Control id 1294,
361		-#. Dialog IDD_EDITPROPMIMETYPE: Control id 1294, Dialog IDD_EDITPROPNEEDSLOCK:
362		-#. Control id 1294, Dialog IDD_EDITPROPTSVNLANG: Control id 1294, Dialog
363		-#. IDD_EDITPROPTSVNSIZES: Control id 1294, Dialog IDD_EDITPROPUSERBOOL:
364		-#. Control id 1294, Dialog IDD_EDITPROPUSERMULTILINE: Control id 1294, Dialog
365		-#. IDD_EDITPROPUSERSINGLELINE: Control id 1294, Dialog IDD_EDITPROPUSERSTATE:
366		-#. Control id 1294)
	355	+#. Resource IDs: (1294)
367	356	msgid "&Apply property recursively"
368	357	msgstr "ا&عمال خاصیت بطور بازگشتی"
369	358

		@@ -371,7 +360,7 @@
371	360	msgid "&Apply unified diff"
372	361	msgstr "&اعمال unified diff"
373	362
374		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535)
	363	+#. Resource IDs: (65535)
375	364	msgid "&Autoclose:"
376	365	msgstr "&بستن خودکار:"
377	366

		@@ -379,15 +368,15 @@
379	368	msgid "&Backup original file"
380	369	msgstr "&پشتیبان‌گیری پروندهٔ اصلی"
381	370
382		-#. Resource IDs: (Dialog IDD_EDITPROPMIMETYPE: Control id 1559)
	371	+#. Resource IDs: (1559)
383	372	msgid "&Binary"
384	373	msgstr "&دودویی"
385	374
386		-#. Resource IDs: (IDS_FILEDIFF_POPBLAME, IDS_LOG_POPUP_BLAMEDIFF)
	375	+#. Resource IDs: (1813, 5150)
387	376	msgid "&Blame changes"
388	377	msgstr "&مقصریابی تغییرات"
389	378
390		-#. Resource IDs: (IDS_LOG_POPUP_BLAMEREVS)
	379	+#. Resource IDs: (1812)
391	380	msgid "&Blame changes in revisions"
392	381	msgstr ""
393	382

		@@ -395,27 +384,27 @@
395	384	msgid "&Blame previous revision"
396	385	msgstr "&با اصلاحیهٔ قبلی مقایسه کنید"
397	386
398		-#. Resource IDs: (IDS_MENUBLAME)
	387	+#. Resource IDs: (203)
399	388	msgid "&Blame..."
400	389	msgstr "&مقصریاب..."
401	390
402		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNSIZES: Control id 65535)
	391	+#. Resource IDs: (65535)
403	392	msgid "&Border:"
404	393	msgstr "&حاشیه:"
405	394
406		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1568)
	395	+#. Resource IDs: (1568)
407	396	msgid "&Bottom"
408	397	msgstr "&زیر"
409	398
410		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 65535)
	399	+#. Resource IDs: (65535)
411	400	msgid "&Branches"
412	401	msgstr "&انشعاب‌ها"
413	402
414		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1645)
	403	+#. Resource IDs: (1645)
415	404	msgid "&Break write locks"
416	405	msgstr ""
417	406
418		-#. Resource IDs: (IDS_LOG_BROWSEREPO)
	407	+#. Resource IDs: (2201)
419	408	msgid "&Browse repository"
420	409	msgstr "&مرور مخزن"
421	410

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

		@@ -641,153 +625,145 @@
641	625	msgid "&Copy to clipboard"
642	626	msgstr "به کلیپ‌بورد &کپی شود "
643	627
644		-#. Resource IDs: (IDS_REPOBROWSE_COPY)
	628	+#. Resource IDs: (1603)
645	629	msgid "&Copy to..."
646	630	msgstr "&کپی شود به..."
647	631
648		-#. Resource IDs: (Dialog IDD_REPOCREATEFINISHED: Control id 1542)
	632	+#. Resource IDs: (1542)
649	633	msgid "&Create folder structure"
650	634	msgstr "&ایجاد ساختار پوشه"
651	635
652		-#. Resource IDs: (Dialog IDD_EDITPROPMIMETYPE: Control id 1560, Dialog
653		-#. IDD_SETTINGSPROGSDIFF: Control id 1097)
	636	+#. Resource IDs: (1097, 1560)
654	637	msgid "&Custom"
655	638	msgstr "&سفارشی"
656	639
657		-#. Resource IDs: (Dialog IDD_REVISIONRANGE: Control id 1638, Dialog
658		-#. IDD_REVISIONRANGE: Control id 1641)
	640	+#. Resource IDs: (1638, 1641)
659	641	msgid "&Date"
660	642	msgstr "&تاریخ"
661	643
662		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1485)
	644	+#. Resource IDs: (1485)
663	645	msgid "&Days of inactivity until small caches get removed"
664	646	msgstr "&تعداد روزهای غیر فعال که پس از آن کَش‌های کوچک حذف می‌شوند"
665	647
666		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1269)
	648	+#. Resource IDs: (1269)
667	649	msgid "&Default"
668	650	msgstr "&پیش‌فرض"
669	651
670		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHELIST: Control id 1382,
671		-#. IDS_MENUREMOVE)
	652	+#. Resource IDs: (1382, 168)
672	653	msgid "&Delete"
673	654	msgstr "&حذف‌کردن"
674	655
675		-#. Resource IDs: (IDS_MENUREMOVEKEEP)
	656	+#. Resource IDs: (271)
676	657	msgid "&Delete (keep local)"
677	658	msgstr "&حذف (حفظ نسخهٔ محلی)"
678	659
679	660	#. Resource IDs: (Dialog IDD_REGEXFILTERS: Control id 1507)
680	661	msgid "&Delete Filter"
681		-msgstr ""
	662	+msgstr "حذف فیلتر"
682	663
683		-#. Resource IDs: (Dialog IDD_REVERT: Control id 1514)
	664	+#. Resource IDs: (1514)
684	665	msgid "&Delete unversioned items..."
685	666	msgstr "&حذف موارد فاقد نسخه..."
686	667
687		-#. Resource IDs: (IDS_REPOBROWSE_DELETE)
	668	+#. Resource IDs: (1604)
688	669	msgid "&Delete..."
689	670	msgstr "&حذف‌کردن..."
690	671
691		-#. Resource IDs: (IDS_SETTINGS_CACHEDELETEQUESTION_TASK3)
	672	+#. Resource IDs: (3181)
692	673	msgid ""
693	674	"&Delete\n"
694	675	"Remove the cache files."
695	676	msgstr ""
696	677
697		-#. Resource IDs: (IDS_MENUDIFF)
	678	+#. Resource IDs: (176)
698	679	msgid "&Diff"
699	680	msgstr "&مقایسه"
700	681
701		-#. Resource IDs: (IDS_MENUURLDIFF)
	682	+#. Resource IDs: (261)
702	683	msgid "&Diff with URL"
703	684	msgstr "&مقایسه با آدرس"
704	685
705		-#. Resource IDs: (IDS_MENUPREVDIFF)
	686	+#. Resource IDs: (214)
706	687	msgid "&Diff with previous version"
707	688	msgstr "&مقایسه با نسخهٔ قبلی"
708	689
709		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1528)
	690	+#. Resource IDs: (1528)
710	691	msgid "&Directories"
711	692	msgstr "&پوشه‌ها"
712	693
713		-#. Resource IDs: (Dialog IDD_RECYCLEBIN: Control id 1562)
	694	+#. Resource IDs: (1562)
714	695	msgid "&Do not ask again"
715	696	msgstr "دوباره نپرس"
716	697
717		-#. Resource IDs: (IDS_HOOKS_APPROVE_TASK4)
	698	+#. Resource IDs: (5803)
718	699	msgid ""
719	700	"&Don't run\n"
720	701	"Do not run the script"
721	702	msgstr ""
722	703
723		-#. Resource IDs: (ID_NEW_EOL - Menu)
	704	+#. Resource IDs: (32851 - Menu)
724	705	msgid "&EOL"
725	706	msgstr "&EOL"
726	707
727		-#. Resource IDs: (65535 - PopupMenu, Dialog IDD_SETTINGSMAIN: Control id 1031,
728		-#. IDS_REPOBROWSE_EDITFILE)
	708	+#. Resource IDs: (1031, 1692, 65535 - PopupMenu)
729	709	msgid "&Edit"
730	710	msgstr "&ویرایش"
731	711
732	712	#. Resource IDs: (Dialog IDD_REGEXFILTERS: Control id 1506)
733	713	msgid "&Edit Filter"
734		-msgstr ""
	714	+msgstr "ویرایش فیلتر"
735	715
736		-#. Resource IDs: (IDS_MENUCONFLICT)
	716	+#. Resource IDs: (186)
737	717	msgid "&Edit conflicts"
738	718	msgstr "&ویرایش برخوردها"
739	719
740		-#. Resource IDs: (IDS_LOG_POPUP_MONITOREDIT)
	720	+#. Resource IDs: (1034)
741	721	msgid "&Edit project"
742		-msgstr ""
	722	+msgstr "ویرایش پروژه"
743	723
744		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1282, Dialog
745		-#. IDD_EDITPROPEXTERNALS: Control id 1596, Dialog IDD_SETTINGSPROGSADV:
746		-#. Control id 1099, IDS_PROP_EDIT)
	724	+#. Resource IDs: (1099, 1282, 1596, 9902)
747	725	msgid "&Edit..."
748	726	msgstr "&ویرایش..."
749	727
750		-#. Resource IDs: (Dialog IDD_RECYCLEBIN: Control id 1542)
	728	+#. Resource IDs: (1542)
751	729	msgid "&Empty the recycle bin now"
752	730	msgstr "سطل بازیافت را الآن خالی کن"
753	731
754		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1023)
	732	+#. Resource IDs: (1023)
755	733	msgid "&Enable Proxy Server"
756	734	msgstr "&فعال‌سازی پراکسی سرور"
757	735
758	736	#. Resource IDs: (ID_EDIT_ENABLE - Menu)
759	737	msgid "&Enable edit"
760		-msgstr ""
	738	+msgstr "فعال کردن ویرایش"
761	739
762		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1434)
	740	+#. Resource IDs: (1434)
763	741	msgid "&Enable log caching"
764	742	msgstr "&فعال‌سازی کَش‌کردن گزارشات"
765	743
766		-#. Resource IDs: (Dialog IDD_LOCK: Control id 1213)
	744	+#. Resource IDs: (1213)
767	745	msgid "&Enter a message describing why you are locking the file(s)."
768	746	msgstr "&یک پیام حاوی دلیل قفل‌گذاری روی فایل‌ها وارد نمائید."
769	747
770		-#. Resource IDs: (Dialog IDD_EDITPROPEXECUTABLE: Control id 1554)
	748	+#. Resource IDs: (1554)
771	749	msgid "&Executable"
772	750	msgstr "&فایل اجرایی"
773	751
774		-#. Resource IDs: (ID_MENUEXIT - Menu)
	752	+#. Resource IDs: (32782 - Menu)
775	753	msgid "&Exit"
776	754	msgstr "&خروج"
777	755
778		-#. Resource IDs: (IDS_FILEDIFF_POPEXPORT)
	756	+#. Resource IDs: (5152)
779	757	msgid "&Export selection to..."
780	758	msgstr "&صدور اقلام انتخاب شده به..."
781	759
782		-#. Resource IDs: (IDS_WARN_FOLDERNOTEMPTY_TASK3_1)
	760	+#. Resource IDs: (1432)
783	761	msgid ""
784	762	"&Export\n"
785	763	"Export into the non-empty folder."
786	764	msgstr ""
787	765
788		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 1092, Dialog
789		-#. IDD_SETTINGSPROGSDIFF: Control id 1094, Dialog IDD_SETTINGSPROGSMERGE:
790		-#. Control id 1095)
	766	+#. Resource IDs: (1092, 1094, 1095)
791	767	msgid "&External"
792	768	msgstr "&خارجی"
793	769

		@@ -795,11 +771,11 @@
795	771	msgid "&File"
796	772	msgstr "&پرونده"
797	773
798		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1529)
	774	+#. Resource IDs: (1529)
799	775	msgid "&Files"
800	776	msgstr "&پرونده‌ها"
801	777
802		-#. Resource IDs: (ID_VIEW_FILTER - Menu)
	778	+#. Resource IDs: (32809 - Menu)
803	779	msgid "&Filter"
804	780	msgstr "&پالایه"
805	781

		@@ -815,37 +791,35 @@
815	791	msgid "&Fit images in window\t(F)"
816	792	msgstr ""
817	793
818		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1646)
	794	+#. Resource IDs: (1646)
819	795	msgid "&Fix time stamps"
820	796	msgstr ""
821	797
822		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1050)
	798	+#. Resource IDs: (1050)
823	799	msgid "&Fixed drives"
824	800	msgstr "&درایوهای ثابت"
825	801
826		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535)
	802	+#. Resource IDs: (65535)
827	803	msgid "&Font for log messages:"
828	804	msgstr "&قلم پیام‌های گزارش:"
829	805
830		-#. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535, Dialog
831		-#. IDD_SETTINGSTBLAME: Control id 65535, Dialog IDD_SETTINGSUDIFF: Control id
832		-#. 65535)
	806	+#. Resource IDs: (65535, Dialog IDD_SETMAINPAGE: Control id 65535)
833	807	msgid "&Font:"
834	808	msgstr "&قلم:"
835	809
836		-#. Resource IDs: (Dialog IDD_RELOCATE: Control id 1530, IDS_COPYDLG_FROMURL)
	810	+#. Resource IDs: (1530, 8000)
837	811	msgid "&From URL:"
838	812	msgstr "&از آدرس:"
839	813
840		-#. Resource IDs: (Dialog IDD_COPY: Control id 1259)
	814	+#. Resource IDs: (1259)
841	815	msgid "&From WC / URL:"
842	816	msgstr "&از WC / URL:"
843	817
844		-#. Resource IDs: (Dialog IDD_BLAME: Control id 65535)
	818	+#. Resource IDs: (65535)
845	819	msgid "&From revision"
846	820	msgstr "&از اصلاحیهٔ"
847	821
848		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_TREE: Control id 1494)
	822	+#. Resource IDs: (1494)
849	823	msgid "&From: (start URL and revision of the range to merge)"
850	824	msgstr "&از: (آدرس و اصلاحیهٔ شروع محدودهٔ‌ ادغام)"
851	825

		@@ -853,29 +827,23 @@
853	827	msgid "&Go To Line...\t(Ctrl+G)"
854	828	msgstr ""
855	829
856		-#. Resource IDs: (ID_VIEW_GROUPBRANCHES - Menu)
	830	+#. Resource IDs: (32799 - Menu)
857	831	msgid "&Group by branch"
858	832	msgstr "&گروه‌بندی بر اساس شاخه"
859	833
860		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_TREE: Control id 1115)
	834	+#. Resource IDs: (1115)
861	835	msgid "&HEAD Revision"
862	836	msgstr "&اصلاحیهٔ اصلی"
863	837
864		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1032, Dialog IDD_CHECKOUT:
865		-#. Control id 1032, Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 1032, Dialog
866		-#. IDD_EXPORT: Control id 1032, Dialog IDD_REVISION: Control id 1032, Dialog
867		-#. IDD_REVISIONRANGE: Control id 1636, Dialog IDD_REVISIONRANGE: Control id
868		-#. 1639, Dialog IDD_SWITCH: Control id 1032, Dialog IDD_UPDATE: Control id
869		-#. 1032, Dialog IDD_URLDIFF: Control id 1032)
	838	+#. Resource IDs: (1032, 1636, 1639)
870	839	msgid "&HEAD revision"
871	840	msgstr "&اصلاحیهٔ اصلی"
872	841
873		-#. Resource IDs: (Dialog IDD_COPY: Control id 1182)
	842	+#. Resource IDs: (1182)
874	843	msgid "&HEAD revision in the repository"
875	844	msgstr "&نسخهٔ اصلی در مخزن"
876	845
877		-#. Resource IDs: (57670, 65535 - PopupMenu, Dialog IDD_ADD: Control id 9,
878		-#. Dialog IDD_CLEANUP: Control id 9, IDS_MENUHELP, ID_MENUHELP - Menu)
	846	+#. Resource IDs: (190, 32781 - Menu, 57670, 65535 - PopupMenu, 9)
879	847	msgid "&Help"
880	848	msgstr "&راهنما"
881	849

		@@ -887,7 +855,7 @@
887	855	msgid "&Hide"
888	856	msgstr "&پنهان"
889	857
890		-#. Resource IDs: (Dialog IDD_DELUNVERSIONED: Control id 1562)
	858	+#. Resource IDs: (1562)
891	859	msgid "&Hide ignored items"
892	860	msgstr ""
893	861

		@@ -895,24 +863,24 @@
895	863	msgid "&Hide/Show the patch file list"
896	864	msgstr ""
897	865
898		-#. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1170)
	866	+#. Resource IDs: (1170)
899	867	msgid "&Icon Set:"
900	868	msgstr "&مجموعه آیکون:"
901	869
902		-#. Resource IDs: (IDS_MENUIGNOREMULTIPLE)
	870	+#. Resource IDs: (231)
903	871	#, c-format
904	872	msgid "&Ignore %d items by name"
905	873	msgstr "&نادیده گرفتن %d قلم با نام"
906	874
907		-#. Resource IDs: (Dialog IDD_SWITCH: Control id 1267)
	875	+#. Resource IDs: (1267)
908	876	msgid "&Ignore ancestry"
909	877	msgstr "&نادیده گرفتن اصل و نسب"
910	878
911		-#. Resource IDs: (Dialog IDD_RECYCLEBIN: Control id 2)
	879	+#. Resource IDs: (2)
912	880	msgid "&Ignore and proceed"
913	881	msgstr "نادیده‌بگیر و انجام‌ده"
914	882
915		-#. Resource IDs: (IDS_MENUIGNOREMULTIPLE2)
	883	+#. Resource IDs: (283)
916	884	msgid "&Ignore multiple items by name"
917	885	msgstr ""
918	886

		@@ -920,29 +888,29 @@
920	888	msgid "&Image info\t(I)"
921	889	msgstr ""
922	890
923		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1461, IDS_MENUIMPORT)
	891	+#. Resource IDs: (131, 1461)
924	892	msgid "&Import..."
925	893	msgstr "&واردکردن..."
926	894
927		-#. Resource IDs: (IDS_REPOBROWSE_MULTIIMPORT_TASK3)
	895	+#. Resource IDs: (1673)
928	896	msgid ""
929	897	"&Import\n"
930	898	"The items are imported, creating a new revision for each item."
931	899	msgstr ""
932	900
933		-#. Resource IDs: (Dialog IDD_RELOCATE: Control id 1562)
	901	+#. Resource IDs: (1562)
934	902	msgid "&Include externals"
935	903	msgstr "&شامل خارجی"
936	904
937		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1480)
	905	+#. Resource IDs: (1480)
938	906	msgid "&Include merge info"
939	907	msgstr "&با درنظرگرفتن اطلاعات ادغام"
940	908
941		-#. Resource IDs: (IDS_REVGRAPH_POPUP_JOIN_ALL)
	909	+#. Resource IDs: (4385)
942	910	msgid "&Join all"
943	911	msgstr "&اتصال همه"
944	912
945		-#. Resource IDs: (IDS_REVGRAPH_POPUP_JOIN_RIGHT)
	913	+#. Resource IDs: (4394)
946	914	msgid "&Join with sub-trees"
947	915	msgstr "&الحاق با زیر شاخه‌ها"
948	916

		@@ -950,11 +918,11 @@
950	918	msgid "&Jump to first difference when loading"
951	919	msgstr "&پرش به اولین مقایسه هنگام بارگزاری"
952	920
953		-#. Resource IDs: (ID_NEW_KEYWORDS - Menu)
	921	+#. Resource IDs: (32852 - Menu)
954	922	msgid "&Keywords"
955	923	msgstr "&کلمات کلیدی"
956	924
957		-#. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 65535)
	925	+#. Resource IDs: (65535)
958	926	msgid "&Language:"
959	927	msgstr "&زبان:"
960	928

		@@ -962,7 +930,7 @@
962	930	msgid "&Limit search to modified lines"
963	931	msgstr "&محدودکردن جستجو به خطوط تغییر یافته"
964	932
965		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNSIZES: Control id 65535)
	933	+#. Resource IDs: (65535)
966	934	msgid "&Limit:"
967	935	msgstr "&محدوده:"
968	936

		@@ -979,37 +947,35 @@
979	947	msgid "&Link image positions"
980	948	msgstr "&Link image positions"
981	949
982		-#. Resource IDs: (Dialog IDD_EDITPROPEOL: Control id 1590)
	950	+#. Resource IDs: (1590)
983	951	msgid "&Linux (LF)"
984	952	msgstr "&لینوکس (LF)"
985	953
986		-#. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1172)
	954	+#. Resource IDs: (1172)
987	955	msgid "&List View"
988	956	msgstr "&نمایش فهرستی"
989	957
990		-#. Resource IDs: (Dialog IDD_EDITPROPERTYVALUE: Control id 1309)
	958	+#. Resource IDs: (1309)
991	959	msgid "&Load..."
992	960	msgstr "&بارکردن..."
993	961
994		-#. Resource IDs: (Dialog IDD_EDITPROPNEEDSLOCK: Control id 1554)
	962	+#. Resource IDs: (1554)
995	963	msgid "&Locking required (read-only update)"
996	964	msgstr "&نیاز به قفل گذاری وجود دارد(بروزرسانی فقط-خواندنی)"
997	965
998		-#. Resource IDs: (ID_NEW_LOGSIZES - Menu)
	966	+#. Resource IDs: (32854 - Menu)
999	967	msgid "&Log Sizes"
1000	968	msgstr "&اندازه لاگها"
1001	969
1002		-#. Resource IDs: (Dialog IDD_SHELVE: Control id 1673, Dialog IDD_UNSHELVE:
1003		-#. Control id 1673)
	970	+#. Resource IDs: (1673)
1004	971	msgid "&Log message:"
1005	972	msgstr ""
1006	973
1007		-#. Resource IDs: (Dialog IDD_EDITPROPEOL: Control id 1591)
	974	+#. Resource IDs: (1591)
1008	975	msgid "&Mac (CR)"
1009	976	msgstr "&Mac (CR)"
1010	977
1011		-#. Resource IDs: (Dialog IDD_SWITCH: Control id 1562, Dialog IDD_UPDATE:
1012		-#. Control id 1562)
	978	+#. Resource IDs: (1562)
1013	979	msgid "&Make depth sticky"
1014	980	msgstr "&Make depth sticky"
1015	981

		@@ -1017,11 +983,11 @@
1017	983	msgid "&Max line length for inline diffs"
1018	984	msgstr ""
1019	985
1020		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1486)
	986	+#. Resource IDs: (1486)
1021	987	msgid "&Maximum size [kByte] of a removed inactive cache"
1022	988	msgstr "&حداکثر اندازه [به کیلوبایت] یک کَش حذف شده غیر فعال"
1023	989
1024		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 1, IDS_MERGE_MERGE)
	990	+#. Resource IDs: (1, 4454)
1025	991	msgid "&Merge"
1026	992	msgstr "&ادغام"
1027	993

		@@ -1029,7 +995,7 @@
1029	995	msgid "&Merge paths"
1030	996	msgstr "&مسیرهای ادغام"
1031	997
1032		-#. Resource IDs: (IDS_MENUMERGE)
	998	+#. Resource IDs: (129)
1033	999	msgid "&Merge..."
1034	1000	msgstr "&ادغام..."
1035	1001

		@@ -1037,15 +1003,15 @@
1037	1003	msgid "&Merging"
1038	1004	msgstr "&در حال ادغام"
1039	1005
1040		-#. Resource IDs: (ID_NEW_MIMETYPE - Menu)
	1006	+#. Resource IDs: (32847 - Menu)
1041	1007	msgid "&Mime-Type"
1042	1008	msgstr "&Mime-Type"
1043	1009
1044		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 1493)
	1010	+#. Resource IDs: (1493)
1045	1011	msgid "&Modify color for tag copies"
1046	1012	msgstr "&تغییر رنگ برای کپی‌های تَگ"
1047	1013
1048		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 1492)
	1014	+#. Resource IDs: (1492)
1049	1015	msgid "&Modify color for trunk copies"
1050	1016	msgstr "&تغییر رنگ کپی‌های شاخهٔ اصلی"
1051	1017

		@@ -1053,15 +1019,15 @@
1053	1019	msgid "&Moved blocks"
1054	1020	msgstr "&بلوکهای منتقل شده"
1055	1021
1056		-#. Resource IDs: (Dialog IDD_UNSHELVE: Control id 1672)
	1022	+#. Resource IDs: (1672)
1057	1023	msgid "&Name"
1058		-msgstr ""
	1024	+msgstr "نام"
1059	1025
1060	1026	#. Resource IDs: (65535 - PopupMenu)
1061	1027	msgid "&Navigate"
1062	1028	msgstr "&پیمایش"
1063	1029
1064		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1049)
	1030	+#. Resource IDs: (1049)
1065	1031	msgid "&Network drives"
1066	1032	msgstr "&درایوهای شبکه"
1067	1033

		@@ -1069,17 +1035,16 @@
1069	1035	msgid "&New "
1070	1036	msgstr "&جدید"
1071	1037
1072		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1310, Dialog
1073		-#. IDD_EDITPROPEXTERNALS: Control id 1542)
	1038	+#. Resource IDs: (1310, 1542)
1074	1039	msgid "&New..."
1075	1040	msgstr "&جدید..."
1076	1041
1077		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1208, IDS_LOG_SHOWNEXT)
	1042	+#. Resource IDs: (1208, 1836)
1078	1043	#, c-format
1079	1044	msgid "&Next %ld"
1080	1045	msgstr "&%ld بعدی"
1081	1046
1082		-#. Resource IDs: (IDS_PROPPAGE_NEXT)
	1047	+#. Resource IDs: (5301)
1083	1048	msgid "&Next >"
1084	1049	msgstr "&بعدی >"
1085	1050

		@@ -1087,55 +1052,27 @@
1087	1052	msgid "&Next Page"
1088	1053	msgstr "&صفحهٔ بعدی "
1089	1054
1090		-#. Resource IDs: (Dialog IDD_EDITPROPNEEDSLOCK: Control id 1555)
	1055	+#. Resource IDs: (1555)
1091	1056	msgid "&No locking required"
1092	1057	msgstr "&به قفل گذاری نیاز نیست"
1093	1058
1094		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1506)
	1059	+#. Resource IDs: (1506)
1095	1060	msgid "&None"
1096	1061	msgstr "هیچ"
1097	1062
1098		-#. Resource IDs: (Dialog IDD_EDITPROPEXECUTABLE: Control id 1555)
	1063	+#. Resource IDs: (1555)
1099	1064	msgid "&Not executable"
1100	1065	msgstr "&اجرایی نیست"
1101	1066
1102		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1566)
	1067	+#. Resource IDs: (1566)
1103	1068	msgid "&Numeric"
1104	1069	msgstr "&عددی"
1105	1070
1106		-#. Resource IDs: (Dialog IDD_ABOUT: Control id 1, Dialog IDD_ADD: Control id
1107		-#. 1, Dialog IDD_BLAME: Control id 1, Dialog IDD_CHANGEDFILES: Control id 1,
1108		-#. Dialog IDD_CHECKOUT: Control id 1, Dialog IDD_CLEANUP: Control id 1, Dialog
1109		-#. IDD_COMMITDLG: Control id 1, Dialog IDD_COPY: Control id 1, Dialog
1110		-#. IDD_CREATECHANGELIST: Control id 1, Dialog IDD_CREATEPATCH: Control id 1,
1111		-#. Dialog IDD_DELUNVERSIONED: Control id 1, Dialog IDD_DIFFOPTIONS: Control id
1112		-#. 1, Dialog IDD_EDITPROPBUGTRAQ: Control id 1, Dialog IDD_EDITPROPEOL:
1113		-#. Control id 1, Dialog IDD_EDITPROPERTIES: Control id 1, Dialog
1114		-#. IDD_EDITPROPERTYVALUE: Control id 1, Dialog IDD_EDITPROPEXECUTABLE: Control
1115		-#. id 1, Dialog IDD_EDITPROPEXTERNALS: Control id 1, Dialog
1116		-#. IDD_EDITPROPEXTERNALSVALUE: Control id 1, Dialog IDD_EDITPROPKEYWORDS:
1117		-#. Control id 1, Dialog IDD_EDITPROPMIMETYPE: Control id 1, Dialog
1118		-#. IDD_EDITPROPNEEDSLOCK: Control id 1, Dialog IDD_EDITPROPTSVNLANG: Control
1119		-#. id 1, Dialog IDD_EDITPROPTSVNSIZES: Control id 1, Dialog IDD_EXPORT:
1120		-#. Control id 1, Dialog IDD_HISTORYDLG: Control id 1, Dialog IDD_IMPORT:
1121		-#. Control id 1, Dialog IDD_INPUTDLG: Control id 1, Dialog IDD_INPUTLOGDLG:
1122		-#. Control id 1, Dialog IDD_LOCK: Control id 1, Dialog IDD_LOGCACHESTATISTICS:
1123		-#. Control id 1, Dialog IDD_LOGMESSAGE: Control id 1, Dialog IDD_PROMPT:
1124		-#. Control id 1, Dialog IDD_PROPERTIES: Control id 1, Dialog IDD_RELOCATE:
1125		-#. Control id 1, Dialog IDD_RENAME: Control id 1, Dialog
1126		-#. IDD_REPOCREATEFINISHED: Control id 1, Dialog IDD_REPOSITORY_BROWSER:
1127		-#. Control id 1, Dialog IDD_RESOLVE: Control id 1, Dialog IDD_REVERT: Control
1128		-#. id 1607, Dialog IDD_REVGRAPHFILTER: Control id 1, Dialog IDD_REVISION:
1129		-#. Control id 1, Dialog IDD_REVISIONRANGE: Control id 1, Dialog
1130		-#. IDD_SIMPLEPROMPT: Control id 1, Dialog IDD_STATGRAPH: Control id 1, Dialog
1131		-#. IDD_SVNPROGRESS: Control id 1, Dialog IDD_SWITCH: Control id 1, Dialog
1132		-#. IDD_TOOLASSOC: Control id 1, Dialog IDD_UNLOCK: Control id 1, Dialog
1133		-#. IDD_UPDATE: Control id 1, Dialog IDD_URL: Control id 1, Dialog IDD_URLDIFF:
1134		-#. Control id 1, IDS_MSGBOX_OK)
	1071	+#. Resource IDs: (1, 1607, 9001)
1135	1072	msgid "&OK"
1136	1073	msgstr "&تائید"
1137	1074
1138		-#. Resource IDs: (Dialog IDD_GOOFFLINE: Control id 1)
	1075	+#. Resource IDs: (1)
1139	1076	msgid "&Offline for now"
1140	1077	msgstr "&فعلاً خارج ار خط"
1141	1078

		@@ -1143,8 +1080,7 @@
1143	1080	msgid "&One Page"
1144	1081	msgstr "&یک صفحه"
1145	1082
1146		-#. Resource IDs: (IDS_LOG_POPUP_OPEN, IDS_REPOBROWSE_OPEN,
1147		-#. cmdOpen_LabelTitle_RESID)
	1083	+#. Resource IDs: (1602, 1804, cmdOpen_LabelTitle_RESID)
1148	1084	msgid "&Open"
1149	1085	msgstr "&بازکردن"
1150	1086

		@@ -1152,15 +1088,15 @@
1152	1088	msgid "&Open\t(Ctrl+O)"
1153	1089	msgstr ""
1154	1090
1155		-#. Resource IDs: (Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 1602)
	1091	+#. Resource IDs: (1602)
1156	1092	msgid "&Operative:"
1157	1093	msgstr "&عملیات:"
1158	1094
1159		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQADV: Control id 1382)
	1095	+#. Resource IDs: (1382)
1160	1096	msgid "&Options"
1161	1097	msgstr "&تنظیمات"
1162	1098
1163		-#. Resource IDs: (ID_NEW_ADVANCED - Menu)
	1099	+#. Resource IDs: (32849 - Menu)
1164	1100	msgid "&Other"
1165	1101	msgstr ""
1166	1102

		@@ -1168,63 +1104,61 @@
1168	1104	msgid "&Overlay images\t(O)"
1169	1105	msgstr ""
1170	1106
1171		-#. Resource IDs: (IDS_PROC_OVERWRITEEXPORT_TASK3)
	1107	+#. Resource IDs: (1440)
1172	1108	msgid ""
1173	1109	"&Overwrite\n"
1174	1110	"Replace the target folder."
1175	1111	msgstr ""
1176	1112
1177		-#. Resource IDs: (IDS_PROC_REPLACEEXISTING_TASK3)
	1113	+#. Resource IDs: (2340)
1178	1114	msgid ""
1179	1115	"&Overwrite\n"
1180	1116	"The target file gets replaced"
1181	1117	msgstr ""
1182	1118
1183		-#. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM_TASK3)
	1119	+#. Resource IDs: (1436)
1184	1120	msgid ""
1185	1121	"&Overwrite\n"
1186	1122	"The target file is replaced."
1187	1123	msgstr ""
1188	1124
1189		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1411, Dialog
1190		-#. IDD_SIMPLEPROMPT: Control id 65535)
	1125	+#. Resource IDs: (1411, 65535)
1191	1126	msgid "&Password:"
1192	1127	msgstr "&گذرواژه:"
1193	1128
1194		-#. Resource IDs: (IDS_EDIT_PASTE, IDS_MENUCLIPPASTE, IDS_SCIEDIT_PASTE,
1195		-#. ID_EDIT_PASTE - Menu)
	1129	+#. Resource IDs: (225, 6004, IDS_EDIT_PASTE, ID_EDIT_PASTE - Menu)
1196	1130	msgid "&Paste"
1197	1131	msgstr "&الصاق"
1198	1132
1199		-#. Resource IDs: (Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 1600)
	1133	+#. Resource IDs: (1600)
1200	1134	msgid "&Peg:"
1201	1135	msgstr "&میخ:"
1202	1136
1203		-#. Resource IDs: (Dialog IDD_GOOFFLINE: Control id 1382)
	1137	+#. Resource IDs: (1382)
1204	1138	msgid "&Permanently offline"
1205	1139	msgstr "&همیشه خارج از خط"
1206	1140
1207		-#. Resource IDs: (Dialog IDD_EDITPROPEOL: Control id 1588)
	1141	+#. Resource IDs: (1588)
1208	1142	msgid "&Platform dependent (native)"
1209	1143	msgstr "&وابسته به پلاتفرم (بومی)"
1210	1144
1211		-#. Resource IDs: (Dialog IDD_MONITOROPTIONS: Control id 1654)
	1145	+#. Resource IDs: (1654)
1212	1146	msgid "&Play sound on notification"
1213	1147	msgstr ""
1214	1148
1215		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 1414)
	1149	+#. Resource IDs: (1414)
1216	1150	msgid "&Port:"
1217	1151	msgstr "&درگاه:"
1218	1152
1219		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1489)
	1153	+#. Resource IDs: (1489)
1220	1154	msgid "&Power user defaults"
1221	1155	msgstr "&Power user defaults"
1222	1156
1223		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 1562)
	1157	+#. Resource IDs: (1562)
1224	1158	msgid "&Pre-fetch folders for faster browsing"
1225	1159	msgstr ""
1226	1160
1227		-#. Resource IDs: (Dialog IDD_DIFFOPTIONS: Control id 1676)
	1161	+#. Resource IDs: (1676)
1228	1162	msgid "&Pretty print"
1229	1163	msgstr ""
1230	1164

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

		@@ -1339,70 +1269,63 @@
1339	1269
1340	1270	#. Resource IDs: (Dialog IDD_FIND: Control id 1511)
1341	1271	msgid "&Replace"
1342		-msgstr ""
	1272	+msgstr "جایگزینی"
1343	1273
1344		-#. Resource IDs: (IDS_MENUREPOBROWSE)
	1274	+#. Resource IDs: (201)
1345	1275	msgid "&Repo-browser"
1346	1276	msgstr "&مرورگرمخزن"
1347	1277
1348		-#. Resource IDs: (IDS_PROC_RESOLVE_TASK3)
	1278	+#. Resource IDs: (2356)
1349	1279	msgid ""
1350	1280	"&Resolve\n"
1351	1281	"The item is marked as resolved."
1352	1282	msgstr ""
1353	1283
1354		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1488)
	1284	+#. Resource IDs: (1488)
1355	1285	msgid "&Restore defaults"
1356	1286	msgstr "&بازنشانی پیش‌فرض"
1357	1287
1358		-#. Resource IDs: (Dialog IDD_GOOFFLINE: Control id 1542)
	1288	+#. Resource IDs: (1542)
1359	1289	msgid "&Retry"
1360		-msgstr ""
	1290	+msgstr "تلاش مجدد"
1361	1291
1362		-#. Resource IDs: (Dialog IDD_SVNPROGRESS: Control id 1545)
	1292	+#. Resource IDs: (1545)
1363	1293	msgid "&Retry as different user"
1364	1294	msgstr ""
1365	1295
1366		-#. Resource IDs: (Dialog IDD_SVNPROGRESS: Control id 1542,
1367		-#. IDS_MSGBOX_RETRYWITHOUTHOOKS)
	1296	+#. Resource IDs: (1542, 9020)
1368	1297	msgid "&Retry without hooks"
1369	1298	msgstr "&Retry without hooks"
1370	1299
1371		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1529)
	1300	+#. Resource IDs: (1529)
1372	1301	msgid "&Revert all changes recursively"
1373	1302	msgstr "&برگشت همه تغییرات بصورت بازگشتی"
1374	1303
1375		-#. Resource IDs: (IDS_LOG_POPUP_REVERTREVS)
	1304	+#. Resource IDs: (1808)
1376	1305	msgid "&Revert changes from these revisions"
1377	1306	msgstr "&بازگرداندن تغییرات از این اصلاحیه‌ها"
1378	1307
1379		-#. Resource IDs: (IDS_LOG_POPUP_REVERTREV)
	1308	+#. Resource IDs: (1801)
1380	1309	msgid "&Revert changes from this revision"
1381	1310	msgstr "&برگرداندن تغییرات از این اصلاحیه"
1382	1311
1383		-#. Resource IDs: (IDS_LOG_REVERT_CONFIRM_TASK3)
	1312	+#. Resource IDs: (1898)
1384	1313	msgid ""
1385	1314	"&Revert\n"
1386	1315	"Changes will be applied to the working copy."
1387	1316	msgstr ""
1388	1317
1389		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1033, Dialog IDD_CHECKOUT:
1390		-#. Control id 1033, Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 1033, Dialog
1391		-#. IDD_EXPORT: Control id 1033, Dialog IDD_MERGEWIZARD_TREE: Control id 1116,
1392		-#. Dialog IDD_REVISION: Control id 1033, Dialog IDD_REVISIONRANGE: Control id
1393		-#. 1637, Dialog IDD_REVISIONRANGE: Control id 1640, Dialog IDD_SWITCH: Control
1394		-#. id 1033, Dialog IDD_UPDATE: Control id 1033, Dialog IDD_URLDIFF: Control id
1395		-#. 1033)
	1318	+#. Resource IDs: (1033, 1116, 1637, 1640)
1396	1319	msgid "&Revision"
1397	1320	msgstr "&اصلاحیه"
1398	1321
1399		-#. Resource IDs: (IDS_HOOKS_APPROVE_TASK3)
	1322	+#. Resource IDs: (5802)
1400	1323	msgid ""
1401	1324	"&Run\n"
1402	1325	"Run the hook script"
1403	1326	msgstr ""
1404	1327
1405		-#. Resource IDs: (Dialog IDD_SETTINGSPROXY: Control id 65535)
	1328	+#. Resource IDs: (65535)
1406	1329	msgid "&SSH client:"
1407	1330	msgstr "&SSH client:"
1408	1331

		@@ -1414,54 +1337,51 @@
1414	1337	msgid "&Save"
1415	1338	msgstr "&ذخیره"
1416	1339
1417		-#. Resource IDs: (Dialog IDD_PROMPT: Control id 1023, Dialog IDD_SIMPLEPROMPT:
1418		-#. Control id 1023)
	1340	+#. Resource IDs: (1023)
1419	1341	msgid "&Save authentication"
1420	1342	msgstr "&ذخیره‌سازی اطلاعات شناسائی"
1421	1343
1422		-#. Resource IDs: (IDS_REVGRAPH_SAVEPIC, ID_FILE_SAVEGRAPHAS - Menu,
1423		-#. ID_FILE_SAVESTATGRAPHAS - Menu)
	1344	+#. Resource IDs: (32771 - Menu, 32806 - Menu, 4351)
1424	1345	msgid "&Save graph as..."
1425	1346	msgstr "&ذخیره‌سازی نمودار بانام..."
1426	1347
1427		-#. Resource IDs: (IDS_FILEDIFF_POPSAVELIST)
	1348	+#. Resource IDs: (5151)
1428	1349	msgid "&Save list of selected files to..."
1429	1350	msgstr "&فایل‌های انتخاب شده ذخیره به..."
1430	1351
1431		-#. Resource IDs: (Dialog IDD_EDITPROPERTIES: Control id 1308,
1432		-#. IDS_PROP_SAVEVALUE)
	1352	+#. Resource IDs: (1308, 9900)
1433	1353	msgid "&Save value..."
1434	1354	msgstr "&ذخیره سازی مقدار..."
1435	1355
1436		-#. Resource IDs: (IDS_MENUSETTINGS, ID_FILE_SETTINGS - Menu)
	1356	+#. Resource IDs: (133, ID_FILE_SETTINGS - Menu)
1437	1357	msgid "&Settings"
1438	1358	msgstr "&تنظیمات"
1439	1359
1440		-#. Resource IDs: (Dialog IDD_SHELVE: Control id 1)
	1360	+#. Resource IDs: (1)
1441	1361	msgid "&Shelve"
1442	1362	msgstr ""
1443	1363
1444		-#. Resource IDs: (ID_REFRESHBROWSER - Menu)
	1364	+#. Resource IDs: (32815 - Menu)
1445	1365	msgid "&Show HEAD revisions"
1446	1366	msgstr "&نمایش اصلاحیه‌های HEAD"
1447	1367
1448		-#. Resource IDs: (Dialog IDD_REVISION: Control id 1132)
	1368	+#. Resource IDs: (1132)
1449	1369	msgid "&Show Log"
1450	1370	msgstr "&نمایش لاگ"
1451	1371
1452		-#. Resource IDs: (ID_POPUP_SHOWMONITOR - Menu)
	1372	+#. Resource IDs: (32873 - Menu)
1453	1373	msgid "&Show Monitor"
1454	1374	msgstr ""
1455	1375
1456		-#. Resource IDs: (Dialog IDD_MONITOROPTIONS: Control id 1529)
	1376	+#. Resource IDs: (1529)
1457	1377	msgid "&Show popup notifications"
1458	1378	msgstr ""
1459	1379
1460		-#. Resource IDs: (Dialog IDD_COPY: Control id 1185)
	1380	+#. Resource IDs: (1185)
1461	1381	msgid "&Specific revision in repository"
1462	1382	msgstr "&اصلاحیهٔ خاص در مخزن"
1463	1383
1464		-#. Resource IDs: (Dialog IDD_REPOCREATEFINISHED: Control id 1605)
	1384	+#. Resource IDs: (1605)
1465	1385	msgid "&Start Repobrowser"
1466	1386	msgstr "&شروع مرورگر مخزن"
1467	1387

		@@ -1469,27 +1389,27 @@
1469	1389	msgid "&Status Bar"
1470	1390	msgstr "&نوار وضعیت"
1471	1391
1472		-#. Resource IDs: (Dialog IDD_LOCK: Control id 1211)
	1392	+#. Resource IDs: (1211)
1473	1393	msgid "&Steal the locks"
1474	1394	msgstr "&دزدیدن قفل‌ها"
1475	1395
1476		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1130)
	1396	+#. Resource IDs: (1130)
1477	1397	msgid "&Stop on copy/rename"
1478	1398	msgstr "&توقف در کپی/تغییر نام"
1479	1399
1480		-#. Resource IDs: (Dialog IDD_COLLABORATORSETTINGS: Control id 65535)
	1400	+#. Resource IDs: (65535)
1481	1401	msgid "&Subversion username"
1482	1402	msgstr ""
1483	1403
1484		-#. Resource IDs: (IDS_REVGRAPH_POPUP_SWITCH)
	1404	+#. Resource IDs: (4400)
1485	1405	msgid "&Switch WC to path and revision"
1486	1406	msgstr "&سوئیچ نسخهٔ کاری به مسیر و اصلاحیه"
1487	1407
1488		-#. Resource IDs: (IDS_REVGRAPH_POPUP_SWITCHTOHEAD)
	1408	+#. Resource IDs: (4399)
1489	1409	msgid "&Switch WC to path@HEAD"
1490	1410	msgstr "&سوییچ‌کردن نسخهٔ کاری به مسیر@HEAD"
1491	1411
1492		-#. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1173)
	1412	+#. Resource IDs: (1173)
1493	1413	msgid "&Symbol View"
1494	1414	msgstr "&مشاهدهٔ نشان‌ها"
1495	1415

		@@ -1497,41 +1417,39 @@
1497	1417	msgid "&Tab size:"
1498	1418	msgstr "&اندازهٔ تب:"
1499	1419
1500		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 65535)
	1420	+#. Resource IDs: (65535)
1501	1421	msgid "&Tags"
1502	1422	msgstr "&تگ‌ها"
1503	1423
1504		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_OPTIONS: Control id 1382)
	1424	+#. Resource IDs: (1382)
1505	1425	msgid "&Test merge"
1506	1426	msgstr "&ادغام آزمایشی"
1507	1427
1508		-#. Resource IDs: (Dialog IDD_EDITPROPMIMETYPE: Control id 1558)
	1428	+#. Resource IDs: (1558)
1509	1429	msgid "&Text"
1510	1430	msgstr "&متن"
1511	1431
1512		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1438)
	1432	+#. Resource IDs: (1438)
1513	1433	msgid "&Timeout in seconds before updating the HEAD revision"
1514	1434	msgstr "&زمان به ثانیه قبل از بروزرسانی اصلاحیه HEAD"
1515	1435
1516		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 1222)
	1436	+#. Resource IDs: (1222)
1517	1437	msgid "&Timeout in seconds to stop the auto-completion parsing"
1518	1438	msgstr "&زمان به ثانیه جهت توقف تجزیه سازی کامل کردن خودکار"
1519	1439
1520		-#. Resource IDs: (Dialog IDD_BLAME: Control id 65535)
	1440	+#. Resource IDs: (65535)
1521	1441	msgid "&To Revision"
1522	1442	msgstr "&به اصلاحیه"
1523	1443
1524		-#. Resource IDs: (Dialog IDD_RELOCATE: Control id 1384, Dialog IDD_URLDIFF:
1525		-#. Control id 1305)
	1444	+#. Resource IDs: (1305, 1384)
1526	1445	msgid "&To URL:"
1527	1446	msgstr "&به آدرس:"
1528	1447
1529		-#. Resource IDs: (Dialog IDD_COPY: Control id 1384, Dialog IDD_SWITCH: Control
1530		-#. id 1305)
	1448	+#. Resource IDs: (1305, 1384)
1531	1449	msgid "&To path:"
1532	1450	msgstr "&به مسیر:"
1533	1451
1534		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_TREE: Control id 1495)
	1452	+#. Resource IDs: (1495)
1535	1453	msgid "&To: (end URL and revision of the range to merge)"
1536	1454	msgstr "&به: (آدرس و اصلاحیه پایانی از محدوده جهت ادغام)"
1537	1455

		@@ -1539,25 +1457,23 @@
1539	1457	msgid "&Toolbar"
1540	1458	msgstr "&نوارابزار"
1541	1459
1542		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1567)
	1460	+#. Resource IDs: (1567)
1543	1461	msgid "&Top"
1544	1462	msgstr "&بالا"
1545	1463
1546		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 1091, Dialog
1547		-#. IDD_SETTINGSPROGSDIFF: Control id 1093, Dialog IDD_SETTINGSPROGSMERGE:
1548		-#. Control id 1094)
	1464	+#. Resource IDs: (1091, 1093, 1094)
1549	1465	msgid "&TortoiseMerge"
1550	1466	msgstr "&TortoiseMerge"
1551	1467
1552		-#. Resource IDs: (IDS_MENUSUBMENU)
	1468	+#. Resource IDs: (135)
1553	1469	msgid "&TortoiseSVN"
1554	1470	msgstr "&TortoiseSVN"
1555	1471
1556		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 1096)
	1472	+#. Resource IDs: (1096)
1557	1473	msgid "&TortoiseUDiff"
1558	1474	msgstr "&TortoiseUDiff"
1559	1475
1560		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPH: Control id 65535)
	1476	+#. Resource IDs: (65535)
1561	1477	msgid "&Trunk"
1562	1478	msgstr "&شاخهٔ اصلی"
1563	1479

		@@ -1565,88 +1481,83 @@
1565	1481	msgid "&Two Page"
1566	1482	msgstr "&دو صفحه"
1567	1483
1568		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1376, Dialog IDD_EXPORT:
1569		-#. Control id 1394, Dialog IDD_IMPORT: Control id 1058)
	1484	+#. Resource IDs: (1058, 1376, 1394)
1570	1485	msgid "&URL of repository:"
1571	1486	msgstr "&آدرس مخزن:"
1572	1487
1573		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1561, Dialog
1574		-#. IDD_EDITPROPEXTERNALSVALUE: Control id 1305, Dialog IDD_URL: Control id
1575		-#. 1076)
	1488	+#. Resource IDs: (1076, 1305, 1561)
1576	1489	msgid "&URL:"
1577	1490	msgstr "&آدرس:"
1578	1491
1579		-#. Resource IDs: (IDS_SCIEDIT_UNDO, ID_EDIT_UNDO - Menu)
	1492	+#. Resource IDs: (6000, ID_EDIT_UNDO - Menu)
1580	1493	msgid "&Undo"
1581	1494	msgstr "&ابطال آخرین عمل"
1582	1495
1583		-#. Resource IDs: (IDS_REVGRAPH_POPUP_UNIDIFFREVS, ID_VIEW_UNIFIEDDIFF - Menu)
	1496	+#. Resource IDs: (32785 - Menu, 4382)
1584	1497	msgid "&Unified diff"
1585	1498	msgstr "&Unified diff"
1586	1499
1587		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1061)
	1500	+#. Resource IDs: (1061)
1588	1501	msgid "&Unknown drives"
1589	1502	msgstr "&درایوهای ناشناخته"
1590	1503
1591		-#. Resource IDs: (IDS_MENUUPDATE)
	1504	+#. Resource IDs: (121)
1592	1505	msgid "&Update"
1593	1506	msgstr "&بروزرسانی"
1594	1507
1595		-#. Resource IDs: (ID_POPUP_UPDATEALL - Menu)
	1508	+#. Resource IDs: (32877 - Menu)
1596	1509	msgid "&Update all"
1597	1510	msgstr ""
1598	1511
1599		-#. Resource IDs: (IDS_LOG_POPUP_UPDATE)
	1512	+#. Resource IDs: (1215)
1600	1513	msgid "&Update item to revision"
1601	1514	msgstr "برو&زرسانی قلم به اصلاحیه"
1602	1515
1603		-#. Resource IDs: (IDS_LOG_POPUP_UPDATEREV)
	1516	+#. Resource IDs: (1823)
1604	1517	msgid "&Update item to revision..."
1605	1518	msgstr "&بروزرسانی قلم به اصلاحیه..."
1606	1519
1607		-#. Resource IDs: (IDS_MENUUPDATEEXT)
	1520	+#. Resource IDs: (170)
1608	1521	msgid "&Update to revision..."
1609	1522	msgstr "&به‌روزرسانی به اصلاحیه"
1610	1523
1611		-#. Resource IDs: (IDS_WARN_LOCKOUTDATED_TASK3)
	1524	+#. Resource IDs: (1474)
1612	1525	msgid ""
1613	1526	"&Update\n"
1614	1527	"Update the file and try locking again."
1615	1528	msgstr ""
1616	1529
1617		-#. Resource IDs: (IDS_MSG_NEEDSUPDATE_TASK3)
	1530	+#. Resource IDs: (1433)
1618	1531	msgid ""
1619	1532	"&Update\n"
1620	1533	"Update the working copy and reopen the commit dialog to try again."
1621	1534	msgstr ""
1622	1535
1623		-#. Resource IDs: (IDS_DROPEXT_UPDATE_TASK3)
	1536	+#. Resource IDs: (4653)
1624	1537	msgid ""
1625	1538	"&Update\n"
1626	1539	"Update to the HEAD revision"
1627	1540	msgstr ""
1628	1541
1629		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 1184)
	1542	+#. Resource IDs: (1184)
1630	1543	msgid "&Use auto-completion of file paths and keywords"
1631	1544	msgstr "&استفاده از تکمیل خودکار مسیر فایل‌ها و کلمات کلیدی"
1632	1545
1633		-#. Resource IDs: (Dialog IDD_DELUNVERSIONED: Control id 1432)
	1546	+#. Resource IDs: (1432)
1634	1547	msgid "&Use recycle bin"
1635	1548	msgstr "&استفاده از سطل زباله"
1636	1549
1637		-#. Resource IDs: (Dialog IDD_PROMPT: Control id 1005, Dialog
1638		-#. IDD_SETTINGSPROXY: Control id 1410, Dialog IDD_SIMPLEPROMPT: Control id
1639		-#. 65535)
	1550	+#. Resource IDs: (1005, 1410, 65535)
1640	1551	msgid "&Username:"
1641	1552	msgstr "&نام کاربر:"
1642	1553
1643		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1647)
	1554	+#. Resource IDs: (1647)
1644	1555	msgid "&Vacuum pristine copies"
1645	1556	msgstr ""
1646	1557
1647		-#. Resource IDs: (Dialog IDD_UNSHELVE: Control id 1674)
	1558	+#. Resource IDs: (1674)
1648	1559	msgid "&Version"
1649		-msgstr ""
	1560	+msgstr "نسخه"
1650	1561
1651	1562	#. Resource IDs: (65535 - PopupMenu)
1652	1563	msgid "&View"

		@@ -1656,24 +1567,24 @@
1656	1567	msgid "&Whole word"
1657	1568	msgstr "&همهٔ کلمه"
1658	1569
1659		-#. Resource IDs: (Dialog IDD_EDITPROPEOL: Control id 1589)
	1570	+#. Resource IDs: (1589)
1660	1571	msgid "&Windows (CRLF)"
1661	1572	msgstr "&Windows (CRLF)"
1662	1573
1663		-#. Resource IDs: (Dialog IDD_COPY: Control id 1183)
	1574	+#. Resource IDs: (1183)
1664	1575	msgid "&Working copy"
1665	1576	msgstr "&نسخهٔ کاری"
1666	1577
1667		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1540)
	1578	+#. Resource IDs: (1540)
1668	1579	msgid "&file list control"
1669	1580	msgstr "&کنترل لیست فایل"
1670	1581
1671		-#. Resource IDs: (IDS_MONITOR_NOTIFY_TEXT)
	1582	+#. Resource IDs: (1024)
1672	1583	#, c-format
1673	1584	msgid "'%ls' : %ld new commits"
1674	1585	msgstr ""
1675	1586
1676		-#. Resource IDs: (IDS_ERR_MUSTBEURLORPATH)
	1587	+#. Resource IDs: (1337)
1677	1588	#, c-format
1678	1589	msgid ""
1679	1590	"'%ls'\n"

		@@ -1680,65 +1591,65 @@
1680	1591	"is not a valid URL or path!"
1681	1592	msgstr "'%ls'\nمسیر یا آدرس معتبری نیست!"
1682	1593
1683		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_SKIPRANGES)
	1594	+#. Resource IDs: (5406)
1684	1595	msgid ""
1685	1596	"'skip ranges' are used to mark revision ranges that have not been cached yet"
1686	1597	msgstr "'skip ranges' are used to mark revision ranges that have not been cached yet"
1687	1598
1688		-#. Resource IDs: (IDS_REVGRAPH_TAGATTRIBUTED)
	1599	+#. Resource IDs: (4349)
1689	1600	#, c-format
1690	1601	msgid "(%1!ls!) %2!ls!"
1691	1602	msgstr "(%1!ls!) %2!ls!"
1692	1603
1693		-#. Resource IDs: (IDS_LOG_CLEARERROR)
	1604	+#. Resource IDs: (1895)
1694	1605	msgid "(Double-click to clear error message)"
1695	1606	msgstr "(برای پاک‌کردن پیغام خطا دو-بار کلیک کنید)"
1696	1607
1697		-#. Resource IDs: (IDS_EDITPROPS_BINVALUE, IDS_PROPBIN)
	1608	+#. Resource IDs: (263, 9420)
1698	1609	msgid "(binary value)"
1699	1610	msgstr "(مقدار دودوئی)"
1700	1611
1701		-#. Resource IDs: (IDS_CONTENTANDPROP)
	1612	+#. Resource IDs: (7004)
1702	1613	msgid "(content and properties)"
1703	1614	msgstr ""
1704	1615
1705		-#. Resource IDs: (IDS_CONTENTONLY)
	1616	+#. Resource IDs: (7002)
1706	1617	msgid "(content only)"
1707	1618	msgstr ""
1708	1619
1709		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_COPY)
	1620	+#. Resource IDs: (4422)
1710	1621	msgid "(copy)"
1711	1622	msgstr "(کپی)"
1712	1623
1713		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_BRANCH)
	1624	+#. Resource IDs: (4421)
1714	1625	msgid "(create branch)"
1715	1626	msgstr "(بازکردن بخش)"
1716	1627
1717		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_ADDED)
	1628	+#. Resource IDs: (4429)
1718	1629	msgid "(created)"
1719	1630	msgstr "(ایجاد شده)"
1720	1631
1721		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_DELETE)
	1632	+#. Resource IDs: (4428)
1722	1633	msgid "(delete)"
1723	1634	msgstr "(حذف کردن)"
1724	1635
1725		-#. Resource IDs: (IDS_STATUSLIST_EXTERNAL_GROUP)
	1636	+#. Resource IDs: (3414)
1726	1637	msgid "(externals)"
1727	1638	msgstr "(خارجی)"
1728	1639
1729		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_MODIFIED)
	1640	+#. Resource IDs: (4426)
1730	1641	msgid "(modified)"
1731	1642	msgstr "(اصلاح‌شده)"
1732	1643
1733		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_HEAD)
	1644	+#. Resource IDs: (4425)
1734	1645	msgid "(modified, HEAD revision)"
1735	1646	msgstr "(اصلاح‌شده، اصلاحیه سر)"
1736	1647
1737		-#. Resource IDs: (IDS_STATUSLIST_MULTIPLETARGETS)
	1648	+#. Resource IDs: (3320)
1738	1649	msgid "(multiple targets selected)"
1739	1650	msgstr "(چند مقصد انتخاب شده‌است)"
1740	1651
1741		-#. Resource IDs: (IDS_STATUSLIST_UNASSIGNED_CHANGESET)
	1652	+#. Resource IDs: (3405)
1742	1653	msgid "(no changelist)"
1743	1654	msgstr "(عدم وجود فهرست تغییرات)"
1744	1655

		@@ -1746,15 +1657,15 @@
1746	1657	msgid "(no line number)"
1747	1658	msgstr "(عدم وجود شمارهٔ خط)"
1748	1659
1749		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_COPYSOURCE)
	1660	+#. Resource IDs: (4427)
1750	1661	msgid "(no modification but copy created from here)"
1751	1662	msgstr "(بدون تغییر اما از اینجا کپی ایجاد شد)"
1752	1663
1753		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_WORKINGCOPY)
	1664	+#. Resource IDs: (4437)
1754	1665	msgid "(no modification but relevant for working copy)"
1755	1666	msgstr "(no modification but relevant for working copy)"
1756	1667
1757		-#. Resource IDs: (IDS_STATUSLIST_NOPROPVALUE)
	1668	+#. Resource IDs: (3412)
1758	1669	msgid "(no value)"
1759	1670	msgstr "(عدم وجود مقدار)"
1760	1671

		@@ -1762,11 +1673,11 @@
1762	1673	msgid "(not found)"
1763	1674	msgstr "(پیدا نشد)"
1764	1675
1765		-#. Resource IDs: (IDS_PROPMODS, IDS_PROPONLY)
	1676	+#. Resource IDs: (7003, IDS_PROPMODS)
1766	1677	msgid "(properties only)"
1767	1678	msgstr "(فقط خصوصیات)"
1768	1679
1769		-#. Resource IDs: (IDS_STATUSLIST_PROPONLY)
	1680	+#. Resource IDs: (3321)
1770	1681	msgid "(property change only)"
1771	1682	msgstr "(فقط تغییر خاصیت)"
1772	1683

		@@ -1774,15 +1685,15 @@
1774	1685	msgid "(props and content)"
1775	1686	msgstr "(props and content)"
1776	1687
1777		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_RENAME)
	1688	+#. Resource IDs: (4424)
1778	1689	msgid "(rename)"
1779	1690	msgstr "(تغییر نام)"
1780	1691
1781		-#. Resource IDs: (IDS_REVGRAPH_NODEIS_TAG)
	1692	+#. Resource IDs: (4420)
1782	1693	msgid "(tagged)"
1783	1694	msgstr "(تَگ شد)"
1784	1695
1785		-#. Resource IDs: (IDS_STATGRAPH_EMPTYAUTHOR)
	1696	+#. Resource IDs: (3908)
1786	1697	msgid "(unknown)"
1787	1698	msgstr "(ناشناخته)"
1788	1699

		@@ -1796,55 +1707,42 @@
1796	1707	msgid "- %d"
1797	1708	msgstr "- %d"
1798	1709
1799		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1035, Dialog IDD_CHECKOUT:
1800		-#. Control id 1036, Dialog IDD_COPY: Control id 1035, Dialog
1801		-#. IDD_EDITPROPEXTERNALSVALUE: Control id 1035, Dialog IDD_EXPORT: Control id
1802		-#. 1035, Dialog IDD_EXPORT: Control id 1036, Dialog IDD_IMPORT: Control id
1803		-#. 1035, Dialog IDD_MERGEWIZARD_REVRANGE: Control id 1035, Dialog
1804		-#. IDD_MERGEWIZARD_TREE: Control id 1035, Dialog IDD_MERGEWIZARD_TREE: Control
1805		-#. id 1036, Dialog IDD_OPEN: Control id 1002, Dialog IDD_OPEN: Control id
1806		-#. 1003, Dialog IDD_SETTINGSBUGTRAQADV: Control id 1474, Dialog
1807		-#. IDD_SETTINGSDIALOGS: Control id 1362, Dialog IDD_SETTINGSHOOKCONFIG:
1808		-#. Control id 1324, Dialog IDD_SETTINGSHOOKCONFIG: Control id 1333, Dialog
1809		-#. IDD_SETTINGSPROGSDIFF: Control id 1021, Dialog IDD_SETTINGSPROGSDIFF:
1810		-#. Control id 1022, Dialog IDD_SETTINGSPROGSDIFF: Control id 1089, Dialog
1811		-#. IDD_SETTINGSPROGSMERGE: Control id 1022, Dialog IDD_SETTINGSSYNC: Control
1812		-#. id 1542, Dialog IDD_SWITCH: Control id 1035, Dialog IDD_TOOLASSOC: Control
1813		-#. id 1104, Dialog IDD_URLDIFF: Control id 1035)
	1710	+#. Resource IDs: (1021, 1022, 1035, 1036, 1089, 1104, 1324, 1333, 1362, 1474,
	1711	+#. 1542, Dialog IDD_OPEN: Control id 1002, Dialog IDD_OPEN: Control id 1003)
1814	1712	msgid "..."
1815	1713	msgstr "..."
1816	1714
1817		-#. Resource IDs: (IDS_REVGRAPH_PROGPREPARING)
	1715	+#. Resource IDs: (4303)
1818	1716	msgid "... checking cache and preparing log query"
1819	1717	msgstr "... در حال بررسی کَش و آماده سازی درخواست گزارشات"
1820	1718
1821		-#. Resource IDs: (IDS_REVGRAPH_PROGREADINGWC)
	1719	+#. Resource IDs: (4306)
1822	1720	msgid "... reading working copy status"
1823	1721	msgstr "...در حال بررسی وضعیت نسخه کاری"
1824	1722
1825		-#. Resource IDs: (IDS_ERR_SHELVE_FAILED_MORE)
	1723	+#. Resource IDs: (1057)
1826	1724	#, c-format
1827	1725	msgid "...and %d more paths."
1828	1726	msgstr ""
1829	1727
1830		-#. Resource IDs: (IDS_DIFF_REVISIONPATCHED)
	1728	+#. Resource IDs: (2403)
1831	1729	#, c-format
1832	1730	msgid ": Revision %d"
1833	1731	msgstr ": اصلاحیه %d"
1834	1732
1835		-#. Resource IDs: (IDS_DIFF_WORKINGCOPY)
	1733	+#. Resource IDs: (2402)
1836	1734	msgid ": working copy"
1837	1735	msgstr ": نسخهٔ کاری"
1838	1736
1839		-#. Resource IDs: (IDS_PROPPAGE_BACK)
	1737	+#. Resource IDs: (5300)
1840	1738	msgid "< &Back"
1841	1739	msgstr "< &برگشت"
1842	1740
1843		-#. Resource IDs: (IDS_STATUSLIST_CONTEXT_CREATECS)
	1741	+#. Resource IDs: (3339)
1844	1742	msgid "<new changelist>"
1845	1743	msgstr "<لیست تغییرات جدید>"
1846	1744
1847		-#. Resource IDs: (IDS_MONITOR_TOOLBARTEXTS)
	1745	+#. Resource IDs: (1020)
1848	1746	msgid ""
1849	1747	"=&Check Now=&Add Project=E&dit=&Remove=&Mark all as read=&Clear "
1850	1748	"errors=&Update all=&Options=="

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

		@@ -1875,7 +1773,7 @@
1875	1773	"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."
1876	1774	msgstr "A newline separated list of paths for which icon overlays are shown.\nIf you add an '?' char at the end of a path, then only this path will be included.\nIf 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."
1877	1775
1878		-#. Resource IDs: (IDS_SETTINGS_EXCLUDECONTEXTLIST_TT)
	1776	+#. Resource IDs: (3145)
1879	1777	msgid ""
1880	1778	"A newline separated list of paths for which no context menu is shown.\r\n"
1881	1779	"If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n"

		@@ -1882,7 +1780,7 @@
1882	1780	"An empty list will allow the context menu on all paths."
1883	1781	msgstr "یک لیست از مسیرهائی که برای آنها منوی راست کلیک نمایش داده نمی‌شود. \r\nاگر به انتهای یک مسیر '*' را اضافه کنید، همه پرونده ها و پوشه های زیر مجموعه نیز مشمول این تنظیم خواهند بود.\r\nیک لیست خالی منوی راست کلیک را برای همه مسیرها فعال میکند."
1884	1782
1885		-#. Resource IDs: (IDS_SETTINGS_EXCLUDELIST_TT)
	1783	+#. Resource IDs: (3103)
1886	1784	msgid ""
1887	1785	"A newline separated list of paths for which no icon overlays are shown.\r\n"
1888	1786	"If you add an '?' char at the end of a path, then only this path will be excluded.\r\n"

		@@ -1890,7 +1788,7 @@
1890	1788	"An empty list will allow overlays on all paths."
1891	1789	msgstr "A newline separated list of paths for which no icon overlays are shown.\nIf you add an '?' char at the end of a path, then only this path will be excluded.\nIf you add an '*' or no char at all at the end of a path, then all files and subdirs inside that path are excluded too.\nAn empty list will allow overlays on all paths."
1892	1790
1893		-#. Resource IDs: (IDS_WARN_RELOCATEREALLY_TASK5)
	1791	+#. Resource IDs: (1424)
1894	1792	msgid ""
1895	1793	"A relocate is only needed if the path to a repository has changed.\n"
1896	1794	"Changing to a different path inside a repository is done by a switch operation.\n"

		@@ -1902,7 +1800,7 @@
1902	1800	msgid "A required resource was unavailable."
1903	1801	msgstr "یک منبع لازم خارج از دسترس بود."
1904	1802
1905		-#. Resource IDs: (IDS_WARN_NOVALIDPATH_TASK5)
	1803	+#. Resource IDs: (1419)
1906	1804	#, c-format
1907	1805	msgid ""
1908	1806	"A valid path on windows must not contain '<>\|\"?*:' or one of the following device names:\n"

		@@ -1910,17 +1808,17 @@
1910	1808	"See the <a href=\"http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx\">documentation</a> from Microsoft about this."
1911	1809	msgstr "A valid path on windows must not contain '<>\|\"?*:' or one of the following device names:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\nSee the <a href=\"http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx\">documentation</a> from Microsoft about this."
1912	1810
1913		-#. Resource IDs: (IDS_SETTINGS_DIFFVIEWER_TT)
	1811	+#. Resource IDs: (1252)
1914	1812	msgid ""
1915	1813	"A viewer program for GNU diff files (patch files).\r\n"
1916	1814	"If you don't have one use NotePad."
1917	1815	msgstr "(فایل‌های وصله). GNU diff یک نمایشگر فایل‌های\r\n استفاده کنید. Notepad اگر چنین برنامه‌ای ندارید از"
1918	1816
1919		-#. Resource IDs: (IDS_REPOBROWSE_IMPORTFOLDER)
	1817	+#. Resource IDs: (1608)
1920	1818	msgid "A&dd folder..."
1921	1819	msgstr "&اضافه‌کردن پوشه..."
1922	1820
1923		-#. Resource IDs: (IDS_MSGBOX_ABORT)
	1821	+#. Resource IDs: (9005)
1924	1822	msgid "Abort"
1925	1823	msgstr "ناتمام بماند"
1926	1824

		@@ -1928,7 +1826,7 @@
1928	1826	msgid "Abou&t TortoiseMerge"
1929	1827	msgstr ""
1930	1828
1931		-#. Resource IDs: (IDS_MENUABOUT)
	1829	+#. Resource IDs: (134)
1932	1830	msgid "About"
1933	1831	msgstr "درباره"
1934	1832

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

		@@ -1951,15 +1849,15 @@
1951	1849	msgid "Access to %1 was denied."
1952	1850	msgstr "امکان دسترسی به %1 رد شد."
1953	1851
1954		-#. Resource IDs: (IDS_FILEDIFF_ACTION, IDS_PROGRS_ACTION)
	1852	+#. Resource IDs: (1222, 5101)
1955	1853	msgid "Action"
1956	1854	msgstr "اقدام"
1957	1855
1958		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 65535)
	1856	+#. Resource IDs: (65535)
1959	1857	msgid "Action log"
1960	1858	msgstr "سیاههٔ اقدام"
1961	1859
1962		-#. Resource IDs: (IDS_LOG_ACTIONS)
	1860	+#. Resource IDs: (1870)
1963	1861	msgid "Actions"
1964	1862	msgstr "اقدام‌ها"
1965	1863

		@@ -1974,39 +1872,38 @@
1974	1872	"Discard all changes to %1?"
1975	1873	msgstr "ActiveX objects cannot be saved while exiting Windows!\nDiscard all changes to %1?"
1976	1874
1977		-#. Resource IDs: (IDS_WARN_ADDCASERENAMED_TASK3)
	1875	+#. Resource IDs: (1426)
1978	1876	msgid ""
1979	1877	"Ad&just case\n"
1980	1878	"The file is not added."
1981	1879	msgstr ""
1982	1880
1983		-#. Resource IDs: (Dialog IDD_ADD: Control id 155, IDS_PROGRS_CMD_ADD,
1984		-#. IDS_PROGRS_TITLE_ADD, IDS_STATUSLIST_CONTEXT_ADD)
	1881	+#. Resource IDs: (1229, 155, 3330, 3657)
1985	1882	msgid "Add"
1986	1883	msgstr "اضافه شود"
1987	1884
1988		-#. Resource IDs: (IDS_REPOBROWSE_IMPORT)
	1885	+#. Resource IDs: (1605)
1989	1886	msgid "Add &file..."
1990	1887	msgstr "اضافه‌کردن &فایل..."
1991	1888
1992		-#. Resource IDs: (IDS_SCIEDIT_ADDWORD)
	1889	+#. Resource IDs: (6006)
1993	1890	#, c-format
1994	1891	msgid "Add '%ls' to dictionary"
1995	1892	msgstr "اضافه‌کردن '%ls' به فرهنگ لغت"
1996	1893
1997		-#. Resource IDs: (IDS_MENUADDASREPLACEMENT)
	1894	+#. Resource IDs: (255)
1998	1895	msgid "Add (as replacement)..."
1999	1896	msgstr "اضافه شود (به‌عنوان جایگزین)..."
2000	1897
2001		-#. Resource IDs: (IDS_EDITPROPS_ADDTITLE)
	1898	+#. Resource IDs: (9407)
2002	1899	msgid "Add Properties"
2003	1900	msgstr "اضافه‌کردن خصوصیات"
2004	1901
2005		-#. Resource IDs: (IDS_DLGTITLE_ADD_DIFF_TOOL)
	1902	+#. Resource IDs: (1750)
2006	1903	msgid "Add extension specific diff program"
2007	1904	msgstr "Add extension specific diff program"
2008	1905
2009		-#. Resource IDs: (IDS_DLGTITLE_ADD_MERGE_TOOL)
	1906	+#. Resource IDs: (1751)
2010	1907	msgid "Add extension specific merge program"
2011	1908	msgstr "Add extension specific merge program"
2012	1909

		@@ -2014,47 +1911,45 @@
2014	1911	msgid "Add new files automatically to SVN"
2015	1912	msgstr "اضافه کردن فایلهای جدید بطور خودکار به SVN"
2016	1913
2017		-#. Resource IDs: (IDS_LOG_POPUP_MONITORADDSUB)
	1914	+#. Resource IDs: (1044)
2018	1915	msgid "Add project or folder here..."
2019	1916	msgstr ""
2020	1917
2021		-#. Resource IDs: (IDS_LOG_POPUP_MONITORADD)
	1918	+#. Resource IDs: (1040)
2022	1919	msgid "Add project or folder..."
2023	1920	msgstr ""
2024	1921
2025		-#. Resource IDs: (IDS_DROPDESC_ADD)
	1922	+#. Resource IDs: (9804)
2026	1923	#, c-format
2027	1924	msgid "Add to %1"
2028	1925	msgstr ""
2029	1926
2030		-#. Resource IDs: (IDS_MENUIGNORE)
	1927	+#. Resource IDs: (194)
2031	1928	msgid "Add to &ignore list"
2032	1929	msgstr "اضافه‌کردن به لیست &نادیده‌ها"
2033	1930
2034		-#. Resource IDs: (IDS_REPOBROWSE_ADDBOOKMARK)
	1931	+#. Resource IDs: (1619)
2035	1932	msgid "Add to Bookmarks"
2036	1933	msgstr ""
2037	1934
2038		-#. Resource IDs: (Dialog IDD_SETTINGSBUGTRAQ: Control id 1279, Dialog
2039		-#. IDD_SETTINGSHOOKS: Control id 1279, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE)
	1935	+#. Resource IDs: (1279, 3341)
2040	1936	msgid "Add..."
2041	1937	msgstr "اضافه شود..."
2042	1938
2043		-#. Resource IDs: (Dialog IDD_TOOLASSOC: Control id 171)
	1939	+#. Resource IDs: (171)
2044	1940	msgid "Add/Edit Extension Specific Diff/Merge Program"
2045	1941	msgstr "اضافه کردن/ویرایش برنامه خاص مقایسه/ادغام"
2046	1942
2047		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1509, Dialog
2048		-#. IDD_SETCOLORPAGE: Control id 65535, Dialog IDD_SETTINGSOVERLAYHANDLERS:
2049		-#. Control id 1549, IDS_SVNACTION_ADD, IDS_SVN_SUMMARIZEADDED)
	1943	+#. Resource IDs: (1163, 1509, 1549, 4221, Dialog IDD_SETCOLORPAGE: Control id
	1944	+#. 65535)
2050	1945	msgid "Added"
2051	1946	msgstr "اضافه شده"
2052	1947
2053		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	1948	+#. Resource IDs: (65535)
2054	1949	msgid "Added node"
2055	1950	msgstr "گرهٔ اضافه‌شده"
2056	1951
2057		-#. Resource IDs: (IDS_PROC_IGNORERECURSIVESUCCESS)
	1952	+#. Resource IDs: (2319)
2058	1953	#, c-format
2059	1954	msgid ""
2060	1955	"Added the file pattern(s)\n"

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

		@@ -2070,19 +1965,19 @@
2070	1965	"to the ignore list."
2071	1966	msgstr "الگوهای فایل\n%ls\nبه فهرست نادیده گرفته‌ها."
2072	1967
2073		-#. Resource IDs: (IDS_SVNACTION_ADDING)
	1968	+#. Resource IDs: (4201)
2074	1969	msgid "Adding"
2075	1970	msgstr "در حال اضافه‌کردن"
2076	1971
2077		-#. Resource IDs: (IDS_PROP_TT_ADD)
	1972	+#. Resource IDs: (9296)
2078	1973	msgid "Adds a new property"
2079	1974	msgstr "یک خاصیت جدید اضافه می‌کند"
2080	1975
2081		-#. Resource IDs: (IDS_MENUDESCADD)
	1976	+#. Resource IDs: (139)
2082	1977	msgid "Adds file(s) to Subversion control"
2083	1978	msgstr "اضافه‌کردن فایل(ها) به کنترل سابورژن"
2084	1979
2085		-#. Resource IDs: (IDS_MENUDESCIGNORE)
	1980	+#. Resource IDs: (195)
2086	1981	msgid "Adds the selected file(s) or the filemask to the 'ignore' list"
2087	1982	msgstr "فایل(های) انتخاب شده یا فایل ماسک را به فهرست نادیده گرفته‌ها اضافه می‌کند"
2088	1983

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

		@@ -2133,7 +2027,7 @@
2133	2027	msgid "All Files (.)"
2134	2028	msgstr "تمام پرونده‌ها (.)"
2135	2029
2136		-#. Resource IDs: (IDS_COMMONFILEFILTER)
	2030	+#. Resource IDs: (2500, IDS_COMMONFILEFILTER)
2137	2031	msgid "All Files (.)\|.\|\|"
2138	2032	msgstr "تمام پرونده‌ها (.)\|.\|\|"
2139	2033

		@@ -2143,47 +2037,46 @@
2143	2037	"Allow Edit"
2144	2038	msgstr ""
2145	2039
2146		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1484)
	2040	+#. Resource IDs: (1484)
2147	2041	msgid "Allow ambiguous &UUIDs"
2148	2042	msgstr "پذیرفتن &UUID های مبهم"
2149	2043
2150		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_AMBIGUOUSURL)
	2044	+#. Resource IDs: (5508)
2151	2045	msgid ""
2152	2046	"Allow different repositories to use the same URL, e.g. "
2153	2047	"http://localhost/myrepos/"
2154	2048	msgstr "http://localhost/myrepos/ یکسان، مثال: URL اجازهٔ استفاده از مخزن‌های مختلف از"
2155	2049
2156		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_AMBIGUOUSUUID)
	2050	+#. Resource IDs: (5512)
2157	2051	msgid ""
2158	2052	"Allow different repositories to use the same UUID, e.g. copied repositories"
2159	2053	msgstr "اجازهٔ استفاده مخزن‌های مختلف از UUIDهای یکسان، مثال مخزن‌های کپی شده"
2160	2054
2161		-#. Resource IDs: (IDS_LOG_ALREADYMERGED)
	2055	+#. Resource IDs: (1896)
2162	2056	msgid "Already merged"
2163	2057	msgstr "از قبل ادغام شده اند"
2164	2058
2165		-#. Resource IDs: (IDS_LOG_ALREADYMERGEDREVERSED)
	2059	+#. Resource IDs: (1889)
2166	2060	msgid "Already reverse merged"
2167	2061	msgstr "ادغام معکوس از قبل انجام شده است"
2168	2062
2169		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1480)
	2063	+#. Resource IDs: (1480)
2170	2064	msgid "Always close dialogs for local operations"
2171	2065	msgstr "بستن پنجره‌ها برای عملیات محلی"
2172	2066
2173		-#. Resource IDs: (Dialog IDD_EDITPROPLOCALHOOKS: Control id 1339, Dialog
2174		-#. IDD_SETTINGSHOOKCONFIG: Control id 1339)
	2067	+#. Resource IDs: (1339)
2175	2068	msgid "Always execute the script"
2176	2069	msgstr ""
2177	2070
2178		-#. Resource IDs: (IDS_SETTINGS_USESYSTEMLOCALEFORDATES_TT)
	2071	+#. Resource IDs: (3143)
2179	2072	msgid "Always use the system locale settings to show times and dates"
2180	2073	msgstr "همیشه از تنظیمات محلی سیستم برای نمایش ساعت و تاریخ استفاده شود"
2181	2074
2182		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_RAM)
	2075	+#. Resource IDs: (5422)
2183	2076	msgid "Amount of memory required to load the cache"
2184	2077	msgstr "مقدار حافظه مورد نیاز جهت بارگزاری کَش"
2185	2078
2186		-#. Resource IDs: (IDS_SETTINGS_EXTDIFF_TT)
	2079	+#. Resource IDs: (1245)
2187	2080	#, c-format
2188	2081	msgid ""
2189	2082	"An external diff program used\r\n"

		@@ -2194,7 +2087,7 @@
2194	2087	"%mine : the modified file"
2195	2088	msgstr "یک برنامه مقایسه خارجی\r\nجهت مقایسه اصلاحیه های مختلف فایل ها\r\n\r\nشما میتوانید پارامترهای ذیل را به مسیر ارسال کنید:\r\n%base : پروندهٔ پایه\r\n%mine : پروندهٔ اصلاح شده"
2196	2089
2197		-#. Resource IDs: (IDS_SETTINGS_EXTMERGE_TT)
	2090	+#. Resource IDs: (1250)
2198	2091	#, c-format
2199	2092	msgid ""
2200	2093	"An external merge program used\r\n"

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

		@@ -2242,15 +2135,15 @@
2242	2135	msgid "Append this block to left"
2243	2136	msgstr ""
2244	2137
2245		-#. Resource IDs: (IDS_MENUDESCAPPLYPATCH)
	2138	+#. Resource IDs: (209)
2246	2139	msgid "Applies a unified diff file to the working copy"
2247	2140	msgstr "یک فایل unified diff را به نسخهٔ کاری اعمال می‌کند."
2248	2141
2249		-#. Resource IDs: (IDS_MENUAPPLYPATCH)
	2142	+#. Resource IDs: (207)
2250	2143	msgid "Apply &patch..."
2251	2144	msgstr "اعمال &وصله..."
2252	2145
2253		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_POWERDEFAULT)
	2146	+#. Resource IDs: (5514)
2254	2147	msgid ""
2255	2148	"Apply 'Power User' defaults. Those will provide a smoother experience.\n"
2256	2149	"You should know the meaning of all the settings above."

		@@ -2264,28 +2157,28 @@
2264	2157	msgid "Apply unified diff"
2265	2158	msgstr "اعمال unified diff"
2266	2159
2267		-#. Resource IDs: (IDS_HOOKS_APPROVE_TASK2)
	2160	+#. Resource IDs: (5801)
2268	2161	msgid "Approve or reject client-side hook script"
2269	2162	msgstr "تایید یا رد هوک اسکریپت سمت کلاینت"
2270	2163
2271		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1282)
	2164	+#. Resource IDs: (1282)
2272	2165	msgid "Approved hook scripts"
2273	2166	msgstr "هوک اسکریپت های تایید شده"
2274	2167
2275		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1565)
	2168	+#. Resource IDs: (1565)
2276	2169	msgid "Arb&itrary text"
2277	2170	msgstr "Arb&itrary text"
2278	2171
2279		-#. Resource IDs: (IDS_PROC_RESOLVE)
	2172	+#. Resource IDs: (2308)
2280	2173	msgid "Are you sure you want to mark the conflicted file(s) as resolved?"
2281	2174	msgstr "آیا مطمئن هستید می‌خواهید فایل‌های دارای تضاد را به‌عنوان حل شده علامت‌گزاری کنید؟"
2282	2175
2283		-#. Resource IDs: (IDS_SETTINGS_CACHEDELETEQUESTION)
	2176	+#. Resource IDs: (3177)
2284	2177	#, c-format
2285	2178	msgid "Are you sure you want to remove the cache of the selected %d items?"
2286	2179	msgstr "آیا مطمئن هستید می خواهید کَش %d قلم انتخاب شده را حذف کنید؟"
2287	2180
2288		-#. Resource IDs: (IDS_PROC_WARNREVERT)
	2181	+#. Resource IDs: (1256)
2289	2182	#, c-format
2290	2183	msgid ""
2291	2184	"Are you sure you want to revert %d item(s)? You will lose all changes since "

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

		@@ -2333,17 +2226,15 @@
2333	2226	msgid "Attempted to write to the reading %1."
2334	2227	msgstr "سعی در نوشتن از خواندن %1."
2335	2228
2336		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535, Dialog
2337		-#. IDD_PROMPT: Control id 131, Dialog IDD_SIMPLEPROMPT: Control id 160)
	2229	+#. Resource IDs: (131, 160, 65535)
2338	2230	msgid "Authentication"
2339	2231	msgstr "شناسائی"
2340	2232
2341		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1278)
	2233	+#. Resource IDs: (1278)
2342	2234	msgid "Authentication data"
2343	2235	msgstr "داده‌های شناسائی"
2344	2236
2345		-#. Resource IDs: (Dialog IDD_EDITPROPKEYWORDS: Control id 1562,
2346		-#. IDS_HEADER_AUTHOR, IDS_LOG_AUTHOR, IDS_STATUSLIST_COLAUTHOR)
	2237	+#. Resource IDs: (1209, 1562, 3311, IDS_HEADER_AUTHOR)
2347	2238	msgid "Author"
2348	2239	msgstr "مؤلف"
2349	2240

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

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

		@@ -2431,19 +2320,19 @@
2431	2320	"a bitmap"
2432	2321	msgstr "Bitmap\na bitmap"
2433	2322
2434		-#. Resource IDs: (Dialog IDD_BLAME: Control id 162)
	2323	+#. Resource IDs: (162)
2435	2324	msgid "Blame"
2436	2325	msgstr "مقصریابی"
2437	2326
2438		-#. Resource IDs: (IDS_BLAME_PROGRESSTITLE)
	2327	+#. Resource IDs: (2100)
2439	2328	msgid "Blame - TortoiseSVN"
2440	2329	msgstr "مقصریابی - TortoiseSVN"
2441	2330
2442		-#. Resource IDs: (IDS_LOG_POPUP_BLAME)
	2331	+#. Resource IDs: (1818)
2443	2332	msgid "Blame..."
2444	2333	msgstr "مقصریاب..."
2445	2334
2446		-#. Resource IDs: (IDS_MENUDESCBLAME)
	2335	+#. Resource IDs: (205)
2447	2336	msgid "Blames each line of a file on an author"
2448	2337	msgstr "مولف هر خط از یک فایل را نمایش می‌دهد"
2449	2338

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

		@@ -2478,7 +2367,7 @@
2478	2367	msgid "Br&owse..."
2479	2368	msgstr "مر&ور..."
2480	2369
2481		-#. Resource IDs: (IDS_LOG_COPY_SUCCESS)
	2370	+#. Resource IDs: (1830)
2482	2371	msgid "Branch / tag created successfully!"
2483	2372	msgstr "شاخه/تگ با موفقیت ایجاد شد!"
2484	2373

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

		@@ -2532,27 +2419,27 @@
2532	2419	msgid "C"
2533	2420	msgstr ""
2534	2421
2535		-#. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 1215)
	2422	+#. Resource IDs: (1215)
2536	2423	msgid "C&heck now"
2537	2424	msgstr "&الان بررسی کن"
2538	2425
2539		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1132)
	2426	+#. Resource IDs: (1132)
2540	2427	msgid "C&heck repository"
2541	2428	msgstr "بررسی مخزن&"
2542	2429
2543		-#. Resource IDs: (IDS_REVGRAPH_POPUP_COLLAPSE_RIGHT)
	2430	+#. Resource IDs: (4389)
2544	2431	msgid "C&ollapse sub-trees"
2545	2432	msgstr "&بستن زیر درخت‌ها"
2546	2433
2547		-#. Resource IDs: (IDS_REPOBROWSE_SHOWDIFF_CONTENTONLY)
	2434	+#. Resource IDs: (1618)
2548	2435	msgid "C&ompare URLs (content only)"
2549	2436	msgstr ""
2550	2437
2551		-#. Resource IDs: (IDS_LOG_POPUP_COPY)
	2438	+#. Resource IDs: (1216)
2552	2439	msgid "C&reate branch/tag from revision"
2553	2440	msgstr "&ایجاد شاخه/تگ از اصلاحیه"
2554	2441
2555		-#. Resource IDs: (IDS_REPOBROWSE_MKDIR)
	2442	+#. Resource IDs: (1607)
2556	2443	msgid "C&reate folder..."
2557	2444	msgstr "&ایجاد پوشه..."
2558	2445

		@@ -2564,15 +2451,15 @@
2564	2451	msgid "CAP"
2565	2452	msgstr "CAP"
2566	2453
2567		-#. Resource IDs: (IDS_SETTINGS_REPOSITORY_SIZE)
	2454	+#. Resource IDs: (3171)
2568	2455	msgid "Cache size [kB]"
2569	2456	msgstr "اندازه کش [ک.ب]"
2570	2457
2571		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHELIST: Control id 1440)
	2458	+#. Resource IDs: (1440)
2572	2459	msgid "Cached Repositories"
2573	2460	msgstr "مخزن‌های کَش‌شده"
2574	2461
2575		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1127)
	2462	+#. Resource IDs: (1127)
2576	2463	msgid "Can double-click in log list to compare with previous revision"
2577	2464	msgstr "می‌توانید برای مقایسه با اصلاحیه قبلی در لیست گزارش دوبار کلیک کنید"
2578	2465

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

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

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

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

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

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

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

		@@ -2896,7 +2747,7 @@
2896	2747	"%ls"
2897	2748	msgstr "پاکسازی در پردازش مسیرهای زیر ناموفق بود:\n%ls"
2898	2749
2899		-#. Resource IDs: (IDS_PROC_CLEANUPFINISHED)
	2750	+#. Resource IDs: (1257)
2900	2751	#, c-format
2901	2752	msgid ""
2902	2753	"Cleanup has successfully processed the following paths:\n"

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

		@@ -2940,36 +2787,36 @@
2940	2787	"usernames"
2941	2788	msgstr "پاکسازی %1!ld! نام کاربری/رمز ورود, %2!ld! مجوزهای ssl و %3!ld! نامهای کاربری"
2942	2789
2943		-#. Resource IDs: (IDS_SETTINGS_CLEARHOOKS_TT)
	2790	+#. Resource IDs: (3162)
2944	2791	#, c-format
2945	2792	msgid "Clears all %ld approved client-side hook scripts"
2946	2793	msgstr "همه %ld هوک اسکریپت مورد تایید کاربر را پاک کن"
2947	2794
2948		-#. Resource IDs: (IDS_SETTINGS_SAVEDDATA_REPOLOGHIST_TT)
	2795	+#. Resource IDs: (3139)
2949	2796	#, c-format
2950	2797	msgid "Clears cached logs from %ld repositories"
2951	2798	msgstr "پاکسازی کَش گزارشات %ld repositories"
2952	2799
2953		-#. Resource IDs: (IDS_SETTINGS_SAVEDDATA_RESIZABLE_TT)
	2800	+#. Resource IDs: (3128)
2954	2801	#, c-format
2955	2802	msgid "Clears the stored sizes and positions of %ld dialogs"
2956	2803	msgstr "اندازه و وضعیت محاوره‌های %ld را پاک می‌کند"
2957	2804
2958		-#. Resource IDs: (Dialog IDD_CHECKFORUPDATES: Control id 1466)
	2805	+#. Resource IDs: (1466)
2959	2806	msgid "Click here to go to the website"
2960	2807	msgstr "برای مراجعه به وب‌گاه کلیک کنید"
2961	2808
2962		-#. Resource IDs: (IDS_COMMITDLG_HISTORY_TT)
	2809	+#. Resource IDs: (2705)
2963	2810	msgid "Click here to select a recently typed message"
2964	2811	msgstr "برای انتخاب یک پیام تایپ شده جدید کلیک کنید"
2965	2812
2966		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSDIFF: Control id 65535)
	2813	+#. Resource IDs: (65535)
2967	2814	msgid ""
2968	2815	"Click on \"Advanced\" to specify alternate diff programs based on file "
2969	2816	"extension"
2970	2817	msgstr "برای مشخص کردن برنامه های مقایسه جایگزین بر اساس پسوند فایل‌ها بر روی \"پیشزفته\" کلیک کنید"
2971	2818
2972		-#. Resource IDs: (Dialog IDD_SETTINGSPROGSMERGE: Control id 65535)
	2819	+#. Resource IDs: (65535)
2973	2820	msgid ""
2974	2821	"Click on \"Advanced\" to specify alternate merge programs based on file "
2975	2822	"extension"

		@@ -2981,11 +2828,11 @@
2981	2828	"Use text blocks"
2982	2829	msgstr ""
2983	2830
2984		-#. Resource IDs: (IDS_CLIPBOARD_PROGRESS_DEST)
	2831	+#. Resource IDs: (4100)
2985	2832	msgid "Clipboard"
2986	2833	msgstr "کلیپ‌بورد"
2987	2834
2988		-#. Resource IDs: (IDS_PROGRS_CLOSE_MANUAL)
	2835	+#. Resource IDs: (3540)
2989	2836	msgid "Close manually"
2990	2837	msgstr "بستن دستی "
2991	2838

		@@ -2993,15 +2840,15 @@
2993	2840	msgid "Close the active window and prompts to save the documents"
2994	2841	msgstr "بستن پنجره فعال واعلان جهت ذخیره سازی سنده"
2995	2842
2996		-#. Resource IDs: (Dialog IDD_COLLABORATORSETTINGS: Control id 350)
	2843	+#. Resource IDs: (350)
2997	2844	msgid "Code Collaborator Settings"
2998	2845	msgstr ""
2999	2846
3000		-#. Resource IDs: (IDS_REVGRAPH_POPUP_COLLAPSE_ABOVE)
	2847	+#. Resource IDs: (4387)
3001	2848	msgid "Coll&apse source tree"
3002	2849	msgstr "Coll&apse source tree"
3003	2850
3004		-#. Resource IDs: (Dialog IDD_COLLABORATORSETTINGS: Control id 65535)
	2851	+#. Resource IDs: (65535)
3005	2852	msgid "Collaborator &password"
3006	2853	msgstr ""
3007	2854

		@@ -3009,7 +2856,7 @@
3009	2856	msgid "Collapse"
3010	2857	msgstr ""
3011	2858
3012		-#. Resource IDs: (IDS_REVGRAPH_POPUP_COLLAPSE_BELOW)
	2859	+#. Resource IDs: (4391)
3013	2860	msgid "Collapse &following tree"
3014	2861	msgstr "بستن پوشه &بعدی"
3015	2862

		@@ -3019,11 +2866,11 @@
3019	2866	"Collapse"
3020	2867	msgstr "بستن بخش‌های فاقد تغییر\nبستن"
3021	2868
3022		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	2869	+#. Resource IDs: (65535)
3023	2870	msgid "Color 1"
3024	2871	msgstr "رنگ ۱"
3025	2872
3026		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	2873	+#. Resource IDs: (65535)
3027	2874	msgid "Color 2"
3028	2875	msgstr "رنگ ۲"
3029	2876

		@@ -3039,25 +2886,23 @@
3039	2886	msgid "Color by au&thor"
3040	2887	msgstr ""
3041	2888
3042		-#. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 138, Dialog
3043		-#. IDD_SETTINGSTBLAME: Control id 65535, Dialog IDD_SETTINGSUDIFF: Control id
3044		-#. 65535)
	2889	+#. Resource IDs: (65535, Dialog IDD_SETCOLORPAGE: Control id 138)
3045	2890	msgid "Colors"
3046	2891	msgstr "رنگ‌ها"
3047	2892
3048		-#. Resource IDs: (IDS_PROGRS_CMDINFO)
	2893	+#. Resource IDs: (3506)
3049	2894	msgid "Command"
3050	2895	msgstr "دستور"
3051	2896
3052		-#. Resource IDs: (IDS_SETTINGS_HOOKS_COMMANDLINECOL)
	2897	+#. Resource IDs: (3154)
3053	2898	msgid "Command Line"
3054	2899	msgstr "خط فرمان"
3055	2900
3056		-#. Resource IDs: (Dialog IDD_SETTINGSHOOKCONFIG: Control id 1336)
	2901	+#. Resource IDs: (1336)
3057	2902	msgid "Command Line To Execute:"
3058	2903	msgstr "خط فرمان جهت اجرا:"
3059	2904
3060		-#. Resource IDs: (IDS_EDITPROPS_LOCALHOOK_CMDLINELABEL)
	2905	+#. Resource IDs: (9432)
3061	2906	#, c-format
3062	2907	msgid ""
3063	2908	"Command Line To Execute:\r\n"

		@@ -3064,7 +2909,7 @@
3064	2909	"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."
3065	2910	msgstr ""
3066	2911
3067		-#. Resource IDs: (IDS_MSG_NEEDSUPDATE_TITLE)
	2912	+#. Resource IDs: (9850)
3068	2913	msgid "Command failed - Update needed"
3069	2914	msgstr "دستور ناموفق - بروزرسانی لازم است"
3070	2915

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

		@@ -3167,23 +3010,23 @@
3167	3010	msgid "Compare whitespaces"
3168	3011	msgstr "مقایسه فاصله‌ها"
3169	3012
3170		-#. Resource IDs: (IDS_LOG_COMPAREWITHHEAD)
	3013	+#. Resource IDs: (2202)
3171	3014	msgid "Compare with &HEAD and BASE"
3172	3015	msgstr ""
3173	3016
3174		-#. Resource IDs: (IDS_LOG_POPUP_COMPARE)
	3017	+#. Resource IDs: (1212)
3175	3018	msgid "Compare with &working copy"
3176	3019	msgstr "&با نسخهٔ کاری مقایسه کنید"
3177	3020
3178		-#. Resource IDs: (IDS_LOG_COMPAREWITHBASE)
	3021	+#. Resource IDs: (2200)
3179	3022	msgid "Compare with b&ase"
3180	3023	msgstr "با نسخهٔ &پایه مقایسه کنید"
3181	3024
3182		-#. Resource IDs: (IDS_LOG_COMPAREWITHBASE_CONTENTONLY)
	3025	+#. Resource IDs: (2203)
3183	3026	msgid "Compare with base (content only)"
3184	3027	msgstr ""
3185	3028
3186		-#. Resource IDs: (IDS_LOG_POPUP_COMPAREWITHPREVIOUS)
	3029	+#. Resource IDs: (1816)
3187	3030	msgid "Compare with previous revision"
3188	3031	msgstr "با اصلاحیهٔ قبلی مقایسه کنید"
3189	3032

		@@ -3193,25 +3036,25 @@
3193	3036	"Compare whitespaces"
3194	3037	msgstr "تمامی فضاهای خالی را هنگام مقایسه‌گیری مقایسه می‌کند\nمقایسه فضاهای خالی"
3195	3038
3196		-#. Resource IDs: (IDS_MENUDESCDIFF)
	3039	+#. Resource IDs: (177)
3197	3040	msgid ""
3198	3041	"Compares the file with the last committed revision to show you the changes "
3199	3042	"you made"
3200	3043	msgstr "جهت نمایش تغییرات شما، فایل را با آخرین اصلاحیه اعمال شده مقایسه می‌کند"
3201	3044
3202		-#. Resource IDs: (IDS_MENUDESCURLDIFF)
	3045	+#. Resource IDs: (262)
3203	3046	msgid "Compares the selected file with a file in the repository"
3204	3047	msgstr "مقایسه‌کردن فایل انتحاب شده بایک فایل در مخزن "
3205	3048
3206		-#. Resource IDs: (IDS_SVNACTION_COMPLETED)
	3049	+#. Resource IDs: (1170)
3207	3050	msgid "Completed"
3208	3051	msgstr "تکمیل‌شده"
3209	3052
3210		-#. Resource IDs: (IDS_PROGRS_FINISHED)
	3053	+#. Resource IDs: (3503)
3211	3054	msgid "Completed!"
3212	3055	msgstr "تکمیل‌شده!"
3213	3056
3214		-#. Resource IDs: (Dialog IDD_RECYCLEBIN: Control id 1620)
	3057	+#. Resource IDs: (1620)
3215	3058	msgid "Configure &TortoiseSVN to never use the recycle bin"
3216	3059	msgstr "تنظیم TortoiseSVN برای هیچ‌گاه استفاده کردن از سطل بازیافت"
3217	3060

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

		@@ -3261,12 +3104,11 @@
3261	3104	msgid "Conflict resolved"
3262	3105	msgstr "برخورد حل شد"
3263	3106
3264		-#. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535,
3265		-#. IDS_SVNACTION_CONFLICTED)
	3107	+#. Resource IDs: (4204, Dialog IDD_SETCOLORPAGE: Control id 65535)
3266	3108	msgid "Conflicted"
3267	3109	msgstr "دارای برخورد"
3268	3110
3269		-#. Resource IDs: (IDS_SVNACTION_DRYRUN_CONFLICTED)
	3111	+#. Resource IDs: (4236)
3270	3112	msgid "Conflicted (maybe)"
3271	3113	msgstr "برخورددار (شاید)"
3272	3114

		@@ -3275,11 +3117,11 @@
3275	3117	msgid "Conflicts: %d"
3276	3118	msgstr "تضادها: %d"
3277	3119
3278		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_UPDATE)
	3120	+#. Resource IDs: (5505)
3279	3121	msgid "Connect to the repository server and download missing log data"
3280	3122	msgstr "اتصال به سرویس‌دهنده مخزن جهت بارگزاری گزارشات ناموجود"
3281	3123
3282		-#. Resource IDs: (Dialog IDD_LOGCACHESTATISTICS: Control id 65535)
	3124	+#. Resource IDs: (65535)
3283	3125	msgid "Container sizes"
3284	3126	msgstr "اندازه‌های محتوی"
3285	3127

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

		@@ -3327,12 +3169,12 @@
3327	3169	"%2!ls!"
3328	3170	msgstr "کپی کردن%1!ld! قلم به\n%2!ls!"
3329	3171
3330		-#. Resource IDs: (IDS_PROGRS_CMD_COPY)
	3172	+#. Resource IDs: (3655)
3331	3173	#, c-format
3332	3174	msgid "Copy %1!ls! to %2!ls!, Revision %3!ls!"
3333	3175	msgstr "کپی %1!ls! به %2!ls!, اصلاحیه %3!ls!"
3334	3176
3335		-#. Resource IDs: (IDS_INPUT_COPY)
	3177	+#. Resource IDs: (2012)
3336	3178	#, c-format
3337	3179	msgid ""
3338	3180	"Copy %1!ls!\r\n"

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

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

		@@ -3451,25 +3293,25 @@
3451	3293	msgid "Could not create %1 because the directory is full."
3452	3294	msgstr "ایجاد %1 بدلیل پربودن پوشه ممکن نشد."
3453	3295
3454		-#. Resource IDs: (IDS_ERR_CREATETEMPDIR)
	3296	+#. Resource IDs: (1334)
3455	3297	msgid "Could not create temp folder!"
3456	3298	msgstr "ایجاد پوشه موقت موفقیت آمیز نبود!"
3457	3299
3458		-#. Resource IDs: (IDS_EDITCONFLICT_ACTIONINFO_DELETE)
	3300	+#. Resource IDs: (9302)
3459	3301	#, c-format
3460	3302	msgid "Could not delete '%ls' because"
3461	3303	msgstr "حذف '%ls' ممکن نشد بدلیل"
3462	3304
3463		-#. Resource IDs: (IDS_EDITCONFLICT_PROP_ACTIONINFO_DELETE)
	3305	+#. Resource IDs: (9305)
3464	3306	#, c-format
3465	3307	msgid "Could not delete property '%1!ls!' on '%2!ls!' because"
3466	3308	msgstr "عدم موفقیت در حذف کردن خصوصیت '%1!ls!' روی '%2!ls!' بدلیل"
3467	3309
3468		-#. Resource IDs: (IDS_ERR_NOPREVREVISION)
	3310	+#. Resource IDs: (1323)
3469	3311	msgid "Could not determine the last committed revision!"
3470	3312	msgstr "آخرین اصلاحیه اعمال شده قابل تشخیص نبود!"
3471	3313
3472		-#. Resource IDs: (IDS_ERR_NOPARENTFOUND)
	3314	+#. Resource IDs: (1335)
3473	3315	#, c-format
3474	3316	msgid ""
3475	3317	"Could not find a parent folder for\n"

		@@ -3476,16 +3318,16 @@
3476	3318	"%ls"
3477	3319	msgstr "Could not find a parent folder for\n%ls"
3478	3320
3479		-#. Resource IDs: (IDS_ERR_NOSTATUS)
	3321	+#. Resource IDs: (1285)
3480	3322	msgid "Could not get the status!"
3481	3323	msgstr "دریافت وضعیت ممکن نشد!"
3482	3324
3483		-#. Resource IDs: (IDS_EDITCONFLICT_ACTIONINFO_MODIFY)
	3325	+#. Resource IDs: (9301)
3484	3326	#, c-format
3485	3327	msgid "Could not merge '%ls' because"
3486	3328	msgstr "ادغام '%ls' ممکن نشد بدلیل"
3487	3329
3488		-#. Resource IDs: (IDS_EDITCONFLICT_PROP_ACTIONINFO_MODIFY)
	3330	+#. Resource IDs: (9304)
3489	3331	#, c-format
3490	3332	msgid "Could not merge property '%1!ls!' on '%2!ls!' because"
3491	3333	msgstr "عدم موفقیت در ادغام کردن خصوصیت '%1!ls!' روی '%2!ls!' بدلیل"

		@@ -3507,22 +3349,22 @@
3507	3349	msgid "Could not remove %1 because it is the current directory."
3508	3350	msgstr "حذف %1 ممکن نشد زیرا پوشه جاری می باشد."
3509	3351
3510		-#. Resource IDs: (IDS_ERR_FAILEDUNIGNOREPROPERTY)
	3352	+#. Resource IDs: (1309)
3511	3353	#, c-format
3512	3354	msgid "Could not remove %ls from the ignore list"
3513	3355	msgstr "خارج کردن %ls از لیست نادیده گرفته ها ممکن نشد"
3514	3356
3515		-#. Resource IDs: (IDS_EDITCONFLICT_ACTIONINFO_REPLACE)
	3357	+#. Resource IDs: (9306)
3516	3358	#, c-format
3517	3359	msgid "Could not replace '%ls' because"
3518	3360	msgstr "عدم موفقیت در جایگزینی '%ls' بدلیل"
3519	3361
3520		-#. Resource IDs: (IDS_EDITCONFLICT_PROP_ACTIONINFO_REPLACE)
	3362	+#. Resource IDs: (9307)
3521	3363	#, c-format
3522	3364	msgid "Could not replace property '%1!ls!' on '%2!ls!' because"
3523	3365	msgstr "عدم موفقیت در جایگزینی خصوصیت '%1!ls!' روی '%2!ls!' بدلیل"
3524	3366
3525		-#. Resource IDs: (IDS_ERR_NOURLOFFILE)
	3367	+#. Resource IDs: (1287)
3526	3368	#, c-format
3527	3369	msgid ""
3528	3370	"Could not retrieve URL of the file!\n"

		@@ -3536,7 +3378,7 @@
3536	3378	"Patching is not possible!"
3537	3379	msgstr "عدم موفقیت در بازیابی اصلاحیه %1!ls! فایل %2!ls!.\nایجاد وصله ممکن نشد!"
3538	3380
3539		-#. Resource IDs: (IDS_ERR_DIFFVIEWSTART)
	3381	+#. Resource IDs: (1293, IDS_ERR_DIFFVIEWSTART)
3540	3382	#, c-format
3541	3383	msgid ""
3542	3384	"Could not start diff viewer!\n"

		@@ -3543,7 +3385,7 @@
3543	3385	"%ls"
3544	3386	msgstr "اجرای نمایشگر تغییرات ناموفق بود!\n%ls"
3545	3387
3546		-#. Resource IDs: (IDS_ERR_EXTDIFFSTART)
	3388	+#. Resource IDs: (1282)
3547	3389	#, c-format
3548	3390	msgid ""
3549	3391	"Could not start external diff program!\n"

		@@ -3550,7 +3392,7 @@
3550	3392	"%ls"
3551	3393	msgstr "اجرای برنامه خارجی مقایسه ناموفق بود!\n%ls"
3552	3394
3553		-#. Resource IDs: (IDS_ERR_EXTMERGESTART)
	3395	+#. Resource IDs: (1290)
3554	3396	#, c-format
3555	3397	msgid ""
3556	3398	"Could not start external merge program!\n"

		@@ -3561,7 +3403,7 @@
3561	3403	msgid "Could not start print job."
3562	3404	msgstr "عدم موفقیت در شروع کار چاپ."
3563	3405
3564		-#. Resource IDs: (IDS_ERR_TEXTVIEWSTART)
	3406	+#. Resource IDs: (1326, IDS_ERR_TEXTVIEWSTART)
3565	3407	#, c-format
3566	3408	msgid ""
3567	3409	"Could not start text viewer!\n"

		@@ -3568,7 +3410,7 @@
3568	3410	"%ls"
3569	3411	msgstr "اجرای نمایشگر متن ناموفق بود\n%ls"
3570	3412
3571		-#. Resource IDs: (IDS_ERR_THREADSTARTFAILED)
	3413	+#. Resource IDs: (1281, IDS_ERR_THREADSTARTFAILED)
3572	3414	msgid "Could not start thread!"
3573	3415	msgstr "عدم موفقیت در اجرای thread!"
3574	3416

		@@ -3581,7 +3423,7 @@
3581	3423	msgid "Count: %u matches."
3582	3424	msgstr ""
3583	3425
3584		-#. Resource IDs: (Dialog IDD_SETTINGSMAIN: Control id 1542)
	3426	+#. Resource IDs: (1542)
3585	3427	msgid "Create &Library"
3586	3428	msgstr "ایجاد &کتابخانه"
3587	3429

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

		@@ -3630,20 +3472,20 @@
3630	3472	msgid "Create patch file"
3631	3473	msgstr ""
3632	3474
3633		-#. Resource IDs: (IDS_MENUCREATEREPOS)
	3475	+#. Resource IDs: (123)
3634	3476	msgid "Create repositor&y here"
3635	3477	msgstr "ایجاد &مخزن در این مسیر..."
3636	3478
3637		-#. Resource IDs: (IDS_REPOBROWSE_CREATELINK)
	3479	+#. Resource IDs: (1617)
3638	3480	msgid "Create shortcut"
3639	3481	msgstr "ایجاد میان‌بر"
3640	3482
3641		-#. Resource IDs: (IDS_MENUDESCCOPY)
	3483	+#. Resource IDs: (148)
3642	3484	msgid ""
3643	3485	"Creates a 'cheap' copy inside the repository used for branches or tagging"
3644	3486	msgstr "یک کپی 'ارزان' داخل مخزن برای استفاده جهت شاخه یا تگ ایجاد می کند"
3645	3487
3646		-#. Resource IDs: (IDS_SETTINGS_CREATELIB_TT)
	3488	+#. Resource IDs: (3179)
3647	3489	msgid ""
3648	3490	"Creates a library folder with special settings for Subversion working copies"
3649	3491	msgstr "یک پوشه کتابخانه ای با تنظیمات خاص برای نسخه های کاری سابروژن ایجاد میکند"

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

		@@ -3703,40 +3545,39 @@
3703	3545	"Cut"
3704	3546	msgstr "کپی گزیده و قراردادن روی کلیپبورد\nکپی"
3705	3547
3706		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHELIST: Control id 1279)
	3548	+#. Resource IDs: (1279)
3707	3549	msgid "D&etails"
3708	3550	msgstr "&جزئیات"
3709	3551
3710		-#. Resource IDs: (Dialog IDD_EDITPROPKEYWORDS: Control id 1529,
3711		-#. IDS_HEADER_DATE, IDS_LOG_DATE, IDS_STATUSLIST_COLDATE)
	3552	+#. Resource IDs: (1210, 1529, 3312, IDS_HEADER_DATE)
3712	3553	msgid "Date"
3713	3554	msgstr "تاریخ"
3714	3555
3715		-#. Resource IDs: (IDS_LOG_FILTER_DATERANGE)
	3556	+#. Resource IDs: (1858)
3716	3557	msgid "Date Range"
3717	3558	msgstr "محدوده تاریخ"
3718	3559
3719		-#. Resource IDs: (ID_EDIT_DEFAULT - Menu)
	3560	+#. Resource IDs: (32842 - Menu)
3720	3561	msgid "Default"
3721	3562	msgstr "پیش فرض"
3722	3563
3723		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 65535)
	3564	+#. Resource IDs: (65535)
3724	3565	msgid "Default &number of log messages"
3725	3566	msgstr "&تعداد پیش فرض پیام"
3726	3567
3727		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1516)
	3568	+#. Resource IDs: (1516)
3728	3569	msgid "Default URL:"
3729	3570	msgstr "آدرس پیش فرض:"
3730	3571
3731		-#. Resource IDs: (IDS_MSG_IMPORTEDSTRUCTUREFINISHED)
	3572	+#. Resource IDs: (1280)
3732	3573	msgid "Default directory structure successfully created!"
3733	3574	msgstr "ساختار پوشه ای پیش فرض با موفقیت ایجاد شد!"
3734	3575
3735		-#. Resource IDs: (Dialog IDD_MONITOROPTIONS: Control id 65535)
	3576	+#. Resource IDs: (65535)
3736	3577	msgid "Default monitor interval in minutes:"
3737	3578	msgstr ""
3738	3579
3739		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS: Control id 1515)
	3580	+#. Resource IDs: (1515)
3740	3581	msgid "Default path:"
3741	3582	msgstr "مسیر پیش فرض:"
3742	3583

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

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

		@@ -3865,7 +3704,7 @@
3865	3704	"a device independent bitmap"
3866	3705	msgstr "Device Independent Bitmap\na device independent bitmap"
3867	3706
3868		-#. Resource IDs: (Dialog IDD_SETTINGSSAVEDDATA: Control id 1277)
	3707	+#. Resource IDs: (1277)
3869	3708	msgid "Dialog sizes and positions"
3870	3709	msgstr "اندازه و مکان پنجره های محاوره ای"
3871	3710

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

		@@ -3905,40 +3744,40 @@
3905	3744	msgid "Diff file:"
3906	3745	msgstr "فایل Diff:"
3907	3746
3908		-#. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535)
	3747	+#. Resource IDs: (65535)
3909	3748	msgid "Diff header"
3910	3749	msgstr ""
3911	3750
3912		-#. Resource IDs: (IDS_MENUDIFFLATER)
	3751	+#. Resource IDs: (267)
3913	3752	msgid "Diff later"
3914	3753	msgstr ""
3915	3754
3916		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1533)
	3755	+#. Resource IDs: (1533)
3917	3756	msgid "Diff options"
3918	3757	msgstr "تنظیمات Diff"
3919	3758
3920		-#. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535)
	3759	+#. Resource IDs: (65535)
3921	3760	msgid "Diff position"
3922	3761	msgstr ""
3923	3762
3924		-#. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 65535)
	3763	+#. Resource IDs: (65535)
3925	3764	msgid "Diff removed lines"
3926	3765	msgstr ""
3927	3766
3928		-#. Resource IDs: (Dialog IDD_URLDIFF: Control id 279)
	3767	+#. Resource IDs: (279)
3929	3768	msgid "Diff with URL"
3930	3769	msgstr "مقایسه با آدرس"
3931	3770
3932		-#. Resource IDs: (IDS_MENUDIFFNOW)
	3771	+#. Resource IDs: (275)
3933	3772	#, c-format
3934	3773	msgid "Diff with \"%ls\""
3935	3774	msgstr ""
3936	3775
3937		-#. Resource IDs: (Dialog IDD_DIFFFILES: Control id 1302)
	3776	+#. Resource IDs: (1302)
3938	3777	msgid "Difference between"
3939	3778	msgstr "تفاوت مابین "
3940	3779
3941		-#. Resource IDs: (ID_VIEW_SHOWDIFFPATHS - Menu)
	3780	+#. Resource IDs: (32817 - Menu)
3942	3781	msgid "Differential path &names"
3943	3782	msgstr "Differential path &names"
3944	3783

		@@ -3946,11 +3785,11 @@
3946	3785	msgid "Diffing"
3947	3786	msgstr "Diffing"
3948	3787
3949		-#. Resource IDs: (IDS_MENUDESCPREVDIFF)
	3788	+#. Resource IDs: (215)
3950	3789	msgid "Diffs the working copy file with the one before the last commit."
3951	3790	msgstr "فایل نسخه کاری را با نمونه قبل از آخرین اعمال مقایسه می کند."
3952	3791
3953		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1513)
	3792	+#. Resource IDs: (1513)
3954	3793	msgid "Directories"
3955	3794	msgstr "پوشه ها"
3956	3795

		@@ -3958,11 +3797,11 @@
3958	3797	msgid "Directory:"
3959	3798	msgstr "فهرست:"
3960	3799
3961		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1529)
	3800	+#. Resource IDs: (1529)
3962	3801	msgid "Disable status cache for elevated processes"
3963	3802	msgstr ""
3964	3803
3965		-#. Resource IDs: (IDS_MERGEWIZARD_OPTIONS_FORCE_TT)
	3804	+#. Resource IDs: (9521)
3966	3805	msgid "Discards local changes upon incoming deletes"
3967	3806	msgstr "درهنگام اعمال عملیات حذف از مخزن تغییرات محلی از بین می روند"
3968	3807

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

		@@ -4053,7 +3892,7 @@
4053	3892	msgid "Do you want to load the changed files?"
4054	3893	msgstr "آیا می‌خواهید پرونده‌ها تغییر را بارگیری کنید؟"
4055	3894
4056		-#. Resource IDs: (IDS_PROC_EXPORTUNVERSION)
	3895	+#. Resource IDs: (1577)
4057	3896	#, c-format
4058	3897	msgid ""
4059	3898	"Do you want to make this working copy unversioned?\n"

		@@ -4061,7 +3900,7 @@
4061	3900	"%ls!"
4062	3901	msgstr "آیا از نسخه خارج کردن این نسخه کاری را تایید میکنید؟\nاین عمل تمامی پوشه های مدیریتی سابورژن را حذف خواهد کرد از\n%ls!"
4063	3902
4064		-#. Resource IDs: (IDS_PROC_RESOLVE_TASK1)
	3903	+#. Resource IDs: (2354)
4065	3904	#, c-format
4066	3905	msgid "Do you want to mark '%ls' as resolved?"
4067	3906	msgstr "آیا مایلید '%ls' بعنوان حل شده علامت گذاری شود؟"

		@@ -4074,7 +3913,7 @@
4074	3913	"as resolved?"
4075	3914	msgstr ""
4076	3915
4077		-#. Resource IDs: (IDS_SSL_ACCEPTQUESTION)
	3916	+#. Resource IDs: (1201)
4078	3917	msgid "Do you want to proceed?"
4079	3918	msgstr "آیا میخواهید ادامه بدهی؟"
4080	3919

		@@ -4088,22 +3927,22 @@
4088	3927	"Note: you will lose all changes you've made!"
4089	3928	msgstr "آیا مایلید برای اعمال تنظیمات تغییر یافته اسناد دوباره بارگذاری گردند؟\nنکته: همه تغییرات شما از بین خواهد رفت!"
4090	3929
4091		-#. Resource IDs: (IDS_MONITOR_DELETE_TASK2)
	3930	+#. Resource IDs: (1030)
4092	3931	#, c-format
4093	3932	msgid "Do you want to remove the monitored project '%ls'?"
4094	3933	msgstr ""
4095	3934
4096		-#. Resource IDs: (IDS_EDITPROPS_RECURSIVEREMOVEQUESTION)
	3935	+#. Resource IDs: (9402)
4097	3936	#, c-format
4098	3937	msgid "Do you want to remove the property %ls recursively?"
4099	3938	msgstr "آیا میخواهید خصوصیت %ls بطور بازگشتی حذف گردد؟"
4100	3939
4101		-#. Resource IDs: (IDS_PROC_WARNREVERT_TASK1)
	3940	+#. Resource IDs: (2349)
4102	3941	#, c-format
4103	3942	msgid "Do you want to revert '%ls'?"
4104	3943	msgstr "آیا مایلید '%ls' برگشت شود؟"
4105	3944
4106		-#. Resource IDs: (IDS_LOG_REVERT_CONFIRM_TASK6)
	3945	+#. Resource IDs: (1911)
4107	3946	#, c-format
4108	3947	msgid ""
4109	3948	"Do you want to revert all changes in\n"

		@@ -4111,7 +3950,7 @@
4111	3950	"and go back to this revision?"
4112	3951	msgstr "آیا میخواهید تمامی تغییرات در\n%ls\nبرگشت گردد و به این اصلاحیه بازگشت کنید؟"
4113	3952
4114		-#. Resource IDs: (IDS_LOG_REVERT_CONFIRM_TASK1)
	3953	+#. Resource IDs: (1910)
4115	3954	#, c-format
4116	3955	msgid ""
4117	3956	"Do you want to revert all changes in\n"

		@@ -4119,7 +3958,7 @@
4119	3958	"which were made in this revision?"
4120	3959	msgstr "آیا میخواهید تمامی تغییرات در این اصلاحیه در\n%ls\nبرگشت گردد؟"
4121	3960
4122		-#. Resource IDs: (IDS_DROPEXT_UPDATE_TASK1)
	3961	+#. Resource IDs: (4651)
4123	3962	#, c-format
4124	3963	msgid ""
4125	3964	"Do you want to update the folder \"%ls\" to fetch the applied svn:externals?"

		@@ -4129,13 +3968,13 @@
4129	3968	msgid "Document :"
4130	3969	msgstr "سند :"
4131	3970
4132		-#. Resource IDs: (Dialog IDD_ABOUT: Control id 65535)
	3971	+#. Resource IDs: (65535)
4133	3972	msgid ""
4134	3973	"Documentation : Simon Large\n"
4135	3974	"Code : Tobias Schäfer, Stefan Fuhrmann"
4136	3975	msgstr "مستند سازی : Simon Large\nکدنویسی : Tobias Schäfer, Stefan Fuhrmann"
4137	3976
4138		-#. Resource IDs: (IDS_CHECKOUT_TT_MULTIWC)
	3977	+#. Resource IDs: (1503)
4139	3978	msgid ""
4140	3979	"Don't make the checkout directory a sparse working copy.\n"
4141	3980	"Instead, all URLs get checked out into a separate\n"

		@@ -4161,15 +4000,15 @@
4161	4000	"Reload the views without saving the modifications"
4162	4001	msgstr "ذخیره نکن\nبارگزاری مجدد نما ها بدون ذخیره سازی تغییرات"
4163	4002
4164		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1079)
	4003	+#. Resource IDs: (1079)
4165	4004	msgid "Drive Types"
4166	4005	msgstr "نوع درایوها"
4167	4006
4168		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1315)
	4007	+#. Resource IDs: (1315)
4169	4008	msgid "Drives A: and B:"
4170	4009	msgstr "درایوهای A: و B:"
4171	4010
4172		-#. Resource IDs: (IDS_DROPDESC_NODROP)
	4011	+#. Resource IDs: (9800)
4173	4012	#, c-format
4174	4013	msgid "Drop not possible on %1!ls!"
4175	4014	msgstr ""

		@@ -4178,19 +4017,19 @@
4178	4017	msgid "E"
4179	4018	msgstr ""
4180	4019
4181		-#. Resource IDs: (ID_INLINEEDIT - Menu)
	4020	+#. Resource IDs: (32816 - Menu)
4182	4021	msgid "E&xact copy sources"
4183	4022	msgstr "&کپی دقیق منابع"
4184	4023
4185		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1518)
	4024	+#. Resource IDs: (1518)
4186	4025	msgid "E&xclude paths:"
4187	4026	msgstr "مسیرهای &مستثناء شده:"
4188	4027
4189		-#. Resource IDs: (ID_NEW_EXECUTABLE - Menu)
	4028	+#. Resource IDs: (32839 - Menu)
4190	4029	msgid "E&xecutable"
4191	4030	msgstr "ا&جرایی"
4192	4031
4193		-#. Resource IDs: (105 - Menu, ID_APP_EXIT - Menu, ID_POPUP_EXIT - Menu,
	4032	+#. Resource IDs: (105 - Menu, 32874 - Menu, ID_APP_EXIT - Menu,
4194	4033	#. cmdExit_LabelTitle_RESID)
4195	4034	msgid "E&xit"
4196	4035	msgstr "خ&روج"

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

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

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

		@@ -4321,11 +4158,11 @@
4321	4158	msgid "Empty"
4322	4159	msgstr "خالی"
4323	4160
4324		-#. Resource IDs: (Dialog IDD_ADD: Control id 1562)
	4161	+#. Resource IDs: (1562)
4325	4162	msgid "Enable Auto-&Properties"
4326	4163	msgstr "فعال سازی خصوصیات-&خودکار"
4327	4164
4328		-#. Resource IDs: (Dialog IDD_IMPORT: Control id 1562)
	4165	+#. Resource IDs: (1562)
4329	4166	msgid "Enable Auto-Properties"
4330	4167	msgstr "فعال کردن خصوصیات-خودکار"
4331	4168

		@@ -4337,19 +4174,19 @@
4337	4174	msgid "Enable EditorConfig"
4338	4175	msgstr ""
4339	4176
4340		-#. Resource IDs: (Dialog IDD_SETTINGSLOOKANDFEEL: Control id 1648)
	4177	+#. Resource IDs: (1648)
4341	4178	msgid "Enable drag context menu"
4342	4179	msgstr ""
4343	4180
4344		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_ENABLE)
	4181	+#. Resource IDs: (5500)
4345	4182	msgid "Enable log caching to speed up log and revision graph dialogs"
4346	4183	msgstr "فعال کردن کَش گزاری گزارشات برای سرعت عمل پنجره های گراف اصلاحیه ها و گزارشات"
4347	4184
4348		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 65535)
	4185	+#. Resource IDs: (65535)
4349	4186	msgid "Enabled Overlay Handlers"
4350	4187	msgstr "Enabled Overlay Handlers"
4351	4188
4352		-#. Resource IDs: (IDS_SETTINGS_SPELLCHECKER_TT)
	4189	+#. Resource IDs: (3118)
4353	4190	msgid ""
4354	4191	"Enables the spellchecker only if the\n"
4355	4192	"tsvn:projectlanguage property is set."

		@@ -4396,7 +4233,7 @@
4396	4233	msgid "Encountered an unexpected error while writing %1."
4397	4234	msgstr "خطای غیر مترقبه در نوشتن %1 رخ داد."
4398	4235
4399		-#. Resource IDs: (Dialog IDD_REVISIONRANGE: Control id 1537)
	4236	+#. Resource IDs: (1537)
4400	4237	msgid "End Revision"
4401	4238	msgstr "اصلاحیه آخر"
4402	4239

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

		@@ -4412,11 +4249,11 @@
4412	4249	msgid "Enlarge the window to full size"
4413	4250	msgstr "بزرگنمائی پنجره به حداکثر اندازه"
4414	4251
4415		-#. Resource IDs: (Dialog IDD_INPUTLOGDLG: Control id 241)
	4252	+#. Resource IDs: (241)
4416	4253	msgid "Enter Log Message"
4417	4254	msgstr "پیغام وارد نمائید"
4418	4255
4419		-#. Resource IDs: (Dialog IDD_CREATECHANGELIST: Control id 65535)
	4256	+#. Resource IDs: (65535)
4420	4257	msgid "Enter a &name for the changelist:"
4421	4258	msgstr "یک &نام برای لیست تغییرات وارد نمائید:"
4422	4259

		@@ -4436,7 +4273,7 @@
4436	4273	msgid "Enter a date."
4437	4274	msgstr "لطفا یک تاریخ وارد نمائید."
4438	4275
4439		-#. Resource IDs: (IDS_LOCK_MESSAGEHINT)
	4276	+#. Resource IDs: (5000)
4440	4277	msgid "Enter a lock message (optional):"
4441	4278	msgstr "یک پیام قفل گذاری وارد نمائید (اختیاری):"
4442	4279

		@@ -4470,15 +4307,15 @@
4470	4307	msgid "Enter an integer."
4471	4308	msgstr "لطفا یک عدد وارد نمائید."
4472	4309
4473		-#. Resource IDs: (Dialog IDD_AUTOTEXTTESTDLG: Control id 65535)
	4310	+#. Resource IDs: (65535)
4474	4311	msgid "Enter file content to test for below:"
4475	4312	msgstr "محتویات فایل را برای آزمایش در قسمت پایین وارد کنید:"
4476	4313
4477		-#. Resource IDs: (Dialog IDD_INPUTDLG: Control id 1065)
	4314	+#. Resource IDs: (1065)
4478	4315	msgid "Enter log &message:"
4479	4316	msgstr "&گزارش تغییرات را وارد نمائید:"
4480	4317
4481		-#. Resource IDs: (IDS_INPUT_ENTERLOG)
	4318	+#. Resource IDs: (2000)
4482	4319	msgid "Enter log message:"
4483	4320	msgstr "گزارش تغییرات را وارد نمائید:"
4484	4321

		@@ -4487,15 +4324,15 @@
4487	4324	msgid "Enter no more than %1 characters."
4488	4325	msgstr "بیش از %1 حرف وارد نکنید."
4489	4326
4490		-#. Resource IDs: (IDS_LOGCACHE_EXPORTFILTER)
	4327	+#. Resource IDs: (1017)
4491	4328	msgid "Enter the prefix\|*"
4492	4329	msgstr ""
4493	4330
4494		-#. Resource IDs: (Dialog IDD_AUTOTEXTTESTDLG: Control id 65535)
	4331	+#. Resource IDs: (65535)
4495	4332	msgid "Enter the regex string below:"
4496	4333	msgstr "رشته regex را در قسمت پایین وارد کنید:"
4497	4334
4498		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1577)
	4335	+#. Resource IDs: (1577)
4499	4336	msgid ""
4500	4337	"Enter the regular expression patterns for filtering out the bug-ID from a "
4501	4338	"commit message."

		@@ -4513,20 +4350,20 @@
4513	4350	"Erase"
4514	4351	msgstr "پاک کردن انتخاب شده\nپاک کردن"
4515	4352
4516		-#. Resource IDs: (IDS_ERR_ERROR)
	4353	+#. Resource IDs: (1307, IDS_ERR_ERROR)
4517	4354	msgid "Error"
4518	4355	msgstr "خطا"
4519	4356
4520		-#. Resource IDs: (IDS_PROC_ICONCACHENOTREBUILT)
	4357	+#. Resource IDs: (2315)
4521	4358	msgid "Error rebuilding Shell Icon Cache!"
4522	4359	msgstr "خطا در بازسازی کَش آیکونهای شٍل"
4523	4360
4524		-#. Resource IDs: (IDS_ERR_SSL_VALIDATE)
	4361	+#. Resource IDs: (1294)
4525	4362	#, c-format
4526	4363	msgid "Error validating server certificate for %ls:"
4527	4364	msgstr "خطا در تائید اعتبار گواهینامه سرویس دهنده %ls:"
4528	4365
4529		-#. Resource IDs: (IDS_REG_ERROR)
	4366	+#. Resource IDs: (1110)
4530	4367	#, c-format
4531	4368	msgid ""
4532	4369	"Error while reading/writing the registry key %1!ls!\n"

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

		@@ -4643,15 +4480,15 @@
4643	4480	"Revision %2!ls!"
4644	4481	msgstr ""
4645	4482
4646		-#. Resource IDs: (IDS_SVNACTION_FAILEDEXTERNAL)
	4483	+#. Resource IDs: (4192)
4647	4484	msgid "External failed"
4648	4485	msgstr "فرمان خراب شده "
4649	4486
4650		-#. Resource IDs: (IDS_PROGRS_EXTERNALSEXCLUDED)
	4487	+#. Resource IDs: (3604)
4651	4488	msgid "Externals excluded"
4652	4489	msgstr "عدم در نظر گرفتن خارجیها"
4653	4490
4654		-#. Resource IDs: (IDS_PROGRS_EXTERNALSINCLUDED)
	4491	+#. Resource IDs: (3605)
4655	4492	msgid "Externals included"
4656	4493	msgstr " با در نظر گرفتن خارجیها"
4657	4494

		@@ -4659,12 +4496,11 @@
4659	4496	msgid "F"
4660	4497	msgstr ""
4661	4498
4662		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 1480, Dialog
4663		-#. IDD_MERGEWIZARD_OPTIONS: Control id 1480)
	4499	+#. Resource IDs: (1480)
4664	4500	msgid "F&orce the merge"
4665	4501	msgstr "ا&دغام اجباری"
4666	4502
4667		-#. Resource IDs: (IDS_SVNACTION_FAILEDREVERT)
	4503	+#. Resource IDs: (1175)
4668	4504	msgid "Failed revert"
4669	4505	msgstr "عدم موفقیت در برگشت"
4670	4506

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

		@@ -4704,7 +4540,7 @@
4704	4540	msgid "Failed to launch server application."
4705	4541	msgstr "عدم موفقیت در اجرای برنامه سرویس دهنده"
4706	4542
4707		-#. Resource IDs: (IDS_ERR_MONITORINILOAD)
	4543	+#. Resource IDs: (1043)
4708	4544	msgid "Failed to load the configuration file for the project monitor!"
4709	4545	msgstr ""
4710	4546

		@@ -4720,7 +4556,7 @@
4720	4556	msgid "Failed to save document."
4721	4557	msgstr "عدم موفقیت در ذخیره سازی سند."
4722	4558
4723		-#. Resource IDs: (IDS_ERR_FAILEDISSUETRACKERCOM)
	4559	+#. Resource IDs: (1327)
4724	4560	#, c-format
4725	4561	msgid ""
4726	4562	"Failed to start the issue tracker COM provider '%1!ls!'.\n"

		@@ -4727,28 +4563,28 @@
4727	4563	"%2!ls!"
4728	4564	msgstr "Failed to start the issue tracker COM provider '%1!ls!'.\n%2!ls!"
4729	4565
4730		-#. Resource IDs: (IDS_PROGRS_TITLEFAILED)
	4566	+#. Resource IDs: (3504)
4731	4567	msgid "Failed!"
4732	4568	msgstr "عدم موفقیت!"
4733	4569
4734		-#. Resource IDs: (IDS_SVNACTION_FAILEDREQUIRESTARGET)
	4570	+#. Resource IDs: (4245)
4735	4571	msgid "Failed: target required"
4736	4572	msgstr ""
4737	4573
4738		-#. Resource IDs: (IDS_EDITPROPS_FETCH_AND_ADJUST_TO_HEAD)
	4574	+#. Resource IDs: (9444)
4739	4575	msgid "Fetch HEAD revision and adjust to it"
4740	4576	msgstr ""
4741	4577
4742		-#. Resource IDs: (IDS_SETTINGS_REPOBROWSER_PREFETCH_TT)
	4578	+#. Resource IDs: (3183)
4743	4579	msgid ""
4744	4580	"Fetches the contents of folders in the background so browsing is faster"
4745	4581	msgstr "جهت تسریع در مرور محتویات پوشه ها در پس زمینه بازخوانی شود"
4746	4582
4747		-#. Resource IDs: (IDS_PROC_VENDORDROP_GETDATA2)
	4583	+#. Resource IDs: (1462)
4748	4584	msgid "Fetching file list of source"
4749	4585	msgstr ""
4750	4586
4751		-#. Resource IDs: (IDS_PROC_VENDORDROP_GETDATA1)
	4587	+#. Resource IDs: (1461)
4752	4588	msgid "Fetching file list of target"
4753	4589	msgstr ""
4754	4590

		@@ -4761,16 +4597,16 @@
4761	4597	msgid "Fetching revision %ls of file:"
4762	4598	msgstr "در حال دریافت اصلاحیه %ls از فایل:"
4763	4599
4764		-#. Resource IDs: (IDS_PROC_CLEANUP_INFOFETCHSTATUS)
	4600	+#. Resource IDs: (2363)
4765	4601	#, c-format
4766	4602	msgid "Fetching status of %1!ls!"
4767	4603	msgstr "در حال دریافت وضعیت %1!ls!"
4768	4604
4769		-#. Resource IDs: (IDS_PROGRS_FETCHING_TREE_CONFLICT_INFO)
	4605	+#. Resource IDs: (1237)
4770	4606	msgid "Fetching tree conflict information..."
4771	4607	msgstr ""
4772	4608
4773		-#. Resource IDs: (IDS_FILEDIFF_FILE, IDS_LOG_FILE)
	4609	+#. Resource IDs: (1180, 5100)
4774	4610	msgid "File"
4775	4611	msgstr "فایل"
4776	4612

		@@ -4778,21 +4614,20 @@
4778	4614	msgid "File Encoding"
4779	4615	msgstr ""
4780	4616
4781		-#. Resource IDs: (IDS_PROC_OVERWRITE_CONFIRM_TASK2,
4782		-#. IDS_WARN_ADDCASERENAMED_TASK2)
	4617	+#. Resource IDs: (1425, 1435)
4783	4618	msgid "File already exists"
4784	4619	msgstr "فایل وجود دارد"
4785	4620
4786		-#. Resource IDs: (IDS_STATGRAPH_FILECHANGESBYUNIT)
	4621	+#. Resource IDs: (3942)
4787	4622	#, c-format
4788	4623	msgid "File changes each %ls:"
4789	4624	msgstr ""
4790	4625
4791		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1138)
	4626	+#. Resource IDs: (1138)
4792	4627	msgid "File changes each week:"
4793	4628	msgstr "تغییرات هفتگی فایلها:"
4794	4629
4795		-#. Resource IDs: (IDS_PROGRS_REVERTMARKERS_TASK2)
	4630	+#. Resource IDs: (3607)
4796	4631	msgid "File contains conflict markers"
4797	4632	msgstr "فایل حاوی مارکرهای برخورد"
4798	4633

		@@ -4808,7 +4643,7 @@
4808	4643	msgid "File is empty."
4809	4644	msgstr "فایل خالیست."
4810	4645
4811		-#. Resource IDs: (IDS_STATUSLIST_EMPTYMSG)
	4646	+#. Resource IDs: (3404)
4812	4647	msgid "File list is empty"
4813	4648	msgstr "لیست فایل خالی است "
4814	4649

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

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

		@@ -4959,15 +4794,15 @@
4959	4794	msgid "Find: First occurrence from the top found. End of document reached."
4960	4795	msgstr ""
4961	4796
4962		-#. Resource IDs: (IDS_PROGRS_TITLEFIN)
	4797	+#. Resource IDs: (1224)
4963	4798	msgid "Finished!"
4964	4799	msgstr "پایان!"
4965	4800
4966		-#. Resource IDs: (ID_VIEW_ZOOMALL - Menu)
	4801	+#. Resource IDs: (32804 - Menu)
4967	4802	msgid "Fit graph"
4968	4803	msgstr "جایگیری در نمودار"
4969	4804
4970		-#. Resource IDs: (ID_VIEW_ZOOMHEIGHT - Menu)
	4805	+#. Resource IDs: (32802 - Menu)
4971	4806	msgid "Fit height"
4972	4807	msgstr "جایگیری در ارتفاع"
4973	4808

		@@ -4979,24 +4814,23 @@
4979	4814	msgid "Fit image &widths\t(W)"
4980	4815	msgstr ""
4981	4816
4982		-#. Resource IDs: (ID_VIEW_ZOOMWIDTH - Menu)
	4817	+#. Resource IDs: (32803 - Menu)
4983	4818	msgid "Fit width"
4984	4819	msgstr "جایگیری در عرض"
4985	4820
4986		-#. Resource IDs: (IDS_COPYEXTLIST_COLTAGGED)
	4821	+#. Resource IDs: (4483)
4987	4822	msgid "Fixed at rev"
4988	4823	msgstr "اصلاح شده در اصلاحیه"
4989	4824
4990		-#. Resource IDs: (ID_VIEW_FOLDTAGS - Menu)
	4825	+#. Resource IDs: (32818 - Menu)
4991	4826	msgid "Fold &tags"
4992	4827	msgstr "Fold &tags"
4993	4828
4994		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	4829	+#. Resource IDs: (65535)
4995	4830	msgid "Folded tag"
4996	4831	msgstr "برچسب مرتب شده"
4997	4832
4998		-#. Resource IDs: (Dialog IDD_SETTINGSTBLAME: Control id 65535, Dialog
4999		-#. IDD_SETTINGSUDIFF: Control id 65535)
	4833	+#. Resource IDs: (65535)
5000	4834	msgid "Font"
5001	4835	msgstr "فانت"
5002	4836

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

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

		@@ -5186,11 +5017,11 @@
5186	5017	msgid "Goto Line"
5187	5018	msgstr "برو به خط"
5188	5019
5189		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1134)
	5020	+#. Resource IDs: (1134)
5190	5021	msgid "Graph type:"
5191	5022	msgstr "نوع نمودار:"
5192	5023
5193		-#. Resource IDs: (IDS_REVGRAPH_ERR_NOGRAPHFORROOT)
	5024	+#. Resource IDs: (4365)
5194	5025	msgid "Graphs for repository roots are always empty!"
5195	5026	msgstr "نمودار برای ریشه مخزن همیشه خالی هستند!"
5196	5027

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

		@@ -5268,20 +5078,19 @@
5268	5078	msgid "Hide deleted branches and tags"
5269	5079	msgstr "حذف شاخه ها و تگهای پاک شده"
5270	5080
5271		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1562)
	5081	+#. Resource IDs: (1562)
5272	5082	msgid "Hide non-mergeable revisions"
5273	5083	msgstr "پنهان کردن اصلاحیه های غیرقابل-ادغام"
5274	5084
5275		-#. Resource IDs: (ID_VIEW_REMOVETAGS - Menu)
	5085	+#. Resource IDs: (32832 - Menu)
5276	5086	msgid "Hide ta&gs"
5277	5087	msgstr "پنهان کردن ت&گ ها"
5278	5088
5279		-#. Resource IDs: (Dialog IDD_EDITPROPLOCALHOOKS: Control id 1326, Dialog
5280		-#. IDD_SETTINGSHOOKCONFIG: Control id 1326)
	5089	+#. Resource IDs: (1326)
5281	5090	msgid "Hide the script while running"
5282	5091	msgstr "پنهان سازی اسکریپت در حین اجراء"
5283	5092
5284		-#. Resource IDs: (ID_VIEW_REMOVEUNCHANGEDBRANCHES - Menu)
	5093	+#. Resource IDs: (32830 - Menu)
5285	5094	msgid "Hide unused &branches"
5286	5095	msgstr "پنهان سازی &شاخه های راکد"
5287	5096

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

		@@ -5517,19 +5324,19 @@
5517	5324	msgid "ID:57665:V C +W"
5518	5325	msgstr "ID:57665:V C +W"
5519	5326
5520		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 106)
	5327	+#. Resource IDs: (106)
5521	5328	msgid "Icon Overlays"
5522	5329	msgstr "پوشش آیکونها"
5523	5330
5524		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 65535)
	5331	+#. Resource IDs: (65535)
5525	5332	msgid "Icon Overlays / Status Columns"
5526	5333	msgstr "پوشش آیکونها / ستونهای وضعیت"
5527	5334
5528		-#. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 184)
	5335	+#. Resource IDs: (184)
5529	5336	msgid "Icon Overlays::Icon Set"
5530	5337	msgstr "پوشش آیکونها::مجموعه آیکون"
5531	5338
5532		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAYHANDLERS: Control id 308)
	5339	+#. Resource IDs: (308)
5533	5340	msgid "Icon Overlays::Overlay Handlers"
5534	5341	msgstr "Icon Overlays::Overlay Handlers"
5535	5342

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

		@@ -5627,11 +5434,11 @@
5627	5434	"background color."
5628	5435	msgstr "If the graph contains multiple trees, separate them by slight variations in background color."
5629	5436
5630		-#. Resource IDs: (Dialog IDD_SETTINGSLOGCACHE: Control id 1439)
	5437	+#. Resource IDs: (1439)
5631	5438	msgid "If the repository can not be contacted"
5632	5439	msgstr "در صورت عدم موفقیت در دسترسی به مخزن"
5633	5440
5634		-#. Resource IDs: (IDS_PROC_UPGRADECONFIRMATION_TASK5)
	5441	+#. Resource IDs: (1585)
5635	5442	msgid ""
5636	5443	"If you use other SVN clients besides TortoiseSVN on this computer, you have "
5637	5444	"to upgrade those clients too. Otherwise those clients won't be able to "

		@@ -5638,32 +5445,30 @@
5638	5445	"access the working copy with the new format."
5639	5446	msgstr "If you use other SVN clients besides TortoiseSVN on this computer, you have to upgrade those clients too. Otherwise those clients won't be able to access the working copy with the new format."
5640	5447
5641		-#. Resource IDs: (IDS_SVNERR_UNLOCKFAILED)
	5448	+#. Resource IDs: (4004)
5642	5449	msgid ""
5643	5450	"If you want to break the lock, use the 'Check For Modifications' dialog or "
5644	5451	"the repository browser."
5645	5452	msgstr "اگر مایلید قفل را بشکنید، تز گزینه 'بررسی وجود تغییرات' یا مرورگر مخزن استفاده کنید."
5646	5453
5647		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535)
	5454	+#. Resource IDs: (65535)
5648	5455	msgid "Ignore"
5649	5456	msgstr "نادیده گرفتن"
5650	5457
5651		-#. Resource IDs: (IDS_MENUIGNOREMULTIPLEMASK)
	5458	+#. Resource IDs: (220)
5652	5459	#, c-format
5653	5460	msgid "Ignore %d items by &extension"
5654	5461	msgstr "نادیده گرفتن %d قلم با توجه به &پسوند"
5655	5462
5656		-#. Resource IDs: (Dialog IDD_DIFFOPTIONS: Control id 1126)
	5463	+#. Resource IDs: (1126)
5657	5464	msgid "Ignore &EOL changes"
5658	5465	msgstr "نادیده گرفتن تغییرات &EOL"
5659	5466
5660		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1392, Dialog IDD_DIFFOPTIONS:
5661		-#. Control id 1611)
	5467	+#. Resource IDs: (1392, 1611)
5662	5468	msgid "Ignore &all whitespaces"
5663	5469	msgstr "نادیده گرفتن &تمام حروف خالی"
5664	5470
5665		-#. Resource IDs: (Dialog IDD_MERGEALL: Control id 1267, Dialog
5666		-#. IDD_MERGEWIZARD_OPTIONS: Control id 1267)
	5471	+#. Resource IDs: (1267)
5667	5472	msgid "Ignore &ancestry"
5668	5473	msgstr "نادیده گرفتن &ریشه"
5669	5474

		@@ -5700,8 +5505,7 @@
5700	5505	msgid "Ignore comments"
5701	5506	msgstr ""
5702	5507
5703		-#. Resource IDs: (Dialog IDD_BLAME: Control id 1127, Dialog IDD_MERGEALL:
5704		-#. Control id 1126, Dialog IDD_MERGEWIZARD_OPTIONS: Control id 1126)
	5508	+#. Resource IDs: (1126, 1127)
5705	5509	msgid "Ignore line &endings"
5706	5510	msgstr "نادیده گرفتن حروف &پایان خط"
5707	5511

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

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

		@@ -5789,7 +5591,7 @@
5789	5591	"to %2!ls!"
5790	5592	msgstr "وارد کردن فایل %1!ls!\nبه %2!ls!"
5791	5593
5792		-#. Resource IDs: (IDS_INPUT_IMPORTFILE)
	5594	+#. Resource IDs: (2011)
5793	5595	#, c-format
5794	5596	msgid ""
5795	5597	"Import file to\r\n"

		@@ -5796,7 +5598,7 @@
5796	5598	"%ls"
5797	5599	msgstr "وارد کردن فایل به\r\n%ls"
5798	5600
5799		-#. Resource IDs: (IDS_INPUT_IMPORTFOLDER)
	5601	+#. Resource IDs: (2010)
5800	5602	#, c-format
5801	5603	msgid ""
5802	5604	"Import folder %1!ls!\r\n"

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

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

		@@ -5883,7 +5685,7 @@
5883	5685	msgid "Inline differences"
5884	5686	msgstr "تغییرات درخط"
5885	5687
5886		-#. Resource IDs: (Dialog IDD_INPUTDLG: Control id 161)
	5688	+#. Resource IDs: (161)
5887	5689	msgid "Input"
5888	5690	msgstr "ورودی"
5889	5691

		@@ -5893,11 +5695,11 @@
5893	5695	"Paste"
5894	5696	msgstr "واردکردن محتوای کلیپ بورد\nچسباندن"
5895	5697
5896		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1575)
	5698	+#. Resource IDs: (1575)
5897	5699	msgid "Insert message at:"
5898	5700	msgstr "وارد کردن پیام در:"
5899	5701
5900		-#. Resource IDs: (Dialog IDD_EDITPROPMERGELOGTEMPLATE: Control id 1660)
	5702	+#. Resource IDs: (1660)
5901	5703	msgid "Insert title at the bottom, after the message"
5902	5704	msgstr ""
5903	5705

		@@ -5909,7 +5711,7 @@
5909	5711	msgid "Internal application error."
5910	5712	msgstr "خطای داخلی برنامه."
5911	5713
5912		-#. Resource IDs: (IDS_SETTINGS_LOGCACHESTATS_PAIRTOKENS)
	5714	+#. Resource IDs: (5408)
5913	5715	msgid "Internal value indicating compression quality"
5914	5716	msgstr "Internal value indicating compression quality"
5915	5717

		@@ -5917,11 +5719,11 @@
5917	5719	msgid "Invalid Currency."
5918	5720	msgstr "واحد پولی نامعتبر."
5919	5721
5920		-#. Resource IDs: (IDS_INVALIDPARAMS)
	5722	+#. Resource IDs: (1340)
5921	5723	msgid "Invalid parameters"
5922	5724	msgstr ""
5923	5725
5924		-#. Resource IDs: (IDS_ERR_INVALIDREV)
	5726	+#. Resource IDs: (1304)
5925	5727	msgid ""
5926	5728	"Invalid revision number! Valid revisions are:\n"
5927	5729	"HEAD, BASE, PREV, COMMITTED, WC,\n"

		@@ -5940,7 +5742,7 @@
5940	5742	"{20020217T1530-0500}"
5941	5743	msgstr "شماره اصلاحیه نامعتبر! اصلاحیه های معتبر:\nHEAD, BASE, PREV, COMMITTED, WC,\nاعداد مثبت,\nتاریخ ها با یکی از این فرمها: \n{2002-02-17}\n{15:30}\n{15:30:00.200000}\n{\"2002-02-17 15:30\"}\n{\"2002-02-17 15:30 +0230\"}\n{2002-02-17T15:30}\n{2002-02-17T15:30Z}\n{2002-02-17T15:30-04:00}\n{20020217T1530}\n{20020217T1530Z}\n{20020217T1530-0500}"
5942	5744
5943		-#. Resource IDs: (IDS_ERR_INVALIDREVNOWC)
	5745	+#. Resource IDs: (1315)
5944	5746	msgid ""
5945	5747	"Invalid revision number! Valid revisions are:\n"
5946	5748	"HEAD\n"

		@@ -5959,7 +5761,7 @@
5959	5761	"{20020217T1530-0500}"
5960	5762	msgstr "شماره اصلاحیه نامعتبر! اصلاحیه های معتبر شامل:\nHEAD\nاعداد مثبت,\nتاریخ در یکی از فرمهای زیر:\n{2002-02-17}\n{15:30}\n{15:30:00.200000}\n{\"2002-02-17 15:30\"}\n{\"2002-02-17 15:30 +0230\"}\n{2002-02-17T15:30}\n{2002-02-17T15:30Z}\n{2002-02-17T15:30-04:00}\n{20020217T1530}\n{20020217T1530Z}\n{20020217T1530-0500}"
5961	5763
5962		-#. Resource IDs: (IDS_ERR_INVALIDREVRANGE)
	5764	+#. Resource IDs: (1322)
5963	5765	msgid ""
5964	5766	"Invalid revision range!\n"
5965	5767	"Valid revisions are numbers and HEAD, separated by commas.\n"

		@@ -5967,11 +5769,11 @@
5967	5769	"Example: 2-5,7,10,44-70,300-HEAD"
5968	5770	msgstr "Invalid revision range!\nValid revisions are numbers and HEAD, separated by commas.\nA range can be specified with a dash.\nExample: 2-5,7,10,44-70,300-HEAD"
5969	5771
5970		-#. Resource IDs: (Dialog IDD_EDITPROPBUGTRAQ: Control id 1571)
	5772	+#. Resource IDs: (1571)
5971	5773	msgid "Issue tracker"
5972	5774	msgstr "ردگیر درخواستها"
5973	5775
5974		-#. Resource IDs: (IDS_WARN_RELOCATEREALLY_TASK1)
	5776	+#. Resource IDs: (1420)
5975	5777	#, c-format
5976	5778	msgid ""
5977	5779	"It seems you are trying to relocate your working copy to a different path inside the same repository.\n"

		@@ -5981,11 +5783,11 @@
5981	5783	"Improper use of relocate will corrupt your working copy!"
5982	5784	msgstr "به نظر میرسد شما در حال جابجایی نسخه کاری خود به مسیر دیگری در مخزن هستید.\nاز: %1!ls!\nبه: %2!ls!\n\nاستفاده ناصحیح از جابجابب نسخه کاری شما را تخریب خواهد کرد!"
5983	5785
5984		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1480)
	5786	+#. Resource IDs: (1480)
5985	5787	msgid "Items in &externals"
5986	5788	msgstr "اقلام موجود در &خارجی"
5987	5789
5988		-#. Resource IDs: (Dialog IDD_CHANGEDFILES: Control id 1527)
	5790	+#. Resource IDs: (1527)
5989	5791	msgid "Items to show"
5990	5792	msgstr "اقلام جهت نمایش"
5991	5793

		@@ -5993,23 +5795,23 @@
5993	5795	msgid "J&ump to first conflict when loading"
5994	5796	msgstr "هنگام بازگزاری به اولین برخورد &پرش کن"
5995	5797
5996		-#. Resource IDs: (IDS_REVGRAPH_POPUP_JOIN_BELOW)
	5798	+#. Resource IDs: (4396)
5997	5799	msgid "Join with following &tree"
5998	5800	msgstr "الحاق با &شاخه بعدی"
5999	5801
6000		-#. Resource IDs: (IDS_REVGRAPH_POPUP_JOIN_ABOVE)
	5802	+#. Resource IDs: (4392)
6001	5803	msgid "Join with source tree"
6002	5804	msgstr "الحاق با شاخه منبع"
6003	5805
6004		-#. Resource IDs: (Dialog IDD_SVNPROGRESS: Control id 1632)
	5806	+#. Resource IDs: (1632)
6005	5807	msgid "Jump to next &conflict"
6006	5808	msgstr ""
6007	5809
6008		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1203)
	5810	+#. Resource IDs: (1203)
6009	5811	msgid "Keep &locks"
6010	5812	msgstr "نگهداری &قفل ها"
6011	5813
6012		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1126)
	5814	+#. Resource IDs: (1126)
6013	5815	msgid "Keep c&hangelists"
6014	5816	msgstr "نگهداری &لیست تغییرات"
6015	5817

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

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

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

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

		@@ -6105,7 +5907,7 @@
6105	5907	msgid "Line"
6106	5908	msgstr "خط"
6107	5909
6108		-#. Resource IDs: (IDS_STATGRAPH_LINEBUTTON_TT)
	5910	+#. Resource IDs: (3932)
6109	5911	msgid "Line Graph"
6110	5912	msgstr "نمودار خطی"
6111	5913

		@@ -6143,11 +5945,11 @@
6143	5945	"Help Topics"
6144	5946	msgstr "لیست فهرست راهنما\nفهرست راهنما"
6145	5947
6146		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_CACHELIST)
	5948	+#. Resource IDs: (5503)
6147	5949	msgid "List of repositories for which log information has been cached"
6148	5950	msgstr "لیست مخزنهای دارای گزارشات کَش شده"
6149	5951
6150		-#. Resource IDs: (Dialog IDD_EDITPROPEXTERNALSVALUE: Control id 1599)
	5952	+#. Resource IDs: (1599)
6151	5953	msgid "Lo&cal path:"
6152	5954	msgstr "مسیر &محلی:"
6153	5955

		@@ -6155,7 +5957,7 @@
6155	5957	msgid "Load Images"
6156	5958	msgstr "بارگزاری تصاویر"
6157	5959
6158		-#. Resource IDs: (Dialog IDD_SETTINGSSYNC: Control id 1663)
	5960	+#. Resource IDs: (1663)
6159	5961	msgid "Load Settings from file"
6160	5962	msgstr ""
6161	5963

		@@ -6171,15 +5973,15 @@
6171	5973	"The views are updated with the new content."
6172	5974	msgstr "بارگزاری تغییرات\nنماها با محتوای جدید بروز میگردند."
6173	5975
6174		-#. Resource IDs: (ID_NEW_LOCALHOOKS - Menu)
	5976	+#. Resource IDs: (32861 - Menu)
6175	5977	msgid "Local &Hooks"
6176	5978	msgstr "هوک های &محلی"
6177	5979
6178		-#. Resource IDs: (Dialog IDD_EDITPROPLOCALHOOKS: Control id 334)
	5980	+#. Resource IDs: (334)
6179	5981	msgid "Local hook scripts"
6180	5982	msgstr ""
6181	5983
6182		-#. Resource IDs: (IDS_CHECKOUT_TT_DIR)
	5984	+#. Resource IDs: (1500)
6183	5985	msgid ""
6184	5986	"Location where the contents of the\n"
6185	5987	"repository URL(s) will be saved to."

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

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

		@@ -6364,11 +6164,11 @@
6364	6164	msgid "Mark current revision of your working copy"
6365	6165	msgstr "علامتگذاری اصلاحیه جاری نسخه کاری"
6366	6166
6367		-#. Resource IDs: (IDS_REPOBROWSE_PREPAREDIFF)
	6167	+#. Resource IDs: (1615)
6368	6168	msgid "Mark for comparison"
6369	6169	msgstr "جهت مقایسه علامتگذاری شود"
6370	6170
6371		-#. Resource IDs: (IDS_PROC_VENDORDROP_REMOVE)
	6171	+#. Resource IDs: (1463)
6372	6172	msgid "Mark missing files as removed"
6373	6173	msgstr ""
6374	6174

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

		@@ -6390,13 +6190,13 @@
6390	6190	"Mark as resolved"
6391	6191	msgstr "علامتگذاری فایل بعنوان حل شده در سابورژن\nMark as resolved"
6392	6192
6393		-#. Resource IDs: (IDS_EDITPROPCONFLICT_TT_RESOLVED)
	6193	+#. Resource IDs: (1037)
6394	6194	msgid ""
6395	6195	"Marks the conflict as resolved.\r\n"
6396	6196	"Note: this does not resolve the conflict, only marks it as resolved!"
6397	6197	msgstr ""
6398	6198
6399		-#. Resource IDs: (IDS_MERGEWIZARD_OPTIONS_RECORDONLY_TT)
	6199	+#. Resource IDs: (9520)
6400	6200	msgid ""
6401	6201	"Marks the revisions as merged, without actually doing the merge.\r\n"
6402	6202	"This blocks the revisions from getting merged in the future."

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

		@@ -6516,16 +6310,16 @@
6516	6310	msgid "Merging"
6517	6311	msgstr "در حال ادغام"
6518	6312
6519		-#. Resource IDs: (IDS_PROGRS_CMD_MERGEALL)
	6313	+#. Resource IDs: (3656)
6520	6314	#, c-format
6521	6315	msgid "Merging %1!ls! into %2!ls!, %3!ls!%4!ls!"
6522	6316	msgstr "در حال ادغام %1!ls! به %2!ls!, %3!ls!%4!ls!"
6523	6317
6524		-#. Resource IDs: (IDS_SVNACTION_MERGEBEGINNONE)
	6318	+#. Resource IDs: (4216)
6525	6319	msgid "Merging differences between repository URLs"
6526	6320	msgstr "ادغام تغییرات بین URLهای مخزن"
6527	6321
6528		-#. Resource IDs: (IDS_PROGRS_CMD_MERGEURL)
	6322	+#. Resource IDs: (3654)
6529	6323	#, c-format
6530	6324	msgid ""
6531	6325	"Merging from %1!ls!, revision %2!ls! to %3!ls!, revision %4!ls! into %5!ls!,"

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

		@@ -6585,18 +6377,16 @@
6585	6377	msgid "Mine"
6586	6378	msgstr "مال من"
6587	6379
6588		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNSIZES: Control id 65535)
	6380	+#. Resource IDs: (65535)
6589	6381	msgid "Minimum number of chars for a commit message:"
6590	6382	msgstr "حداقل تعداد حروف برای پیغام اعمال:"
6591	6383
6592		-#. Resource IDs: (Dialog IDD_EDITPROPTSVNSIZES: Control id 65535)
	6384	+#. Resource IDs: (65535)
6593	6385	msgid "Minimum number of chars for a lock message:"
6594	6386	msgstr "حداقل تعداد حروف برای پیغام قفل:"
6595	6387
6596		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535, Dialog
6597		-#. IDD_SETCOLORPAGE: Control id 65535, Dialog IDD_SETMAINPAGE: Control id
6598		-#. 1023, Dialog IDD_SETTINGSDIALOGS: Control id 65535, Dialog
6599		-#. IDD_SETTINGSREVGRAPH: Control id 65535, Dialog IDD_UPDATE: Control id 1610)
	6388	+#. Resource IDs: (1610, 65535, Dialog IDD_SETCOLORPAGE: Control id 65535,
	6389	+#. Dialog IDD_SETMAINPAGE: Control id 1023)
6600	6390	msgid "Misc"
6601	6391	msgstr "غیره"
6602	6392

		@@ -6604,21 +6394,19 @@
6604	6394	msgid "Mixed"
6605	6395	msgstr "مخلوط"
6606	6396
6607		-#. Resource IDs: (IDS_STATUSLIST_COLMODIFICATIONDATE)
	6397	+#. Resource IDs: (3316)
6608	6398	msgid "Modification date"
6609	6399	msgstr "تاریخ تغییر"
6610	6400
6611		-#. Resource IDs: (Dialog IDD_COMMITDLG: Control id 1511, Dialog
6612		-#. IDD_SETCOLORPAGE: Control id 65535, IDS_SVNACTION_MODIFIED,
6613		-#. IDS_SVN_SUMMARIZEMODIFIED)
	6401	+#. Resource IDs: (1172, 1511, 4222, Dialog IDD_SETCOLORPAGE: Control id 65535)
6614	6402	msgid "Modified"
6615	6403	msgstr "تغییر داده شده"
6616	6404
6617		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	6405	+#. Resource IDs: (65535)
6618	6406	msgid "Modified node"
6619	6407	msgstr "گره اصلاح شده"
6620	6408
6621		-#. Resource IDs: (Dialog IDD_MONITORPROJECT: Control id 65535)
	6409	+#. Resource IDs: (65535)
6622	6410	msgid "Monitor interval in minutes:"
6623	6411	msgstr ""
6624	6412

		@@ -6626,19 +6414,19 @@
6626	6414	msgid "More colors..."
6627	6415	msgstr "رنگهای بیشتر..."
6628	6416
6629		-#. Resource IDs: (IDS_REPOBROWSE_MULTIIMPORT_TASK2)
	6417	+#. Resource IDs: (1672)
6630	6418	msgid "More than one item dropped."
6631	6419	msgstr "بیش از یک قلم افتاده است."
6632	6420
6633		-#. Resource IDs: (IDS_COLOURPICKER_CUSTOMTEXT)
	6421	+#. Resource IDs: (7000)
6634	6422	msgid "More..."
6635	6423	msgstr "بیشتر..."
6636	6424
6637		-#. Resource IDs: (Dialog IDD_STATGRAPH: Control id 1136)
	6425	+#. Resource IDs: (1136)
6638	6426	msgid "Most active author:"
6639	6427	msgstr "فعالترین مولف:"
6640	6428
6641		-#. Resource IDs: (IDS_INPUT_MOVEMORE)
	6429	+#. Resource IDs: (2021)
6642	6430	#, c-format
6643	6431	msgid ""
6644	6432	"Move %1!ld! items to\r\n"

		@@ -6645,7 +6433,7 @@
6645	6433	"%2!ls!"
6646	6434	msgstr "انتقال %1!ld! قلم به\n%2!ls!"
6647	6435
6648		-#. Resource IDs: (IDS_INPUT_MOVE)
	6436	+#. Resource IDs: (2019)
6649	6437	#, c-format
6650	6438	msgid ""
6651	6439	"Move %1!ls!\r\n"

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

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

		@@ -6730,20 +6518,20 @@
6730	6518	"%ls"
6731	6519	msgstr ""
6732	6520
6733		-#. Resource IDs: (IDS_SETTINGS_USERECYCLEBIN_TT)
	6521	+#. Resource IDs: (3144)
6734	6522	msgid "Moves the modified files to the recycle bin first before reverting"
6735	6523	msgstr " انتقال فایل های ویرایش شده به سطل بازیافت قبل از بازگرداندن "
6736	6524
6737		-#. Resource IDs: (IDS_PROC_MOVINGPROG)
	6525	+#. Resource IDs: (1275)
6738	6526	#, c-format
6739	6527	msgid "Moving %1!ls!"
6740	6528	msgstr "جابجایی%1!ls!"
6741	6529
6742		-#. Resource IDs: (IDS_PROC_MOVING)
	6530	+#. Resource IDs: (1269)
6743	6531	msgid "Moving..."
6744	6532	msgstr "در حال انتقال..."
6745	6533
6746		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1204)
	6534	+#. Resource IDs: (1204)
6747	6535	msgid "Multiple, &independent working copies"
6748	6536	msgstr "چند نسخه کاری &مستقل"
6749	6537

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

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

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

		@@ -6842,13 +6629,13 @@
6842	6629	msgid "Next inline difference"
6843	6630	msgstr "تفائت درون برنامه ای بعدی"
6844	6631
6845		-#. Resource IDs: (IDS_ERR_NOCOMMAND)
	6632	+#. Resource IDs: (1283)
6846	6633	msgid ""
6847	6634	"No command specified!\n"
6848	6635	"TortoiseProc.exe is used by the Shell extension and should not be called directly!"
6849	6636	msgstr "هیچ دستوری قید نشده است!\nTortoiseProc.exe توسط توسعه شل استفاده میشود و بطور مستقیم نباید فراخوانی شود!"
6850	6637
6851		-#. Resource IDs: (IDS_ERR_EMPTYDIFF)
	6638	+#. Resource IDs: (1305)
6852	6639	msgid "No differences found!"
6853	6640	msgstr "هیچ تفاوتی یافت نشد!"
6854	6641

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

		@@ -6877,7 +6664,7 @@
6877	6664	"To see remote changes, click on 'Check Repository'"
6878	6665	msgstr "فایلی برای نمایش با تنظیمات فعلی وجود ندارد.\nیک یا چند گزینه را از پائین جهت مشاهده فایل های فاقد نسخه، نادیده گرفته شده و/یا تغییر نیافته انتخاب کنید.\nبرای مشاهده تغییرات دیگران، روی 'بررسی مخزن' کلیک کنید"
6879	6666
6880		-#. Resource IDs: (IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED)
	6667	+#. Resource IDs: (2704)
6881	6668	msgid ""
6882	6669	"No files were changed or added since the last commit.\n"
6883	6670	"There's nothing for TortoiseSVN to do here...\n"

		@@ -6885,7 +6672,7 @@
6885	6672	"with the checkbox at the bottom."
6886	6673	msgstr "No files were changed or added since the last commit.\nThere's nothing for TortoiseSVN to do here...\nYou can show the unversioned items by enabling them\nwith the checkbox at the bottom."
6887	6674
6888		-#. Resource IDs: (IDS_COMMITDLG_NOTHINGTOCOMMIT)
	6675	+#. Resource IDs: (1220)
6889	6676	msgid ""
6890	6677	"No files were changed or added since\n"
6891	6678	"the last commit. There's nothing\n"

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

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

		@@ -6965,7 +6750,7 @@
6965	6750	"collapsing nodes or reducing the zoom factor."
6966	6751	msgstr "حافظه کافی وجود ندارد!\nسعی کنید اندازه گراف اصلاحیه ها را از طریق\nبستن گره ها یا کاهش ضریب بزرگنمائی کاهش دهید."
6967	6752
6968		-#. Resource IDs: (IDS_SVNACTION_PATHNOTEXIST)
	6753	+#. Resource IDs: (4234)
6969	6754	msgid "Not under version control"
6970	6755	msgstr "تحت کنترل نسخه نمی باشد"
6971	6756

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

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

		@@ -7120,11 +6893,11 @@
7120	6893	msgid "One or more auto-saved documents were found."
7121	6894	msgstr "یک یا بیشتر سند ذخیره شده خودکار یافت شد."
7122	6895
7123		-#. Resource IDs: (IDS_PROGRS_CONFLICTSOCCURED)
	6896	+#. Resource IDs: (3501)
7124	6897	msgid "One or more files are in a conflicted state."
7125	6898	msgstr "یک یا چند فایل در حالی متضاد قرار دارند."
7126	6899
7127		-#. Resource IDs: (IDS_ERR_SHELVE_FAILED_PATHS)
	6900	+#. Resource IDs: (1056)
7128	6901	#, c-format
7129	6902	msgid ""
7130	6903	"One or more paths could not be shelved.\n"

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

		@@ -7170,15 +6943,15 @@
7170	6943	msgid "Open"
7171	6944	msgstr "بازکردن"
7172	6945
7173		-#. Resource IDs: (IDS_LOG_POPUP_OPENLOCAL)
	6946	+#. Resource IDs: (1826)
7174	6947	msgid "Open &local"
7175	6948	msgstr ""
7176	6949
7177		-#. Resource IDs: (IDS_LOG_POPUP_OPENWITHLOCAL)
	6950	+#. Resource IDs: (1827)
7178	6951	msgid "Open &with local..."
7179	6952	msgstr ""
7180	6953
7181		-#. Resource IDs: (IDS_SSL_CLIENTCERTIFICATEFILENAME)
	6954	+#. Resource IDs: (1202)
7182	6955	msgid "Open client certificate file"
7183	6956	msgstr "باز کردن فایل مجوز کلاینت"
7184	6957

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

		@@ -7222,19 +6995,19 @@
7222	6995	"Help Topics"
7223	6996	msgstr "بازکردن راهنما\nفهرست راهنما"
7224	6997
7225		-#. Resource IDs: (IDS_MENUDESCREPOBROWSE)
	6998	+#. Resource IDs: (202)
7226	6999	msgid "Opens the repository browser to tweak the repository online"
7227	7000	msgstr "مرورگر مخزن را برای دستکاری مخزن بصورت برخط باز میکند"
7228	7001
7229		-#. Resource IDs: (IDS_SETTINGS_CONNECTIVITY_OFFLINENOW)
	7002	+#. Resource IDs: (3173)
7230	7003	msgid "Operate from log cache for now only"
7231	7004	msgstr "استفاده از کَش گزارشات فقط برای این دفعه"
7232	7005
7233		-#. Resource IDs: (IDS_EXTERNALS_OPERATIVE)
	7006	+#. Resource IDs: (3481)
7234	7007	msgid "Operative"
7235	7008	msgstr "عملیات"
7236	7009
7237		-#. Resource IDs: (IDS_SETTINGS_CONF_NAMECOL)
	7010	+#. Resource IDs: (5560)
7238	7011	msgid "Option"
7239	7012	msgstr "انتخاب"
7240	7013

		@@ -7242,7 +7015,7 @@
7242	7015	msgid "Ori&ginal size\t(S)"
7243	7016	msgstr ""
7244	7017
7245		-#. Resource IDs: (IDS_STATGRAPH_OTHERGROUP)
	7018	+#. Resource IDs: (3907)
7246	7019	msgid "Others"
7247	7020	msgstr "دیگران"
7248	7021

		@@ -7254,17 +7027,17 @@
7254	7027	msgid "Output.prn"
7255	7028	msgstr "Output.prn"
7256	7029
7257		-#. Resource IDs: (Dialog IDD_SETTINGSREVGRAPHCOLORS: Control id 65535)
	7030	+#. Resource IDs: (65535)
7258	7031	msgid "Overlays"
7259	7032	msgstr "پوشش آیکونها"
7260	7033
7261		-#. Resource IDs: (IDS_EXPORT_TT_EOL)
	7034	+#. Resource IDs: (1505)
7262	7035	msgid ""
7263	7036	"Override the svn:eol-style property setting.\n"
7264	7037	"Files which don't have this property set are not affected."
7265	7038	msgstr "لغو تنظیمات خاصیت svn:eol-style.\nفایلهایی که این خاصیت بر روی آنها اعمال نشده باشد تحت تاثیر قرار نخواهند گرفت."
7266	7039
7267		-#. Resource IDs: (IDS_WARN_SYNCPWWRONG_TASK3)
	7040	+#. Resource IDs: (9924)
7268	7041	msgid ""
7269	7042	"Overwrite\n"
7270	7043	"The settings are overwritten"

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

		@@ -7332,11 +7103,11 @@
7332	7103	msgid "Paste"
7333	7104	msgstr "چسباندن"
7334	7105
7335		-#. Resource IDs: (IDS_COMMITDLG_POPUP_PASTEFILELIST)
	7106	+#. Resource IDs: (2750)
7336	7107	msgid "Paste filename list"
7337	7108	msgstr "چسباندن لیست فایلها"
7338	7109
7339		-#. Resource IDs: (IDS_MENUDESCCLIPPASTE)
	7110	+#. Resource IDs: (226)
7340	7111	msgid ""
7341	7112	"Pastes the svn path from the clipboard, resulting in a move (cut) or copy "
7342	7113	"operation"

		@@ -7358,7 +7129,7 @@
7358	7129	msgid "Patch selected files"
7359	7130	msgstr "وصله فایلهای انتخاب شده"
7360	7131
7361		-#. Resource IDs: (IDS_PATCHFILEFILTER)
	7132	+#. Resource IDs: (2503, IDS_PATCHFILEFILTER)
7362	7133	msgid "Patchfiles (.diff, .patch)\|.diff;.patch\|All (.)\|.\|\|"
7363	7134	msgstr "فایلهای وصله (.diff, .patch)\|.diff;.patch\|همه (.)\|.\|\|"
7364	7135

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

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

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

		@@ -7446,29 +7215,27 @@
7446	7215	"Use the Switch command to do that."
7447	7216	msgstr "لطفا توجه کنید:\nنسخه کاری شما همچنان در مسیر قبلی قرار دارد. برای اینکه تغییرات شما از این به بعد در کپی یا شاخه \nجدیدی که ایجاد کرده اید اعمال شوند بایستی نسخه کاری خود را به آدرس جدید سوئیچ نمائید. \nاز دستور سوئیچ برای انجام این کار استفاده کنید."
7448	7217
7449		-#. Resource IDs: (IDS_ERR_NOHOOKTYPESPECIFIED)
	7218	+#. Resource IDs: (1317)
7450	7219	msgid "Please select a hook type"
7451	7220	msgstr "لطفا نوع قلاب را انتخاب کنید"
7452	7221
7453		-#. Resource IDs: (IDS_PROPWAITCANCEL)
	7222	+#. Resource IDs: (199)
7454	7223	msgid "Please wait while cancelling..."
7455	7224	msgstr "لطفا منتظر باشید - در حال ابطال عملیات..."
7456	7225
7457		-#. Resource IDs: (IDS_FILEDIFF_WAIT)
	7226	+#. Resource IDs: (5102)
7458	7227	msgid "Please wait while differences are obtained..."
7459	7228	msgstr "لطفا منتظر باشید تا تغییرات دریافت شوند..."
7460	7229
7461		-#. Resource IDs: (IDS_COPY_WAITFOREXTERNALS)
	7230	+#. Resource IDs: (4480)
7462	7231	msgid "Please wait while the externals are gathered..."
7463	7232	msgstr "مادامیکه اکسترنالها دریافت میگردند صبر کنید..."
7464	7233
7465		-#. Resource IDs: (IDS_REPOBROWSE_INITWAIT)
	7234	+#. Resource IDs: (1660)
7466	7235	msgid "Please wait while the repository browser is initializing..."
7467	7236	msgstr "لطفا منتظر باشید تا مرورگر مخزن راه اندازی گردد..."
7468	7237
7469		-#. Resource IDs: (Dialog IDD_PLEASEWAIT: Control id 347,
7470		-#. IDS_BLAME_PROGRESSINFO, IDS_PROC_CLEANUP_INFO2, IDS_PROGRESSWAIT,
7471		-#. IDS_REPOBROWSE_WAIT, IDS_STATUSLIST_BUSYMSG)
	7238	+#. Resource IDs: (1661, 1902, 2101, 2333, 3403, 347)
7472	7239	msgid "Please wait..."
7473	7240	msgstr "لطفا منتظر باشید..."
7474	7241

		@@ -7476,19 +7243,19 @@
7476	7243	msgid "Port :"
7477	7244	msgstr "درگاه :"
7478	7245
7479		-#. Resource IDs: (IDS_SETTINGS_REVGRAPH_OPACITY)
	7246	+#. Resource IDs: (5550)
7480	7247	msgid "Possible values: 0 (fully transparent) .. 255 (opaque)"
7481	7248	msgstr "مقادیر ممکن: 0 (کامل شفاف) .. 255 (کاملا کدر)"
7482	7249
7483		-#. Resource IDs: (IDS_HOOKTYPE_POSTCOMMIT)
	7250	+#. Resource IDs: (9102)
7484	7251	msgid "Post-Commit Hook"
7485	7252	msgstr "Hook قبلاعمال"
7486	7253
7487		-#. Resource IDs: (IDS_HOOKTYPE_POSTLOCK)
	7254	+#. Resource IDs: (9110)
7488	7255	msgid "Post-Lock Hook"
7489	7256	msgstr ""
7490	7257
7491		-#. Resource IDs: (IDS_HOOKTYPE_POSTUPDATE)
	7258	+#. Resource IDs: (9105)
7492	7259	msgid "Post-Update Hook"
7493	7260	msgstr "Hook قبلاعمال"
7494	7261

		@@ -7496,19 +7263,19 @@
7496	7263	msgid "Pre&v Page"
7497	7264	msgstr "صفحه &قبلی"
7498	7265
7499		-#. Resource IDs: (IDS_HOOKTYPE_PRECOMMIT)
	7266	+#. Resource IDs: (9101)
7500	7267	msgid "Pre-Commit Hook"
7501	7268	msgstr "Hook قبلاعمال"
7502	7269
7503		-#. Resource IDs: (IDS_HOOKTYPE_PRECONNECT)
	7270	+#. Resource IDs: (9106)
7504	7271	msgid "Pre-Connect Hook"
7505	7272	msgstr "Pre-Connect Hook"
7506	7273
7507		-#. Resource IDs: (IDS_HOOKTYPE_PRELOCK)
	7274	+#. Resource IDs: (9109)
7508	7275	msgid "Pre-Lock Hook"
7509	7276	msgstr ""
7510	7277
7511		-#. Resource IDs: (IDS_HOOKTYPE_PREUPDATE)
	7278	+#. Resource IDs: (9104)
7512	7279	msgid "Pre-Update Hook"
7513	7280	msgstr "Hook قبلبروزرسانی"
7514	7281

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

		@@ -7723,19 +7489,19 @@
7723	7489	msgid "R"
7724	7490	msgstr ""
7725	7491
7726		-#. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1073)
	7492	+#. Resource IDs: (1073)
7727	7493	msgid "R&AM drives"
7728	7494	msgstr "درایوهای &رَم"
7729	7495
7730		-#. Resource IDs: (Dialog IDD_MERGEWIZARD_REVRANGE: Control id 1423)
	7496	+#. Resource IDs: (1423)
7731	7497	msgid "R&everse merge"
7732	7498	msgstr "&ادغام معکوس"
7733	7499
7734		-#. Resource IDs: (IDS_LOG_POPUP_REVERTTOREV)
	7500	+#. Resource IDs: (1810)
7735	7501	msgid "R&evert to this revision"
7736	7502	msgstr "&بازگشت به اصلاحیه"
7737	7503
7738		-#. Resource IDs: (Dialog IDD_LOGCACHESTATISTICS: Control id 65535)
	7504	+#. Resource IDs: (65535)
7739	7505	msgid "RAM [kB]: "
7740	7506	msgstr "رَم [kB]"
7741	7507

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

		@@ -7809,25 +7575,25 @@
7809	7575	"Open the auto-saved versions instead of the explicitly saved versions"
7810	7576	msgstr "Recover the auto-saved documents\nOpen the auto-saved versions instead of the explicitly saved versions"
7811	7577
7812		-#. Resource IDs: (IDS_EDITPROPS_RECURSIVEREMOVE_TASK3)
	7578	+#. Resource IDs: (9410)
7813	7579	msgid ""
7814	7580	"Recur&sive\n"
7815	7581	"Remove the property also from items in Subfolders."
7816	7582	msgstr ""
7817	7583
7818		-#. Resource IDs: (Dialog IDD_SETTINGSMISC: Control id 1260)
	7584	+#. Resource IDs: (1260)
7819	7585	msgid "Recurse into unversioned folders"
7820	7586	msgstr "پیمایش پوشه های بدون نسخه بصورت بازگشتی"
7821	7587
7822		-#. Resource IDs: (IDS_EDITPROPS_RECURSIVEREMOVE_TASK2)
	7588	+#. Resource IDs: (9409)
7823	7589	msgid "Recursive operation"
7824	7590	msgstr "عملیات برگشتی"
7825	7591
7826		-#. Resource IDs: (Dialog IDD_RECYCLEBIN: Control id 333)
	7592	+#. Resource IDs: (333)
7827	7593	msgid "Recycle bin"
7828	7594	msgstr "سطل زباله"
7829	7595
7830		-#. Resource IDs: (IDS_SVNACTION_URLREDIRECT)
	7596	+#. Resource IDs: (4231)
7831	7597	msgid "Redirecting to url"
7832	7598	msgstr "تغییر مسیر به آدرس"
7833	7599

		@@ -7841,7 +7607,7 @@
7841	7607	"Redo"
7842	7608	msgstr "انجام مجدد عمل بازگشت شده قبلی\nانجام مجدد"
7843	7609
7844		-#. Resource IDs: (ID_VIEW_REDUCECROSSLINES - Menu)
	7610	+#. Resource IDs: (32819 - Menu)
7845	7611	msgid "Reduce cross-&lines"
7846	7612	msgstr "کاهش cross-&lines"
7847	7613

		@@ -7849,16 +7615,15 @@
7849	7615	msgid "Reduce the window to an icon"
7850	7616	msgstr "کاهش پنجره یه آیکون"
7851	7617
7852		-#. Resource IDs: (Dialog IDD_LOGMESSAGE: Control id 1382,
7853		-#. IDS_REPOBROWSE_REFRESH)
	7618	+#. Resource IDs: (1382, 1609)
7854	7619	msgid "Refresh"
7855	7620	msgstr "بازیابی مجدد"
7856	7621
7857		-#. Resource IDs: (Dialog IDD_CLEANUP: Control id 1615)
	7622	+#. Resource IDs: (1615)
7858	7623	msgid "Refresh &shell overlays"
7859	7624	msgstr "بازیابی مجدد پوشش های &پوسته"
7860	7625
7861		-#. Resource IDs: (IDS_PROC_CLEANUP_INFOREFRESHSHELL)
	7626	+#. Resource IDs: (2366)
7862	7627	#, c-format
7863	7628	msgid "Refreshing shell for %1!ls!"
7864	7629	msgstr "بازیابی مجدد پوسته برای %1!ls!"

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

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

		@@ -7915,7 +7680,7 @@
7915	7680	"\\s : whitespaces"
7916	7681	msgstr "Regular expressions filter:\r\n. : any character\r\nc+ : match character c one or more times\r\nc* : match character c zero or more times\r\n^ : start of line\r\n$ : end of line\r\n(string){n} : match string n times\r\n(abcd) : subexpression\r\n[aei0-9] : match a,e,i and 0..9\r\n[^aei0-9] : anything but a,e,i and 0..9\r\n\r\n\\w : matches a-z,A-Z,0-9 and _\r\n\\W : any non-alphanumeric character\r\n\\d : digits 0-9\r\n\\s : whitespaces"
7917	7682
7918		-#. Resource IDs: (IDS_PROGRS_CMD_MERGEREINTEGRATE)
	7683	+#. Resource IDs: (3666)
7919	7684	#, c-format
7920	7685	msgid "Reintegrate merge %1!ls! into %2!ls!"
7921	7686	msgstr "Reintegrate merge %1!ls! into %2!ls!"

		@@ -7925,20 +7690,20 @@
7925	7690	msgid "Rejected patch hunks for '%ls'"
7926	7691	msgstr "Rejected patch hunks for '%ls'"
7927	7692
7928		-#. Resource IDs: (IDS_MENU_UNLOCK)
	7693	+#. Resource IDs: (241)
7929	7694	msgid "Release loc&k..."
7930	7695	msgstr "برداشتن قفل&"
7931	7696
7932		-#. Resource IDs: (IDS_MENUDESC_UNLOCKFORCE)
	7697	+#. Resource IDs: (245)
7933	7698	msgid ""
7934	7699	"Releases locks even if you're not the owner of the locks (breaks them)."
7935	7700	msgstr "آزادسازی قفلها حتی اگر شما صاحب آن نباشید (آنها را میشکند)."
7936	7701
7937		-#. Resource IDs: (IDS_MENUDESC_UNLOCK)
	7702	+#. Resource IDs: (243)
7938	7703	msgid "Releases locks on files so other users can edit them again."
7939	7704	msgstr "آزادسازی قفل روی فایلها تا سایر کاربران امکان ویرایش مجدد داشته باشند."
7940	7705
7941		-#. Resource IDs: (IDS_MENURELOCATE)
	7706	+#. Resource IDs: (188)
7942	7707	msgid "Relo&cate..."
7943	7708	msgstr "&تغییر مکان..."
7944	7709

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

		@@ -8026,11 +7790,11 @@
8026	7790	"%2!ls!"
8027	7791	msgstr ""
8028	7792
8029		-#. Resource IDs: (IDS_SETTINGS_LOGCACHE_DELETE)
	7793	+#. Resource IDs: (5507)
8030	7794	msgid "Remove the selected cache(s) from disk"
8031	7795	msgstr "حذف کَشهای انتخاب شده از دیسک"
8032	7796
8033		-#. Resource IDs: (Dialog IDD_REVGRAPHFILTER: Control id 1352)
	7797	+#. Resource IDs: (1352)
8034	7798	msgid "Remove the whole subtree(s)"
8035	7799	msgstr "حذف تمامی زیر شاخه (ها)"
8036	7800

		@@ -8038,11 +7802,11 @@
8038	7802	msgid "Removed"
8039	7803	msgstr "حذف شده"
8040	7804
8041		-#. Resource IDs: (IDS_SVNACTION_CHANGELISTCLEAR)
	7805	+#. Resource IDs: (4211)
8042	7806	msgid "Removed from changelist"
8043	7807	msgstr "از لیست تغییرات حذف شد"
8044	7808
8045		-#. Resource IDs: (IDS_PROC_UNIGNORERECURSIVESUCCESS)
	7809	+#. Resource IDs: (2320)
8046	7810	#, c-format
8047	7811	msgid ""
8048	7812	"Removed the file pattern(s)\n"

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

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

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

		@@ -8155,74 +7919,71 @@
8155	7919	msgid "Replaced %d matches"
8156	7920	msgstr ""
8157	7921
8158		-#. Resource IDs: (IDS_SVNACTION_REPLACED)
	7922	+#. Resource IDs: (1173)
8159	7923	msgid "Replacing"
8160	7924	msgstr "درحال جایگزینی"
8161	7925
8162		-#. Resource IDs: (Dialog IDD_CHECKOUT: Control id 1374, Dialog IDD_COPY:
8163		-#. Control id 1383, Dialog IDD_EXPORT: Control id 1383, Dialog IDD_IMPORT:
8164		-#. Control id 1055)
	7926	+#. Resource IDs: (1055, 1374, 1383)
8165	7927	msgid "Repository"
8166	7928	msgstr "مخزن"
8167	7929
8168		-#. Resource IDs: (Dialog IDD_REPOSITORY_BROWSER: Control id 153)
	7930	+#. Resource IDs: (153)
8169	7931	msgid "Repository Browser"
8170	7932	msgstr "مرورگر مخزن "
8171	7933
8172		-#. Resource IDs: (IDS_SETTINGS_REPOSITORY_URL)
	7934	+#. Resource IDs: (3170)
8173	7935	msgid "Repository URL"
8174	7936	msgstr "آدرس مخزن"
8175	7937
8176		-#. Resource IDs: (Dialog IDD_PROPPAGE: Control id 65535)
	7938	+#. Resource IDs: (65535)
8177	7939	msgid "Repository UUID:"
8178	7940	msgstr "UUID مخزن:"
8179	7941
8180		-#. Resource IDs: (Dialog IDD_SETTINGSDIALOGS3: Control id 65535)
	7942	+#. Resource IDs: (65535