--- a/i18n/eric5_tr.ts Mon May 28 15:59:36 2012 +0200 +++ b/i18n/eric5_tr.ts Tue May 29 20:59:40 2012 +0200 @@ -16963,87 +16963,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -17058,192 +17058,192 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -19827,7 +19827,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Resolve conflict</source> - <translation>Çelişkiyi çözümle</translation> + <translation type="obsolete">Çelişkiyi çözümle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> @@ -19859,6 +19859,11 @@ <source>Do you really want to remove these files from the repository?</source> <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -20005,60 +20010,50 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> - <translation>Kaynak havuzuna ekle</translation> + <translation type="obsolete">Kaynak havuzuna ekle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Add to repository...</source> - <translation>K&aynak havuzuna ekle...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> - <source>Add the local project to the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> - <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <translation type="obsolete">K&aynak havuzuna ekle...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldı&r (ve diskten)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show log</source> <translation>Kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show &log</source> <translation>Kayıtı &göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Show the log of the local project</source> <translation>Yerel projenin günlük kaydını göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"></translation> </message> @@ -20068,652 +20063,642 @@ <translation type="obsolete">Sınırlı kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show difference</source> + <translation>Farkları göster</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show &difference</source> + <translation>Farkları gös&ter</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation>Farkları göster</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show &difference</source> - <translation>Farkları gös&ter</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source>Show difference (extended)</source> <translation>Farkları göster (gelişmiş)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &status</source> <translation>Durumu gö&ster</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show heads</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> - <source>Show the status of the local project</source> + <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> - <source>Show heads</source> + <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> - <source>Show the heads of the repository</source> + <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source>Show parents</source> + <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> - <source>Show the parents of the repository</source> + <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> - <source>Show tip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> - <source>Show the tip of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Re&vert changes</source> <translation>Değişiklikleri ba&şa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Merge</source> <translation>Birleştir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Mer&ge changes...</source> <translation>De&ğişiklikleri birleştir...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> - <translation>Çelişkileri çözümle</translation> + <translation type="obsolete">Çelişkileri çözümle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> - <translation>Çelişkileri çö&zümle</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> - <source>Resolve all conflicts of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> - <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <translation type="obsolete">Çelişkileri çö&zümle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Tag in repository</source> <translation>Kaynak havuzu etiketi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>&Tag in repository...</source> <translation>Kaynak havuzu e&tiketi...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags</source> + <translation>Etiketleri listele</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags...</source> + <translation>Etiketleri listele...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> - <source>Tag the local project in the repository</source> + <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags</source> - <translation>Etiketleri listele</translation> + <source>List branches</source> + <translation>Branşlar listesi</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags...</source> - <translation>Etiketleri listele...</translation> + <source>List branches...</source> + <translation>Branşlar listesi...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> - <source>List tags of the project</source> - <translation type="unfinished"></translation> + <source>List branches of the project</source> + <translation>Prosenin branşlar listesi</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches</source> - <translation>Branşlar listesi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches...</source> - <translation>Branşlar listesi...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>List branches of the project</source> - <translation>Prosenin branşlar listesi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <source>Close branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> + <source>Close the current branch of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> - <source>Close branch</source> + <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> - <source>Close the current branch of the local project</source> + <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source>Show current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> - <source>Show the current branch of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Switch</source> <translation>Değiştirmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>S&witch...</source> <translation>Deği&ştirmek...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanup</source> + <translation>Temizle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanu&p</source> + <translation>Temi&zle</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> - <source>Switch the working directory to another revision</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation>Yerel projeyi temizle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanup</source> - <translation>Temizle</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanu&p</source> - <translation>Temi&zle</translation> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> - <source>Cleanup the local project</source> - <translation>Yerel projeyi temizle</translation> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Execute command</source> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>E&xecute command...</source> - <translation type="unfinished"></translation> + <source>Command options</source> + <translation>Komut seçenekleri</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <source>Command &options...</source> + <translation>K&omut seçenekleri...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>Execute an arbitrary Mercurial command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command options</source> - <translation>Komut seçenekleri</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command &options...</source> - <translation>K&omut seçenekleri...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure</source> + <translation>Yapılandırma</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure...</source> + <translation>Ayarlanıyor...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure</source> - <translation>Yapılandırma</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure...</source> - <translation>Ayarlanıyor...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths</source> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths...</source> + <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> - <source>Show the aliases for remote repositories</source> + <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository</source> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository...</source> + <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source>Verify the integrity of the repository</source> + <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover</source> + <source>Identify</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover...</source> + <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Recover from an interrupted transaction</source> + <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> - <source>Identify</source> + <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> - <source>Identify...</source> + <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Identify the project directory</source> + <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Create .hgignore</source> + <source>Create changegroup</source> + <translation>Değişimgrubu oluştur</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> - <source>Create a .hgignore file with default values</source> + <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup</source> - <translation>Değişimgrubu oluştur</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"</source> + <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"...</source> + <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Mark a selectable changeset as good</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"</source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation type="unfinished"></translation> + <source>Skip</source> + <translation>Atla</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> - <source>Skip</source> - <translation>Atla</translation> + <source>Reset</source> + <translation>Başadön</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> - <source>Reset</source> - <translation>Başadön</translation> + <source>Back out changeset</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> - <source>Reset the bisect search data</source> + <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Back out changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Back out changes of an earlier changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -20733,260 +20718,280 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration</source> + <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration...</source> + <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the user configuration file</source> + <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> - <source>Revert Changes</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches...</source> + <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> - <source>Export revisions to patch files</source> + <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -30517,7 +30522,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Profile Data</source> <translation>Veri Kesiti</translation> </message> @@ -30537,7 +30542,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Application Diagram</source> <translation>Uygulama Şeması</translation> </message> @@ -30557,7 +30562,7 @@ <translation><b>Uygulama Şeması...</b><p>Bu projenin bir şemasını gösterir.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source>Create Package List</source> <translation>Paket Listesini Oluştur</translation> </message> @@ -30577,7 +30582,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source>Create Plugin Archive</source> <translation>Eklenti Arşivi Oluştur</translation> </message> @@ -30702,77 +30707,77 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3834"/> + <location filename="Project/Project.py" line="3836"/> <source>Coverage Data</source> <translation>Veri Kapsamı</translation> </message> <message> - <location filename="Project/Project.py" line="3880"/> + <location filename="Project/Project.py" line="3882"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Bugeçerli projede tanımlanan ana betik değil. Durduruluyor</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Code Coverage</source> <translation>Kod Koruyucu</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Please select a coverage file</source> <translation>Lütfen bir koruyucu dosya seçiniz</translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Please select a profile file</source> <translation>Lütfen kesit dosyasını seçiniz</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Include module names?</source> <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="Project/Project.py" line="4058"/> + <location filename="Project/Project.py" line="4060"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4102"/> + <location filename="Project/Project.py" line="4104"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4110"/> + <location filename="Project/Project.py" line="4112"/> <source>The project does not have a main script defined. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4122"/> + <location filename="Project/Project.py" line="4124"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4133"/> + <location filename="Project/Project.py" line="4135"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4153"/> + <location filename="Project/Project.py" line="4155"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4165"/> + <location filename="Project/Project.py" line="4167"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -38945,270 +38950,270 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> <source>Could not start the svn executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>Create project in repository</source> <translation>Bilgi havuzunda proje oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Proje bilgi havuzunda oluşturulamadı. Belki verilen bilgi havuzu yoktur yada bilgi havuzunun serveri bozuktur.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>New project</source> <translation>Yeni Proje</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Proje bilgi havuzundan kontrol edilemiyor.<br />Orjinal içerik eski haline getiriliyor.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> <source>Importing project into Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> <source>Subversion Checkout</source> <translation>Altsürüm Kontrolü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> <source>Checking project out of Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>Subversion Export</source> <translation>Altsürüm Dışaaktarma</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> <source>Exporting project from Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> <source>Commiting changes to Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> <source>Synchronizing with the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> <source>Adding files/directories to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> <source>Adding directory trees to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> <source>Removing files/directories from the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> <source>Moving {0}</source> <translation>Taşınıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>Subversion Error</source> <translation>Altsürüm Hatası</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> <source>Merging {0}</source> <translation>Birleştiriliyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> <source>Cleaning up {0}</source> <translation>Temizle {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion command</source> <translation>Altsürüm komutu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> <source>Resolving conficts</source> <translation>Çelişki çözümleniyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> <source>Subversion Set Property</source> <translation>Altsürüm Özelliklerini Ayarla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> <source>You have to supply a property name. Aborting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> <source>Subversion Delete Property</source> <translation>Altsürüm Silme Önceliği</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Subversion Log</source> <translation>Altsürüm Kayıtı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Select number of entries to show.</source> <translation>Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> <source>Relocating</source> <translation>Yeniden konumlandırılıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Repository Browser</source> <translation>Kaynak Havuzu Gözatıcısı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> <source>Remove from changelist</source> <translation>Değişiklik listesinden çıkar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> <source>Add to changelist</source> <translation>Değişiklik listesine ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> <source>Enter name of the changelist:</source> <translation>Değişiklik listesi adını giriniz:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> <source>Revision {0}. </source> <translation>Gözden geçirme {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> <source>Property set.</source> <translation>Özellikleri Ayarla.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Subversion Lock</source> <translation>Altsürüm Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -40932,7 +40937,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> <source>Resolve conflict</source> - <translation>Çelişkiyi çözümle</translation> + <translation type="obsolete">Çelişkiyi çözümle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> @@ -40999,6 +41004,11 @@ <source>Show repository info</source> <translation>Kaynak havuzu bilgisini göster</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -41065,60 +41075,60 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Add to repository</source> - <translation>Kaynak havuzuna ekle</translation> + <translation type="obsolete">Kaynak havuzuna ekle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Add to repository...</source> - <translation>K&aynak havuzuna ekle...</translation> + <translation type="obsolete">K&aynak havuzuna ekle...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/> <source>Add the local project to the VCS repository</source> - <translation>VCS kaynak havuzuna yerel proje ekle</translation> + <translation type="obsolete">VCS kaynak havuzuna yerel proje ekle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> - <translation><b>Kaynak havuzuna ekle</b><p>Bu yerel projeyi kaynak havuzana ekler ( aktarır).</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <translation type="obsolete"><b>Kaynak havuzuna ekle</b><p>Bu yerel projeyi kaynak havuzana ekler ( aktarır).</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldı&r (ve diskten)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show log</source> <translation>Kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show &log</source> <translation>Kayıtı &göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> <source>Show the log of the local project</source> <translation>Yerel projenin günlük kaydını göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"></translation> </message> @@ -41128,465 +41138,475 @@ <translation type="obsolete">Sınırlı kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> + <source>Show difference</source> + <translation>Farkları göster</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> + <source>Show &difference</source> + <translation>Farkları gös&ter</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> - <source>Show difference</source> - <translation>Farkları göster</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> - <source>Show &difference</source> - <translation>Farkları gös&ter</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show difference (extended)</source> <translation>Farkları göster (gelişmiş)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show difference (URLs)</source> <translation>Farkları göster (URL'ler)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show &status</source> <translation>Durumu gö&ster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation>Kaynak havuzu etiketi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation>Kaynak havuzu e&tiketi...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation>Kaynak havuzundan ihraç et</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation>Dışarı kaynak havuzundan ihraç &et...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <source>Export a project from the repository</source> + <translation>Dışa Kaynak havuzundan proje aktar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command options</source> + <translation>Komut seçenekleri</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation>K&omut seçenekleri...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Export a project from the repository</source> - <translation>Dışa Kaynak havuzundan proje aktar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command options</source> - <translation>Komut seçenekleri</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command &options...</source> - <translation>K&omut seçenekleri...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Re&vert changes</source> <translation>Değişiklikleri ba&şa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation>Birleştir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation>De&ğişiklikleri birleştir...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation>Değiştirmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation>Deği&ştirmek...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> - <translation>Çelişkileri çözümle</translation> + <translation type="obsolete">Çelişkileri çözümle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> - <translation>Çelişkileri çö&zümle</translation> + <translation type="obsolete">Çelişkileri çö&zümle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanup</source> + <translation>Temizle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanu&p</source> + <translation>Temi&zle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> - <source>Resolve all conflicts of the local project</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation>Yerel projeyi temizle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> - <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanup</source> - <translation>Temizle</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanu&p</source> - <translation>Temi&zle</translation> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> - <source>Cleanup the local project</source> - <translation>Yerel projeyi temizle</translation> + <source>Execute an arbitrary VCS command</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>Execute command</source> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>E&xecute command...</source> - <translation type="unfinished"></translation> + <source>List tags</source> + <translation>Etiketleri listele</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <source>List tags...</source> + <translation>Etiketleri listele...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> - <source>Execute an arbitrary VCS command</source> + <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags</source> - <translation>Etiketleri listele</translation> + <source>List branches</source> + <translation>Branşlar listesi</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags...</source> - <translation>Etiketleri listele...</translation> + <source>List branches...</source> + <translation>Branşlar listesi...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> - <source>List tags of the project</source> - <translation type="unfinished"></translation> + <source>List branches of the project</source> + <translation>Prosenin branşlar listesi</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished"></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches</source> - <translation>Branşlar listesi</translation> + <source>List repository contents</source> + <translation>Kaynak Havuzu içeriğini listele</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches...</source> - <translation>Branşlar listesi...</translation> + <source>List repository contents...</source> + <translation>Kaynak Havuzu içeriğini listele...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> - <source>List branches of the project</source> - <translation>Prosenin branşlar listesi</translation> + <source>Lists the contents of the repository</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents</source> - <translation>Kaynak Havuzu içeriğini listele</translation> + <source>Set Property</source> + <translation>Özellikleri Ayarla</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents...</source> - <translation>Kaynak Havuzu içeriğini listele...</translation> + <source>Set Property...</source> + <translation>Özellikleri Ayarla...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> - <source>Lists the contents of the repository</source> + <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property</source> - <translation>Özellikleri Ayarla</translation> + <source>List Properties</source> + <translation>Özellikleri Listele</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property...</source> - <translation>Özellikleri Ayarla...</translation> + <source>List Properties...</source> + <translation>Özellikler Listeleniyor...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> - <source>Set a property for the project files</source> - <translation type="unfinished"></translation> + <source>List properties of the project files</source> + <translation>Proje dosyalarının özelliklerin listele</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties</source> - <translation>Özellikleri Listele</translation> + <source>Delete Property</source> + <translation>Özellikleri Sil</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties...</source> - <translation>Özellikler Listeleniyor...</translation> + <source>Delete Property...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> - <source>List properties of the project files</source> - <translation>Proje dosyalarının özelliklerin listele</translation> + <source>Delete a property for the project files</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <source>Relocate</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property</source> - <translation>Özellikleri Sil</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> - <source>Delete a property for the project files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser</source> <translation>Kaynak Havuzu Gözatıcısı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure</source> + <translation>Yapılandırma</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation>Ayarlanıyor...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source>Show the Repository Browser dialog</source> + <source>Show the configuration dialog with the Subversion page selected</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure</source> - <translation>Yapılandırma</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure...</source> - <translation>Ayarlanıyor...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> <source>Show repository info</source> <translation>Kaynak havuzu bilgisini göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show some repository related information for the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -50459,17 +50479,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="662"/> + <location filename="VCS/VersionControl.py" line="673"/> <source>Repository status checking is switched off</source> <translation>Kaynak havuzu durum konrol anahtarı kapalı</translation> </message> @@ -54195,24 +54215,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -54221,7 +54241,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54238,23 +54258,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -54265,7 +54285,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -54509,17 +54529,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Kaynak Havuzu Bilgisi</h3><table><tr><td><b>Altsürüm V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{2}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{3}</td></tr><tr><td><b>Teslim Tarihi</b></td><td>{4}</td></tr><tr><td><b>Teslim Zamanı</b></td><td>{5}</td></tr><tr><td><b>Son yazar</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>KAynak Havuzu Bilgisi</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Altsürümn V.</b></td><td>{1}</td></tr><tr><td><b>Altsürüm API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{4}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{5}</td></tr><tr><td><b>Teslim tarihi</b></td><td>{6}</td></tr><tr><td><b>Teslim zamanı</b></td><td>{7}</td></tr><tr><td><b>Son yazar</b></td><td>{8}</td></tr></table></translation> </message>